17 files changed, 81 insertions, 79 deletions
diff --git a/bin/date/date.1 b/bin/date/date.1
index ed36fdd..75707f1 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -268,9 +268,8 @@ Time changes for Daylight Saving Time, standard time, leap seconds,
 and leap years are handled automatically.
 .Sh EXAMPLES
 The command:
-.Bd -literal -offset indent
-date "+DATE: %Y-%m-%d%nTIME: %H:%M:%S"
-.Ed
+.Pp
+.Dl "date ""+DATE: %Y-%m-%d%nTIME: %H:%M:%S"""
 .Pp
 will display:
 .Bd -literal -offset indent
@@ -279,56 +278,48 @@ TIME: 13:36:16
 .Ed
 .Pp
 In the Europe/London timezone, the command:
-.Bd -literal -offset indent
-date -v1m -v+1y
-.Ed
+.Pp
+.Dl "date -v1m -v+1y"
 .Pp
 will display:
-.Bd -literal -offset indent
-Sun Jan  4 04:15:24 GMT 1998
-.Ed
+.Pp
+.Dl "Sun Jan  4 04:15:24 GMT 1998"
 .Pp
 where it is currently Mon Aug  4 04:15:24 BST 1997.
 .Pp
 The command:
-.Bd -literal -offset indent
-date -v1d -v3m -v0y -v-1d
-.Ed
+.Pp
+.Dl "date -v1d -v3m -v0y -v-1d"
 .Pp
 will display the last day of February in the year 2000:
-.Bd -literal -offset indent
-Tue Feb 29 03:18:00 GMT 2000
-.Ed
+.Pp
+.Dl "Tue Feb 29 03:18:00 GMT 2000"
 .Pp
 The command:
-.Bd -literal -offset indent
-date -v1d -v+1m -v-1d -v-fri
-.Ed
+.Pp
+.Dl "date -v1d -v+1m -v-1d -v-fri"
 .Pp
 will display the last Friday of the month:
-.Bd -literal -offset indent
-Fri Aug 29 04:31:11 BST 1997
-.Ed
+.Pp
+.Dl "Fri Aug 29 04:31:11 BST 1997"
 .Pp
 where it is currently Mon Aug  4 04:31:11 BST 1997.
 .Pp
 The command:
-.Bd -literal -offset indent
-date 8506131627
-.Ed
+.Pp
+.Dl "date 8506131627"
 .Pp
 sets the date to
 .Dq Li "June 13, 1985, 4:27 PM" .
-.Bd -literal -offset indent
-date "+%Y%m%d%H%M.%S"
-.Ed
 .Pp
-may be used on one machine to print out the date suitable for setting on another.
+.Dl "date ""+%Y%m%d%H%M.%S"""
+.Pp
+may be used on one machine to print out the date
+suitable for setting on another.
 .Pp
 The command:
-.Bd -literal -offset indent
-date 1432
-.Ed
+.Pp
+.Dl "date 1432"
 .Pp
 sets the time to
 .Li "2:32 PM" ,
diff --git a/lib/libc/gen/stringlist.3 b/lib/libc/gen/stringlist.3
index 4665176..d75407c 100644
--- a/lib/libc/gen/stringlist.3
+++ b/lib/libc/gen/stringlist.3
@@ -115,7 +115,7 @@ at
 .Fa sl->sl_cur ,
 extending the size of
 .Fa sl->sl_str .
-Returns zero upon success, -1 upon failure.
+Returns zero upon success, \-1 upon failure.
 .It Fn sl_find
 Find
 .Fa item
diff --git a/lib/libc/stdio/ferror.3 b/lib/libc/stdio/ferror.3
index cb170a4..3fe2839 100644
--- a/lib/libc/stdio/ferror.3
+++ b/lib/libc/stdio/ferror.3
@@ -113,7 +113,7 @@ and
 .Fn fileno
 respectively, except that the caller is responsible for locking the stream
 with
-.Fn flockfile
+.Xr flockfile 3
 before calling them.
 These functions may be used to avoid the overhead of locking the stream
 and to prevent races when multiple threads are operating on the same stream.
diff --git a/lib/libc/stdio/getc.3 b/lib/libc/stdio/getc.3
index 022521f..570867b 100644
--- a/lib/libc/stdio/getc.3
+++ b/lib/libc/stdio/getc.3
@@ -42,9 +42,9 @@
 .Sh NAME
 .Nm fgetc ,
 .Nm getc ,
-.Nm getc_unlocked
+.Nm getc_unlocked ,
 .Nm getchar ,
-.Nm getchar_unlocked
+.Nm getchar_unlocked ,
 .Nm getw
 .Nd get next character or word from input stream
 .Sh LIBRARY
@@ -104,7 +104,7 @@ and
 respectively,
 except that the caller is responsible for locking the stream
 with
-.Fn flockfile
+.Xr flockfile 3
 before calling them.
 These functions may be used to avoid the overhead of locking the stream
 for each character, and to avoid input being dispersed among multiple
diff --git a/lib/libc/stdio/putc.3 b/lib/libc/stdio/putc.3
index bd51c10..2476f5f 100644
--- a/lib/libc/stdio/putc.3
+++ b/lib/libc/stdio/putc.3
@@ -42,7 +42,9 @@
 .Sh NAME
 .Nm fputc ,
 .Nm putc ,
+.Nm putc_unlocked ,
 .Nm putchar ,
+.Nm putchar_unlocked ,
 .Nm putw
 .Nd output a character or word to a stream
 .Sh LIBRARY
@@ -103,7 +105,7 @@ and
 respectively,
 except that the caller is responsible for locking the stream
 with
-.Fn flockfile
+.Xr flockfile 3
 before calling them.
 These functions may be used to avoid the overhead of locking the stream
 for each character, and to avoid output being interspersed from multiple
diff --git a/lib/libc/stdio/stdio.3 b/lib/libc/stdio/stdio.3
index 71626f4..7a0d2f9 100644
--- a/lib/libc/stdio/stdio.3
+++ b/lib/libc/stdio/stdio.3
@@ -172,13 +172,13 @@ looks like and which external variables are of interest.
 The following are defined as macros;
 these names may not be re-used
 without first removing their current definitions with
-.Dv #undef :
+.Ic #undef :
 .Dv BUFSIZ ,
 .Dv EOF ,
 .Dv FILENAME_MAX ,
 .Dv FOPEN_MAX ,
-.Dv L_cuserid ,
 .Dv L_ctermid ,
+.Dv L_cuserid ,
 .Dv L_tmpnam ,
 .Dv NULL ,
 .Dv P_tmpdir ,
@@ -190,12 +190,12 @@ without first removing their current definitions with
 .Dv feof_unlocked ,
 .Dv ferror_unlocked ,
 .Dv fileno_unlocked ,
+.Dv fropen ,
+.Dv fwopen ,
 .Dv getc_unlocked ,
 .Dv getchar_unlocked ,
 .Dv putc_unlocked ,
 .Dv putchar_unlocked ,
-.Dv fropen ,
-.Dv fwopen ,
 .Dv stderr ,
 .Dv stdin
 and
@@ -209,7 +209,7 @@ Function versions of the macro functions
 .Dv getchar_unlocked ,
 .Dv putc_unlocked
 and
-.Dv putchar_unlocked ,
+.Dv putchar_unlocked
 exist and will be used if the macro
 definitions are explicitly removed.
 .Sh SEE ALSO
diff --git a/lib/libc/sys/mincore.2 b/lib/libc/sys/mincore.2
index c3a5e32..836f846 100644
--- a/lib/libc/sys/mincore.2
+++ b/lib/libc/sys/mincore.2
@@ -55,7 +55,7 @@ bytes is resident.
 .\"The beginning address,
 .\".Fa addr ,
 .\"is first rounded down to a multiple of the page size (see
-.\".Xr getpagesize 3 Ns ).
+.\".Xr getpagesize 3 ) .
 .\"The end address,
 .\".Fa addr No + Fa len ,
 .\"is rounded up to a multiple of the page size.
@@ -64,7 +64,7 @@ The status is returned in the
 array, one character per page.
 Each character is either 0 if the page is not resident, or a combination of
 the following flags (defined in
-.Sy <sys/mman.h> Ns No ) Ns :
+.Aq Pa sys/mman.h ) :
 .Bl -tag -width ".Dv MINCORE_REFERENCED_OTHER"
 .It Dv MINCORE_INCORE
 Page is in core (resident).
@@ -80,17 +80,17 @@ Page has been modified.
 .Pp
 The information returned by
 .Fn mincore
-may be out of date by the time the function returns.
+may be out of date by the time the system call returns.
 The only way to ensure that a page is resident is to lock it into memory
 with the
 .Xr mlock 2
-function.
+system call.
 .Sh RETURN VALUES
 .Rv -std mincore
 .Sh ERRORS
 The
 .Fn mincore
-function will fail if:
+system call will fail if:
 .Bl -tag -width Er
 .It Bq Er EINVAL
 The virtual address range specified by the
diff --git a/lib/libc/sys/mount.2 b/lib/libc/sys/mount.2
index dae53d6..bd3b7e4 100644
--- a/lib/libc/sys/mount.2
+++ b/lib/libc/sys/mount.2
@@ -76,9 +76,11 @@ are unavailable until the file system is unmounted.
 .Pp
 By default only the super-user may call the
 .Fn mount
-function.
-This restriction can be removed by setting the sysctl
-.Em vfs.usermount
+system call.
+This restriction can be removed by setting the
+.Va vfs.usermount
+.Xr sysctl 8
+variable
 to a non-zero value.
 .Pp
 The following
@@ -188,7 +190,7 @@ system call will fail when one of the following occurs:
 .Bl -tag -width Er
 .It Bq Er EPERM
 The caller is neither the super-user nor the owner of
-.Ar dir .
+.Fa dir .
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded 255 characters,
 or the entire length of a path name exceeded 1023 characters.
@@ -272,7 +274,7 @@ system call may fail with one of the following errors:
 .Bl -tag -width Er
 .It Bq Er EPERM
 The caller is neither the super-user nor the user who issued the corresponding
-.Xr mount 2
+.Fn mount
 call.
 .It Bq Er ENOTDIR
 A component of the path is not a directory.
@@ -302,7 +304,6 @@ mounted.
 .Sh SEE ALSO
 .Xr lsvfs 1 ,
 .Xr mount 8 ,
-.Xr sysctl 8 ,
 .Xr umount 8
 .Sh BUGS
 Some of the error codes need translation to more obvious messages.
diff --git a/lib/libc/sys/mprotect.2 b/lib/libc/sys/mprotect.2
index 312950f..909b240 100644
--- a/lib/libc/sys/mprotect.2
+++ b/lib/libc/sys/mprotect.2
@@ -58,14 +58,15 @@ and end addresses of a
 .Pp
 Currently these protection bits are known,
 which can be combined, OR'd together:
-.Bl -tag width "PROT_WRITE"
-.It PROT_NONE
+.Pp
+.Bl -tag -width ".Dv PROT_WRITE" -compact
+.It Dv PROT_NONE
 No permissions at all.
-.It PROT_READ
+.It Dv PROT_READ
 The pages can be read.
-.It PROT_WRITE
+.It Dv PROT_WRITE
 The pages can be written.
-.It PROT_EXEC
+.It Dv PROT_EXEC
 The pages can be executed.
 .El
 .Sh RETURN VALUES
diff --git a/lib/libc/sys/rfork.2 b/lib/libc/sys/rfork.2
index 1081b6b..88f8144 100644
--- a/lib/libc/sys/rfork.2
+++ b/lib/libc/sys/rfork.2
@@ -35,26 +35,26 @@ The
 .Fa flags
 argument
 is the logical OR of some subset of:
-.Bl -tag -width "RFLINUXTHPN" -offset indent
-.It RFPROC
+.Bl -tag -width ".Dv RFLINUXTHPN"
+.It Dv RFPROC
 If set a new process is created; otherwise changes affect the
 current process.
-.It RFNOWAIT
+.It Dv RFNOWAIT
 If set, the child process will be dissociated from the parent.
 Upon
 exit the child will not leave a status for the parent to collect.
 See
 .Xr wait 2 .
-.It RFFDG
+.It Dv RFFDG
 If set, the invoker's file descriptor table (see
 .Xr intro 2 )
 is copied; otherwise the two processes share a
 single table.
-.It RFCFDG
+.It Dv RFCFDG
 If set, the new process starts with a clean file descriptor table.
 Is mutually exclusive with
 .Dv RFFDG .
-.It RFMEM
+.It Dv RFMEM
 If set, the kernel will force sharing of the entire address space,
 typically by sharing the hardware page table directly.
 The child
@@ -70,10 +70,10 @@ A helper function is provided to assist with this problem and will cause
 the new process to run on the provided stack.  See
 .Xr rfork_thread 3
 for information.
-.It RFSIGSHARE
+.It Dv RFSIGSHARE
 If set, the kernel will force sharing the sigacts structure between the
 child and the parent.
-.It RFLINUXTHPN
+.It Dv RFLINUXTHPN
 If set, the kernel will return SIGUSR1 instead of SIGCHILD upon thread
 exit for the child.  This is intended to mimic certain Linux clone behaviour.
 .El
diff --git a/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8 b/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8
index 93f01c1..034ace5 100644
--- a/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8
+++ b/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8
@@ -117,7 +117,7 @@ These messages include reasons why the user's authentication attempt
 was declined.
 .El
 .Sh FILES
-.Bl -tag -width Ds
+.Bl -tag -width ".Pa /etc/opieaccess"
 .It Pa /etc/opieaccess
 List of trusted hosts or networks.
 See
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.8 b/lib/libpam/modules/pam_ssh/pam_ssh.8
index 9fe1ec4..b6efc6e 100644
--- a/lib/libpam/modules/pam_ssh/pam_ssh.8
+++ b/lib/libpam/modules/pam_ssh/pam_ssh.8
@@ -149,4 +149,4 @@ Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 This manual page was written by
-.An "Mark R V Murray" Aq markm@FreeBSD.ORG .
+.An "Mark R V Murray" Aq markm@FreeBSD.org .
diff --git a/lib/libutil/realhostname_sa.3 b/lib/libutil/realhostname_sa.3
index 19a17f4..fdeb099 100644
--- a/lib/libutil/realhostname_sa.3
+++ b/lib/libutil/realhostname_sa.3
@@ -56,7 +56,9 @@
 .Dt REALHOSTNAME_SA 3
 .Sh NAME
 .Nm realhostname_sa
-.Nd "convert a struct sockaddr to the real host name"
+.Nd "convert a"
+.Vt "struct sockaddr"
+to the real host name
 .Sh LIBRARY
 .Lb libutil
 .Sh SYNOPSIS
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index f26d00e..fb8167c 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -164,7 +164,7 @@ with offset 16 and size 9984.
 .Pp
 .Bd -unfilled -offset
 # disklabel ccd0 > /tmp/disklabel.ccd0
-# disklabel -Rr ccd0 /tmp/disklabel.ccd0            
+# disklabel -Rr ccd0 /tmp/disklabel.ccd0
 # disklabel -e ccd0
 .Ed
 .Pp
@@ -206,8 +206,11 @@ default ccd configuration file
 The initial disklabel returned by
 .Xr ccd 4
 specifies only 3 partitions.
-One needs to change the number of paritions to "8" using `disklabel -e'
-to get the usual BSD expectations.
+One needs to change the number of paritions to 8 using
+.Dq Nm disklabel Fl e
+to get the usual
+.Bx
+expectations.
 .Sh HISTORY
 The
 .Nm
diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8
index 6032acd..5259a3b 100644
--- a/sbin/dumpfs/dumpfs.8
+++ b/sbin/dumpfs/dumpfs.8
@@ -56,9 +56,9 @@ free space percentage.
 .Pp
 If
 .Fl m
-is specified, the filesystem is marshalled in terms of a
+is specified, the file system is marshalled in terms of a
 .Xr newfs 8
-command to generate the filesystem.
+command to generate the file system.
 .Sh SEE ALSO
 .Xr disktab 5 ,
 .Xr fs 5 ,
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index 029840c..b9e9dc5 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -342,8 +342,10 @@ file
 A process being started to service a line is exiting quickly
 each time it is started.
 This is often caused by a ringing or noisy terminal line.
-.Em "Init will sleep for 30 seconds" ,
-.Em "then continue trying to start the process" .
+.Bf -emphasis
+Init will sleep for 30 seconds,
+then continue trying to start the process.
+.Ef
 .It "some processes would not die; ps axl advised."
 A process
 is hung and could not be killed when the system was shutting down.
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index c186c2d..57dc0b2 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -40,8 +40,8 @@
 .Nd construct a new UFS1/UFS2 file system
 .Sh SYNOPSIS
 .Nm
-.Op Fl L Ar volname
 .Op Fl NU
+.Op Fl L Ar volname
 .Op Fl O Ar filesystem-type
 .Op Fl S Ar sector-size
 .Op Fl T Ar disktype
@@ -81,8 +81,6 @@ has numerous options to allow the defaults to be selectively overridden.
 .Pp
 The following options define the general layout policies:
 .Bl -tag -width indent
-.It Fl T Ar disktype
-For backward compatibility.
 .It Fl L Ar volname
 Add a volume label to the new file system.
 .It Fl N
@@ -92,6 +90,8 @@ without really creating the file system.
 Use 1 to specify that a UFS1 format file system be built;
 use 2 to specify that a UFS2 format file system be built.
 The default is UFS1 format, but will eventually be changed to UFS2.
+.It Fl T Ar disktype
+For backward compatibility.
 .It Fl U
 Enables soft updates on the new file system.
 .It Fl a Ar maxcontig