summaryrefslogtreecommitdiffstats
path: root/term-utils
diff options
context:
space:
mode:
authorKarel Zak2015-01-26 11:31:05 +0100
committerKarel Zak2015-01-26 11:31:05 +0100
commit3d0b57d62cf289fed16537076018ba87d2d1c841 (patch)
tree230660e127fc909d53ea4d74ecf4ccc0b6764f14 /term-utils
parentlogger: improve usage() (diff)
parentdocs: restore minus symbols in long opts (diff)
downloadkernel-qcow2-util-linux-3d0b57d62cf289fed16537076018ba87d2d1c841.tar.gz
kernel-qcow2-util-linux-3d0b57d62cf289fed16537076018ba87d2d1c841.tar.xz
kernel-qcow2-util-linux-3d0b57d62cf289fed16537076018ba87d2d1c841.zip
Merge branch 'opts' of https://github.com/jwpi/util-linux
Diffstat (limited to 'term-utils')
-rw-r--r--term-utils/agetty.86
-rw-r--r--term-utils/setterm.16
2 files changed, 6 insertions, 6 deletions
diff --git a/term-utils/agetty.8 b/term-utils/agetty.8
index 10f339586..1652e0aef 100644
--- a/term-utils/agetty.8
+++ b/term-utils/agetty.8
@@ -22,7 +22,7 @@ The program can handle 7-bit characters with even, odd, none or space
parity, and 8-bit characters with no parity. The following special
characters are recognized: Control-U (kill); DEL and
backspace (erase); carriage return and line feed (end of line).
-See also the \fB\-\-erase-chars\fP and \fB\-\-kill-chars\fP options.
+See also the \fB\-\-erase\-chars\fP and \fB\-\-kill\-chars\fP options.
.IP \(bu
Optionally deduces the baud rate from the CONNECT messages produced by
Hayes(tm)-compatible modems.
@@ -71,7 +71,7 @@ null character (Ctrl\-@) can also be used for baud-rate switching.
This argument is optional and unnecessary for \fBvirtual terminals\fP.
.sp
The default for \fBserial terminals\fP is keep the current baud rate
-(see \fB\-\-keep-baud\fP) and if unsuccessful then default to '9600'.
+(see \fB\-\-keep\-baud\fP) and if unsuccessful then default to '9600'.
.TP
term
The value to be used for the TERM environment variable. This overrides
@@ -91,7 +91,7 @@ Assume that the tty is 8-bit clean, hence disable parity detection.
\-a, \-\-autologin \fIusername\fP
Log the specified user automatically in without asking for a login name and
password. The \-f \fIusername\fP option is added to the \fB/bin/login\fP
-command line by default. The \-\-login-options option changes this default
+command line by default. The \-\-login\-options option changes this default
behavior and then only \\u is replaced by the \fIusername\fP and no other
option is added to the login command line.
.TP
diff --git a/term-utils/setterm.1 b/term-utils/setterm.1
index 7525d411d..da0762436 100644
--- a/term-utils/setterm.1
+++ b/term-utils/setterm.1
@@ -63,7 +63,7 @@ The various color options may be set independently, at least on virtual
consoles, though the results of setting multiple modes (for example,
.B \-\-underline
and
-.BR \-\-half-bright )
+.BR \-\-half\-bright )
are hardware-dependent.
.TP
\fB\-\-appcursorkeys\fP [\fBon\fP|\fBoff\fP] (virtual consoles only)
@@ -159,9 +159,9 @@ truncated, see PATH_MAX from linux/limits.h for the value.
\fB\-\-foreground\fP \fI8-color\fP|\fBdefault\fP
Sets the foreground text color.
.TP
-.BR \-\-half-bright " [" on | off ]
+.BR \-\-half\-bright " [" on | off ]
Turns dim (half-brightness) mode on or off. Except on a virtual console,
-.B \-\-half-bright off
+.B \-\-half\-bright off
turns off all attributes (bold, half-brightness, blink, reverse).
.TP
\fB\-\-hbcolor\fP \fI16-color\fP