9 files changed, 33 insertions, 41 deletions
diff --git a/libexec/atrun/atrun.man b/libexec/atrun/atrun.man
index 8e58661..1dc7b6f 100644
--- a/libexec/atrun/atrun.man
+++ b/libexec/atrun/atrun.man
@@ -19,9 +19,10 @@ Root's
 file
 .Pa /etc/crontab
 has to contain the line
-.nf
+.Bd -literal
 */5     *       *       *       *       root    /usr/libexec/atrun
-.fi
+.Ed
+.Pp
 so that
 .Xr atrun 8
 gets invoked every five minutes.
diff --git a/libexec/bootpd/bootpd.8 b/libexec/bootpd/bootpd.8
index fa30a2e..82c7b40 100644
--- a/libexec/bootpd/bootpd.8
+++ b/libexec/bootpd/bootpd.8
@@ -32,7 +32,7 @@ RFC951, RFC1532, and RFC1533.
 .Nm Bootpgw
 implements a simple BOOTP gateway which can be used to forward
 requests and responses between clients on one subnet and a
-BOOTP server (i.e.
+BOOTP server (i.e.\&
 .Nm )
 on another subnet. While either
 .Nm
@@ -132,7 +132,7 @@ useful when client boot files are specified as relative pathnames, and
 .Nm
 needs to use the same current directory as the TFTP server
 (typically
-.Pa /tftpboot Ns ).
+.Pa /tftpboot ) .
 This option is not recognized by
 .Nm bootpgw .
 .It Fl i
@@ -189,7 +189,7 @@ the client has been waiting for at least three seconds.
 When
 .Nm
 is started it reads a configuration file, (normally
-.Pa /etc/bootptab Ns )
+.Pa /etc/bootptab )
 that initializes the internal database of known clients and client
 options.  This internal database is reloaded
 from the configuration file when
@@ -221,7 +221,7 @@ During initialization, both programs
 determine the UDP port numbers to be used by calling
 .Xr getservbyname 3
 (which normally uses
-.Pa /etc/services Ns ).
+.Pa /etc/services ) .
 Two service names (and port numbers) are used:
 .Pp
 .Dl bootps BOOTP Server listening port
diff --git a/libexec/bootpd/bootptab.5 b/libexec/bootpd/bootptab.5
index 30c9d09..b6fee66 100644
--- a/libexec/bootpd/bootptab.5
+++ b/libexec/bootpd/bootptab.5
@@ -33,7 +33,7 @@ default values used by other entries via the
 mechanism.  Most tags must be followed by an equals-sign
 and a value as above.  Some may also appear in a boolean form with no
 value (i.e.
-.Em :tg: Ns ).
+.Em :tg: ) .
 The currently recognized tags are:
 .Pp
 .Bl -tag -width xxx -compact
diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5
index 4094d38..e6e32e9 100644
--- a/libexec/getty/gettytab.5
+++ b/libexec/getty/gettytab.5
@@ -412,7 +412,7 @@ formfeed.
 half-second pause.
 .It \er
 carriage return.
-.It \eS, \es
+.It \eS , \es
 space character.
 .It \et
 tab.
diff --git a/libexec/rbootd/rbootd.8 b/libexec/rbootd/rbootd.8
index 8ef5d1f..254d853 100644
--- a/libexec/rbootd/rbootd.8
+++ b/libexec/rbootd/rbootd.8
@@ -135,15 +135,15 @@ Turn off debugging, do nothing if already off.
 .El
 .Sh "FILES"
 .Bl -tag -width /usr/libexec/rbootd -compact
-.It /dev/bpf#
+.It Pa /dev/bpf#
 packet-filter device
-.It /etc/rbootd.conf
+.It Pa /etc/rbootd.conf
 configuration file
-.It /tmp/rbootd.dbg
+.It Pa /tmp/rbootd.dbg
 debug output
-.It /usr/mdec/rbootd
+.It Pa /usr/mdec/rbootd
 directory containing boot files
-.It /var/run/rbootd.pid
+.It Pa /var/run/rbootd.pid
 process id
 .El
 .Sh SEE ALSO
diff --git a/libexec/rlogind/rlogind.8 b/libexec/rlogind/rlogind.8
index ba17817..887281f 100644
--- a/libexec/rlogind/rlogind.8
+++ b/libexec/rlogind/rlogind.8
@@ -183,9 +183,7 @@ by the server failed.
 .Bl -tag -width /etc/hostsxxxxxxxx -compact
 .It Pa /etc/hosts
 .It Pa /etc/hosts.equiv
-.Sm off
-.It Pa Ev $HOME /.rhosts
-.Sm on
+.It Ev $HOME Ns Pa /.rhosts
 .It Pa /var/run/nologin
 .El
 .Sh BUGS
diff --git a/libexec/rshd/rshd.8 b/libexec/rshd/rshd.8
index 7b11dd0..14328b6 100644
--- a/libexec/rshd/rshd.8
+++ b/libexec/rshd/rshd.8
@@ -234,9 +234,7 @@ and is not preceded by a flag byte.
 .It Pa /etc/hosts
 .It Pa /etc/hosts.equiv
 .It Pa /etc/login.conf
-.Sm off
-.It Pa Ev $HOME /.rhosts
-.Sm on
+.It Ev $HOME Ns Pa /.rhosts
 .It Pa /var/run/nologin
 .El
 .Sh BUGS
diff --git a/libexec/rtld-aout/rtld.1aout b/libexec/rtld-aout/rtld.1aout
index 5807a9d..6c2ca18 100644
--- a/libexec/rtld-aout/rtld.1aout
+++ b/libexec/rtld-aout/rtld.1aout
@@ -40,10 +40,8 @@
 is a self-contained, position independent program image providing run-time
 support for loading and link-editing shared objects into a process'
 address space. It uses the data structures
-.Po
-see
-.Xr link 5
-.Pc
+(see
+.Xr link 5 )
 contained within dynamically linked programs to determine which shared
 libraries are needed and loads them at a convenient virtual address
 using the
@@ -76,15 +74,13 @@ has relocated this symbol to a location other than 0,
 assumes the services of
 .Nm
 are needed
-.Po
-see
+(see
 .Xr link 5
-for details
-.Pc \&.
+for details).
 .Em crt0
 passes control to
-.Nm
-\&'s entry point before the program's
+.Nm Ns 's
+entry point before the program's
 .Fn main
 routine is called. Thus,
 .Nm
@@ -178,9 +174,8 @@ The following conversions can be used:
 .Bl -tag -width "xxxx"
 .It \&%a
 The main program's name
-.Po also known as
-.Dq __progname
-.Pc .
+(also known as
+.Dq __progname ) .
 .It \&%A
 The value of the environment variable
 .Ev LD_TRACE_LOADED_OBJECTS_PROGNAME
diff --git a/libexec/telnetd/telnetd.8 b/libexec/telnetd/telnetd.8
index cb920cc..95513e9 100644
--- a/libexec/telnetd/telnetd.8
+++ b/libexec/telnetd/telnetd.8
@@ -197,7 +197,7 @@ from
 to use when init starts login sessions.  The default
 .Dv ID
 is
-.Dv fe.
+.Dv fe .
 .It Fl k
 This option is only useful if
 .Nm
@@ -224,7 +224,7 @@ that do not support kludge linemode, but pass the heuristic
 (if they respond with
 .Dv WILL TIMING-MARK
 in response to a
-.Dv DO TIMING-MARK)
+.Dv DO TIMING-MARK )
 for kludge linemode support.
 .It Fl l
 Specify line mode. Try to force clients to use line-
@@ -249,12 +249,12 @@ be reached may be cleaned up.
 This option is only enabled when
 .Nm
 is compiled for
-.Dv UNICOS.
+.Dv UNICOS .
 It specifies an inclusive range of pseudo-terminal devices to
 use.  If the system has sysconf variable
 .Dv _SC_CRAY_NPTY
 configured, the default pty search range is 0 to
-.Dv _SC_CRAY_NPTY;
+.Dv _SC_CRAY_NPTY ;
 otherwise, the default range is 0 to 128.  Either
 .Ar lowpty
 or
@@ -409,7 +409,7 @@ Indicate that the client is willing to send a
 of the Network Virtual Terminal.
 .It "WILL SGA"
 Indicate that it will not be sending
-.Dv IAC GA,
+.Dv IAC GA ,
 go ahead, commands.
 .It "WILL STATUS"
 Indicate a willingness to send the client, upon
@@ -454,7 +454,7 @@ characters remotely.
 This is not really supported, but is sent to identify a 4.2BSD
 .Xr telnet 1
 client, which will improperly respond with
-.Dv WILL ECHO.
+.Dv WILL ECHO .
 If a
 .Dv WILL ECHO
 is received, a
@@ -466,7 +466,7 @@ name of the type of terminal that is attached
 to the client side of the connection.
 .It "DO SGA"
 Indicate that it does not need to receive
-.Dv IAC GA,
+.Dv IAC GA ,
 the go ahead command.
 .It "DO NAWS"
 Requests that the client inform the server when
@@ -495,9 +495,9 @@ Only sent if
 .Nm
 is compiled with support for both linemode and
 kludge linemode, and the client responded with
-.Dv WONT LINEMODE.
+.Dv WONT LINEMODE .
 If the client responds with
-.Dv WILL TM,
+.Dv WILL TM ,
 the it is assumed that the client supports
 kludge linemode.
 Note that the