52 files changed, 177 insertions, 174 deletions

diff --git a/lib/libc/gen/dlopen.3 b/lib/libc/gen/dlopen.3
index 634f160d7fd4..f9c10849a522 100644
--- a/lib/libc/gen/dlopen.3
+++ b/lib/libc/gen/dlopen.3
@@ -36,7 +36,7 @@
 .Os FreeBSD
 .Dt DLOPEN 3
 .Sh NAME
-.Nm dlopen, dlsym, dlerror, dlclose
+.Nm dlopen , dlsym , dlerror , dlclose
 .Nd programmatic interface to the dynamic linker
 .Sh LIBRARY
 .Lb libc
diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3
index ccab5b6e39eb..b453ef09bd8e 100644
--- a/lib/libc/gen/fts.3
+++ b/lib/libc/gen/fts.3
@@ -341,7 +341,7 @@ are attempted.
 The
 .Fa fts_name
 field is always
-.Dv NUL Ns -terminated.
+.Dv NUL Ns -terminated .
 .Sh FTS_OPEN
 The
 .Fn fts_open
diff --git a/lib/libc/gen/getcap.3 b/lib/libc/gen/getcap.3
index 974cf7f5a059..2d86caf55079 100644
--- a/lib/libc/gen/getcap.3
+++ b/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.
@@ -103,7 +103,7 @@ must be retained through all subsequent calls to
 and
 .Fn cgetustr ,
 but may then be
-.Xr free 3 Ns \&'d.
+.Xr free 3 Ns \&'d .
 On success 0 is returned, 1 if the returned
 record contains an unresolved
 .Nm tc
@@ -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"
+.Sm on
 .Em name
 does not exist
+.Sm off
 .It Em name No \&=@ Ta "the string capability"
+.Sm on
 .Em name
 does not exist
-.Sm on
 .El
 .Pp
 Numeric capability values may be given in one of three numeric bases.
diff --git a/lib/libc/gen/getcwd.3 b/lib/libc/gen/getcwd.3
index 27d37e6d469c..4e08fab51bdf 100644
--- a/lib/libc/gen/getcwd.3
+++ b/lib/libc/gen/getcwd.3
@@ -66,7 +66,7 @@ is
 .Dv NULL ,
 space is allocated as necessary to store the pathname.
 This space may later be
-.Xr free 3 Ns 'd.
+.Xr free 3 Ns 'd .
 .Pp
 The function
 .Fn getwd
@@ -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.
diff --git a/lib/libc/gen/getpwent.3 b/lib/libc/gen/getpwent.3
index 1e66b69c4814..e41054c67780 100644
--- a/lib/libc/gen/getpwent.3
+++ b/lib/libc/gen/getpwent.3
@@ -178,7 +178,7 @@ The
 .Fn getpwent ,
 .Fn getpwnam ,
 .Fn getpwuid ,
-.Fn setpwent,
+.Fn setpwent ,
 and
 .Fn endpwent
 functions appeared in
diff --git a/lib/libc/gen/glob.3 b/lib/libc/gen/glob.3
index 43839944b92f..760103b7f8a7 100644
--- a/lib/libc/gen/glob.3
+++ b/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
@@ -409,13 +409,13 @@ function is expected to be
 .St -p1003.2
 compatible with the exception
 that the flags
-.Dv GLOB_ALTDIRFUNC,
-.Dv GLOB_BRACE
-.Dv GLOB_MAGCHAR,
-.Dv GLOB_NOMAGIC,
-.Dv GLOB_QUOTE,
+.Dv GLOB_ALTDIRFUNC ,
+.Dv GLOB_BRACE ,
+.Dv GLOB_MAGCHAR ,
+.Dv GLOB_NOMAGIC ,
+.Dv GLOB_QUOTE ,
 and
-.Dv GLOB_TILDE,
+.Dv GLOB_TILDE ,
 and the fields
 .Fa gl_matchc
 and
diff --git a/lib/libc/gen/msgget.3 b/lib/libc/gen/msgget.3
index 91a61e03fc90..6d221415415e 100644
--- a/lib/libc/gen/msgget.3
+++ b/lib/libc/gen/msgget.3
@@ -60,7 +60,7 @@ or
 does not have a message queue identifier associated with it, and the
 .Dv IPC_CREAT
 bit is set in
-.Fa msgflg.
+.Fa msgflg .
 .Pp
 If a new message queue is created, the data structure associated with it (the
 .Va msqid_ds
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index c4c39fdc4f09..82f1b74d8795 100644
--- a/lib/libc/gen/sysctl.3
+++ b/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"
diff --git a/lib/libc/gen/syslog.3 b/lib/libc/gen/syslog.3
index 7ee51bb9ba85..e392a8719cd9 100644
--- a/lib/libc/gen/syslog.3
+++ b/lib/libc/gen/syslog.3
@@ -146,7 +146,7 @@ If
 cannot pass the message to
 .Xr syslogd 8
 it will attempt to write the message to the console
-.Pq Dq Pa /dev/console.
+.Pq Dq Pa /dev/console .
 .It Dv LOG_NDELAY
 Open the connection to
 .Xr syslogd 8
diff --git a/lib/libc/gen/tcsetattr.3 b/lib/libc/gen/tcsetattr.3
index d2bf5001f47b..58de728c63b0 100644
--- a/lib/libc/gen/tcsetattr.3
+++ b/lib/libc/gen/tcsetattr.3
@@ -184,7 +184,7 @@ The
 .Fn cfmakeraw
 function sets the flags stored in the termios structure to a state disabling
 all input and output processing, giving a
-.Dq raw I/O path.
+.Dq raw I/O path .
 It should be noted that there is no function to reverse this effect.
 This is because there are a variety of processing options that could be
 re-enabled and the correct method is for an application to snapshot the
diff --git a/lib/libc/gen/ttyname.3 b/lib/libc/gen/ttyname.3
index 5648c300e61f..9141dfc93d31 100644
--- a/lib/libc/gen/ttyname.3
+++ b/lib/libc/gen/ttyname.3
@@ -62,7 +62,7 @@ and named
 .Pa /dev/tty Ns Em xx
 and for which an entry exists
 in the initialization file
-.Pa /etc/ttys.
+.Pa /etc/ttys .
 (See
 .Xr ttys 5 . )
 .Pp
diff --git a/lib/libc/gen/tzset.3 b/lib/libc/gen/tzset.3
index d763e071c45c..5ae5ec027bf1 100644
--- a/lib/libc/gen/tzset.3
+++ b/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 dst Bo
-.Em offset
-.Bc
+.Em std offset
 .Bo
-.No , Em rule
-.Bc
+.Em dst
+.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
-.Bo
-.Pf \&: Em ss
-.Bc
+.Em : mm
+.Bq Em : ss
 .Bc
+.Sm on
 .Ed
 .Pp
 The minutes
diff --git a/lib/libc/gen/uname.3 b/lib/libc/gen/uname.3
index 2c72472635ab..0ad18d888554 100644
--- a/lib/libc/gen/uname.3
+++ b/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
diff --git a/lib/libc/gen/vis.3 b/lib/libc/gen/vis.3
index 118941b078cb..105e1f9b31af 100644
--- a/lib/libc/gen/vis.3
+++ b/lib/libc/gen/vis.3
@@ -100,7 +100,7 @@ characters from
 .Fa src
 (this
 is useful for encoding a block of data that may contain
-.Dv NUL Ns 's).
+.Dv NUL Ns 's ) .
 Both forms
 .Dv NUL
 terminate
diff --git a/lib/libc/locale/mbrune.3 b/lib/libc/locale/mbrune.3
index 1e68ae59eb6d..680b01ecaa4b 100644
--- a/lib/libc/locale/mbrune.3
+++ b/lib/libc/locale/mbrune.3
@@ -98,7 +98,7 @@ The
 function locates the first occurrence of the null-terminated string
 .Fa pattern
 in the null-terminated string
-.Fa string.
+.Fa string .
 If
 .Fa pattern
 is the empty string,
diff --git a/lib/libc/locale/multibyte.3 b/lib/libc/locale/multibyte.3
index cf4093c5ba12..dff599d1e069 100644
--- a/lib/libc/locale/multibyte.3
+++ b/lib/libc/locale/multibyte.3
@@ -150,7 +150,7 @@ function converts a multibyte character
 .Fa mbchar
 into a wide character and stores the result
 in the object pointed to by
-.Fa wcharp.
+.Fa wcharp .
 Up to
 .Fa nbytes
 bytes are examined.
diff --git a/lib/libc/locale/rune.3 b/lib/libc/locale/rune.3
index 087ef4ca896e..a9452747dfcb 100644
--- a/lib/libc/locale/rune.3
+++ b/lib/libc/locale/rune.3
@@ -159,7 +159,7 @@ is not
 .Dv NULL ,
 .Fa *result
 will be set to
-.Dv NULL.
+.Dv NULL .
 In all cases, 
 .Fn sputrune
 will return the number of bytes which would be needed to store
@@ -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
diff --git a/lib/libc/locale/utf2.4 b/lib/libc/locale/utf2.4
index 3734dbab1669..35eb3ad64e1d 100644
--- a/lib/libc/locale/utf2.4
+++ b/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.
diff --git a/lib/libc/locale/utf2.5 b/lib/libc/locale/utf2.5
index 3734dbab1669..35eb3ad64e1d 100644
--- a/lib/libc/locale/utf2.5
+++ b/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.
diff --git a/lib/libc/net/if_indextoname.3 b/lib/libc/net/if_indextoname.3
index a0d4bebd673d..adf82cbc4f5f 100644
--- a/lib/libc/net/if_indextoname.3
+++ b/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
-.Li ``lo0''
-.Pc
-, and vice versa.
+(such as
+.Dq Li lo0 ) ,
+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.
-.Pc
+interface name.)
 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 {
diff --git a/lib/libc/net/inet6_option_space.3 b/lib/libc/net/inet6_option_space.3
index 63cbfa54820f..82365484f0eb 100644
--- a/lib/libc/net/inet6_option_space.3
+++ b/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
-.Pc .
+(to make its size a multiple of 8 bytes).
 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
-.Pc ,
+.Dq Li "xn + y" ) ,
 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.
-.Po
-.Li 0
+.Li 255 ,
+inclusive.
+.Li ( 0
 and
 .Li 1
 are reserved for the
 .Li Pad1
 and
 .Li PadN
-options, respectively.
-.Pc
+options, respectively.)
 .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.
-.Pc
+since the option data length must already be stored by the caller.)
 .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
-data length, followed by the option data
-.Pc .
+(which is followed by the 8-bit option
+data length, followed by the option data).
 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
diff --git a/lib/libc/net/inet6_rthdr_space.3 b/lib/libc/net/inet6_rthdr_space.3
index 26e5c35a78a6..2c3fd9c49f34 100644
--- a/lib/libc/net/inet6_rthdr_space.3
+++ b/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,
-.Fa in
-.Pc
+(pointed to by the first argument,
+.Fa in )
 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
-.Fn inet6_rthdr_segments
-.Pc
+(which must have a value between 1 and the value returned by
+.Fn inet6_rthdr_segments )
 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
-.Pc
+.Fn inet6_rthdr_segments )
 in the Routing header described by
 .Fa cmsg .
 For an IPv6 Type 0 Routing header the return value will be either
diff --git a/lib/libc/net/resolver.3 b/lib/libc/net/resolver.3
index dedcde1f17ce..1fb97f568be3 100644
--- a/lib/libc/net/resolver.3
+++ b/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
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index 308a1b49cafb..ecf7f3ada7af 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -86,7 +86,7 @@ as described below.
 and
 .Fn vprintf
 write output to
-.Em stdout,
+.Em stdout ,
 the standard output stream;
 .Fn fprintf
 and
diff --git a/lib/libc/stdio/stdio.3 b/lib/libc/stdio/stdio.3
index b4cd7dacf676..657b308b7fe7 100644
--- a/lib/libc/stdio/stdio.3
+++ b/lib/libc/stdio/stdio.3
@@ -42,9 +42,9 @@
 .Lb libc
 .Sh SYNOPSIS
 .Fd #include <stdio.h>
-.Fd FILE *stdin;
-.Fd FILE *stdout;
-.Fd FILE *stderr;
+.Vt FILE *stdin ;
+.Vt FILE *stdout ;
+.Vt FILE *stderr ;
 .Sh DESCRIPTION
 The standard
 .Tn I/O
@@ -179,9 +179,9 @@ without first removing their current definitions with
 .Dv FOPEN_MAX ,
 .Dv L_cuserid ,
 .Dv L_ctermid ,
-.Dv L_tmpnam,
+.Dv L_tmpnam ,
 .Dv NULL ,
-.Dv P_tmpdir,
+.Dv P_tmpdir ,
 .Dv SEEK_CUR ,
 .Dv SEEK_END ,
 .Dv SEEK_SET ,
diff --git a/lib/libc/stdlib/getenv.3 b/lib/libc/stdlib/getenv.3
index 4753dfb6c578..d1122ef7c541 100644
--- a/lib/libc/stdlib/getenv.3
+++ b/lib/libc/stdlib/getenv.3
@@ -89,7 +89,7 @@ If the variable
 .Ar name
 does not exist in the list,
 it is inserted with the given
-.Ar value.
+.Ar value .
 If the variable does exist, the argument
 .Ar overwrite
 is tested; if
diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3
index e9e4d2026c56..bc1a272247b2 100644
--- a/lib/libc/stdlib/malloc.3
+++ b/lib/libc/stdlib/malloc.3
@@ -40,7 +40,7 @@
 .Dt MALLOC 3
 .Os FreeBSD
 .Sh NAME
-.Nm malloc, calloc, realloc, free, reallocf
+.Nm malloc , calloc , realloc , free , reallocf
 .Nd general purpose memory allocation functions
 .Sh LIBRARY
 .Lb libc
@@ -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
diff --git a/lib/libc/stdlib/qsort.3 b/lib/libc/stdlib/qsort.3
index 15e1690905ac..1192721fb24e 100644
--- a/lib/libc/stdlib/qsort.3
+++ b/lib/libc/stdlib/qsort.3
@@ -40,7 +40,7 @@
 .Dt QSORT 3
 .Os
 .Sh NAME
-.Nm qsort, heapsort, mergesort
+.Nm qsort , heapsort , mergesort
 .Nd sort functions
 .Sh LIBRARY
 .Lb libc
diff --git a/lib/libc/stdlib/strtol.3 b/lib/libc/stdlib/strtol.3
index efa4385f164e..528b6d3a0822 100644
--- a/lib/libc/stdlib/strtol.3
+++ b/lib/libc/stdlib/strtol.3
@@ -40,7 +40,7 @@
 .Dt STRTOL 3
 .Os
 .Sh NAME
-.Nm strtol, strtoq
+.Nm strtol , strtoq
 .Nd convert string value to a long or quad_t integer
 .Sh LIBRARY
 .Lb libc
diff --git a/lib/libc/stdlib/strtoul.3 b/lib/libc/stdlib/strtoul.3
index 1bde3e931204..01c092f3ae79 100644
--- a/lib/libc/stdlib/strtoul.3
+++ b/lib/libc/stdlib/strtoul.3
@@ -40,7 +40,7 @@
 .Dt STRTOUL 3
 .Os
 .Sh NAME
-.Nm strtoul, strtouq
+.Nm strtoul , strtouq
 .Nd "convert a string to an unsigned long or uquad_t integer"
 .Sh LIBRARY
 .Lb libc
diff --git a/lib/libc/stdlib/tsearch.3 b/lib/libc/stdlib/tsearch.3
index 051eea4c7031..a474a69f2943 100644
--- a/lib/libc/stdlib/tsearch.3
+++ b/lib/libc/stdlib/tsearch.3
@@ -31,7 +31,7 @@
 .Dt TSEARCH 3
 .Os
 .Sh NAME
-.Nm tsearch, tfind, tdelete, twalk
+.Nm tsearch , tfind , tdelete , twalk
 .Nd manipulate binary search trees
 .Sh SYNOPSIS
 .Fd #include <search.h>
diff --git a/lib/libc/string/bstring.3 b/lib/libc/string/bstring.3
index c79eb94a3172..873c785bca93 100644
--- a/lib/libc/string/bstring.3
+++ b/lib/libc/string/bstring.3
@@ -45,7 +45,7 @@
 .Nm memchr ,
 .Nm memcmp ,
 .Nm memcpy ,
-.Nm memmove,
+.Nm memmove ,
 .Nm memset
 .Nd byte string operations
 .Sh LIBRARY
diff --git a/lib/libc/string/strcat.3 b/lib/libc/string/strcat.3
index 77fd0d275d67..fbb2996bf5cd 100644
--- a/lib/libc/string/strcat.3
+++ b/lib/libc/string/strcat.3
@@ -74,7 +74,7 @@ appends not more than
 characters from
 .Fa append ,
 and then adds a terminating
-.Ql \e0.
+.Ql \e0 .
 .Sh RETURN VALUES
 The
 .Fn strcat
diff --git a/lib/libc/string/strerror.3 b/lib/libc/string/strerror.3
index 762f89d35ee6..1799c1c6a8b2 100644
--- a/lib/libc/string/strerror.3
+++ b/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
diff --git a/lib/libc/string/string.3 b/lib/libc/string/string.3
index 8a83a3732cb8..1131b6dddad0 100644
--- a/lib/libc/string/string.3
+++ b/lib/libc/string/string.3
@@ -44,14 +44,14 @@
 .Nm strrchr ,
 .Nm strcmp ,
 .Nm strncmp ,
-.Nm strcasecmp,
+.Nm strcasecmp ,
 .Nm strncasecmp ,
 .Nm strcpy ,
 .Nm strncpy ,
 .Nm strerror ,
 .Nm strlen ,
 .Nm strpbrk ,
-.Nm strsep,
+.Nm strsep ,
 .Nm strspn ,
 .Nm strcspn ,
 .Nm strstr ,
diff --git a/lib/libc/string/strtok.3 b/lib/libc/string/strtok.3
index 5a3c90770758..ea28f94bcce8 100644
--- a/lib/libc/string/strtok.3
+++ b/lib/libc/string/strtok.3
@@ -54,7 +54,7 @@
 .Dt STRTOK 3
 .Os FreeBSD
 .Sh NAME
-.Nm strtok, strtok_r
+.Nm strtok , strtok_r
 .Nd string tokens
 .Sh LIBRARY
 .Lb libc
@@ -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
diff --git a/lib/libc/sys/aio_waitcomplete.2 b/lib/libc/sys/aio_waitcomplete.2
index 0e586d547676..c554673a3e2c 100644
--- a/lib/libc/sys/aio_waitcomplete.2
+++ b/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
diff --git a/lib/libc/sys/brk.2 b/lib/libc/sys/brk.2
index 09072a4e1565..7f40e3417a27 100644
--- a/lib/libc/sys/brk.2
+++ b/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;
diff --git a/lib/libc/sys/execve.2 b/lib/libc/sys/execve.2
index 04671181580d..32dd4d81ae75 100644
--- a/lib/libc/sys/execve.2
+++ b/lib/libc/sys/execve.2
@@ -105,7 +105,7 @@ The argument
 is also a pointer to a null-terminated array of
 character pointers to null-terminated strings.
 A pointer to this array is normally stored in the global variable
-.Va environ.
+.Va environ .
 These strings pass information to the
 new process that is not directly an argument to the command (see
 .Xr environ 7 ) .
diff --git a/lib/libc/sys/fcntl.2 b/lib/libc/sys/fcntl.2
index 49522c77c414..0b2ec8924d02 100644
--- a/lib/libc/sys/fcntl.2
+++ b/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.
diff --git a/lib/libc/sys/fhopen.2 b/lib/libc/sys/fhopen.2
index 75af67f32357..dbe10a79275a 100644
--- a/lib/libc/sys/fhopen.2
+++ b/lib/libc/sys/fhopen.2
@@ -54,7 +54,7 @@
 .Fn fhstatfs "const fhandle_t *fhp" "struct statfs *buf"
 .Sh DESCRIPTION
 These functions provide a means to access a file given the file handle
-.Fa fhp.
+.Fa fhp .
 As this method bypasses directory access restrictions, these calls are
 restricted to the superuser.
 .Pp
diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2
index 4dab8a65f871..f883fec4cfe1 100644
--- a/lib/libc/sys/getdirentries.2
+++ b/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
diff --git a/lib/libc/sys/getlogin.2 b/lib/libc/sys/getlogin.2
index a631bfb3347b..4015da5b70d2 100644
--- a/lib/libc/sys/getlogin.2
+++ b/lib/libc/sys/getlogin.2
@@ -86,8 +86,8 @@ is normally used only when a new session is being created on behalf
 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 .
+.Em NOTE :
+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.
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2
index dd6ae3a4a763..deb70b96d93c 100644
--- a/lib/libc/sys/getsockopt.2
+++ b/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
diff --git a/lib/libc/sys/kill.2 b/lib/libc/sys/kill.2
index 8ce5c71949d3..5a7c05cb355e 100644
--- a/lib/libc/sys/kill.2
+++ b/lib/libc/sys/kill.2
@@ -75,7 +75,7 @@ to any descendant of the current process.
 .It \&If Fa pid No \&is greater than zero :
 .Fa Sig
 is sent to the process whose ID is equal to
-.Fa pid.
+.Fa pid .
 .It \&If Fa pid No \&is zero :
 .Fa Sig
 is sent to all processes whose group ID is equal
diff --git a/lib/libc/sys/listen.2 b/lib/libc/sys/listen.2
index 11f8fd2db65d..3a98629bf13a 100644
--- a/lib/libc/sys/listen.2
+++ b/lib/libc/sys/listen.2
@@ -60,7 +60,7 @@ The
 call applies only to sockets of type
 .Dv SOCK_STREAM
 or
-.Dv SOCK_SEQPACKET.
+.Dv SOCK_SEQPACKET .
 .Pp
 The
 .Fa backlog
@@ -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
+if a value greater than
+.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
diff --git a/lib/libc/sys/lseek.2 b/lib/libc/sys/lseek.2
index 5ca26cbb135c..5cc0f222240b 100644
--- a/lib/libc/sys/lseek.2
+++ b/lib/libc/sys/lseek.2
@@ -53,7 +53,7 @@ to the
 argument
 .Fa offset
 according to the directive
-.Fa whence.
+.Fa whence .
 The argument
 .Fa fildes
 must be an open
diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2
index 708f9ac44058..c91b2d1a5cee 100644
--- a/lib/libc/sys/ptrace.2
+++ b/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
-.Ec \&.)
+.Fn ptrace . )
 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 )
diff --git a/lib/libc/sys/recv.2 b/lib/libc/sys/recv.2
index 88d7a4a3e2de..1c543fd9475f 100644
--- a/lib/libc/sys/recv.2
+++ b/lib/libc/sys/recv.2
@@ -210,7 +210,7 @@ Process credentials can also be passed as ancillary data for
 domain sockets using a
 .Fa cmsg_type
 of
-.Dv SCM_CREDS.
+.Dv SCM_CREDS .
 In this case,
 .Fa cmsg_data
 should be a structure of type
diff --git a/lib/libc/sys/semget.2 b/lib/libc/sys/semget.2
index cdcd9644801a..dc22c0ac272f 100644
--- a/lib/libc/sys/semget.2
+++ b/lib/libc/sys/semget.2
@@ -84,13 +84,13 @@ parameter:
 Read access for user.
 .It Dv SEM_A
 Alter access for user.
-.It Dv (SEM_R>>3)
+.It Dv ( SEM_R>>3 )
 Read access for group.
-.It Dv (SEM_A>>3)
+.It Dv ( SEM_A>>3 )
 Alter access for group.
-.It Dv (SEM_R>>6)
+.It Dv ( SEM_R>>6 )
 Read access for other.
-.It Dv (SEM_A>>6)
+.It Dv ( SEM_A>>6 )
 Alter access for other.
 .El
 .Pp
diff --git a/lib/libc/sys/shmget.2 b/lib/libc/sys/shmget.2
index 88d3b4a4f582..05bc68cf66fe 100644
--- a/lib/libc/sys/shmget.2
+++ b/lib/libc/sys/shmget.2
@@ -82,13 +82,13 @@ parameter:
 Read access for user.
 .It Dv SHM_W
 Write access for user.
-.It Dv (SHM_R>>3)
+.It Dv ( SHM_R>>3 )
 Read access for group.
-.It Dv (SHM_W>>3)
+.It Dv ( SHM_W>>3 )
 Write access for group.
-.It Dv (SHM_R>>6)
+.It Dv ( SHM_R>>6 )
 Read access for other.
-.It Dv (SHM_W>>6)
+.It Dv ( SHM_W>>6 )
 Write access for other.
 .El
 .\"
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index 1cf4616b627e..7049bc102a7c 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -168,7 +168,7 @@ and
 calls.
 (Some protocol families, such as the Internet family,
 support the notion of an
-.Dq implied connect,
+.Dq implied connect ,
 which permits data to be sent piggybacked onto a connect operation by
 using the
 .Xr sendto 2