Merge branch 'master' of https://github.com/eric-s-raymond/util-linux

* 'master' of https://github.com/eric-s-raymond/util-linux:
  Fix broken list syntax.
  Restore use of correct alternation syntax using { | }.
  Re-layout a FILES section in the traditional style.
  Remove another .ti for .RS/.RE, and remove a .TP that broke list parsing.
  Replace .IP o with .IP \(bu, using the [nt]roff bullet character.
  Replace .ti operations with equivalent .RS/.RE pairs.

1 files changed, 44 insertions, 26 deletions

diff --git a/term-utils/agetty.8 b/term-utils/agetty.8
index ca5140c7..eacd2de7 100644
--- a/term-utils/agetty.8
+++ b/term-utils/agetty.8
@@ -17,7 +17,7 @@ the /bin/login command. It is normally invoked by \fIinit(8)\fP.
 
 \fBagetty\fP has several \fInon-standard\fP features that are useful
 for hard-wired and for dial-in lines:
-.IP o
+.IP \(bu
 Adapts the tty settings to parity bits and to erase, kill,
 end-of-line and uppercase characters when it reads a login name.
 The program can handle 7-bit characters with even, odd, none or space
@@ -25,24 +25,24 @@ parity, and 8-bit characters with no parity. The following special
 characters are recognized: Control-U (kill); DEL and
 back space (erase); carriage return and line feed (end of line).
 See also \fB\-\-erase-chars\fP and \fB\-\-kill-chars\fP options.
-.IP o
+.IP \(bu
 Optionally deduces the baud rate from the CONNECT messages produced by
 Hayes(tm)-compatible modems.
-.IP o
+.IP \(bu
 Optionally does not hang up when it is given an already opened line
 (useful for call-back applications).
-.IP o
+.IP \(bu
 Optionally does not display the contents of the \fI/etc/issue\fP file.
-.IP o
+.IP \(bu
 Optionally displays an alternative issue file instead of \fI/etc/issue\fP.
-.IP o
+.IP \(bu
 Optionally does not ask for a login name.
-.IP o
+.IP \(bu
 Optionally invokes a non-standard login program instead of
 \fI/bin/login\fP.
-.IP o
+.IP \(bu
 Optionally turns on hard-ware flow control
-.IP o
+.IP \(bu
 Optionally forces the line to be local with no need for carrier detect.
 .PP
 This program does not use the \fI/etc/gettydefs\fP (System V) or
@@ -256,25 +256,33 @@ This section shows examples for the process field of an entry in the
 for the other fields.  See \fIinittab(5)\fP for more details.
 
 For a hard-wired line or a console tty:
-.ti +5
+
+.RS
 /sbin/agetty 9600 ttyS1
+.RE
 
 For a directly connected terminal without proper carriage detect wiring:
 (try this if your terminal just sleeps instead of giving you a password:
 prompt.)
-.ti +5
+
+.RS
 /sbin/agetty \-L 9600 ttyS1 vt100
+.RE
 
 For a old style dial-in line with a 9600/2400/1200 baud modem:
-.ti +5
+
+.RS
 /sbin/agetty \-mt60 ttyS1 9600,2400,1200
+.RE
 
 For a Hayes modem with a fixed 115200 bps interface to the machine:
 (the example init string turns off modem echo and result codes, makes
 modem/computer DCD track modem/modem DCD, makes a DTR drop cause a 
 dis-connection and turn on auto-answer after 1 ring.)
-.ti +5
+
+.RS
 /sbin/agetty \-w \-I 'ATE0Q1&D2&C1S0=1\\015' 115200 ttyS1
+.RE
 
 .SH SECURITY NOTICE
 If you use the \fB\-\-login\-program\fP and \fB\-\-login\-options\fP options,
@@ -340,31 +348,41 @@ Insert the number of current users logged in.
 U
 Insert the string "1 user" or "<n> users" where <n> is the number of current
 users logged in.
-.TP
+.PP
 v
 Insert the version of the OS, eg. the build-date etc.
-.TP
+.PP
 Example: On my system, the following \fI/etc/issue\fP file:
-
+.sp
 .na
+.RS
 .nf
-.ti +.5
 This is \\n.\\o (\\s \\m \\r) \\t
-.TP
+.fi
+.RE
+.PP
 displays as
-
-.ti +.5
+.sp
+.RS
+.nf
 This is thingol.orcan.dk (Linux i386 1.1.9) 18:29:30
-
 .fi
+.RE
 
 .SH FILES
 .na
-.nf
-/var/run/utmp, the system status file.
-/etc/issue, printed before the login prompt.
-/dev/console, problem reports (if syslog(3) is not used).
-/etc/inittab, \fIinit\fP(8) configuration file.
+.TP
+.B /var/run/utmp
+the system status file.
+.TP
+.B /etc/issue
+printed before the login prompt.
+.TP
+.B /dev/console
+problem reports (if syslog(3) is not used).
+.TP
+.B /etc/inittab
+\fIinit\fP(8) configuration file.
 .SH BUGS
 .ad
 .fi