23 files changed, 50 insertions, 46 deletions
diff --git a/lib/libc/gen/cap_rights_get.3 b/lib/libc/gen/cap_rights_get.3
index f74d1f7a..a665465 100644
--- a/lib/libc/gen/cap_rights_get.3
+++ b/lib/libc/gen/cap_rights_get.3
@@ -100,10 +100,10 @@ argument points at an invalid address.
 .El
 .Sh SEE ALSO
 .Xr cap_rights_limit 2 ,
-.Xr cap_rights_init 3 ,
 .Xr errno 2 ,
 .Xr open 2 ,
 .Xr assert 3 ,
+.Xr cap_rights_init 3 ,
 .Xr err 3 ,
 .Xr memcmp 3 ,
 .Xr memset 3 ,
diff --git a/lib/libc/gen/ftok.3 b/lib/libc/gen/ftok.3
index 98f8bad..b819dbd 100644
--- a/lib/libc/gen/ftok.3
+++ b/lib/libc/gen/ftok.3
@@ -64,9 +64,9 @@ function will return -1 if
 .Fa path
 does not exist or if it cannot be accessed by the calling process.
 .Sh SEE ALSO
+.Xr msgget 2 ,
 .Xr semget 2 ,
-.Xr shmget 2 ,
-.Xr msgget 2
+.Xr shmget 2
 .Sh HISTORY
 The
 .Fn ftok
diff --git a/lib/libc/gen/ftw.3 b/lib/libc/gen/ftw.3
index ba8859b..df8abab 100644
--- a/lib/libc/gen/ftw.3
+++ b/lib/libc/gen/ftw.3
@@ -87,8 +87,9 @@ A directory which cannot be read.
 The directory will not be descended into.
 .It Dv FTW_DP
 A directory being visited in post-order
-.Fn ( nftw
-only).
+.Po Fn nftw
+only
+.Pc .
 .It Dv FTW_NS
 A file for which no
 .Xr stat 2
@@ -100,8 +101,9 @@ structure are undefined.
 A symbolic link.
 .It Dv FTW_SLN
 A symbolic link with a non-existent target
-.Fn ( nftw
-only).
+.Po Fn nftw
+only
+.Pc .
 .El
 .Pp
 The
diff --git a/lib/libc/gen/getcap.3 b/lib/libc/gen/getcap.3
index 73826ae..c3a9ce8 100644
--- a/lib/libc/gen/getcap.3
+++ b/lib/libc/gen/getcap.3
@@ -137,9 +137,10 @@ It must be called before the
 call.
 If a sequential access is being performed (see below), it must be called
 before the first sequential access call
-.Fn ( cgetfirst
+.Po Fn cgetfirst
 or
-.Fn cgetnext ) ,
+.Fn cgetnext
+.Pc ,
 or be directly preceded by a
 .Fn cgetclose
 call.
diff --git a/lib/libc/gen/posix_spawn.3 b/lib/libc/gen/posix_spawn.3
index dd5bd2b..52e8171 100644
--- a/lib/libc/gen/posix_spawn.3
+++ b/lib/libc/gen/posix_spawn.3
@@ -413,6 +413,10 @@ including trying to close a descriptor that is not open.
 .Xr execve 2 ,
 .Xr fcntl 2 ,
 .Xr open 2 ,
+.Xr sched_setparam 2 ,
+.Xr sched_setscheduler 2 ,
+.Xr setpgid 2 ,
+.Xr vfork 2 ,
 .Xr posix_spawn_file_actions_addclose 3 ,
 .Xr posix_spawn_file_actions_adddup2 3 ,
 .Xr posix_spawn_file_actions_addopen 3 ,
@@ -431,11 +435,7 @@ including trying to close a descriptor that is not open.
 .Xr posix_spawnattr_setschedparam 3 ,
 .Xr posix_spawnattr_setschedpolicy 3 ,
 .Xr posix_spawnattr_setsigdefault 3 ,
-.Xr posix_spawnattr_setsigmask 3 ,
-.Xr sched_setparam 2 ,
-.Xr sched_setscheduler 2 ,
-.Xr setpgid 2 ,
-.Xr vfork 2
+.Xr posix_spawnattr_setsigmask 3
 .Sh STANDARDS
 The
 .Fn posix_spawn
diff --git a/lib/libc/gen/scandir.3 b/lib/libc/gen/scandir.3
index eaba754..aa8dea0 100644
--- a/lib/libc/gen/scandir.3
+++ b/lib/libc/gen/scandir.3
@@ -92,7 +92,7 @@ by freeing each pointer in the array and then the array itself.
 .Pp
 The
 .Fn scandir_b
-function behaves in the same way as 
+function behaves in the same way as
 .Fn scandir ,
 but takes blocks as arguments instead of function pointers and calls
 .Fn qsort_b
@@ -106,8 +106,8 @@ cannot allocate enough memory to hold all the data structures.
 .Xr directory 3 ,
 .Xr malloc 3 ,
 .Xr qsort 3 ,
-.Xr dir 5 ,
-.Xr strcoll 3
+.Xr strcoll 3 ,
+.Xr dir 5
 .Sh HISTORY
 The
 .Fn scandir
diff --git a/lib/libc/net/getaddrinfo.3 b/lib/libc/net/getaddrinfo.3
index 5d03aab..570fc2e 100644
--- a/lib/libc/net/getaddrinfo.3
+++ b/lib/libc/net/getaddrinfo.3
@@ -237,8 +237,8 @@ pointer in each
 .Li addrinfo
 structure until a null pointer is encountered.
 The three members
-.Fa ai_family,
-.Fa ai_socktype,
+.Fa ai_family ,
+.Fa ai_socktype ,
 and
 .Fa ai_protocol
 in each returned
diff --git a/lib/libc/net/sctp_recvmsg.3 b/lib/libc/net/sctp_recvmsg.3
index e3ced9c..bb1cf06 100644
--- a/lib/libc/net/sctp_recvmsg.3
+++ b/lib/libc/net/sctp_recvmsg.3
@@ -282,12 +282,12 @@ This typically means that the socket
 is not connected and is a one-to-one style socket.
 .El
 .Sh SEE ALSO
+.Xr getsockopt 2 ,
 .Xr recv 2 ,
 .Xr select 2 ,
+.Xr setsockopt 2 ,
 .Xr socket 2 ,
 .Xr write 2 ,
-.Xr getsockopt 2 ,
-.Xr setsockopt 2 ,
 .Xr sctp_send 3 ,
 .Xr sctp_sendmsg 3 ,
 .Xr sendmsg 3 ,
diff --git a/lib/libc/net/sctp_send.3 b/lib/libc/net/sctp_send.3
index 37b0b71..9c7f833 100644
--- a/lib/libc/net/sctp_send.3
+++ b/lib/libc/net/sctp_send.3
@@ -337,7 +337,7 @@ is not connected and is a one-to-one style socket.
 .Xr select 2 ,
 .Xr sendmsg 2 ,
 .Xr socket 2 ,
-.Xr write 2
+.Xr write 2 ,
 .Xr sctp_connectx 3 ,
 .Xr sctp_recvmsg 3 ,
 .Xr sctp_sendmsg 3 ,
diff --git a/lib/libc/posix1e/acl_set_flagset_np.3 b/lib/libc/posix1e/acl_set_flagset_np.3
index 2230c48..685680d 100644
--- a/lib/libc/posix1e/acl_set_flagset_np.3
+++ b/lib/libc/posix1e/acl_set_flagset_np.3
@@ -64,9 +64,9 @@ ACL is already branded as POSIX.1e.
 .Sh SEE ALSO
 .Xr acl 3 ,
 .Xr acl_add_flag_np 3 ,
-.Xr acl_get_brand_np 3 ,
 .Xr acl_clear_flags_np 3 ,
 .Xr acl_delete_flag_np 3 ,
+.Xr acl_get_brand_np 3 ,
 .Xr acl_get_flagset_np 3 ,
 .Xr posix1e 3
 .Sh STANDARDS
diff --git a/lib/libc/stdlib/atexit.3 b/lib/libc/stdlib/atexit.3
index 68f4e8f..3cdc59f 100644
--- a/lib/libc/stdlib/atexit.3
+++ b/lib/libc/stdlib/atexit.3
@@ -88,12 +88,12 @@ The existing list of functions is unmodified.
 .It Bq Er ENOSYS
 The
 .Fn atexit_b
-function was called by a program that did not supply a 
+function was called by a program that did not supply a
 .Fn _Block_copy
 implementation.
 .El
 .Sh SEE ALSO
-.Xr at_quick_exit 3
+.Xr at_quick_exit 3 ,
 .Xr exit 3
 .Sh STANDARDS
 The
diff --git a/lib/libc/stdlib/exit.3 b/lib/libc/stdlib/exit.3
index 07ce0d7..7d657c9 100644
--- a/lib/libc/stdlib/exit.3
+++ b/lib/libc/stdlib/exit.3
@@ -117,8 +117,8 @@ never return.
 .Sh SEE ALSO
 .Xr _exit 2 ,
 .Xr wait 2 ,
-.Xr atexit 3 ,
 .Xr at_quick_exit 3 ,
+.Xr atexit 3 ,
 .Xr intro 3 ,
 .Xr quick_exit 3 ,
 .Xr sysexits 3 ,
diff --git a/lib/libc/string/strspn.3 b/lib/libc/string/strspn.3
index 542b190..4a8e3f4 100644
--- a/lib/libc/string/strspn.3
+++ b/lib/libc/string/strspn.3
@@ -71,7 +71,7 @@ spans the initial part of the null-terminated string
 .Fa s
 as long as the characters from
 .Fa s
-.Sy do not 
+.Sy do not
 occur in the null-terminated string
 .Fa charset
 .Po it spans the
diff --git a/lib/libc/sys/access.2 b/lib/libc/sys/access.2
index 46bf948..c70e7a2 100644
--- a/lib/libc/sys/access.2
+++ b/lib/libc/sys/access.2
@@ -136,7 +136,7 @@ and
 .Fn access ,
 .Fn eaccess ,
 or
-.Fn faccessat 
+.Fn faccessat
 will fail if:
 .Bl -tag -width Er
 .It Bq Er EINVAL
diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2
index 3fe1632..ab60ed2 100644
--- a/lib/libc/sys/getdirentries.2
+++ b/lib/libc/sys/getdirentries.2
@@ -134,8 +134,9 @@ 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
-.Fn ( getdirentries
-only)
+.Po Fn getdirentries
+only
+.Pc
 or zero.
 .Sh RETURN VALUES
 If successful, the number of bytes actually transferred is returned.
diff --git a/lib/libc/sys/getrlimit.2 b/lib/libc/sys/getrlimit.2
index 1f84bfb..5fdd58b 100644
--- a/lib/libc/sys/getrlimit.2
+++ b/lib/libc/sys/getrlimit.2
@@ -194,8 +194,8 @@ raised the maximum limit value, and the caller is not the super-user.
 .Xr csh 1 ,
 .Xr quota 1 ,
 .Xr quotactl 2 ,
-.Xr sigaltstack 2 ,
 .Xr sigaction 2 ,
+.Xr sigaltstack 2 ,
 .Xr sysctl 3 ,
 .Xr ulimit 3
 .Sh HISTORY
diff --git a/lib/libc/sys/poll.2 b/lib/libc/sys/poll.2
index 466523b..dbd641f 100644
--- a/lib/libc/sys/poll.2
+++ b/lib/libc/sys/poll.2
@@ -148,8 +148,8 @@ is zero, then
 will return without blocking.
 .Pp
 The
-.Fn ppoll 
-system call, unlike 
+.Fn ppoll
+system call, unlike
 .Fn poll ,
 is used to safely wait until either a set of file descriptors becomes
 ready or until a signal is caught.
@@ -174,10 +174,10 @@ used by
 A null pointer may be passed to indicate that
 .Fn ppoll
 should wait indefinitely.
-Finally, 
+Finally,
 .Fa newsigmask
 specifies a signal mask which is set while waiting for input.
-When 
+When
 .Fn ppoll
 returns, the original signal mask is restored.
 .Bd -literal
@@ -246,11 +246,11 @@ The specified time limit is invalid. One of its components is negative or too la
 .Xr write 2
 .Sh STANDARDS
 The
-.Fn poll 
+.Fn poll
 function conforms to
 .St -p1003.1-2001 .
 The
-.Fn ppoll 
+.Fn ppoll
 is not specified by POSIX.
 .Sh HISTORY
 The
@@ -261,8 +261,8 @@ This manual page and the core of the implementation was taken from
 .Nx .
 The
 .Fn ppoll
-function first appeared in 
-.Fx 11.0 
+function first appeared in
+.Fx 11.0
 .Sh BUGS
 The distinction between some of the fields in the
 .Fa events
diff --git a/lib/libc/sys/posix_openpt.2 b/lib/libc/sys/posix_openpt.2
index 916e75a..d34385f 100644
--- a/lib/libc/sys/posix_openpt.2
+++ b/lib/libc/sys/posix_openpt.2
@@ -110,8 +110,8 @@ is not valid.
 Out of pseudo-terminal resources.
 .El
 .Sh SEE ALSO
-.Xr pts 4 ,
 .Xr ptsname 3 ,
+.Xr pts 4 ,
 .Xr tty 4
 .Sh STANDARDS
 The
diff --git a/lib/libc/sys/procctl.2 b/lib/libc/sys/procctl.2
index 70ee276..649e0ad 100644
--- a/lib/libc/sys/procctl.2
+++ b/lib/libc/sys/procctl.2
@@ -107,7 +107,6 @@ reaper.
 After the system initialization,
 .Xr init 8
 is the default reaper.
-.Pp
 .It Dv PROC_REAP_RELEASE
 Releases the reaper state for the current process.
 The reaper of the current process becomes the new reaper of the
@@ -146,6 +145,7 @@ for the specified process id.
 The specified process is the root of the reaper tree, i.e.
 .Xr init 8 .
 .El
+.Pp
 The
 .Fa rs_children
 field returns the number of children of the reaper.
diff --git a/lib/libc/sys/revoke.2 b/lib/libc/sys/revoke.2
index 57abdbb..482cbf6 100644
--- a/lib/libc/sys/revoke.2
+++ b/lib/libc/sys/revoke.2
@@ -97,8 +97,8 @@ operation on the named file.
 The caller is neither the owner of the file nor the super user.
 .El
 .Sh SEE ALSO
-.Xr close 2 ,
-.Xr revoke 1
+.Xr revoke 1 ,
+.Xr close 2
 .Sh HISTORY
 The
 .Fn revoke
diff --git a/lib/libc/sys/sched_setscheduler.2 b/lib/libc/sys/sched_setscheduler.2
index 3e7c42b..b84c1a1 100644
--- a/lib/libc/sys/sched_setscheduler.2
+++ b/lib/libc/sys/sched_setscheduler.2
@@ -151,9 +151,9 @@ argument is invalid, or one or more of the parameters contained in
 is outside the valid range for the specified scheduling policy.
 .El
 .Sh SEE ALSO
-.Xr sched_getparam 2 ,
 .Xr sched_get_priority_max 2 ,
 .Xr sched_get_priority_min 2 ,
+.Xr sched_getparam 2 ,
 .Xr sched_rr_get_interval 2 ,
 .Xr sched_setparam 2 ,
 .Xr sched_yield 2
diff --git a/lib/libc/sys/sigwaitinfo.2 b/lib/libc/sys/sigwaitinfo.2
index 9109759..b497592 100644
--- a/lib/libc/sys/sigwaitinfo.2
+++ b/lib/libc/sys/sigwaitinfo.2
@@ -172,8 +172,8 @@ system calls fail if:
 .Bl -tag -width Er
 .It Bq Er EINTR
 The wait was interrupted by an unblocked, caught signal.
-.Pp
 .El
+.Pp
 The
 .Fn sigtimedwait
 system call may also fail if:
diff --git a/lib/libc/sys/vfork.2 b/lib/libc/sys/vfork.2
index 1cfaa61..f93b429 100644
--- a/lib/libc/sys/vfork.2
+++ b/lib/libc/sys/vfork.2
@@ -100,8 +100,8 @@ since buffered data would then be flushed twice.)
 Same as for
 .Xr fork 2 .
 .Sh SEE ALSO
-.Xr execve 2 ,
 .Xr _exit 2 ,
+.Xr execve 2 ,
 .Xr fork 2 ,
 .Xr rfork 2 ,
 .Xr sigaction 2 ,