Avoid use of direct troff requests in mdoc(7) manual pages.

28 files changed, 97 insertions, 158 deletions

diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index 5911aa2..461ac17 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -32,31 +32,21 @@
 .Nd command for adding new users
 .Sh SYNOPSIS
 .Nm adduser
+.Bk -words
 .Op Fl check_only
-.br
 .Op Fl class Ar login_class
-.br
 .Op Fl config_create
-.br
 .Op Fl dotdir Ar dotdir
-.br
 .Op Fl group Ar login_group
-.br
 .Op Fl h | help
-.br
 .Op Fl home Ar home
-.br
 .Op Fl message Ar message_file
-.br
 .Op Fl noconfig
-.br
 .Op Fl shell Ar shell
-.br
 .Op Fl s | silent | q | quiet
-.br
 .Op Fl uid Ar uid_start
-.br
 .Op Fl v | verbose
+.Ek
 .Sh DESCRIPTION
 .Nm Adduser 
 is a simple program for adding new users.
diff --git a/usr.sbin/arp/arp.4 b/usr.sbin/arp/arp.4
index 39c60c5b..2af8401 100644
--- a/usr.sbin/arp/arp.4
+++ b/usr.sbin/arp/arp.4
@@ -128,7 +128,6 @@ routing table.  It can also occur if the kernel cannot allocate memory.
 .Xr arp 8 ,
 .Xr ifconfig 8 ,
 .Xr route 8
-.sp
 .Rs
 .%A Plummer, D.
 .%B "An Ethernet Address Resolution Protocol"
@@ -140,4 +139,3 @@ routing table.  It can also occur if the kernel cannot allocate memory.
 .%B "Trailer Encapsulations
 .%T RFC893
 .Re
-
diff --git a/usr.sbin/burncd/burncd.8 b/usr.sbin/burncd/burncd.8
index 49071bd..5b3617a 100644
--- a/usr.sbin/burncd/burncd.8
+++ b/usr.sbin/burncd/burncd.8
@@ -123,6 +123,5 @@ command appeared in
 .Fx 4.0 .
 .Sh AUTHORS
 The program has been contributed by
-.ie t S/oren Schmidt,
-.el Søren Schmidt,
+.An S\(/oren Schmidt ,
 Denmark.
diff --git a/usr.sbin/config/config.8 b/usr.sbin/config/config.8
index fa62fe4..7a126e0 100644
--- a/usr.sbin/config/config.8
+++ b/usr.sbin/config/config.8
@@ -163,8 +163,7 @@ strings kernel | grep ___
 .Sh DEBUG KERNELS
 Traditional BSD kernels compiled without symbols due to the heavy load on the
 system when compiling a
-.if n "debug"
-.if t ``debug''
+.Dq debug
 kernel.  A debug kernel contains complete symbols for all the source files, and
 enables an experienced kernel programmer to analyse the cause of a problem.  The
 debuggers available prior to 4.4BSD-Lite were able to find some information
diff --git a/usr.sbin/cron/crontab/crontab.5 b/usr.sbin/cron/crontab/crontab.5
index 01f6207..6c23e31 100644
--- a/usr.sbin/cron/crontab/crontab.5
+++ b/usr.sbin/cron/crontab/crontab.5
@@ -182,7 +182,6 @@ fields \(em day of month, and day of week.  If both fields are
 restricted (ie, aren't *), the command will be run when
 .Em either
 field matches the current time.  For example,
-.br
 ``30 4 1,15 * 5''
 would cause a command to be run at 4:30 am on the 1st and 15th of each
 month, plus every Friday.
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.1 b/usr.sbin/crunch/crunchgen/crunchgen.1
index e5ec1f9..e50002e 100644
--- a/usr.sbin/crunch/crunchgen/crunchgen.1
+++ b/usr.sbin/crunch/crunchgen/crunchgen.1
@@ -39,14 +39,12 @@
 .Op Fl e Ar exec-file-name
 .Op Ar conf-file
 .Sh DESCRIPTION
-
 A crunched binary is a program made up of many other programs linked
 together into a single executable.  The crunched binary main()
 function determines which component program to run by the contents of
 argv[0].  The main reason to crunch programs together is for fitting
 as many programs as possible onto an installation or system recovery
 floppy.
-
 .Pp
 .Nm
 reads in the specifications in
@@ -63,7 +61,6 @@ uses the companion program
 .Nm crunchide
 to eliminate link-time conflicts between the component programs by
 hiding all unnecessary symbols.
-
 .Pp
 .Nm 
 places specific requirements on package
@@ -84,7 +81,6 @@ in the source directory
 looks for the file
 .Pa Makefile.foo
 in the current directory.
-
 .Pp
 After
 .Nm
@@ -95,7 +91,6 @@ run make in each component program's source dir to build the object
 files for the user.  This is not done automatically since in release
 engineering circumstances it is generally not desirable to be
 modifying objects in other directories.
-
 .Pp
 The options are as follows:
 .Bl -tag -width indent
@@ -129,7 +124,6 @@ Add ``make obj'' rules to each program make target.
 Quiet operation.  Status messages are suppressed.
 .El
 .Sh CRUNCHGEN CONFIGURATION FILE COMMANDS
-
 .Nm Crunchgen
 reads specifications from the 
 .Ar conf-file
@@ -171,7 +165,6 @@ whenever
 appears in argv[0].  This allows programs that change their behavior when
 run under different names to operate correctly. 
 .El
-
 To handle specialized situations, such as when the source is not
 available or not built via a conventional Makefile, the following
 .Nm special
@@ -236,7 +229,6 @@ This option is to be used as a last resort as its use can cause a
 symbol conflict, however in certain instances it may be the only way to
 have a symbol resolve.
 .El
-
 .Pp
 Only the 
 .Nm objpaths
@@ -251,7 +243,6 @@ which are in turn calculated from
 so is sometimes convenient to specify the earlier parameters and let 
 .Nm
 calculate forward from there if it can.
-
 .Pp
 The makefile produced by
 .Nm
@@ -272,20 +263,20 @@ Here is an example
 input conf file, named
 .Dq Pa kcopy.conf :
 .Pp
-.nf
-	srcdirs /usr/src/bin /usr/src/sbin
+.Bd -literal -offset indent
+srcdirs /usr/src/bin /usr/src/sbin
 
-	progs test cp echo sh fsck halt init mount umount myinstall
-	progs anotherprog
-	ln test [       # test can be invoked via [
-	ln sh -sh       # init invokes the shell with "-sh" in argv[0]
+progs test cp echo sh fsck halt init mount umount myinstall
+progs anotherprog
+ln test [       # test can be invoked via [
+ln sh -sh       # init invokes the shell with "-sh" in argv[0]
 
-	special myprog objpaths /homes/leroy/src/myinstall.o # no sources
+special myprog objpaths /homes/leroy/src/myinstall.o # no sources
 
-	special anotherprog -DNO_FOO WITHOUT_BAR=YES
+special anotherprog -DNO_FOO WITHOUT_BAR=YES
 
-	libs -lutil -lcrypt
-.fi
+libs -lutil -lcrypt
+.Ed
 .Pp
 This conf file specifies a small crunched binary consisting of some
 basic system utilities plus a homegrown install program ``myinstall'',
@@ -300,13 +291,13 @@ are added to all build targets.
 .Pp
 The crunched binary ``kcopy'' can be built as follows:
 .Pp
-.nf
-	% crunchgen -m Makefile kcopy.conf    # gen Makefile and kcopy.c
-	% make objs             # build the component programs' .o files
-	% make                  # build the crunched binary kcopy
-	% kcopy sh              # test that this invokes a sh shell
-	$			# it works!
-.fi
+.Bd -literal -offset indent
+% crunchgen -m Makefile kcopy.conf    # gen Makefile and kcopy.c
+% make objs             # build the component programs' .o files
+% make                  # build the crunched binary kcopy
+% kcopy sh              # test that this invokes a sh shell
+$			# it works!
+.Ed
 .Pp
 At this point the binary ``kcopy'' can be copied onto an install floppy
 and hard-linked to the names of the component programs.
diff --git a/usr.sbin/crunch/crunchide/crunchide.1 b/usr.sbin/crunch/crunchide/crunchide.1
index 3543c29..90f9792 100644
--- a/usr.sbin/crunch/crunchide/crunchide.1
+++ b/usr.sbin/crunch/crunchide/crunchide.1
@@ -36,7 +36,6 @@
 .Op Fl k Ar keep-symbol
 .Op Ar object-file ...
 .Sh DESCRIPTION
-
 .Nm Crunchide
 hides the global symbols of
 .Ar object-file
@@ -72,12 +71,12 @@ multiple component programs.
 .Nm Crunch
 was written by
 .An James da Silva Aq jds@cs.umd.edu .
-.sp 0
+.Pp
 Copyright (c) 1994 University of Maryland.  All Rights Reserved.
 .Pp
 Chris Demetriou <cgd@netbsd.org> reorganized
 .Nm
 so that it supported multiple object formats, and added
 ELF object support and ECOFF object recognition.
-.sp 0
+.Pp
 Copyright (c) 1997 Christopher G. Demetriou.  All Rights Reserved.
diff --git a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1 b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
index db892db..836ea7c 100644
--- a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
+++ b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
@@ -232,7 +232,6 @@ It is safe to invoke
 multiple times concurrently (with different input files),
 as might happen when
 .Xr sendmail
-.nh
 is delivering mail asynchronously.  This is because locking is used to
 keep things orderly.
 .Sh FILE FORMAT
@@ -464,7 +463,7 @@ will report:
 .Bd -literal -offset indent
 ctm_rmail: message contains no delta
 .Ed
-.sp \n(Ppu
+.Pp
 and return an exit status of 1.  You can use this to redirect wayward messages
 back into your real mailbox if your mail filter goes wonky.
 .Pp
diff --git a/usr.sbin/edquota/edquota.8 b/usr.sbin/edquota/edquota.8
index dc07d19..e19be6b 100644
--- a/usr.sbin/edquota/edquota.8
+++ b/usr.sbin/edquota/edquota.8
@@ -56,7 +56,6 @@
 .Nm edquota
 .Fl t
 .Fl g
-.br
 .Sh DESCRIPTION
 .Nm Edquota
 is a quota editor.
diff --git a/usr.sbin/fdcontrol/fdcontrol.8 b/usr.sbin/fdcontrol/fdcontrol.8
index ab7adab..f5adc08 100644
--- a/usr.sbin/fdcontrol/fdcontrol.8
+++ b/usr.sbin/fdcontrol/fdcontrol.8
@@ -98,6 +98,5 @@ It's user interface and overall
 functionality are subjects to future improvements and changes.
 .Sh AUTHORS
 The program has been contributed by
-.if n Joerg Wunsch,
-.if t J\(:org Wunsch,
+.An J\(:org Wunsch ,
 Dresden.
diff --git a/usr.sbin/fdformat/fdformat.1 b/usr.sbin/fdformat/fdformat.1
index 306e575..7e944d5 100644
--- a/usr.sbin/fdformat/fdformat.1
+++ b/usr.sbin/fdformat/fdformat.1
@@ -162,8 +162,7 @@ It later became part of the
 system.
 .Sh AUTHORS
 The program has been contributed by
-.if n Joerg Wunsch,
-.if t J\(:org Wunsch,
+.An J\(:org Wunsch ,
 Dresden, with changes by
 .An Serge Vakulenko
 and
diff --git a/usr.sbin/fdwrite/fdwrite.1 b/usr.sbin/fdwrite/fdwrite.1
index 245818b..bb104b5 100644
--- a/usr.sbin/fdwrite/fdwrite.1
+++ b/usr.sbin/fdwrite/fdwrite.1
@@ -25,7 +25,7 @@
 .Nm Fdwrite
 formats and writes one and more floppy disks.
 Any floppy disk device capable of formatting can be used.
-
+.Pp
 .Nm Fdwrite
 will ask the user
 .Pq on /dev/tty
@@ -37,7 +37,7 @@ read back and compared.
 When the floppy disk is filled, the process is repeated, with the next disk.
 This continues until the program is interrupted or EOF is encountered on the
 .Ar inputfile .
-
+.Pp
 The options are as follows:
 .Bl -tag -width 10n -offset indent
 .It Fl v
@@ -60,35 +60,32 @@ Input file to read.  If none is given, stdin is assumed.
 The name of the floppy device to write to.  Default is
 .Pa /dev/fd0 .
 .El
-
+.Pp
 .Nm Fdwrite
 actually closes the
 .Ar device
 while it waits for the user to press return,
 it is thus quite possible to use the drive for other purposes at this
 time and later resume writing with the next floppy.
-
+.Pp
 The parameters returned from
 .Ar device
 are used for formatting.
 If custom formatting is needed, please use
 .Xr fdformat 1
 instead.
-
 .Sh EXAMPLE
 .Nm Fdwrite
 was planned as a tool to make life easier when writing a set of floppies,
 one such use could be to write a tar-archive:
-
-.ce 1
-tar cf - . | gzip -9 | fdwrite -d /dev/fd0.1720 -v
-
+.Pp
+.Dl "tar cf - . | gzip -9 | fdwrite -d /dev/fd0.1720 -v
+.Pp
 The main difference from using
 .Xr tar 1 's
 multivolume facility is of course the formatting of the floppies, which
 here is done on the fly,
 thus reducing the amount of work for the floppy-jockey.
-
 .Sh SEE ALSO
 .Xr fdformat 1
 .Sh HISTORY
@@ -101,18 +98,18 @@ The program has been contributed by
 .An Poul-Henning Kamp Aq phk@login.dknet.dk .
 .Sh BUGS
 Diagnostics are less than complete at present.
-
+.Pp
 If a floppy is sick, and the
 .Ar inputfile
 is seekable, it should ask the user to frisbee the disk, insert
 another, and rewind to the right spot and continue.
-
+.Pp
 This concept could be extended to cover non-seekable input also
 by employing a temporary file.
-
+.Pp
 An option (defaulting to zero) should allow the user to ask for
 retries in case of failure.
-
+.Pp
 At present a suitable tool for reading back a multivolume set
 of floppies is missing.
 Programs like
diff --git a/usr.sbin/i4b/isdnd/isdnd.rc.5 b/usr.sbin/i4b/isdnd/isdnd.rc.5
index 56c6190..4e5bd9f 100644
--- a/usr.sbin/i4b/isdnd/isdnd.rc.5
+++ b/usr.sbin/i4b/isdnd/isdnd.rc.5
@@ -698,7 +698,7 @@ PPP interface.
 
 .It Li ratetype
 The rate entry used from the rates file. (optional)
-.br
+.Pp
 For example, ratetype=0 selects lines beginning "ra0" in /etc/isdn/isdnd.rates;
 (typically ra0 lines are a set of tables for local call rates on different
 days of the week & times per day).
diff --git a/usr.sbin/lpr/lp/lp.1 b/usr.sbin/lpr/lp/lp.1
index 8666925..ed2226c 100644
--- a/usr.sbin/lpr/lp/lp.1
+++ b/usr.sbin/lpr/lp/lp.1
@@ -107,8 +107,7 @@ specification.
 This implementation of the
 .Nm
 command has been written by
-.if t J\(:org Wunsch.
-.if n Joerg Wunsch.
+.An J\(:org Wunsch .
 .Sh BUGS
 The
 .St -p1003.2
diff --git a/usr.sbin/mrouted/mrinfo.8 b/usr.sbin/mrouted/mrinfo.8
index c8b5c01..f43bb5b 100644
--- a/usr.sbin/mrouted/mrinfo.8
+++ b/usr.sbin/mrouted/mrinfo.8
@@ -2,7 +2,7 @@
 .\"
 .Dd May 8, 1995
 .Dt MRINFO 8
-.UC 5
+.Os
 .Sh NAME
 .Nm mrinfo
 .Nd display configuration info from a multicast router
@@ -60,14 +60,14 @@ reply.
 Default timeout is 4 seconds.
 .El
 .Sh SAMPLE OUTPUT
-.nf
-.Nm mrinfo mbone.phony.dom.net
+.Bd -literal
+.Nm mrinfo Ar mbone.phony.dom.net
 127.148.176.10 (mbone.phony.dom.net) [version 3.3]:
  127.148.176.10 -> 0.0.0.0 (?) [1/1/querier]
  127.148.176.10 -> 127.0.8.4 (mbone2.phony.dom.net) [1/45/tunnel]
  127.148.176.10 -> 105.1.41.9 (momoney.com) [1/32/tunnel/down]
  127.148.176.10 -> 143.192.152.119 (mbone.dipu.edu) [1/32/tunnel]
-.fi
+.Ed
 .Pp
 For each neighbor of the queried multicast router, the IP of the queried router
 is displayed, followed by the IP and name of the neighbor.
diff --git a/usr.sbin/mrouted/mrouted.8 b/usr.sbin/mrouted/mrouted.8
index 1e56452..bf8b5c4 100644
--- a/usr.sbin/mrouted/mrouted.8
+++ b/usr.sbin/mrouted/mrouted.8
@@ -4,7 +4,7 @@
 .\"
 .Dd May 8, 1995
 .Dt MROUTED 8
-.UC 5
+.Os
 .Sh NAME
 .Nm mrouted
 .Nd IP multicast routing daemon
@@ -386,8 +386,8 @@ direct tunnels (i.e. eliminate the middle man).
 .Sh "EXAMPLE CONFIGURATION"
 This is an example configuration for a mythical multicast router at a big
 school.
-.sp
-.nf
+.Pp
+.Bd -literal
 #
 # mrouted.conf example
 #
@@ -420,7 +420,7 @@ tunnel 192.168.5.4 192.168.55.101 metric 1 threshold 1
 # Careful with those boundaries, Eugene.
 tunnel 192.168.5.4 10.11.12.13 metric 1 threshold 32
 	boundary LOCAL boundary EE
-.fi
+.Ed
 .Sh SIGNALS
 .Nm Mrouted 
 responds to the following signals:
@@ -453,9 +453,8 @@ writes its pid to
 upon startup.
 .Sh EXAMPLE
 The routing tables look like this:
-.nf
-.ft C
-
+.Pp
+.Bd -literal
 Virtual Interface Table
  Vif  Local-Address                    Metric  Thresh  Flags
   0   36.2.0.8      subnet: 36.2/16       1       1    querier
@@ -488,8 +487,7 @@ Multicast Routing Table (1136 entries)
  .
  .
  .
-
-.fi
+.Ed
 .Pp
 In this example, there are four vifs connecting to two subnets and two
 tunnels.  The vif 3 tunnel is not in use (no peer address). The vif 0 and
@@ -520,9 +518,8 @@ are created and deleted by
 .Nm mrouted .
 .Pp
 The cache tables look like this:
-.nf
-.ft C
-
+.Pp
+.Bd -literal
 Multicast Routing Cache Table (147 entries)
  Origin             Mcast-group     CTmr  Age Ptmr IVif Forwvifs
  13.2.116/22        224.2.127.255     3m   2m    -  0    1 
@@ -534,8 +531,7 @@ Multicast Routing Cache Table (147 entries)
 >128.9.160.45
  198.106.194/24     224.2.135.190     9m  28s   9m  0P  
 >198.106.194.22
-
-.fi 
+.Ed 
 .Pp
 Each entry is characterized by the origin subnet number and mask and the
 destination multicast group.
diff --git a/usr.sbin/mrouted/mtrace.8 b/usr.sbin/mrouted/mtrace.8
index 2f2a53e..12543d1 100644
--- a/usr.sbin/mrouted/mtrace.8
+++ b/usr.sbin/mrouted/mtrace.8
@@ -33,7 +33,7 @@
 .\"
 .Dd May 8, 1995
 .Dt MTRACE 8
-.UC 6
+.Os
 .Sh NAME
 .Nm mtrace
 .Nd print multicast path from a source to a receiver
@@ -358,8 +358,7 @@ received, both derived from the local system clock, and the total
 ttl required for a packet to travel along this path.  A sample use and
 output might be:
 .Pp
-.nf
-.ft C
+.Bd -literal
 oak.isi.edu 80# mtrace -l caraway.lcs.mit.edu 224.2.0.3
 Mtrace from 18.26.0.170 to 128.9.160.100 via group 224.2.0.3
 Querying full reverse path... 
@@ -371,7 +370,7 @@ Querying full reverse path...
  -5  mit.dart.net (140.173.48.2)  DVMRP  thresh^ 1  71 ms  
  -6  caraway.lcs.mit.edu (18.26.0.170)
 Round trip time 124 ms; total ttl of 6 required.
-.fi
+.Ed
 .Pp
 If a hop reports that it is using the default route to forward packets,
 the word
@@ -423,17 +422,8 @@ seconds in the example below.  The second section of the output is
 omitted if the
 .Fl s
 option is set or if no multicast group is specified.
-.ie t \{\
-.ft C
-.  ie \w'i'<>\w'm' \{\" looks like this is not proper Courier font
-(If this example is not properly columned with a fixed-width font, get
-.B groff
-and try again.)
-.  \}
-.\}
 .Pp
-.ft C
-.nf
+.Bd -literal
 Waiting to accumulate statistics... Results after 101 seconds:
 
   Source       Response Dest    Overall   Packet Statistics For Traffic From
@@ -462,7 +452,7 @@ Waiting to accumulate statistics... Results after 101 seconds:
      v         \\ hop   -8 ms     79 pps      ?/18        0 pps
 128.9.160.100  128.9.160.100
   Receiver     Query Source
-.fi
+.Ed
 .Pp
 Because the packet counts may be changing as the trace query is
 propagating, there may be small errors (off by 1 or 2) in these
@@ -501,8 +491,7 @@ that did not implement the multicast traceroute function, so
 switched to hop-by-hop mode.  The \*(lqOutput pruned\*(rq error code
 indicates that traffic for group 224.2.143.24 would not be forwarded.
 .Pp
-.nf
-.ft C
+.Bd -literal
 oak.isi.edu 108# mtrace -g 140.173.48.2 204.62.246.73 \\
                            butter.lcs.mit.edu 224.2.143.24
 Mtrace from 204.62.246.73 to 18.26.0.151 via group 224.2.143.24
@@ -514,7 +503,7 @@ Querying full reverse path... * switching to hop-by-hop:
  -4  darpa.dart.net (140.173.240.2)  DVMRP  thresh^ 16  47 ms
  -5  * * * noc.hpc.org (192.187.8.2) [mrouted 2.2] didn't respond
 Round trip time 95 ms
-.fi
+.Ed
 .Sh AUTHORS
 Implemented by
 .An Steve Casner
diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/mtree/mtree.8
index fae66e8..c106d8f 100644
--- a/usr.sbin/mtree/mtree.8
+++ b/usr.sbin/mtree/mtree.8
@@ -209,7 +209,7 @@ The file the symbolic link is expected to reference.
 The last modification time of the file.
 .It Cm type
 The type of the file; may be set to any one of the following:
-.sp
+.Pp
 .Bl -tag -width Cm -compact
 .It Cm block
 block special device
diff --git a/usr.sbin/pcvt/loadfont/loadfont.1 b/usr.sbin/pcvt/loadfont/loadfont.1
index d51a014..1e599ac 100644
--- a/usr.sbin/pcvt/loadfont/loadfont.1
+++ b/usr.sbin/pcvt/loadfont/loadfont.1
@@ -62,8 +62,7 @@ This utility is used only on EGA and VGA boards, as MDA, HCG and CGA boards
 do not have downloadable charactersets available.
 .Sh FILES
 The following fontfiles are available in the pcvt distribution:
-
-.nf
+.Bd -literal
 /usr/share/misc/pcvtfonts/vt220l.808:	8x8  IBM II font
 /usr/share/misc/pcvtfonts/vt220h.808:	8x8  Extension font
 /usr/share/misc/pcvtfonts/vt220l.810:	8x10 IBM II font
@@ -72,7 +71,7 @@ The following fontfiles are available in the pcvt distribution:
 /usr/share/misc/pcvtfonts/vt220h.814:	8x14 Extension font
 /usr/share/misc/pcvtfonts/vt220l.816:	8x16 IBM II font
 /usr/share/misc/pcvtfonts/vt220h.816:	8x16 Extension font
-.fi
+.Ed
 .Sh EXAMPLES
 The command
 .Dq Li loadfont -c0 -f/usr/share/misc/pcvtfonts/vt220l.816
diff --git a/usr.sbin/pcvt/scon/scon.1 b/usr.sbin/pcvt/scon/scon.1
index cdebf71..c522c7a 100644
--- a/usr.sbin/pcvt/scon/scon.1
+++ b/usr.sbin/pcvt/scon/scon.1
@@ -45,17 +45,14 @@
 .Op Fl v
 .Op Fl V
 .Op Fl s Ar lines
-.br
 .Nm scon
 .Op Fl v
 .Op Fl d Ar device
 .Fl p Ar entry,red,green,blue
-.br
 .Nm scon
 .Op Fl v
 .Op Fl d Ar device
 .Fl p Ar default
-.br
 .Nm scon
 .Op Fl v
 .Op Fl d Ar device
diff --git a/usr.sbin/pcvt/vgaio/vgaio.8 b/usr.sbin/pcvt/vgaio/vgaio.8
index d5d3285..0c54a42 100644
--- a/usr.sbin/pcvt/vgaio/vgaio.8
+++ b/usr.sbin/pcvt/vgaio/vgaio.8
@@ -140,7 +140,6 @@ being defined !
 
 .Sh AUTHORS
 The program has been contributed by
-.if n Joerg Wunsch,
-.if t J\(:org Wunsch,
+.An J\(:org Wunsch ,
 Dresden
 .Aq joerg_wunsch@uriah.sax.de .
diff --git a/usr.sbin/ppp/ppp.8 b/usr.sbin/ppp/ppp.8
index 13cd00a..50f2aaa 100644
--- a/usr.sbin/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp.8
@@ -1,6 +1,5 @@
 .\" $FreeBSD$
 .Dd 20 September 1995
-.nr XX \w'\fC00'
 .Dt PPP 8
 .Os
 .Sh NAME
@@ -2264,7 +2263,7 @@ locally.
 .Sh SIGNAL HANDLING
 .Nm
 deals with the following signals:
-.Bl -tag -width XX
+.Bl -tag -width "USR2"
 .It INT
 Receipt of this signal causes the termination of the current connection
 (if any).
@@ -2466,7 +2465,7 @@ session, from a configuration file or from a
 or
 .Xr telnet 1
 session.
-.Bl -tag -width XX
+.Bl -tag -width 2n
 .It accept|deny|enable|disable Ar option....
 These directives tell
 .Nm
@@ -2485,7 +2484,7 @@ means that the option will not be requested by us.
 .Pp
 .Dq Option
 may be one of the following:
-.Bl -tag -width XX
+.Bl -tag -width 2n
 .It acfcomp
 Default: Enabled and Accepted.
 ACFComp stands for Address and Control Field Compression.
@@ -2767,7 +2766,7 @@ This option determines if Van Jacobson header compression will be used.
 .Pp
 The following options are not actually negotiated with the peer.
 Therefore, accepting or denying them makes no sense.
-.Bl -tag -width XX
+.Bl -tag -width 2n
 .It filter-decapsulation
 Default: Disabled.
 When this option is enabled,
@@ -3077,7 +3076,7 @@ in
 mode.
 .Pp
 User id 0 is immune to these commands.
-.Bl -tag -width XX
+.Bl -tag -width 2n
 .It allow user Ns Xo
 .Op s
 .Ar logname Ns No ...
@@ -3151,7 +3150,7 @@ may be used in place of
 .Dq nat .
 If nat is enabled on your system (it may be omitted at compile time),
 the following commands are possible:
-.Bl -tag -width XX
+.Bl -tag -width 2n
 .It nat enable yes|no
 This command either switches network address translation on or turns it off.
 The
@@ -3460,7 +3459,7 @@ This command is used to control the interface used by
 .Nm ppp .
 .Ar Command
 may be one of the following:
-.Bl -tag -width XX
+.Bl -tag -width 2n
 .It iface add Ns Xo
 .Op \&!
 .Ar addr Ns Op / Ns Ar bits
@@ -3771,7 +3770,7 @@ for details) and are never responded to.
 .Ar var value
 .Xc
 This option allows the setting of any of the following variables:
-.Bl -tag -width XX
+.Bl -tag -width 2n
 .It set accmap Ar hex-value
 ACCMap stands for Asynchronous Control Character Map.
 This is always
@@ -5241,7 +5240,7 @@ Use the
 command if you wish processing to happen in the background.
 .It show Ar var
 This command allows the user to examine the following:
-.Bl -tag -width XX
+.Bl -tag -width 2n
 .It show bundle
 Show the current bundle settings.
 .It show ccp
@@ -5342,7 +5341,7 @@ and
 These files are placed in the
 .Pa /etc/ppp
 directory.
-.Bl -tag -width XX
+.Bl -tag -width 2n
 .It Pa /etc/ppp/ppp.conf
 System default configuration file.
 .It Pa /etc/ppp/ppp.secret
diff --git a/usr.sbin/ppp/ppp.8.m4 b/usr.sbin/ppp/ppp.8.m4
index 13cd00a..50f2aaa 100644
--- a/usr.sbin/ppp/ppp.8.m4
+++ b/usr.sbin/ppp/ppp.8.m4
@@ -1,6 +1,5 @@
 .\" $FreeBSD$
 .Dd 20 September 1995
-.nr XX \w'\fC00'
 .Dt PPP 8
 .Os
 .Sh NAME
@@ -2264,7 +2263,7 @@ locally.
 .Sh SIGNAL HANDLING
 .Nm
 deals with the following signals:
-.Bl -tag -width XX
+.Bl -tag -width "USR2"
 .It INT
 Receipt of this signal causes the termination of the current connection
 (if any).
@@ -2466,7 +2465,7 @@ session, from a configuration file or from a
 or
 .Xr telnet 1
 session.
-.Bl -tag -width XX
+.Bl -tag -width 2n
 .It accept|deny|enable|disable Ar option....
 These directives tell
 .Nm
@@ -2485,7 +2484,7 @@ means that the option will not be requested by us.
 .Pp
 .Dq Option
 may be one of the following:
-.Bl -tag -width XX
+.Bl -tag -width 2n
 .It acfcomp
 Default: Enabled and Accepted.
 ACFComp stands for Address and Control Field Compression.
@@ -2767,7 +2766,7 @@ This option determines if Van Jacobson header compression will be used.
 .Pp
 The following options are not actually negotiated with the peer.
 Therefore, accepting or denying them makes no sense.
-.Bl -tag -width XX
+.Bl -tag -width 2n
 .It filter-decapsulation
 Default: Disabled.
 When this option is enabled,
@@ -3077,7 +3076,7 @@ in
 mode.
 .Pp
 User id 0 is immune to these commands.
-.Bl -tag -width XX
+.Bl -tag -width 2n
 .It allow user Ns Xo
 .Op s
 .Ar logname Ns No ...
@@ -3151,7 +3150,7 @@ may be used in place of
 .Dq nat .
 If nat is enabled on your system (it may be omitted at compile time),
 the following commands are possible:
-.Bl -tag -width XX
+.Bl -tag -width 2n
 .It nat enable yes|no
 This command either switches network address translation on or turns it off.
 The
@@ -3460,7 +3459,7 @@ This command is used to control the interface used by
 .Nm ppp .
 .Ar Command
 may be one of the following:
-.Bl -tag -width XX
+.Bl -tag -width 2n
 .It iface add Ns Xo
 .Op \&!
 .Ar addr Ns Op / Ns Ar bits
@@ -3771,7 +3770,7 @@ for details) and are never responded to.
 .Ar var value
 .Xc
 This option allows the setting of any of the following variables:
-.Bl -tag -width XX
+.Bl -tag -width 2n
 .It set accmap Ar hex-value
 ACCMap stands for Asynchronous Control Character Map.
 This is always
@@ -5241,7 +5240,7 @@ Use the
 command if you wish processing to happen in the background.
 .It show Ar var
 This command allows the user to examine the following:
-.Bl -tag -width XX
+.Bl -tag -width 2n
 .It show bundle
 Show the current bundle settings.
 .It show ccp
@@ -5342,7 +5341,7 @@ and
 These files are placed in the
 .Pa /etc/ppp
 directory.
-.Bl -tag -width XX
+.Bl -tag -width 2n
 .It Pa /etc/ppp/ppp.conf
 System default configuration file.
 .It Pa /etc/ppp/ppp.secret
diff --git a/usr.sbin/rmt/rmt.8 b/usr.sbin/rmt/rmt.8
index ffb690b..22ec4a8 100644
--- a/usr.sbin/rmt/rmt.8
+++ b/usr.sbin/rmt/rmt.8
@@ -185,7 +185,6 @@ fields of the structure used in the
 call.  The return value is the
 .Ar count
 parameter when the operation is successful.
-.ne 1i
 .It Sy S
 Return the status of the open device, as
 obtained with a
diff --git a/usr.sbin/sade/sade.8 b/usr.sbin/sade/sade.8
index 965d1ef..f4c0d26 100644
--- a/usr.sbin/sade/sade.8
+++ b/usr.sbin/sade/sade.8
@@ -133,11 +133,10 @@ is run in multi-user mode.  Execution ends either by explicit request
 directive), upon reaching the end of the argument list or on error.
 .Pp
 For example:
-.nf
-
+.Bd -literal
 /stand/sysinstall _ftpPath=ftp://ziggy/pub/ mediaSetFTP configPackages
-
-.fi
+.Ed
+.Pp
 Would initialize
 .Nm
 for FTP installation media (using the server `ziggy') and then
@@ -335,10 +334,9 @@ to mount our DOS partition and make sure that an
 entry is created for it in the new installation.  Before calling the
 .Ar diskLabelEditor
 function, we simply add an additional line:
-.nf
-	da0s1=/dos_c N
-
-.fi
+.Pp
+.Dl "da0s1=/dos_c N"
+.Pp
 before the call.  This tells the label editor that you want to mount
 the first slice on
 .Pa /dos_c
diff --git a/usr.sbin/stallion/bootcode/stl.4 b/usr.sbin/stallion/bootcode/stl.4
index 11f427c..834f6fa 100644
--- a/usr.sbin/stallion/bootcode/stl.4
+++ b/usr.sbin/stallion/bootcode/stl.4
@@ -301,7 +301,7 @@ lock-state callout devices
 .It Pa /dev/staliomem?
 board control device
 .El
-.sp
+.Pp
 Note that the port numbers start at 0 for port 0 of board 0.
 Each board has 64 port slots allocated for it.
 So the second boards ports start at 64 and go through 127.
diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8
index 965d1ef..f4c0d26 100644
--- a/usr.sbin/sysinstall/sysinstall.8
+++ b/usr.sbin/sysinstall/sysinstall.8
@@ -133,11 +133,10 @@ is run in multi-user mode.  Execution ends either by explicit request
 directive), upon reaching the end of the argument list or on error.
 .Pp
 For example:
-.nf
-
+.Bd -literal
 /stand/sysinstall _ftpPath=ftp://ziggy/pub/ mediaSetFTP configPackages
-
-.fi
+.Ed
+.Pp
 Would initialize
 .Nm
 for FTP installation media (using the server `ziggy') and then
@@ -335,10 +334,9 @@ to mount our DOS partition and make sure that an
 entry is created for it in the new installation.  Before calling the
 .Ar diskLabelEditor
 function, we simply add an additional line:
-.nf
-	da0s1=/dos_c N
-
-.fi
+.Pp
+.Dl "da0s1=/dos_c N"
+.Pp
 before the call.  This tells the label editor that you want to mount
 the first slice on
 .Pa /dos_c
diff --git a/usr.sbin/timed/timedc/timedc.8 b/usr.sbin/timed/timedc/timedc.8
index 7ebef13..c07beb6 100644
--- a/usr.sbin/timed/timedc/timedc.8
+++ b/usr.sbin/timed/timedc/timedc.8
@@ -35,7 +35,6 @@
 .Dd June 6, 1993
 .Dt TIMEDC 8
 .Os BSD 4.3
-.ad
 .Sh NAME
 .Nm timedc
 .Nd timed control program