mdoc(7) police: split punctuation characters + misc fixes.

svn path=/head/; revision=71895

bin/df/df.1

@@ -46,7 +46,7 @@
 .Oc
 .Op Fl ain
 .Op Fl t Ar type
-.Op Ar file | Ar filesystem ...
+.Op Ar file | filesystem ...
 .Sh DESCRIPTION
 .Nm Df
 displays statistics about the amount of free disk space on the specified

bin/echo/echo.1

@@ -44,19 +44,24 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl n
-.Op "string ..."
+.Op Ar string ...
 .Sh DESCRIPTION
 The
 .Nm
-utility writes any specified operands, separated by single blank (`` '')
+utility writes any specified operands, separated by single blank
-characters and followed by a newline (``\en'') character, to the standard
+.Pq Ql "\ "
+characters and followed by a newline
+.Pq Ql \en
+character, to the standard
 output.
 .Pp
 The following option is available:
 .Bl -tag -width flag
 .It Fl n
 Do not print the trailing newline character.  This may also be
-achieved by appending `\ec' to the end of the string, as is done
+achieved by appending
+.Ql \ec
+to the end of the string, as is done
 by iBCS2 compatible systems.
 .El
 .Pp

bin/ed/ed.1

@@ -104,8 +104,9 @@ character command and possibly additional parameters; i.e.,
 commands have the structure:
 .Pp
 .Sm off
-.Xo Op "address\ "  Op ,address
+.Xo
-.No command Op parameters
+.Op Ar address Op , Ar address
+.Ar command Op Ar parameters
 .Xc
 .Sm on
 .Pp

bin/pax/pax.1

@@ -1045,7 +1045,7 @@ option, a file is not considered selected unless it is newer
 than the file to which it is compared.
 .Sh EXAMPLES
 The command:
-.Dl pax -w -f /dev/rst0 .\ 
+.Dl "pax -w -f /dev/rst0 ."
 copies the contents of the current directory to the device
 .Pa /dev/rst0 .
 .Pp

bin/ps/ps.1

@@ -148,7 +148,7 @@ Display information about processes attached to the specified terminal
 device.
 .It Fl U
 Display the processes belonging to the specified
-.Tn username Ns No (s).
+.Ar username Ns (s) .
 .It Fl u
 Display information associated with the following keywords:
 user, pid, %cpu, %mem, vsz, rss, tt, state, start, time and command.

bin/sh/sh.1

@@ -1276,9 +1276,9 @@ these, a builtin version of the
 .Xr printf 1
 command is provided for efficiency.
 .Bl -tag -width Ds
-.It Ic :
+.It Ic \&:
 A null command that returns a 0 (true) exit value.
-.It Ic . Ar file
+.It Ic \&. Ar file
 The commands in the specified file are read and executed by the shell.
 If
 .Ar file
@@ -1290,9 +1290,11 @@ for the file.  If it is not found in the
 .Ev PATH ,
 it is sought in the current working directory.
 .It Ic alias Op Ar name ...
-.It Ic alias Op Ar name=string ...
+.It Ic alias Xo
+.Op Ar name Ns = Ns Ar string ...
+.Xc
 If
-.Ar name=string
+.Ar name Ns = Ns Ar string
 is specified, the shell defines the alias
 .Ar name
 with value
@@ -1515,7 +1517,8 @@ Re-execute the command without invoking an editor.
 Select the commands to list or edit.
 The number of previous commands that can be accessed
 are determined by the value of the
-.Ev HISTSIZE variable.
+.Ev HISTSIZE
+variable.
 The value of
 .Ar first
 or

gnu/lib/libdialog/dialog.3

@@ -78,7 +78,18 @@
 .Ft "int"
 .Fn dialog_textbox "unsigned char *title" "unsigned char *prompt" "int height" "int width"
 .Ft "int"
-.Fn dialog_menu "unsigned char *title" "unsigned char *prompt" "int height" "int width" "int menu_height" "int item_no" "void *itptr" "unsigned char *result, int *ch, int *sc"
+.Fo dialog_menu
+.Fa "unsigned char *title"
+.Fa "unsigned char *prompt"
+.Fa "int height"
+.Fa "int width"
+.Fa "int menu_height"
+.Fa "int item_no"
+.Fa "void *itptr"
+.Fa "unsigned char *result"
+.Fa "int *ch"
+.Fa "int *sc"
+.Fc
 .Ft "int"
 .Fn dialog_checklist "unsigned char *title" "unsigned char *prompt" "int height" "int width" "int m_height" "int item_no" "void *itptr" "unsigned char *result"
 .Ft "int"
@@ -341,7 +352,7 @@ integer representing the number of
 structures pointed to by
 .Va itptr
 (which should be of type
-.Va dialogMenuItem "*" ),
+.Vt dialogMenuItem "*" ) ,
 one structure per item.  In the new interface, the
 .Va result
 variable is used as a simple boolean (not a pointer) and should be NULL if

gnu/usr.bin/ld/ld.1

@@ -90,10 +90,9 @@ Specifies that linking against dynamic libraries can take place. If a library
 specifier of the form -lx appears on the command line,
 .Nm
 searches for a library of the from libx.so.n.m
-.Po see the \&
+(see the
 .Fl l
-option
+option)
-.Pc
 according to the search rules in effect. If such a file can not be
 found a traditional archive is looked for.
 This options can appear anywhere on the command line and is complementary
@@ -161,12 +160,12 @@ output. If the
 .Fl B Ns Ar dynamic
 option is in effect, a shared library of the
 form lib<spec>.so.m.n
-.Po where \&
+(where
 .Em m
 is the major, and
 .Em n
-is the minor version number, respectively
+is the minor version number, respectively)
-.Pc is searched for first. The
+is searched for first. The
 library with the highest version found in the search path is selected.
 If no shared library is found or the
 .Fl B Ns Ar static
@@ -187,22 +186,20 @@ Produce a
 output file.
 .It Fl nostdlib
 Do not search the built-in path
-.Po
+(usually
-usually
+.Dq /usr/lib )
-.Dq /usr/lib
-.Pc
 for
 .Fl l
 specified libraries.
 .It Fl O Ar filename
 Specifies the name of the output file.
 The file is created as
-.Ar filename .tmp
+.Ar filename Ns Pa .tmp
 and when output is complete renamed to
 .Ar filename .
 .It Fl o Ar filename
 Specifies the name of the output file. Defaults to
-.Dq a.out.
+.Dq Pa a.out .
 .It Fl Q
 Produce a
 .Dv QMAGIC

gnu/usr.bin/ld/ld.1aout

@@ -63,7 +63,7 @@ combines the object and archive files given on the command line into a new
 object file. The output object file is either an executable program, a
 shared object suitable for loading at run-time, or an object file that can
 once again be processed by
-.Nm ld.
+.Nm .
 Object files and archives are processed in the order given on the command line.
 .Pp
 The options are as follows:
@@ -74,12 +74,12 @@ The the symbol-file is taken as a base for link-editing the object files
 on the command line.
 .It Fl assert Ar keyword
 This option is here mainly for compatibility with SunOS
-.Nm ld .
+.Nm .
 Most conditions which would cause a Sun assertion to fail will
 currently always cause error or warning messages from
-.Nm ld .
+.Nm .
 The only keyword implemented by
-.Nm ld
+.Nm
 is
 .Nm pure-text ,
 which generates a warning if a position independent object is being
@@ -88,12 +88,11 @@ independent.
 .It Fl B Ns Ar dynamic
 Specifies that linking against dynamic libraries can take place. If a library
 specifier of the form -lx appears on the command line,
-.Nm ld
+.Nm
 searches for a library of the from libx.so.n.m
-.Po see the \&
+(see the
 .Fl l
-option
+option)
-.Pc
 according to the search rules in effect. If such a file can not be
 found a traditional archive is looked for.
 This options can appear anywhere on the command line and is complementary
@@ -103,7 +102,7 @@ to
 This is similar to
 .Fl B Ns Ar dynamic
 except that if no dynamic libraries are linked against,
-.Nm ld
+.Nm
 will still produce a dynamic executable.  This is useful for programs
 which are static but still need to load dynamic objects at runtime.
 .It Fl B Ns Ar static
@@ -161,12 +160,12 @@ output. If the
 .Fl B Ns Ar dynamic
 option is in effect, a shared library of the
 form lib<spec>.so.m.n
-.Po where \&
+(where
 .Em m
 is the major, and
 .Em n
-is the minor version number, respectively
+is the minor version number, respectively)
-.Pc is searched for first. The
+is searched for first. The
 library with the highest version found in the search path is selected.
 If no shared library is found or the
 .Fl B Ns Ar static
@@ -187,29 +186,27 @@ Produce a
 output file.
 .It Fl nostdlib
 Do not search the built-in path
-.Po
+(usually
-usually
+.Dq /usr/lib )
-.Dq /usr/lib
-.Pc
 for
 .Fl l
 specified libraries.
 .It Fl O Ar filename
 Specifies the name of the output file.
 The file is created as
-.Ar filename .tmp
+.Ar filename Ns Pa .tmp
 and when output is complete renamed to
 .Ar filename .
 .It Fl o Ar filename
 Specifies the name of the output file. Defaults to
-.Dq a.out.
+.Dq Pa a.out .
 .It Fl Q
 Produce a
 .Dv QMAGIC
 (FreeBSD/BSDi-i386) output file.  This is the default.
 .It Fl r
 Produce relocatable object file, suitable for another pass through
-.Nm ld.
+.Nm .
 .It Fl R
 Record the given path within the executable for run-time library search.
 This only applies to dynamically linked executables.
@@ -273,7 +270,7 @@ options and preceding the built-in path.
 .Sh CAVEATS
 An entry point must now explicitly be given if the output is intended to be
 a normal executable program. This was not the case for the previous version of
-.Nm ld .
+.Nm .
 .Sh BUGS
 Shared objects are not properly checked for undefined symbols.
 .Pp
@@ -282,7 +279,7 @@ Cascading of shared object defeats the
 option.
 .Pp
 All shared objects presented to
-.Nm ld
+.Nm
 are marked for run-time loading in the output file, even if no symbols
 are needed from them.
 .Sh HISTORY

gnu/usr.bin/tar/tar.1

@@ -14,7 +14,7 @@
 .Nd "tape archiver; manipulate ""tar"" archive files"
 .Sh SYNOPSIS
 .Nm
-.Op [-] Ns Ar bundled-options Ar Args
+.Op Oo Fl Oc Ns Ar bundled-options Ar Args
 .Op Ar gnu-style-flags
 .Op Ar filenames | Fl C Ar directory-name
 .Ar ...

lib/libc/gen/getcap.3

@@ -84,13 +84,13 @@ from the database specified by the
 terminated file array
 .Fa db_array
 and returns a pointer to a
-.Xr malloc Ns \&'d
+.Xr malloc 3 Ns \&'d
 copy of it in
 .Fa buf .
 The
 .Fn cgetent
 function will first look for files ending in
-.Nm .db
+.Pa .db
 (see
 .Xr cap_mkdb 1 )
 before accessing the ASCII file.
@@ -200,7 +200,7 @@ from the capability record pointed to by
 A pointer to a decoded,
 .Dv NUL
 terminated,
-.Xr malloc Ns \&'d
+.Xr malloc 3 Ns \&'d
 copy of the string is returned in the
 .Ft char *
 pointed to by
@@ -241,7 +241,7 @@ or
 call.  If there is no such previous call, the first record in the database is
 returned.
 Each record is returned in a
-.Xr malloc Ns \&'d
+.Xr malloc 3 Ns \&'d
 copy pointed to by
 .Fa buf .
 .Ic Tc
@@ -416,21 +416,27 @@ and
 .Bl -column "nameXnumber"
 .Sm off
 .It Em name No \&# Em number Ta numeric
+.Sm on
 capability
 .Em name
 has value
 .Em number
+.Sm off
 .It Em name No = Em string Ta "string capability"
+.Sm on
 .Em name
 has value
 .Em string
+.Sm off
 .It Em name No \&#@ Ta "the numeric capability"
-.Em name
-does not exist
-.It Em name No \&=@ Ta "the string capability"
-.Em name
-does not exist
 .Sm on
+.Em name
+does not exist
+.Sm off
+.It Em name No \&=@ Ta "the string capability"
+.Sm on
+.Em name
+does not exist
 .El
 .Pp
 Numeric capability values may be given in one of three numeric bases.

lib/libc/gen/getcwd.3

@@ -89,7 +89,7 @@ These routines have traditionally been used by programs to save the
 name of a working directory for the purpose of returning to it.
 A much faster and less error-prone method of accomplishing this is to
 open the current directory
-.Pq Ql \&.
+.Pq Ql .\&
 and use the
 .Xr fchdir 2
 function to return.

lib/libc/gen/glob.3

@@ -269,7 +269,7 @@ is
 .Pf non- Dv NULL ,
 .Fn glob
 calls
-.Fa (*errfunc)(path, errno) .
+.Fa \*(lp*errfunc\*(rp Ns ( Fa path , errno ) .
 This may be unintuitive: a pattern like
 .Ql */Makefile
 will try to
@@ -374,7 +374,7 @@ An attempt to allocate memory failed.
 The scan was stopped because an error was encountered and either
 .Dv GLOB_ERR
 was set or
-.Fa (*errfunc)()
+.Fa \*(lp*errfunc\*(rp\*(lp\*(rp
 returned non-zero.
 .El
 .Pp
@@ -410,7 +410,7 @@ function is expected to be
 compatible with the exception
 that the flags
 .Dv GLOB_ALTDIRFUNC ,
-.Dv GLOB_BRACE
+.Dv GLOB_BRACE ,
 .Dv GLOB_MAGCHAR ,
 .Dv GLOB_NOMAGIC ,
 .Dv GLOB_QUOTE ,

lib/libc/gen/sysctl.3

@@ -186,7 +186,7 @@ The next and subsequent levels down are found in the include files
 listed here, and described in separate sections below.
 .Pp
 .Bl -column CTLXMACHDEPXXX "Next level namesXXXXXX" -offset indent
-.It Sy Pa "Name	Next level names	Description"
+.It Sy "Name	Next level names	Description"
 .It "CTL\_DEBUG	sys/sysctl.h	Debugging"
 .It "CTL\_VFS	sys/mount.h	Filesystem"
 .It "CTL\_HW	sys/sysctl.h	Generic CPU, I/O"
@@ -272,7 +272,7 @@ is detailed below.
 The changeable column shows whether a process with appropriate
 privilege may change the value.
 .Bl -column "Second level nameXXXXXX" integerXXX -offset indent
-.It Sy Pa "Second level name	Type	Changeable"
+.It Sy "Second level name	Type	Changeable"
 .It "HW\_MACHINE	string	no"
 .It "HW\_MODEL	string	no"
 .It "HW\_NCPU	integer	no"
@@ -318,7 +318,7 @@ system vnodes, the open file entries, routing table entries,
 virtual memory statistics, load average history, and clock rate
 information.
 .Bl -column "KERNXMAXFILESPERPROCXXX" "struct clockrateXXX" -offset indent
-.It Sy Pa "Second level name	Type	Changeable"
+.It Sy "Second level name	Type	Changeable"
 .It "KERN\_ARGMAX	integer	no"
 .It "KERN\_BOOTFILE	string	yes"
 .It "KERN\_BOOTTIME	struct timeval	no"
@@ -424,7 +424,7 @@ structures is returned,
 whose size depends on the current number of such objects in the system.
 The third and fourth level names are as follows:
 .Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent
-.It Pa "Third level name	Fourth level is:"
+.It "Third level name	Fourth level is:"
 .It "KERN\_PROC\_ALL	None"
 .It "KERN\_PROC\_PID	A process ID"
 .It "KERN\_PROC\_PGRP	A process group"
@@ -439,7 +439,7 @@ follow each other.
 The total size of array is returned.
 It is also possible for a process to set its own process title this way.
 .Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent
-.It Pa "Third level name	Fourth level is:"
+.It Sy "Third level name	Fourth level is:"
 .It "KERN\_PROC\_ARGS	A process ID"
 .El
 .It Li KERN_PROF
@@ -453,7 +453,7 @@ is detailed below.
 The changeable column shows whether a process with appropriate
 privilege may change the value.
 .Bl -column "GPROFXGMONPARAMXXX" "struct gmonparamXXX" -offset indent
-.It Sy Pa "Third level name	Type	Changeable"
+.It Sy "Third level name	Type	Changeable"
 .It "GPROF\_STATE	integer	yes"
 .It "GPROF\_COUNT	u_short[\|]	yes"
 .It "GPROF\_FROMS	u_short[\|]	yes"
@@ -503,7 +503,7 @@ followed by the vnode itself
 The set of variables defined is architecture dependent.
 The following variables are defined for the i386 architecture.
 .Bl -column "CONSOLE_DEVICEXXX" "struct bootinfoXXX" -offset indent
-.It Sy Pa "Second level name	Type	Changeable"
+.It Sy "Second level name	Type	Changeable"
 .It Li "CPU_CONSDEV	dev_t	no"
 .It Li "CPU_ADJKERNTZ	int	yes"
 .It Li "CPU_DISRTCSET	int	yes"
@@ -516,7 +516,7 @@ is detailed below.
 The changeable column shows whether a process with appropriate
 privilege may change the value.
 .Bl -column "Second level nameXXXXXX" "routing messagesXXX" -offset indent
-.It Sy Pa "Second level name	Type	Changeable"
+.It Sy "Second level name	Type	Changeable"
 .It "PF\_ROUTE	routing messages	no"
 .It "PF\_INET	IPv4 values	yes"
 .It "PF\_INET6	IPv6 values	yes"
@@ -535,7 +535,7 @@ The fourth level name is an address family, which may be set to 0 to
 select all address families.
 The fifth and sixth level names are as follows:
 .Bl -column "Fifth level nameXXXXXX" "Sixth level is:XXX" -offset indent
-.It Pa "Fifth level name	Sixth level is:"
+.It Sy "Fifth level name	Sixth level is:"
 .It "NET\_RT\_FLAGS	rtflags"
 .It "NET\_RT\_DUMP	None"
 .It "NET\_RT\_IFLIST	None"
@@ -547,7 +547,7 @@ The third level name is the protocol.
 The fourth level name is the variable name.
 The currently defined protocols and names are:
 .Bl -column ProtocolXX VariableXX TypeXX ChangeableXX
-.It Pa "Protocol	Variable	Type	Changeable"
+.It Sy "Protocol	Variable	Type	Changeable"
 .It "icmp	bmcastecho	integer	yes"
 .It "icmp	maskrepl	integer	yes"
 .It "ip	forwarding	integer	yes"
@@ -598,7 +598,7 @@ is detailed below.
 The changeable column shows whether a process with appropriate
 privilege may change the value.
 .Bl -column "USER_COLL_WEIGHTS_MAXXXX" "integerXXX" -offset indent
-.It Sy Pa "Second level name	Type	Changeable"
+.It Sy "Second level name	Type	Changeable"
 .It "USER\_BC\_BASE\_MAX	integer	no"
 .It "USER\_BC\_DIM\_MAX	integer	no"
 .It "USER\_BC\_SCALE\_MAX	integer	no"
@@ -694,7 +694,7 @@ is detailed below.
 The changeable column shows whether a process with appropriate
 privilege may change the value.
 .Bl -column "Second level nameXXXXXX" "struct loadavgXXX" -offset indent
-.It Sy Pa "Second level name	Type	Changeable"
+.It Sy "Second level name	Type	Changeable"
 .It "VM\_LOADAVG	struct loadavg	no"
 .It "VM\_METER	struct vmtotal	no"
 .It "VM\_PAGEOUT\_ALGORITHM	integer	yes"

lib/libc/gen/tzset.3

@@ -116,13 +116,11 @@ When
 is used directly as a specification of the time conversion information,
 it must have the following syntax (spaces inserted for clarity):
 .Bd -filled -offset indent
-.Em std offset Bo
+.Em std offset
-.Em dst Bo
-.Em offset
-.Bc
 .Bo
-.No , Em rule
+.Em dst
-.Bc
+.Bq Em offset
+.Bq , Em rule
 .Bc
 .Ed
 .Pp
@@ -156,13 +154,13 @@ Indicates the value one must add to the local time to arrive at
 Coordinated Universal Time.  The
 .Em offset
 has the form:
-.Bd -unfilled -offset indent
+.Bd -ragged -offset indent
+.Sm off
 .Em hh Bo
-.Pf \&: Em mm
+.Em : mm
-.Bo
+.Bq Em : ss
-.Pf \&: Em ss
-.Bc
 .Bc
+.Sm on
 .Ed
 .Pp
 The minutes

lib/libc/gen/uname.3

@@ -52,9 +52,9 @@ the current system into the structure referenced by
 .Fa name .
 .Pp
 The
-.Li utsname
+.Vt utsname
 structure is defined in the
-.Li <sys/utsname.h>
+.Aq Pa sys/utsname.h
 header file, and contains the following members:
 .Bl -tag -width nodenameXXXX -offset indent
 .It sysname

lib/libc/locale/rune.3

@@ -266,7 +266,7 @@ These functions first appeared in
 The
 .Fn setrunelocale
 function and the other non-ANSI rune functions were inspired by
-.Nm Plan 9 from Bell Labs
+.Sy "Plan 9 from Bell Labs"
 as a much more sane alternative to the ANSI multibyte and
 wide character support.
 .\"They were conceived at the San Diego 1993 Summer USENIX conference by

lib/libc/locale/utf2.4

@@ -49,7 +49,7 @@ The
 .Nm UTF2
 encoding is based on a proposed X-Open multibyte
 \s-1FSS-UCS-TF\s+1 (File System Safe Universal Character Set Transformation Format) encoding as used in
-.Nm Plan 9 from Bell Labs.
+.Sy "Plan 9 from Bell Labs" .
 Although it is capable of representing more than 16 bits,
 the current implementation is limited to 16 bits as defined by the
 Unicode Standard.

lib/libc/locale/utf2.5

@@ -49,7 +49,7 @@ The
 .Nm UTF2
 encoding is based on a proposed X-Open multibyte
 \s-1FSS-UCS-TF\s+1 (File System Safe Universal Character Set Transformation Format) encoding as used in
-.Nm Plan 9 from Bell Labs.
+.Sy "Plan 9 from Bell Labs" .
 Although it is capable of representing more than 16 bits,
 the current implementation is limited to 16 bits as defined by the
 Unicode Standard.

lib/libc/net/if_indextoname.3

@@ -57,11 +57,9 @@
 .Fn if_freenameindex "struct if_nameindex *ptr"
 .Sh DESCRIPTION
 The functions map interface index to readable interface name
-.Po
+(such as
-such as
+.Dq Li lo0 ) ,
-.Li ``lo0''
+and vice versa.
-.Pc
-, and vice versa.
 .Pp
 .Fn if_nametoindex
 converts readable interface name to interface index
@@ -76,13 +74,11 @@ argument must point to a buffer of at least
 .Dv IF_NAMESIZE
 bytes into which the interface name corresponding to the specified index is
 returned.
-.Po
+.Dv ( IF_NAMESIZE
-.Dv IF_NAMESIZE
 is also defined in
-.Li <net/if.h>
+.Aq Pa net/if.h
 and its value includes a terminating null byte at the end of the
-interface name.
+interface name.)
-.Pc
 This pointer is also the return value of the function.
 If there is no interface corresponding to the specified index,
 .Dv NULL
@@ -94,7 +90,7 @@ returns an array of
 structures.
 .Fa if_nametoindex
 is also defined in
-.Li <net/if.h> ,
+.Aq Pa net/if.h ,
 and is as follows:
 .Bd -literal -offset
 struct if_nameindex {

lib/libc/net/inet6_option_space.3

@@ -81,17 +81,13 @@ ancillary data, including the
 .Li cmsghdr
 structure at the beginning,
 and any padding at the end
-.Po
+(to make its size a multiple of 8 bytes).
-to make its size a multiple of 8 bytes
-.Pc .
 The argument is the size of the structure defining the option,
 which must include any pad bytes at the beginning
-.Po
+(the value
-the value
 .Li y
 in the alignment term
-.Dq Li xn + y
+.Dq Li "xn + y" ) ,
-.Pc ,
 the type byte, the length byte, and the option data.
 .Pp
 Note: If multiple options are stored in a single ancillary data
@@ -181,17 +177,16 @@ before calling this function.
 The option type must have a value from
 .Li 2
 to
-.Li 255 , inclusive.
+.Li 255 ,
-.Po
+inclusive.
-.Li 0
+.Li ( 0
 and
 .Li 1
 are reserved for the
 .Li Pad1
 and
 .Li PadN
-options, respectively.
+options, respectively.)
-.Pc
 .Pp
 The option data length must have a value between
 .Li 0
@@ -249,12 +244,10 @@ initialized by
 is the value of the option data length byte for this option.
 This value is required as an argument to allow the function to
 determine if padding must be appended at the end of the option.
-.Po
+(The
-The
 .Fn inet6_option_append
 function does not need a data length argument
-since the option data length must already be stored by the caller.
+since the option data length must already be stored by the caller.)
-.Pc
 .Pp
 .Fa multx
 is the value
@@ -289,10 +282,8 @@ and
 .Fa *tptrp
 points to
 the 8-bit option type field
-.Po
+(which is followed by the 8-bit option
-which is followed by the 8-bit option
+data length, followed by the option data).
-data length, followed by the option data
-.Pc .
 If no more options remain
 to be processed, the return value is
 .Li -1
@@ -407,7 +398,8 @@ on an error.
 .Pp
 .Fn inet6_option_alloc
 returns
-.Dv NULL on an error.
+.Dv NULL
+on an error.
 .Pp
 On errors,
 .Fn inet6_option_next

lib/libc/net/inet6_rthdr_space.3

@@ -212,10 +212,8 @@ When implemented, this should behave as follows.
 .Pp
 This function takes a Routing header that was received as ancillary
 data
-.Po
+(pointed to by the first argument,
-pointed to by the first argument,
+.Fa in )
-.Fa in
-.Pc
 and writes a new Routing
 header that sends datagrams along the reverse of that route.
 Both
@@ -238,10 +236,8 @@ The return value of the function is -1 upon an error.
 .Ss inet6_rthdr_getaddr
 This function returns a pointer to the IPv6 address specified by
 .Fa index
-.Po
+(which must have a value between 1 and the value returned by
-which must have a value between 1 and the value returned by
+.Fn inet6_rthdr_segments )
-.Fn inet6_rthdr_segments
-.Pc
 in the Routing header described by
 .Fa cmsg .
 An
@@ -255,11 +251,9 @@ Upon an error the return value of the function is
 .Ss inet6_rthdr_getflags
 This function returns the flags value specified by
 .Fa index
-.Po
+(which must
-which must
 have a value between 0 and the value returned by
-.Fn inet6_rthdr_segments
+.Fn inet6_rthdr_segments )
-.Pc
 in the Routing header described by
 .Fa cmsg .
 For an IPv6 Type 0 Routing header the return value will be either

lib/libc/net/resolver.3

@@ -305,7 +305,8 @@ as the name is compressed.
 If
 .Em dnptr
 is
-.Dv NULL, names are not compressed.
+.Dv NULL ,
+names are not compressed.
 If
 .Fa lastdnptr
 is

lib/libc/stdio/stdio.3

@@ -42,9 +42,9 @@
 .Lb libc
 .Sh SYNOPSIS
 .Fd #include <stdio.h>
-.Fd FILE *stdin;
+.Vt FILE *stdin ;
-.Fd FILE *stdout;
+.Vt FILE *stdout ;
-.Fd FILE *stderr;
+.Vt FILE *stderr ;
 .Sh DESCRIPTION
 The standard
 .Tn I/O

lib/libc/stdlib/malloc.3

@@ -59,7 +59,7 @@
 .Ft char *
 .Va _malloc_options
 .Ft void
-.Va (*_malloc_message)(char *p1, char *p2, char *p3, char *p4)
+.Fn \*(lp*_malloc_message\*(rp "char *p1" "char *p2" "char *p3" "char *p4"
 .Sh DESCRIPTION
 The
 .Fn malloc

lib/libc/string/strerror.3

@@ -95,7 +95,7 @@ If
 .Fa errnum
 is not a recognized error number,
 the error message string will contain
-.Dq Li "Unknown error:\0
+.Dq Li "Unknown error:\ "
 followed by the error number in decimal.
 .Pp
 The message strings can be accessed directly using the external

lib/libc/string/strtok.3

@@ -165,7 +165,9 @@ Since this implementation always alters the next starting point,
 such a sequence of calls would always return
 .Dv NULL .
 .Sh AUTHORS
-.An Wes Peters, Softweyr LLC: Aq wes@softweyr.com
+.An Wes Peters ,
+Softweyr LLC:
+.Aq wes@softweyr.com
 .Pp
 Based on the 
 .Fx 3.0

lib/libc/sys/aio_waitcomplete.2

@@ -35,7 +35,7 @@
 .Sh SYNOPSIS
 .Fd #include <aio.h>
 .Ft int
-.Fn aio_waitcomplete "struct aiocb **iocbp, struct timespec *timeout"
+.Fn aio_waitcomplete "struct aiocb **iocbp" "struct timespec *timeout"
 .Sh DESCRIPTION
 The
 .Fn aio_waitcomplete

lib/libc/sys/brk.2

@@ -99,11 +99,11 @@ beyond the
 value returned from a call to
 .Xr getrlimit 2 ,
 e.g.\&
-.Dq etext + rlp\(->rlim_max.
+.Dq Va etext No + Va rlp\->rlim_max .
 (See
 .Xr end 3
 for the definition of
-.Em etext ) .
+.Va etext ) .
 .Sh RETURN VALUES
 .Fn Brk
 returns 0 if successful;

lib/libc/sys/fcntl.2

@@ -193,11 +193,11 @@ taken as a pointer to a
 (see above).
 .Dv F_SETLK
 is used to establish shared (or read) locks
-.Dv (F_RDLCK)
+.Pq Dv F_RDLCK
 or exclusive (or write) locks,
-.Dv (F_WRLCK) ,
+.Pq Dv F_WRLCK ,
 as well as remove either type of lock
-.Dv (F_UNLCK) .
+.Pq Dv F_UNLCK .
 If a shared or exclusive lock cannot be set,
 .Fn fcntl
 returns immediately with
@@ -392,11 +392,11 @@ The argument
 is
 .Dv F_SETLK ,
 the type of lock
-.Fa (l_type)
+.Pq Fa l_type
 is a shared lock
-.Dv (F_RDLCK)
+.Pq Dv F_RDLCK
 or exclusive lock
-.Dv (F_WRLCK) ,
+.Pq Dv F_WRLCK ,
 and the segment of a file to be locked is already
 exclusive-locked by another process;
 or the type is an exclusive lock and some portion of the
@@ -413,9 +413,9 @@ is
 or
 .Dv F_SETLKW ,
 the type of lock
-.Fa (l_type)
+.Pq Fa l_type
 is a shared lock
-.Dv (F_RDLCK) ,
+.Pq Dv F_RDLCK ,
 and
 .Fa fildes
 is not a valid file descriptor open for reading.
@@ -427,9 +427,9 @@ is
 or
 .Dv F_SETLKW ,
 the type of lock
-.Fa (l_type)
+.Pq Fa l_type
 is an exclusive lock
-.Dv (F_WRLCK) ,
+.Pq Dv F_WRLCK ,
 and
 .Fa fildes
 is not a valid file descriptor open for writing.

lib/libc/sys/getdirentries.2

@@ -137,7 +137,8 @@ Alternatively, the current position pointer may be set and retrieved by
 The current position pointer should only be set to a value returned by
 .Xr lseek 2 ,
 a value returned in the location pointed to by
-.Fa basep ( Ns Fn getdirentries
+.Fa basep
+.Pf ( Fn getdirentries
 only)
 or zero.
 .Sh IMPLEMENTATION NOTES

lib/libc/sys/getlogin.2

@@ -87,7 +87,7 @@ of the named user
 (for example, at login time, or when a remote shell is invoked).
 .Pp
 .Em NOTE :
-There is only one `login name' per `session .
+There is only one login name per session.
 .Pp
 It is
 .Em CRITICALLY
@@ -107,9 +107,9 @@ which is an ideal way of detaching from a controlling terminal and
 forking into the background.
 .Pp
 In particular, doing a
-.Fn ioctl ttyfd TIOCNOTTY ...
+.Fn ioctl ttyfd TIOCNOTTY ...\&
 or
-.Fn setpgrp ...
+.Fn setpgrp ...\&
 is
 .Em NOT
 sufficient.

lib/libc/sys/getsockopt.2

@@ -191,7 +191,8 @@ are queued on socket and a
 .Xr close 2
 is performed.
 If the socket promises reliable delivery of data and
-.Dv SO_LINGER is set,
+.Dv SO_LINGER
+is set,
 the system will block the process on the 
 .Xr close 2
 attempt until it is able to transmit the data or until it decides it

lib/libc/sys/listen.2

@@ -76,15 +76,15 @@ the request may be ignored so that retries may succeed.
 The
 .Xr sysctl 3
 MIB variable
-.Dq Li kern.ipc.somaxconn
+.Dq Va kern.ipc.somaxconn
 specifies a hard limit on
 .Fa backlog ;
 if a value greater than
-.Li kern.ipc.somaxconn
+.Va kern.ipc.somaxconn
 or less than zero is specified,
 .Fa backlog
 is silently forced to
-.Li kern.ipc.somaxconn .
+.Va kern.ipc.somaxconn .
 .Sh IMPLEMENTATION NOTES
 .Pp
 In the non-threaded library

lib/libc/sys/ptrace.2

@@ -54,9 +54,7 @@ that the process expects to be traced by its parent.  All the other
 arguments are ignored.  (If the parent process does not expect to trace
 the child, it will probably be rather confused by the results; once the
 traced process stops, it cannot be made to continue except via
-.Eo \&
+.Fn ptrace . )
-.Fn ptrace
-.Ec \&.)
 When a process has used this request and calls
 .Xr execve 2
 or any of the routines built on it
@@ -69,7 +67,7 @@ Also, any setuid or setgid bits on the executable being executed will
 be ignored.
 .It Dv PT_READ_I , Dv PT_READ_D
 These requests read a single
-.Li int
+.Vt int
 of data from the traced process' address space.  Traditionally,
 .Fn ptrace
 has allowed for machines with distinct address spaces for instruction
@@ -99,12 +97,12 @@ except that they write rather than read.  The
 argument supplies the value to be written.
 .It Dv PT_READ_U
 This request reads an
-.Li int
+.Vt int
 from the traced process' user structure.  The
 .Fa addr
 argument specifies the location of the int relative to the base of the
 user structure; it will usually be an integer value cast to
-.Li caddr_t
+.Vt caddr_t
 either explicitly or via the presence of a prototype for
 .Eo \&
 .Fn ptrace
@@ -115,14 +113,14 @@ and
 .Dv PT_READ_D ,
 .Fa addr
 must be aligned on an
-.Li int
+.Vt int
 boundary.  The value read is returned as the return value from
 .Eo \&
 .Fn ptrace
 .Ec .
 .It Dv PT_WRITE_U
 This request writes an
-.Li int
+.Vt int
 into the traced process' user structure.
 .Fa addr
 specifies the offset, just as for
@@ -138,7 +136,9 @@ The traced process continues execution.
 .Fa addr
 is an address specifying the place where execution is to be resumed (a
 new value for the program counter), or
-.Li (caddr_t)1
+.Po
+.Vt caddr_t
+.Pc Ns 1
 to indicate that execution is to pick up where it left off.
 .Fa data
 provides a signal number to be delivered to the traced process as it
@@ -180,7 +180,9 @@ are:
 .Bl -tag -width 12n
 .It Dv PT_GETREGS
 This request reads the traced process' machine registers into the
-.Dq Li "struct reg"
+.Do
+.Vt "struct reg"
+.Dc
 (defined in
 .Aq Pa machine/reg.h )
 pointed to by
@@ -189,7 +191,9 @@ pointed to by
 This request is the converse of
 .Dv PT_GETREGS ;
 it loads the traced process' machine registers from the
-.Dq Li "struct reg"
+.Do
+.Vt "struct reg"
+.Dc
 (defined in
 .Aq Pa machine/reg.h )
 pointed to by
@@ -197,7 +201,9 @@ pointed to by
 .It Dv PT_GETFPREGS
 This request reads the traced process' floating-point registers into
 the
-.Dq Li "struct fpreg"
+.Do
+.Vt "struct fpreg"
+.Dc
 (defined in
 .Aq Pa machine/reg.h )
 pointed to by
@@ -206,7 +212,9 @@ pointed to by
 This request is the converse of
 .Dv PT_GETFPREGS ;
 it loads the traced process' floating-point registers from the
-.Dq Li "struct fpreg"
+.Do
+.Vt "struct fpreg"
+.Dc
 (defined in
 .Aq Pa machine/reg.h )
 pointed to by
@@ -214,7 +222,9 @@ pointed to by
 .It Dv PT_GETDBREGS
 This request reads the traced process' debug registers into
 the
-.Dq Li "struct dbreg"
+.Do
+.Vt "struct dbreg"
+.Dc
 (defined in
 .Aq Pa machine/reg.h )
 pointed to by
@@ -223,7 +233,9 @@ pointed to by
 This request is the converse of
 .Dv PT_GETDBREGS ;
 it loads the traced process' debug registers from the
-.Dq Li "struct dbreg"
+.Do
+.Vt "struct dbreg"
+.Dc
 (defined in
 .Aq Pa machine/reg.h )
 pointed to by
@@ -265,7 +277,7 @@ to
 or
 .Dv PT_WRITE_U
 was not
-.Li int Ns \&-aligned.
+.Vt int Ns \-aligned .
 .It
 The signal number (in
 .Fa data )

lib/libc_r/man/pthread_cond_wait.3

@@ -48,7 +48,8 @@ variable specified by
 and unblocks the mutex specified by
 .Fa mutex .
 The waiting thread unblocks only after another thread calls
-.Xr pthread_cond_signal 3 , or
+.Xr pthread_cond_signal 3 ,
+or
 .Xr pthread_cond_broadcast 3
 with the same condition variable, and the current thread requires the lock
 on

lib/libc_r/man/pthread_testcancel.3

@@ -195,5 +195,5 @@ conforms to ISO/IEC 9945-1 ANSI/IEEE
 Std 1003.1 Second Edition 1996-07-12.
 .Sh AUTHORS
 This man page was written by
-.An David Leonard <d@openbsd.org> 
+.An David Leonard Aq d@openbsd.org
 for the OpenBSD implementation of pthread_cancel.

lib/libcompat/4.3/lsearch.3

@@ -37,7 +37,7 @@
 .Os
 .Sh NAME
 .Nm lsearch ,
-.Nm lfind,
+.Nm lfind
 .Nd linear searching routines
 .Sh LIBRARY
 .Lb libcompat

lib/libcompat/4.3/rexec.3

@@ -74,7 +74,7 @@ specifies which well-known
 .Tn DARPA
 Internet port to use for
 the connection; the call
-.Ql getservbyname(\\*qexec\\*q, \\*qtcp\\*q)
+.Fn getservbyname \*qexec\*q \*qtcp\*q
 (see 
 .Xr getservent 3 )
 will return a pointer to a structure, which contains the

lib/libdevstat/devstat.3

@@ -518,7 +518,7 @@ The
 statistics system first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Kenneth Merry Aq ken@FreeBSD.ORG
+.An Kenneth Merry Aq ken@FreeBSD.org
 .Sh BUGS
 There should probably be an interface to de-allocate memory allocated by
 .Fn getdevs ,

lib/libdisk/libdisk.3

@@ -66,7 +66,7 @@
 .Fd #include <sys/types.h>
 .Fd #include <libdisk.h>
 .Pp
-.Dv extern const char *chunk_n[];
+.Vt extern const char *chunk_n[] ;
 .Ft const char *
 .Fn slice_type_name "int type" "int subtype"
 .Ft struct disk *

lib/libedit/editline.3

@@ -420,8 +420,7 @@ Delete
 characters before the cursor.
 .It Fn el_data_set
 Set the user data to
-.Fa data
+.Fa data .
-.
 .It Fn el_data_get
 Get the user data.
 .El

lib/libftpio/ftpio.3

@@ -49,31 +49,31 @@
 .Ft FILE *
 .Fn ftpLogin "char *host" "char *user" "char *passwd" "int ftp_port" "int verbose" "int *retcode"
 .Ft int
-.Fn ftpChdir "FILE *stream, char *dirname"
+.Fn ftpChdir "FILE *stream" "char *dirname"
 .Ft int
 .Fn ftpErrno "FILE *stream"
 .Ft const char *
 .Fn ftpErrString "int errno"
 .Ft time_t
-.Fn ftpGetModtime "FILE *stream, char *file"
+.Fn ftpGetModtime "FILE *stream" "char *file"
 .Ft off_t
-.Fn ftpGetSize "FILE *stream, char *file"
+.Fn ftpGetSize "FILE *stream" "char *file"
 .Ft FILE *
-.Fn ftpGet "FILE *stream, char *file, off_t *seekto"
+.Fn ftpGet "FILE *stream" "char *file" "off_t *seekto"
 .Ft FILE *
-.Fn ftpPut "FILE *stream, char *file"
+.Fn ftpPut "FILE *stream" "char *file"
 .Ft int
 .Fn ftpAscii "FILE *stream"
 .Ft int
 .Fn ftpBinary "FILE *stream"
 .Ft int
-.Fn ftpPassive "FILE *stream, int status"
+.Fn ftpPassive "FILE *stream" "int status"
 .Ft void
-.Fn ftpVerbose "FILE *stream, int status"
+.Fn ftpVerbose "FILE *stream" "int status"
 .Ft FILE *
-.Fn ftpGetURL "char *url, char *user, char *passwd, int *retcode"
+.Fn ftpGetURL "char *url" "char *user" "char *passwd" "int *retcode"
 .Ft FILE *
-.Fn ftpPutURL "char *url, char *user, char *passwd, int *retcode"
+.Fn ftpPutURL "char *url" "char *user" "char *passwd" "int *retcode"
 .Ft int
 .Fn ftpLoginAf "char *host" "int af" "char *user" "char *passwd" "int ftp_port" "int verbose" "int *retcode"
 .Ft FILE *

lib/libipsec/ipsec_strerror.3

@@ -44,8 +44,9 @@
 .Sh DESCRIPTION
 .Pa netinet6/ipsec.h
 declares
-.Pp
+.Bd -ragged -offset indent
-.Dl extern int ipsec_errcode;
+.Vt extern int ipsec_errcode ;
+.Ed
 .Pp
 which is used to pass error code from IPsec policy manipulation library
 to user program.

lib/libkvm/kvm_getswapinfo.3

@@ -21,14 +21,25 @@
 .Sh DESCRIPTION
 The
 .Fn kvm_getswapinfo
-function fills an array of kvm_swap structures with swap summary
+function fills an array of
-information for each swap device, for up to maxswap - 1 devices.
+.Vt kvm_swap
-The number of devices, up to maxswap - 1, is returned.  A grand
+structures with swap summary
+information for each swap device, for up to
+.Fa maxswap
+\- 1 devices.
+The number of devices, up to
+.Fa maxswap
+\- 1, is returned.  A grand
 total of all swap devices (including any devices that go beyond
-maxswap - 1 ) is returned in one additional array entry.  This
+.Fa maxswap
-entry is not counted in the return value.  Thus, if you specify
+\- 1) is returned in one additional array entry.  This
-a maxswap value of 1, the function will typically return the
+entry is not counted in the return value.
-value 0 and the single kvm_swap structure will be filled with
+Thus, if you specify a
+.Fa maxswap
+value of 1, the function will typically return the
+value 0 and the single
+.Vt kvm_swap
+structure will be filled with
 the grand total over all swap devices.  The grand total is calculated
 from all available swap devices whether or not you made room 
 for them all in the array.
@@ -38,21 +49,36 @@ The flags argument is currently unused and must be passed as 0.
 .Pp
 If an error occurs, -1 is returned.
 .Pp
-Each swap partition and the grand total is summarized in the kvm_swap
+Each swap partition and the grand total is summarized in the
+.Vt kvm_swap
 structure.  This structure contains the following fields:
-.Bl -inset -width indent
+.Pp
-.It char ksw_devname[];
+.Bl -item -offset indent -compact
-.It int ksw_total;
+.It
-.It int ksw_used;
+.Va char ksw_devname[] ;
-.It int ksw_flags;
+.It
+.Va int ksw_total ;
+.It
+.Va int ksw_used ;
+.It
+.Va int ksw_flags ;
 .El
 .Pp
-Values are in PAGE_SIZE'd chunks ( see getpagesize() ).  ksw_flags contains
+Values are in
+.Dv PAGE_SIZE Ns 'd
+chunks (see
+.Xr getpagesize 3 ) .
+.Va ksw_flags
+contains
 a copy of the swap device flags.
 .Pp
 .Sh CACHING
 This function caches the nlist values for various kernel variables which
-it reuses in successive calls.  You may call the function with kd == NULL 
+it reuses in successive calls.
+You may call the function with
+.Fa kd
+==
+.Dv NULL 
 to clear the cache.
 .Sh DIAGNOSTICS
 If the load average was unobtainable, \-1 is returned; otherwise,

lib/libm/common_source/exp.3

@@ -220,7 +220,8 @@ and
 .Em NaN
 (the reserved
 operand on a
-.Tn VAX ) .  Previous implementations of pow may
+.Tn VAX ) .
+Previous implementations of pow may
 have defined x**0 to be undefined in some or all of these
 cases.  Here are reasons for returning x**0 = 1 always:
 .Bl -enum -width indent

lib/libm/common_source/hypot.3

@@ -45,7 +45,7 @@
 .Fd #include <math.h>
 .Ft double
 .Fn hypot "double x" "double y"
-.Fd struct {double x, y;} z;
+.Vt struct {double x, y;} z ;
 .Ft double
 .Fn cabs z
 .Sh DESCRIPTION

lib/libm/common_source/ieee.3

@@ -218,7 +218,7 @@ return  \-1.7e38?
 .Pp
 .Tn IEEE
 754 currently specifies that
-.Fn logb "denormalized no."
+.Fn logb "denormalized no.\&"
 =
 .Fn logb "tiniest normalized no. > 0"
 but the consensus has changed to the specification in the new 

lib/libpthread/man/pthread_cond_wait.3

@@ -48,7 +48,8 @@ variable specified by
 and unblocks the mutex specified by
 .Fa mutex .
 The waiting thread unblocks only after another thread calls
-.Xr pthread_cond_signal 3 , or
+.Xr pthread_cond_signal 3 ,
+or
 .Xr pthread_cond_broadcast 3
 with the same condition variable, and the current thread requires the lock
 on

lib/libpthread/man/pthread_testcancel.3

@@ -195,5 +195,5 @@ conforms to ISO/IEC 9945-1 ANSI/IEEE
 Std 1003.1 Second Edition 1996-07-12.
 .Sh AUTHORS
 This man page was written by
-.An David Leonard <d@openbsd.org> 
+.An David Leonard Aq d@openbsd.org
 for the OpenBSD implementation of pthread_cancel.

lib/libstand/libstand.3

@@ -46,16 +46,25 @@ and
 .Xr bstring 3 .
 .Sh MEMORY ALLOCATION
 .Bl -hang -width 10n
-.It Fn "void *malloc" "size_t size"
+.It Xo
+.Ft "void *"
+.Fn malloc "size_t size"
+.Xc
 .Pp
 Allocate
 .Fa size
 bytes of memory from the heap using a best-fit algorithm.
-.It Fn "void free" "void *ptr"
+.It Xo
+.Ft void
+.Fn free "void *ptr"
+.Xc
 .Pp
 Free the allocated object at
 .Fa ptr .
-.It Fn "void setheap" "void *start" "void *limit"
+.It Xo
+.Ft void
+.Fn setheap "void *start" "void *limit"
+.Xc
 .Pp
 Initialise the heap.  This function must be called before calling
 .Fn alloc
@@ -65,7 +74,10 @@ and
 .Fa limit
 will be used for the heap; attempting to allocate beyond this will result
 in a panic.
-.It Fn "char *sbrk" "int junk"
+.It Xo
+.Ft "char *"
+.Fn sbrk "int junk"
+.Xc
 .Pp
 Provides the behaviour of
 .Fn sbrk 0 ,
@@ -79,17 +91,35 @@ A set of functions are provided for manipulating a flat variable space similar
 to the traditional shell-supported evironment.  Major enhancements are support
 for set/unset hook functions.
 .Bl -hang -width 10n
-.It Fn "char *getenv" "const char *name"
+.It Xo
-.It Fn "int setenv" "const char *name" "char *value" "int overwrite"
+.Ft "char *"
-.It Fn "int putenv" "const char *string"
+.Fn getenv "const char *name"
-.It Fn "int unsetenv" "const char *name"
+.Xc
+.It Xo
+.Ft int
+.Fn setenv "const char *name" "char *value" "int overwrite"
+.Xc
+.It Xo
+.Ft int
+.Fn putenv "const char *string"
+.Xc
+.It Xo
+.Ft int
+.Fn unsetenv "const char *name"
+.Xc
 .Pp
 These functions behave similarly to their standard library counterparts.
-.It Fn "struct env_var *env_getenv" "const char *name"
+.It Xo
+.Ft "struct env_var *"
+.Fn env_getenv "const char *name"
+.Xc
 .Pp
 Looks up a variable in the environment and returns its entire 
 data structure.
-.It Fn "int env_setenv" "const char *name" "int flags" "char *value" "ev_sethook_t sethook" "ev_unsethook_t unsethook"
+.It Xo
+.Ft int
+.Fn env_setenv "const char *name" "int flags" "char *value" "ev_sethook_t sethook" "ev_unsethook_t unsethook"
+.Xc
 .Pp
 Creates a new or sets an existing environment variable called
 .Fa name .
@@ -117,20 +147,41 @@ may be used to prevent a variable being unset.
 .El
 .Sh STANDARD LIBRARY SUPPORT
 .Bl -hang -width 10n
-.It Fn "int getopt" "int argc" "char * const *argv" "cont char *optstring"
+.It Xo
-.It Fn "long strtol" "const char *nptr" "char **endptr" "int base"
+.Ft int
-.It Fn "void srandom" "unsigned long seed"
+.Fn getopt "int argc" "char * const *argv" "cont char *optstring"
-.It Fn "unsigned long random" "void"
+.Xc
-.It Fn "char *strerror" "int error"
+.It Xo
+.Ft long
+.Fn strtol "const char *nptr" "char **endptr" "int base"
+.Xc
+.It Xo
+.Ft void
+.Fn srandom "unsigned long seed"
+.Xc
+.It Xo
+.Ft "unsigned long"
+.Fn random void
+.Xc
+.It Xo
+.Ft "char *"
+.Fn strerror "int error"
+.Xc
 .Pp
 Returns error messages for the subset of errno values supported by
 .Nm No .
-.It Fn "assert" "expression"
+.It Fn assert expression
 .Pp
 Requires
 .Fd #include <assert.h>
-.It Fn "int setjmp" "jmp_buf env"
+.It Xo
-.It Fn "void longjmp" "jmp_buf env" "int val"
+.Ft int
+.Fn setjmp "jmp_buf env"
+.Xc
+.It Xo
+.Ft void
+.Fn longjmp "jmp_buf env" "int val"
+.Xc
 .Pp
 Defined as
 .Fn _setjmp
@@ -141,12 +192,18 @@ respectively as there is no signal state to manipulate.  Requires
 .El
 .Sh CHARACTER I/O
 .Bl -hang -width 10n
-.It Fn "void gets" "char *buf"
+.It Xo
+.Ft void
+.Fn gets "char *buf"
+.Xc
 .Pp
 Read characters from the console into
 .Fa buf .
 All of the standard cautions apply to this function.
-.It Fn "void ngets" "char *buf" "size_t size"
+.It Xo
+.Ft void
+.Fn ngets "char *buf" "size_t size"
+.Xc
 .Pp
 Read at most
 .Fa size
@@ -156,7 +213,10 @@ If
 .Fa size
 is less than 1, the function's behaviour is as for
 .Fn gets .
-.It Fn "int fgetstr" "char *buf" "int size" "int fd"
+.It Xo
+.Ft int
+.Fn fgetstr "char *buf" "int size" "int fd"
+.Xc
 .Pp
 Read a line of at most
 .Fa size
@@ -166,10 +226,22 @@ Line terminating characters are stripped, and the buffer is always nul
 terminated.  Returns the number of characters in
 .Fa buf
 if successful, or -1 if a read error occurs.
-.It Fn "int printf" "const char *fmt" "..."
+.It Xo
-.It Fn "void vprintf" "const char *fmt" "va_list ap"
+.Ft int
-.It Fn "int sprintf" "char *buf" "const char *fmt" "..."
+.Fn printf "const char *fmt" "..."
-.It Fn "void vsprintf" "char *buf" "const char *fmt" "va_list ap"
+.Xc
+.It Xo
+.Ft void
+.Fn vprintf "const char *fmt" "va_list ap"
+.Xc
+.It Xo
+.Ft int
+.Fn sprintf "char *buf" "const char *fmt" "..."
+.Xc
+.It Xo
+.Ft void
+.Fn vsprintf "char *buf" "const char *fmt" "va_list ap"
+.Xc
 .Pp
 The *printf functions implement a subset of the standard
 .Fn printf
@@ -233,19 +305,49 @@ ptr,
 .El
 .Sh CHARACTER TESTS AND CONVERSIONS
 .Bl -hang -width 10n
-.It Fn "int isupper" "int c"
+.It Xo
-.It Fn "int islower" "int c"
+.Ft int
-.It Fn "int isspace" "int c"
+.Fn isupper "int c"
-.It Fn "int isdigit" "int c"
+.Xc
-.It Fn "int isxdigit" "int c"
+.It Xo
-.It Fn "int isascii" "int c"
+.Ft int
-.It Fn "int isalpha" "int c"
+.Fn islower "int c"
-.It Fn "int toupper" "int c"
+.Xc
-.It Fn "int tolower" "int c"
+.It Xo
+.Ft int
+.Fn isspace "int c"
+.Xc
+.It Xo
+.Ft int
+.Fn isdigit "int c"
+.Xc
+.It Xo
+.Ft int
+.Fn isxdigit "int c"
+.Xc
+.It Xo
+.Ft int
+.Fn isascii "int c"
+.Xc
+.It Xo
+.Ft int
+.Fn isalpha "int c"
+.Xc
+.It Xo
+.Ft int
+.Fn toupper "int c"
+.Xc
+.It Xo
+.Ft int
+.Fn tolower "int c"
+.Xc
 .El
 .Sh FILE I/O
 .Bl -hang -width 10n
-.It Fn "int open" "const char *path" "int flags"
+.It Xo
+.Ft int
+.Fn open "const char *path" "int flags"
+.Xc
 .Pp
 Similar to the behaviour as specified in
 .Xr open 2 ,
@@ -254,20 +356,41 @@ required.  The
 .Fa flags
 argument may be one of O_RDONLY, O_WRONLY and O_RDWR (although no filesystems
 currently support writing).
-.It Fn "int close" "int fd"
+.It Xo
-.It Fn "void closeall" "void"
+.Ft int
+.Fn close "int fd"
+.Xc
+.It Xo
+.Ft void
+.Fn closeall void
+.Xc
 .Pp
 Close all open files.
-.It Fn "ssize_t read" "int fd" "void *buf" "size_t len"
+.It Xo
-.It Fn "ssize_t write" "int fd" "void *buf" "size_t len"
+.Ft ssize_t
+.Fn read "int fd" "void *buf" "size_t len"
+.Xc
+.It Xo
+.Ft ssize_t
+.Fn write "int fd" "void *buf" "size_t len"
+.Xc
 .Pp
 (No filesystems currently support writing.)
-.It Fn "off_t lseek" "int fd" "off_t offset" "int whence"
+.It Xo
+.Ft off_t
+.Fn lseek "int fd" "off_t offset" "int whence"
+.Xc
 .Pp
 Files being automatically uncompressed during reading cannot seek backwards
 from the current point.
-.It Fn "int stat" "const char *path" "struct stat *sb"
+.It Xo
-.It Fn "int fstat" "int fd" "struct stat *sb"
+.Ft int
+.Fn stat "const char *path" "struct stat *sb"
+.Xc
+.It Xo
+.Ft int
+.Fn fstat "int fd" "struct stat *sb"
+.Xc
 .Pp
 The
 .Fn stat
@@ -285,15 +408,24 @@ filesystem always reports files having uid/gid of zero.
 .Nm
 supplies a simple internal pager to ease reading the output of large commands.
 .Bl -hang -width 10n
-.It Fn "void pager_open"
+.It Xo
+.Ft void
+.Fn pager_open
+.Xc
 .Pp
 Initialises the pager and tells it that the next line output will be the top of the
 display.  The environment variable LINES is consulted to determine the number of
 lines to be displayed before pausing.
-.It Fn "void pager_close" "void"
+.It Xo
+.Ft void
+.Fn pager_close void
+.Xc
 .Pp
 Closes the pager.
-.It Fn "void pager_output" "char *lines"
+.It Xo
+.Ft void
+.Fn pager_output "char *lines"
+.Xc
 .Pp
 Sends the lines in the nul-terminated buffer at
 .Fa lines
@@ -302,7 +434,10 @@ of lines being output (wrapped lines are not accounted for).
 .Fn pager_output
 will return zero when all of the lines have been output, or nonzero if the
 display was paused and the user elected to quit.
-.It Fn "int pager_file" "char *fname"
+.It Xo
+.Ft int
+.Fn pager_file "char *fname"
+.Xc
 .Pp
 Attempts to open and display the file
 .Fa fname .
@@ -310,7 +445,10 @@ Returns -1 on error, 0 at EOF, or 1 if the user elects to quit while reading.
 .El
 .Sh MISC
 .Bl -hang -width 10n
-.It Fn "void twiddle" "void"
+.It Xo
+.Ft void
+.Fn twiddle void
+.Xc
 .Pp
 Successive calls emit the characters in the sequence |,/,-,\\ followed by a 
 backspace in order to provide reassurance to the user.
@@ -356,16 +494,25 @@ returns.
 .Pp
 The consumer must provide the following support functions:
 .Bl -hang -width 10n
-.It Fn "int getchar" "void"
+.It Xo
+.Ft int
+.Fn getchar void
+.Xc
 .Pp
 Return a character from the console, used by
 .Fn gets ,
 .Fn ngets
 and pager functions.
-.It Fn "int ischar" "void"
+.It Xo
+.Ft int
+.Fn ischar void
+.Xc
 .Pp
 Returns nonzero if a character is waiting from the console.
-.It Fn "void putchar" "int"
+.It Xo
+.Ft void
+.Fn putchar int
+.Xc
 .Pp
 Write a character to the console, used by
 .Fn gets , 
@@ -375,7 +522,10 @@ Write a character to the console, used by
 and
 .Fn twiddle
 and thus by many other functions for debugging and informational output.
-.It Fn "int devopen" "struct open_file *of" "const char *name" "char **file"
+.It Xo
+.Ft int
+.Fn devopen "struct open_file *of" "const char *name" "char **file"
+.Xc
 .Pp
 Open the appropriate device for the file named in
 .Fa name ,
@@ -388,18 +538,24 @@ which does not refer to the device.  The
 field in 
 .Fa of
 will be set to point to the
-.Dv devsw
+.Vt devsw
 structure for the opened device if successful.  Device identifiers must
 always precede the path component, but may otherwise be arbitrarily formatted.
 Used by
 .Fn open
 and thus for all device-related I/O.
-.It Fn "int devclose" "struct open_file *of"
+.It Xo
+.Ft int
+.Fn devclose "struct open_file *of"
+.Xc
 Close the device allocated for
 .Fa of .
 The device driver itself will already have been called for the close; this call
 should clean up any allocation made by devopen only.
-.It Fn "void panic" "const char *msg" "..."
+.It Xo
+.Ft void
+.Fn panic "const char *msg" "..."
+.Xc
 .Pp
 Signal a fatal and unrecoverable error condition.  The
 .Fa msg ...
@@ -408,9 +564,10 @@ arguments are as for
 .El
 .Sh INTERNAL FILESYSTEMS
 Internal filesystems are enabled by the consumer exporting the array
-.Dv struct fs_ops *file_system[], which should be initialised with pointers
+.Vt struct fs_ops *file_system[] ,
+which should be initialised with pointers
 to
-.Dv struct fs_ops
+.Vt struct fs_ops
 structures.  The following filesystem handlers are supplied by
 .Nm No ,
 the consumer may supply other filesystems of their own:
@@ -433,7 +590,7 @@ appends
 .Li .gz
 to the end of the filename, and then tries to locate the file using the other
 filesystems.  Placement of this filesystem in the
-.Dv file_system[]
+.Va file_system[]
 array determines whether gzipped files will be opened in preference to non-gzipped
 files.  It is only possible to seek a gzipped file forwards, and
 .Fn stat
@@ -443,11 +600,11 @@ on gzipped files will report an invalid length.
 .El
 .Pp
 The array of
-.Dv struct fs_ops
+.Vt struct fs_ops
 pointers should be terminated with a NULL.
 .Sh DEVICES
 Devices are exported by the supporting code via the array
-.Dv struct devsw *devsw[]
+.Vt struct devsw *devsw[]
 which is a NULL terminated array of pointers to device switch structures.
 .Sh BUGS
 .Pp

lib/msun/man/exp.3

@@ -257,7 +257,8 @@ and
 .Em NaN
 (the reserved
 operand on a
-.Tn VAX ) .  Previous implementations of pow may
+.Tn VAX ) .
+Previous implementations of pow may
 have defined x**0 to be undefined in some or all of these
 cases.  Here are reasons for returning x**0 = 1 always:
 .Bl -enum -width indent

lib/msun/man/hypot.3

@@ -47,10 +47,10 @@
 .Fn hypot "double x" "double y"
 .Ft float
 .Fn hypotf "float x" "float y"
-.Fd struct {double x, y;} z;
+.Vt struct {double x, y;} z ;
 .Ft double
 .Fn cabs z
-.Fd struct {float x, y;} z;
+.Vt struct {float x, y;} z ;
 .Ft float
 .Fn cabsf z
 .Sh DESCRIPTION

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.

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

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

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

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 Ev $HOME Ns Pa /.rhosts
-.It Pa Ev $HOME /.rhosts
-.Sm on
 .It Pa /var/run/nologin
 .El
 .Sh BUGS

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 Ev $HOME Ns Pa /.rhosts
-.It Pa Ev $HOME /.rhosts
-.Sm on
 .It Pa /var/run/nologin
 .El
 .Sh BUGS

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
-see
+.Xr link 5 )
-.Xr link 5
-.Pc
 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
+for details).
-.Pc \&.
 .Em crt0
 passes control to
-.Nm
+.Nm Ns 's
-\&'s entry point before the program'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
+(also known as
-.Dq __progname
+.Dq __progname ) .
-.Pc .
 .It \&%A
 The value of the environment variable
 .Ev LD_TRACE_LOADED_OBJECTS_PROGNAME

sbin/badsect/badsect.8

@@ -106,7 +106,7 @@ bad sector and whose name is the bad sector number.
 When it is discovered by 
 .Xr fsck 8
 it will ask
-.Dq Li "HOLD BAD BLOCK ?" .
+.Dq Li "HOLD BAD BLOCK \&?" .
 A positive response will cause 
 .Xr fsck 8
 to convert the inode to a regular file containing the bad block.

sbin/bsdlabel/bsdlabel.8

@@ -182,7 +182,7 @@ auto
 The required arguments to
 .Nm
 are the drive to be labeled and the drive type as described in the
-.Pa disktab(5)
+.Xr disktab 5
 file.  The drive parameters and partitions are taken from that file.  If
 different disks of the same physical type are to have different partitions, it
 will be necessary to have separate disktab entries describing each, or to edit

sbin/disklabel/disklabel.8

@@ -182,7 +182,7 @@ auto
 The required arguments to
 .Nm
 are the drive to be labeled and the drive type as described in the
-.Pa disktab(5)
+.Xr disktab 5
 file.  The drive parameters and partitions are taken from that file.  If
 different disks of the same physical type are to have different partitions, it
 will be necessary to have separate disktab entries describing each, or to edit

sbin/fdisk/fdisk.8

@@ -80,7 +80,7 @@ is read.  See
 .Sx CONFIGURATION FILE ,
 below, for file syntax.
 .Pp
-.Em WARNING Ns :
+.Em WARNING :
 when
 .Fl f
 is used, you are not asked if you really want to write the partition
@@ -173,15 +173,15 @@ is used to label the partition.
 .Fx
 reserves the
 magic number 165 decimal (A5 in hex).
-.It Em "start and size"
+.It Em start No and Em size
 fields provide the start address
 and size of a partition in sectors.
 .It Em "flag 80"
 specifies that this is the active partition.
-.It Em "cyl, sector and head"
+.It Em cyl , sector No and Em head
 fields are used to specify the beginning address
 and end address for the partition.
-.It Em "Note:"
+.It Em Note :
 these numbers are calculated using BIOS's understanding of the disk geometry
 and saved in the bootblock.
 .El

sbin/fdisk_pc98/fdisk.8

@@ -81,7 +81,7 @@ is read.  See
 .Sx CONFIGURATION FILE ,
 below, for file syntax.
 .Pp
-.Em WARNING Ns :
+.Em WARNING :
 when
 .Fl f
 is used, you are not asked if you really want to write the partition
@@ -199,17 +199,17 @@ is used to label the partition.
 .Fx
 reserves the
 magic number 148 decimal (94 in hex).
-.It Em "start and size"
+.It Em start No and Em size
 fields provide the start address
 and size of a partition in sectors.
 .\" !PC98 .It Em "flag 80"
 .\" specifies that this is the active partition.
-.It Em "cyl, sector and head"
+.It Em cyl , sector No and Em head
 fields are used to specify the beginning address
 and end address for the partition.
 .It Em "system Name"
 is the name of the partition.
-.It Em "Note:"
+.It Em Note :
 these numbers are calculated using BIOS's understanding of the disk geometry
 and saved in the bootblock.
 .El

sbin/fsck/fsck.8

@@ -39,7 +39,7 @@
 .Op Fl dvplfyn
 .Op Fl l Ar maxparallel
 .Op Fl t Ar fstype 
-.Op Fl T Ar fstype:fsoptions 
+.Op Fl T Ar fstype : Ns Ar fsoptions 
 .Op Ar special | node ...
 .Sh DESCRIPTION
 The
@@ -106,7 +106,7 @@ Causes
 .Nm
 to assume yes
 as the answer to all operator questions.
-.It Fl T Ar fstype:fsoptions
+.It Fl T Ar fstype : Ns Ar fsoptions 
 List of comma separated file system specific options for the specified
 file system type, in the same format as
 .Xr mount 8 .

sbin/fsdb/fsdb.8

@@ -204,7 +204,7 @@ or
 .Va atimensec 
 field will be set to zero.
 .Pp
-.It Cm quit, Cm q, Cm exit, Em <EOF>
+.It Cm quit , q , exit , Em <EOF>
 Exit the program.
 .El
 .Sh SEE ALSO

sbin/i386/fdisk/fdisk.8

@@ -80,7 +80,7 @@ is read.  See
 .Sx CONFIGURATION FILE ,
 below, for file syntax.
 .Pp
-.Em WARNING Ns :
+.Em WARNING :
 when
 .Fl f
 is used, you are not asked if you really want to write the partition
@@ -173,15 +173,15 @@ is used to label the partition.
 .Fx
 reserves the
 magic number 165 decimal (A5 in hex).
-.It Em "start and size"
+.It Em start No and Em size
 fields provide the start address
 and size of a partition in sectors.
 .It Em "flag 80"
 specifies that this is the active partition.
-.It Em "cyl, sector and head"
+.It Em cyl , sector No and Em head
 fields are used to specify the beginning address
 and end address for the partition.
-.It Em "Note:"
+.It Em Note :
 these numbers are calculated using BIOS's understanding of the disk geometry
 and saved in the bootblock.
 .El

sbin/ifconfig/ifconfig.8

@@ -139,7 +139,10 @@ The following parameters may be set with
 .Nm :
 .Bl -tag -width indent
 .It Cm add
-Another name for the ``alias'' parameter.  Introduced for compatibility
+Another name for the
+.Cm alias
+parameter.
+Introduced for compatibility
 with BSD/OS.
 .It Cm alias
 Establish an additional network address for this interface.
@@ -181,10 +184,15 @@ extra console error logging.
 .It Fl debug
 Disable driver dependent debugging code.
 .It Cm delete
-Another name for the ``-alias'' parameter.
+Another name for the
+.Fl alias
+parameter.
 .It Cm down
-Mark an interface ``down''.  When an interface is
+Mark an interface
-marked ``down'', the system will not attempt to
+.Dq down .
+When an interface is marked
+.Dq down ,
+the system will not attempt to
 transmit messages through that interface. 
 If possible, the interface will be reset to disable reception as well.
 This action does not automatically disable routes using the interface.
@@ -364,13 +372,18 @@ netmasks though
 .Fx
 implements it internally as a set of netmasks.
 .It Cm remove
-Another name for the ``-alias'' parameter.  Introduced for compatibility
+Another name for the
+.Fl alias
+parameter.
+Introduced for compatibility
 with BSD/OS.
 .It Cm phase
 The argument following this specifies the version (phase) of the 
 Appletalk network attached to the interface.
 Values of 1 or 2 are permitted.
-.It Cm link[0-2]
+.It Cm link Ns Xo
+.Op Cm 0 Ns - Ns Cm 2
+.Xc
 Enable special processing of the link level of the interface.
 These three options are interface specific in actual effect, however,
 they are in general used to select special modes of operation.
@@ -378,7 +391,9 @@ An example
 of this is to enable SLIP compression, or to select the connector type
 for some Ethernet cards.  Refer to the man page for the specific driver
 for more information.
-.It Fl link[0-2]
+.It Fl link Ns Xo
+.Op Cm 0 Ns - Ns Cm 2
+.Xc
 Disable special processing at the link level with the specified interface.
 .It Cm up
 Mark an interface

sbin/ip6fw/ip6fw.8

@@ -161,7 +161,7 @@ TCP packets only.
 Discard packets that match this rule,
 and try to send a TCP reset (RST) notice.
 The search terminates
-.Em (not working yet) .
+.Em ( "not working yet" ) .
 .It Ar count
 Update counters for all packets that match rule.
 The search continues with the next rule.
@@ -362,7 +362,7 @@ The supported IPv6 options are:
 The absence of a particular option may be denoted
 with a
 .Dq \&!
-.Em (not working yet).
+.Em ( "not working yet" ) .
 .It established
 Matches packets that have the RST or ACK bits set.
 TCP packets only.
@@ -418,7 +418,7 @@ firewalls.
 If you are logged in over a network, loading the KLD version of
 .Nm
 is probably not as straightforward as you would think
-.Em (not supported).
+.Em ( "not supported" ) .
 I recommend this command line:
 .Bd -literal -offset center
 kldload /modules/ip6fw_mod.o && \e

sbin/kget/kget.8

@@ -47,7 +47,7 @@ uses the
 .Xr sysctl 3
 interface to retrieve data from the kernel and requires that at least
 the
-.Ar machdep.uc_devlist
+.Va machdep.uc_devlist
 symbol be present.  If it's not, you may need to update your kernel
 before using this utility.
 .Pp

sbin/kldload/kldload.8

@@ -39,7 +39,7 @@
 The
 .Nm
 loads the file 
-.Ar filename.ko
+.Ar filename Ns Pa .ko
 into the kernel using the kernel linker.
 .Pp
 The following option is available:

sbin/ldconfig/ldconfig.8

@@ -40,7 +40,7 @@
 .Op Fl aout | Fl elf
 .Op Fl Rimrsv
 .Op Fl f Ar hints_file
-.Op Ar directory | file Ar ...
+.Op Ar directory | Ar
 .Sh DESCRIPTION
 .Nm
 is used to prepare a set of

sbin/mknod/mknod.8

@@ -82,7 +82,7 @@ major device number to use for a particular device, check the file
 to see if the device is known, or check
 the system dependent device configuration file:
 .Bd -filled -offset indent
-.Dq Pa /usr/src/sys/conf/device. Ns Em architecture
+.Dq Pa /usr/src/sys/conf/device. Ns Aq Ar architecture
 .Ed
 .Pp
 (for example

sbin/mount_nfs/mount_nfs.8

@@ -54,14 +54,15 @@
 .Op Fl t Ar timeout
 .Op Fl w Ar writesize
 .Op Fl x Ar retrans
-.Ar rhost:path node
+.Ar rhost : Ns Ar path node
 .Sh DESCRIPTION
 The
 .Nm
 command
 calls the
 .Xr mount 2
-system call to prepare and graft a remote nfs file system (rhost:path)
+system call to prepare and graft a remote nfs file system
+.Pq Ar rhost : Ns Ar path
 on to the file system tree at the point
 .Ar node .
 This command is normally executed by

sbin/mount_nwfs/mount_nwfs.8

@@ -71,7 +71,7 @@ For native IP you will need also
 option.
 .It Fl U Ar user
 Name of user used in login sequence.
-.It Fl "[connection options]"
+.It Fl connection\ options
 See
 .Xr ncplogin 1
 for details.
@@ -159,7 +159,8 @@ See
 for details.
 If this option is omitted, connection permissions
 assumed the same as directory mode
-.Pf ( Fl d Ns ) option.
+.Pq Fl d
+option.
 .El
 .Sh FILES
 .Bl -tag -width /var/log/wtmp -compact

sbin/mountd/exports.5

@@ -191,7 +191,7 @@ A
 .Sm on
 option can be used to specify a file whose handle will be returned if
 a directory is looked up using the public filehandle (
-.Tn WebNFS Ns ).
+.Tn WebNFS ) .
 This is to mimic the behavior of URLs.
 If no
 .Fl index

sbin/natd/natd.8

@@ -225,7 +225,7 @@ to appear from the specified
 .Ar targetPORT Ns Oo , Ns
 .Ar targetIP Ns : Ns Xo
 .Ar targetPORT Ns Oo , Ns
-.Ar ...
+.Ar ...\&
 .Oc Oc
 .Xc
 .Xc
@@ -239,7 +239,7 @@ to appear from the specified
 .It Fl redirect_address Xo
 .Ar localIP Ns Oo , Ns
 .Ar localIP Ns Oo , Ns
-.Ar ...
+.Ar ...\&
 .Oc Oc
 .Ar publicIP
 .Xc

sbin/pc98/fdisk/fdisk.8

@@ -81,7 +81,7 @@ is read.  See
 .Sx CONFIGURATION FILE ,
 below, for file syntax.
 .Pp
-.Em WARNING Ns :
+.Em WARNING :
 when
 .Fl f
 is used, you are not asked if you really want to write the partition
@@ -199,17 +199,17 @@ is used to label the partition.
 .Fx
 reserves the
 magic number 148 decimal (94 in hex).
-.It Em "start and size"
+.It Em start No and Em size
 fields provide the start address
 and size of a partition in sectors.
 .\" !PC98 .It Em "flag 80"
 .\" specifies that this is the active partition.
-.It Em "cyl, sector and head"
+.It Em cyl , sector No and Em head
 fields are used to specify the beginning address
 and end address for the partition.
 .It Em "system Name"
 is the name of the partition.
-.It Em "Note:"
+.It Em Note :
 these numbers are calculated using BIOS's understanding of the disk geometry
 and saved in the bootblock.
 .El

sbin/reboot/boot_i386.8

@@ -73,18 +73,18 @@ either by specifying a kernel name in the boot block parameter
 file,
 .Pa /boot.config ,
 or by hitting a key during a brief pause (while one of the characters
-.Dv - ,
+.Sy - ,
-.Dv \e ,
+.Sy \e ,
-.Dv \&| ,
+.Sy \&| ,
 or
-.Dv /
+.Sy /
 is displayed) before
 .Xr loader 8
 is invoked.  Booting will also be attempted at stage two, if the
 third stage cannot be loaded.
 .Pp
 The remainder of this subsection deals only with the boot blocks.  The
-.Pa loader
+.Xr loader 8
 program is documented separately.
 .Pp
 After the boot blocks have been loaded,
@@ -104,26 +104,32 @@ This boot may be aborted by typing any character on the keyboard
 at the
 .Ql boot:
 prompt.  At this time, the following input will be accepted:
-.Bl -tag -width 10x
+.Bl -tag -width indent
-.It \&?
+.It Ic \&?
 Give a short listing of the files in the root directory of the default
 boot device, as a hint about available boot files.  (A
-.Dv \&?
+.Ic ?\&
 may also be specified as the last segment of a path, in which case
 the listing will be of the relevant subdirectory.)
 .Pp
-.It bios_drive:interface(unit,part) filename Op Fl aCcDdghPrsv
+.It Xo
+.Ar bios_drive : Ns Ar interface Ns Po
+.Ar unit , Ns Ar part Pc
+.Ar filename
+.Op Fl aCcDdghPrsv
+.Xc
 Specify boot file and flags.
-.Bl -tag -width 10x -compact
+.Bl -tag -width indent
-.It bios_drive
+.It Ar bios_drive
 The drive number as recognized by the BIOS. 
 0 for the first drive, 1 for the second drive, etc.
-.It interface
+.It Ar interface
 The type of controller to boot from.  Note that the controller is required
 to have BIOS support since the BIOS services are used to load the
 boot file image.
 .Pp
 The supported interfaces are:
+.Pp
 .Bl -tag -width "adXX" -compact
 .It ad
 ST506, IDE, ESDI, RLL disks on a WD100[2367] or lookalike
@@ -135,10 +141,10 @@ SCSI disk on any supported SCSI controller
 .\".It cd
 .\"boot from CDROM
 .El
-.It unit
+.It Ar unit
 The unit number of the drive on the interface being used.
 0 for the first drive, 1 for the second drive, etc.
-.It part
+.It Ar part
 The partition letter inside the BSD portion of the disk.  See
 .Xr disklabel 8 .
 By convention, only partition
@@ -149,13 +155,14 @@ any slice can be booted from, with the default being the active slice
 or, otherwise, the first
 .Fx
 slice.
-.It filename
+.It Ar filename
 The pathname of the file to boot (relative to the root directory
 on the specified partition).  Defaults to
 .Pa /kernel .
 Symbolic links are not supported (hard links are).
 .It Fl acCdDghPrsv
 Boot flags:
+.Pp
 .Bl -tag -width "-CXX" -compact
 .It Fl a
 during kernel initialization,
@@ -164,8 +171,9 @@ ask for the device to mount as as the root file system.
 boot from CDROM.
 .It Fl c
 run UserConfig to modify hardware parameters for the loaded
-kernel.  If the kernel was built with one of USERCONFIG,
+kernel.  If the kernel was built with one of
-INTRO_USERCONFIG, VISUAL_USERCONFIG options,
+.Dv USERCONFIG , INTRO_USERCONFIG , VISUAL_USERCONFIG
+options,
 remain in UserConfig regardless of any
 .Ic quit
 commands present in the script.
@@ -237,7 +245,7 @@ to set defaults.  Enter them in one line just as you type at the
 .Ql boot:
 prompt.
 .Sh FILES
-.Bl -tag -width /kernel.old.config -compact
+.Bl -tag -width /boot/loader -compact
 .It Pa /boot.config
 parameters for the boot blocks (optional)
 .It Pa /boot/boot1
@@ -291,7 +299,8 @@ Seek failed
 Timeout
 .El
 .Pp
-IMPORTANT NOTE: Because of limitations imposed by the conventional
+.Sy "IMPORTANT NOTE" :
+Because of limitations imposed by the conventional
 disk interface provided by the BIOS, all boot-related files and
 structures (including the kernel) that need to be accessed during the
 boot phase must reside on the disk at or below cylinder 1023 (as the
@@ -300,7 +309,9 @@ BIOS understands the geometry).  When a
 is reported by the second-stage bootstrap, it generally means that this
 requirement has not been adhered to.
 .Sh BUGS
-The disklabel format used by this version of
+The
+.Xr disklabel 5
+format used by this version of
 .Bx
 is quite
 different from that of other architectures.

sbin/startslip/startslip.1

@@ -42,10 +42,10 @@
 .Nm
 .Op Fl d
 .Op Fl b Ar speed
-[
+.Oo
 .Fl s Ar string1
-.Op Fl s Ar string2 Op Ar ...
+.Op Fl s Ar string2 Op Ar ...\&
-]
+.Oc
 .Op Fl h
 .Op Fl l
 .Op Fl L

sbin/sysctl/sysctl.8

@@ -45,7 +45,7 @@
 .Nm
 .Op Fl bNn
 .Fl w
-.Ar name=value ...
+.Ar name Ns = Ns Ar value ...
 .Nm
 .Op Fl bNn
 .Fl aAX
@@ -87,7 +87,9 @@ set psize=`sysctl -n hw.pagesize`
 Force the value of the variable(s) to be output in raw, binary
 format.  No names are printed and no terminating newlines are output.
 This is mostly useful with a single variable.
-.It Fl w Ar name=value ...
+.It Fl w Xo
+.Ar name Ns = Ns Ar value ...
+.Xc
 Set the MIB
 .Ar name
 to the new

share/examples/mdoc/example.3

@@ -65,7 +65,8 @@ may have one of the following values:
 .Bl -tag -width EXAMPLE_ONE
 .It Dv EXAMPLE_ONE
 First example of a defined variable.
-.Dv EXAMPLE_ONE is described below.
+.Dv EXAMPLE_ONE
+is described below.
 .It Dv EXAMPLE_TWO
 Second example.
 .El

share/man/man3/intro.3

@@ -71,7 +71,8 @@ to supply the loader flag
 .Fl l Ns Ar c
 for these functions.
 There are several `libraries' or groups of functions included inside of
-.Xr libc : the standard
+.Xr libc :
+the standard
 .Tn I/O
 routines,
 database routines,
@@ -80,11 +81,10 @@ string operators,
 character tests and character operators,
 des encryption routines,
 storage allocation, time functions, signal handling and more.
-.It Xo
+.It Xr libcurses Po
-.Xr libcurses
+.Fl l Ns Ar curses
-.Pf ( Fl l Ns Ar curses
+.Fl l Ns Ar termcap
-.Fl l Ns Ar termcap )
+.Pc
-.Xc
 Terminal independent screen management routines
 for two dimensional non-bitmap display terminals.
 (See

share/man/man3/pthread.3

@@ -64,142 +64,310 @@ Cleanup Routines
 .El
 .Sh THREAD ROUTINES
 .Bl -tag -width Er
-.It int Fn pthread_create "pthread_t *thread" "const pthread_attr_t *attr" "void *(*start_routine)(void *)" "void *arg"
+.It Xo
+.Ft int
+.Fn pthread_create "pthread_t *thread" "const pthread_attr_t *attr" "void *(*start_routine)(void *)" "void *arg"
+.Xc
 Creates a new thread of execution.
-.It int Fn pthread_detach "pthread_t thread"
+.It Xo
+.Ft int
+.Fn pthread_detach "pthread_t thread"
+.Xc
 Marks a thread for deletion.
-.It int Fn pthread_equal "pthread_t t1" "pthread_t t2"
+.It Xo
+.Ft int
+.Fn pthread_equal "pthread_t t1" "pthread_t t2"
+.Xc
 Compares two thread IDs.
-.It void Fn pthread_exit "void *value_ptr"
+.It Xo
+.Ft void
+.Fn pthread_exit "void *value_ptr"
+.Xc
 Terminates the calling thread.
-.It int Fn pthread_join "pthread_t thread" "void **value_ptr"
+.It Xo
+.Ft int
+.Fn pthread_join "pthread_t thread" "void **value_ptr"
+.Xc
 Causes the calling thread to wait for the termination of the specified thread.
-.It int Fn pthread_cancel "pthread_t thread"
+.It Xo
+.Ft int
+.Fn pthread_cancel "pthread_t thread"
+.Xc
 Cancels execution of a thread.
-.It int Fn pthread_once "pthread_once_t *once_control" "void (*init_routine)(void)"
+.It Xo
+.Ft int
+.Fn pthread_once "pthread_once_t *once_control" "void (*init_routine)(void)"
+.Xc
 Calls an initialization routine once.
-.It pthread_t Fn pthread_self void
+.It Xo
+.Ft pthread_t
+.Fn pthread_self void
+.Xc
 Returns the thread ID of the calling thread.
 .El
 .Sh ATTRIBUTE OBJECT ROUTINES
 .Bl -tag -width Er
-.It int Fn pthread_attr_destroy "pthread_attr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_attr_destroy "pthread_attr_t *attr"
+.Xc
 Destroy a thread attributes object.
-.It int Fn pthread_attr_getinheritsched "pthread_attr_t *attr" "int *inheritsched"
+.It Xo
+.Ft int
+.Fn pthread_attr_getinheritsched "pthread_attr_t *attr" "int *inheritsched"
+.Xc
 Get the inherit scheduling attribute from a thread attributes object.
-.It int Fn pthread_attr_getschedparam "pthread_attr_t *attr" "struct sched_param *param"
+.It Xo
+.Ft int
+.Fn pthread_attr_getschedparam "pthread_attr_t *attr" "struct sched_param *param"
+.Xc
 Get the scheduling parameter attribute from a thread attributes object.
-.It int Fn pthread_attr_getschedpolicy "pthread_attr_t *attr" "int *policy"
+.It Xo
+.Ft int
+.Fn pthread_attr_getschedpolicy "pthread_attr_t *attr" "int *policy"
+.Xc
 Get the scheduling policy attribute from a thread attributes object.
-.It int Fn pthread_attr_getscope "pthread_attr_t *attr" "int *contentionscope"
+.It Xo
+.Ft int
+.Fn pthread_attr_getscope "pthread_attr_t *attr" "int *contentionscope"
+.Xc
 Get the contention scope attribute from a thread attributes object.
-.It int Fn pthread_attr_getstacksize "pthread_attr_t *attr" "size_t *stacksize"
+.It Xo
+.Ft int
+.Fn pthread_attr_getstacksize "pthread_attr_t *attr" "size_t *stacksize"
+.Xc
 Get the stack size attribute from a thread attributes object.
-.It int Fn pthread_attr_getstackaddr "pthread_attr_t *attr" "void **stackaddr"
+.It Xo
+.Ft int
+.Fn pthread_attr_getstackaddr "pthread_attr_t *attr" "void **stackaddr"
+.Xc
 Get the stack address attribute from a thread attributes object.
-.It int Fn pthread_attr_getdetachstate "pthread_attr_t *attr" "int *detachstate"
+.It Xo
+.Ft int
+.Fn pthread_attr_getdetachstate "pthread_attr_t *attr" "int *detachstate"
+.Xc
 Get the detach state attribute from a thread attributes object.
-.It int Fn pthread_attr_init "pthread_attr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_attr_init "pthread_attr_t *attr"
+.Xc
 Initialize a thread attributes object with default values.
-.It int Fn pthread_attr_setinheritsched "pthread_attr_t *attr" "int inheritsched"
+.It Xo
+.Ft int
+.Fn pthread_attr_setinheritsched "pthread_attr_t *attr" "int inheritsched"
+.Xc
 Set the inherit scheduling attribute in a thread attributes object.
-.It int Fn pthread_attr_setschedparam "pthread_attr_t *attr" "struct sched_param *param"
+.It Xo
+.Ft int
+.Fn pthread_attr_setschedparam "pthread_attr_t *attr" "struct sched_param *param"
+.Xc
 Set the scheduling parameter attribute in a thread attributes object.
-.It int Fn pthread_attr_setschedpolicy "pthread_attr_t *attr" "int policy"
+.It Xo
+.Ft int
+.Fn pthread_attr_setschedpolicy "pthread_attr_t *attr" "int policy"
+.Xc
 Set the scheduling policy attribute in a thread attributes object.
-.It int Fn pthread_attr_setscope "pthread_attr_t *attr" "int contentionscope"
+.It Xo
+.Ft int
+.Fn pthread_attr_setscope "pthread_attr_t *attr" "int contentionscope"
+.Xc
 Set the contention scope attribute in a thread attributes object.
-.It int Fn pthread_attr_setstacksize "pthread_attr_t *attr" "size_t stacksize"
+.It Xo
+.Ft int
+.Fn pthread_attr_setstacksize "pthread_attr_t *attr" "size_t stacksize"
+.Xc
 Set the stack size attribute in a thread attributes object.
-.It int Fn pthread_attr_setstackaddr "pthread_attr_t *attr" "void *stackaddr"
+.It Xo
+.Ft int
+.Fn pthread_attr_setstackaddr "pthread_attr_t *attr" "void *stackaddr"
+.Xc
 Set the stack address attribute in a thread attributes object.
-.It int Fn pthread_attr_setdetachstate "pthread_attr_t *attr" "int detachstate"
+.It Xo
+.Ft int
+.Fn pthread_attr_setdetachstate "pthread_attr_t *attr" "int detachstate"
+.Xc
 Set the detach state in a thread attributes object.
 .El
 .Sh MUTEX ROUTINES
 .Bl -tag -width Er
-.It int Fn pthread_mutexattr_destroy "pthread_mutexattr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_mutexattr_destroy "pthread_mutexattr_t *attr"
+.Xc
 Destroy a mutex attributes object.
-.It int Fn pthread_mutexattr_init "pthread_mutexattr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_mutexattr_init "pthread_mutexattr_t *attr"
+.Xc
 Initialize a mutex attributes object with default values.
-.It int Fn pthread_mutex_destroy "pthread_mutex_t *mutex"
+.It Xo
+.Ft int
+.Fn pthread_mutex_destroy "pthread_mutex_t *mutex"
+.Xc
 Destroy a mutex.
-.It int Fn pthread_mutex_init "pthread_mutex_t *mutex" "const pthread_mutexattr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_mutex_init "pthread_mutex_t *mutex" "const pthread_mutexattr_t *attr"
+.Xc
 Initialize a mutex with specified attributes.
-.It int Fn pthread_mutex_lock "pthread_mutex_t *mutex"
+.It Xo
+.Ft int
+.Fn pthread_mutex_lock "pthread_mutex_t *mutex"
+.Xc
 Lock a mutex and block until it becomes available.
-.It int Fn pthread_mutex_trylock "pthread_mutex_t *mutex"
+.It Xo
+.Ft int
+.Fn pthread_mutex_trylock "pthread_mutex_t *mutex"
+.Xc
 Try to lock a mutex, but don't block if the mutex is locked by another thread,
 including the current thread.
-.It int Fn pthread_mutex_unlock "pthread_mutex_t *mutex"
+.It Xo
+.Ft int
+.Fn pthread_mutex_unlock "pthread_mutex_t *mutex"
+.Xc
 Unlock a mutex.
 .El
 .Sh CONDITION VARIABLE ROUTINES
 .Bl -tag -width Er
-.It int Fn pthread_condattr_init "pthread_condattr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_condattr_init "pthread_condattr_t *attr"
+.Xc
 Initialize a condition variable attributes object with default values.
-.It int Fn pthread_condattr_destroy "pthread_condattr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_condattr_destroy "pthread_condattr_t *attr"
+.Xc
 Destroy a condition variable attributes object.
-.It int Fn pthread_cond_broadcast "pthread_cond_t *cond"
+.It Xo
+.Ft int
+.Fn pthread_cond_broadcast "pthread_cond_t *cond"
+.Xc
 Unblock all threads currently blocked on the specified condition variable.
-.It int Fn pthread_cond_destroy "pthread_cond_t *cond"
+.It Xo
+.Ft int
+.Fn pthread_cond_destroy "pthread_cond_t *cond"
+.Xc
 Destroy a condition variable.
-.It int Fn pthread_cond_init "pthread_cond_t *cond" "const pthread_condattr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_cond_init "pthread_cond_t *cond" "const pthread_condattr_t *attr"
+.Xc
 Initialize a condition variable with specified attributes.
-.It int Fn pthread_cond_signal "pthread_cond_t *cond"
+.It Xo
+.Ft int
+.Fn pthread_cond_signal "pthread_cond_t *cond"
+.Xc
 Unblock at least one of the threads blocked on the specified condition variable.
-.It int Fn pthread_cond_timedwait "pthread_cond_t *cond" "pthread_mutex_t *mutex" "const struct timespec *abstime"
+.It Xo
+.Ft int
+.Fn pthread_cond_timedwait "pthread_cond_t *cond" "pthread_mutex_t *mutex" "const struct timespec *abstime"
+.Xc
 Wait no longer than the specified time for a condition and lock the specified mutex.
-.It int Fn pthread_cond_wait "pthread_cond_t *" "pthread_mutex_t *mutex"
+.It Xo
+.Ft int
+.Fn pthread_cond_wait "pthread_cond_t *" "pthread_mutex_t *mutex"
+.Xc
 Wait for a condition and lock the specified mutex.
 .El
 .Sh READ/WRITE LOCK ROUTINES
 .Bl -tag -width Er
-.It int Fn pthread_rwlock_destroy "pthread_rwlock_t *lock"
+.It Xo
+.Ft int
+.Fn pthread_rwlock_destroy "pthread_rwlock_t *lock"
+.Xc
 Destroy a read/write lock object.
-.It int Fn pthread_rwlock_init "pthread_rwlock_t *lock" "const pthread_rwlockattr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_rwlock_init "pthread_rwlock_t *lock" "const pthread_rwlockattr_t *attr"
+.Xc
 Initialize a read/write lock object.
-.It int Fn pthread_rwlock_rdlock "pthread_rwlock_t *lock"
+.It Xo
+.Ft int
+.Fn pthread_rwlock_rdlock "pthread_rwlock_t *lock"
+.Xc
 Lock a read/write lock for reading, blocking until the lock can be
 acquired.
-.It int Fn pthread_rwlock_tryrdlock "pthread_rwlock_t *lock"
+.It Xo
+.Ft int
+.Fn pthread_rwlock_tryrdlock "pthread_rwlock_t *lock"
+.Xc
 Attempt to lock a read/write lock for reading, without blocking if the
 lock is unavailable.
-.It int Fn pthread_rwlock_trywrlock "pthread_rwlock_t *lock"
+.It Xo
+.Ft int
+.Fn pthread_rwlock_trywrlock "pthread_rwlock_t *lock"
+.Xc
 Attempt to lock a read/write lock for writing, without blocking if the
 lock is unavailable.
-.It int Fn pthread_rwlock_unlock "pthread_rwlock_t *lock"
+.It Xo
+.Ft int
+.Fn pthread_rwlock_unlock "pthread_rwlock_t *lock"
+.Xc
 Unlock a read/write lock.
-.It int Fn pthread_rwlock_wrlock "pthread_rwlock_t *lock"
+.It Xo
+.Ft int
+.Fn pthread_rwlock_wrlock "pthread_rwlock_t *lock"
+.Xc
 Lock a read/write lock for writing, blocking until the lock can be
 acquired.
-.It int Fn pthread_rwlockattr_destroy "pthread_rwlockattr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_rwlockattr_destroy "pthread_rwlockattr_t *attr"
+.Xc
 Destroy a read/write lock attribute object.
-.It int Fn pthread_rwlockattr_getpshared "pthread_rwlockattr_t *attr" "int *pshared"
+.It Xo
+.Ft int
+.Fn pthread_rwlockattr_getpshared "pthread_rwlockattr_t *attr" "int *pshared"
+.Xc
 Retrieve the process shared setting for the read/write lock attribute
 object.
-.It int Fn pthread_rwlockattr_init "pthread_rwlockattr_t *attr"
+.It Xo
+.Ft int
+.Fn pthread_rwlockattr_init "pthread_rwlockattr_t *attr"
+.Xc
 Initialize a read/write lock attribute object.
-.It int Fn pthread_rwlockattr_setpshared "pthread_rwlockattr_t *attr" "int *pshared"
+.It Xo
+.Ft int
+.Fn pthread_rwlockattr_setpshared "pthread_rwlockattr_t *attr" "int *pshared"
+.Xc
 Set the process shared setting for the read/write lock attribute object.
 .El
 .Sh PER-THREAD CONTEXT ROUTINES
 .Bl -tag -width Er
-.It int Fn pthread_key_create "pthread_key_t *key" "void (*routine)(void *)"
+.It Xo
+.Ft int
+.Fn pthread_key_create "pthread_key_t *key" "void (*routine)(void *)"
+.Xc
 Create a thread-specific data key.
-.It int Fn pthread_key_delete "pthread_key_t key"
+.It Xo
+.Ft int
+.Fn pthread_key_delete "pthread_key_t key"
+.Xc
 Delete a thread-specific data key.
-.It void * Fn pthread_getspecific "pthread_key_t key" "void **value_ptr"
+.It Xo
+.Ft "void *"
+.Fn pthread_getspecific "pthread_key_t key" "void **value_ptr"
+.Xc
 Get the thread-specific value for the specified key.
-.It int Fn pthread_setspecific "pthread_key_t key" "const void *value_ptr"
+.It Xo
+.Ft int
+.Fn pthread_setspecific "pthread_key_t key" "const void *value_ptr"
+.Xc
 Set the thread-specific value for the specified key.
 .El
 .Sh CLEANUP ROUTINES
 .Bl -tag -width Er
-.It void Fn pthread_cleanup_pop "int execute"
+.It Xo
+.Ft void
+.Fn pthread_cleanup_pop "int execute"
+.Xc
 Remove the routine at the top of the calling thread's cancellation cleanup
 stack and optionally invoke it.
-.It void Fn pthread_cleanup_push "void (*routine)(void *)" "void *routine_arg"
+.It Xo
+.Ft void
+.Fn pthread_cleanup_push "void (*routine)(void *)" "void *routine_arg"
+.Xc
 Push the specified cancellation cleanup handler onto the calling thread's 
 cancellation stack.
 .El

share/man/man3/pthread_cond_wait.3

@@ -48,7 +48,8 @@ variable specified by
 and unblocks the mutex specified by
 .Fa mutex .
 The waiting thread unblocks only after another thread calls
-.Xr pthread_cond_signal 3 , or
+.Xr pthread_cond_signal 3 ,
+or
 .Xr pthread_cond_broadcast 3
 with the same condition variable, and the current thread requires the lock
 on

share/man/man3/pthread_testcancel.3

@@ -195,5 +195,5 @@ conforms to ISO/IEC 9945-1 ANSI/IEEE
 Std 1003.1 Second Edition 1996-07-12.
 .Sh AUTHORS
 This man page was written by
-.An David Leonard <d@openbsd.org> 
+.An David Leonard Aq d@openbsd.org
 for the OpenBSD implementation of pthread_cancel.

share/man/man4/asr.4

@@ -10,8 +10,7 @@
 .Os FreeBSD
 .Sh NAME
 .Nm asr
-.Nd
+.Nd driver for Adaptec I2O based SCSI host bus adapters
-.Tn Driver for Adaptec I2O based SCSI host bus adapters.
 .Sh SYNOPSIS
 .Cd "device asr"
 .Sh DESCRIPTION

share/man/man4/awi.4

@@ -83,7 +83,7 @@ media type.  For each media type,
 .Em adhoc
 mediaopt can be used to indicate the driver to operate in adhoc mode.
 Also,
-.Em adhoc,flag0
+.Em adhoc , Ns Em flag0
 mediaopt can be used for
 .Xr wi 4
 compatible adhoc mode.

share/man/man4/bktr.4

@@ -23,7 +23,7 @@ capture and
 capture on low cost, high performance boards.  The driver based on
 the Matrox Meteor driver and uses the same API.  The bktr driver should support most video cards
 based on the
-.Em Brooktree Bt848/849/878/879 Video Capture Chip.
+.Em "Brooktree Bt848/849/878/879 Video Capture Chip" .
 The driver also supports 
 .Em FM Radio
 if the Tuner supports it.

share/man/man4/bpf.4

@@ -250,7 +250,8 @@ is given by the
 .Li bf_len
 field.
 Also, the actions of
-.Dv BIOCFLUSH are performed.
+.Dv BIOCFLUSH
+are performed.
 See section
 .Sx "FILTER MACHINE"
 for an explanation of the filter language.

share/man/man4/ccd.4

@@ -58,7 +58,7 @@ partitions of the disks
 .Pa should not
 be combined.  The kernel will only allow component partitions of type
 FS_BSDFFS (type
-.Dq 4.2BSD
+.Dq Bx 4.2
 as shown as
 .Xr disklabel 8 ) .
 .Pp

share/man/man4/ddb.4

@@ -328,7 +328,7 @@ only print when the matching return is hit.
 .It Xo
 .No Cm trace Ns Op Cm /u
 .Op Ar frame
-.Op Ar ,count
+.Op , Ns Ar count
 .Xc
 Stack trace.  The
 .Li u
@@ -350,7 +350,7 @@ only if the machine dependent code supports it.
 .Ar addr
 .Ar value
 .Op Ar mask
-.Op Ar ,count
+.Op , Ns Ar count
 .Xc
 Search memory for
 .Ar value .

share/man/man4/en.4

@@ -41,12 +41,12 @@ To enable the link use the following commands:
 .Dl	# ifconfig en0 128.252.200.2 netmask 0xffffff00 up
 .Dl	# route add -iface 128.252.200.1 -link en0:3.0.0.c9
 .Sh DIAGNOSTICS
-.Bl -diag
+.Bd -literal
-.It	"en0 <Efficient Networks ENI-155p> rev 0 int a irq 5 on pci0:16"
+en0 <Efficient Networks ENI-155p> rev 0 int a irq 5 on pci0:16
-.It	"en0: ATM midway v0, board IDs 6.0, Utopia (pipelined), 512KB on-board RAM"
+en0: ATM midway v0, board IDs 6.0, Utopia (pipelined), 512KB on-board RAM
-.It	"en0: maximum DMA burst length = 64 bytes"
+en0: maximum DMA burst length = 64 bytes
-.It	"en0: 7 32KB receive buffers, 8 32KB transmit buffers allocated"
+en0: 7 32KB receive buffers, 8 32KB transmit buffers allocated
-.El
+.Ed
 .Sh CAVEATS
 The driver extensively uses DMA on PCI.
 The first

share/man/man4/fdc.4

@@ -72,9 +72,9 @@ can be turned off using flags
 .Ql 0x4 .
 .Sh FILES
 .Bl -tag -width Pa -compact
-.It /dev/fd*
+.It Pa /dev/fd*
 floppy disk device nodes
-.It /dev/fd*.<size in kB>
+.It Pa /dev/fd*. Ns Ar "<size in kB>"
 floppy disk device nodes where the trailing number indicates the floppy 
 capacity 
 .It Pa /sys/i386/conf/GENERIC

share/man/man4/ipfirewall.4

@@ -184,7 +184,7 @@ by
 It has been heavily modified and ported to
 .Fx
 by
-.Ar Ugen J.S.Antsilevich
+.An Ugen J.S. Antsilevich
 .Aq ugen@NetVision.net.il .
 .Pp
 Several enhancements added by

share/man/man4/man4.alpha/linux.4

@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .Dd August 17, 2000
-.Dt LINUX 4 alpha
+.Dt LINUX 4 Alpha
 .Os
 .Sh NAME
 .Nm linux

share/man/man4/man4.alpha/osf1.4

@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .Dd November 13, 2000
-.Dt OSF/1 4 alpha
+.Dt OSF/1 4 Alpha
 .Os
 .Sh NAME
 .Nm osf1

share/man/man4/man4.i386/alpm.4

@@ -35,7 +35,8 @@
 .Cd device alpm
 .Sh DESCRIPTION
 This driver provides access to the
-.Tn Aladdin 15x3 Power Management Unit. Currently, only smbus controller 
+.Tn Aladdin 15x3 Power Management Unit .
+Currently, only smbus controller 
 function is implemented.
 .Pp
 The embedded SMBus controller of the Aladdin chipset may give you access

share/man/man4/man4.i386/apm.4

@@ -66,17 +66,17 @@ Get per battery information.
 Some APM implementations execute the HLT 
 .Pq Halt CPU until an interrupt occurs
 instruction in the
-.Dq Pa Idle CPU
+.Dq Em Idle CPU
 call, while others do not.  Thus enabling this may result in
 redundant HLT executions because
-.Dq Pa Idle CPU
+.Dq Em Idle CPU
 is called from the kernel context switch routine that inherently executes 
 HLT. This may reduce peak system performance.  
 .Pp
 Also the system hangs up if HLT instruction is disabled in the kernel 
 context switch routine, and if the APM implementation of the machine 
 does not execute HLT in
-.Dq Pa Idle CPU.
+.Dq Em Idle CPU .
 On some implementations that do not support CPU clock slowdown, APM 
 might not execute HLT.
 .Nm
@@ -87,7 +87,7 @@ operation on such machines.
 The current version of
 .Nm
 does not call
-.Dq Pa Idle CPU
+.Dq Em Idle CPU
 from the kernel context switch routine if clock slowdown is not supported, 
 and it executes HLT instruction by default.  Therefore, there is 
 no need to use these two operations in most cases.