7 files changed, 96 insertions, 77 deletions
diff --git a/lib/libc/posix1e/mac.conf.5 b/lib/libc/posix1e/mac.conf.5
index c382345..4fa58ae 100644
--- a/lib/libc/posix1e/mac.conf.5
+++ b/lib/libc/posix1e/mac.conf.5
@@ -34,16 +34,15 @@
 .Os
 .Sh NAME
 .Nm mac.conf
-.Nd Format of the MAC library configuration file
+.Nd format of the MAC library configuration file
 .Sh DESCRIPTION
 The
 .Nm
 file configures the default label elements to be used by policy-agnostic
 applications that operate on MAC labels.
-.Nm
-contains a series of default label sets specified by object class,
+A file contains a series of default label sets specified by object class,
 in addition to blank lines and comments preceded by a
-.Dv #
+.Ql #
 symbol.
 .Pp
 Each declaration consists of a single line with two fields separated
@@ -53,7 +52,7 @@ as used by the
 library calls prior to an application invocation of a function from
 .Xr mac_get 3 .
 Label element names may optionally begin with a
-.Dv ?
+.Ql \&?
 symbol to indicate that a failure to retrieve the label element for
 an object should be silently ignored, and improves usability if the
 set of MAC policies may change over time.
@@ -86,9 +85,9 @@ label due to the respective policy not being present will be ignored.
 MAC library configuration file.
 .El
 .Sh SEE ALSO
+.Xr mac 3 ,
 .Xr mac_get 3 ,
 .Xr mac_prepare 3 ,
-.Xr mac 3 ,
 .Xr mac 4 ,
 .Xr mac 9
 .Sh HISTORY
diff --git a/lib/libc_r/man/pthread_getconcurrency.3 b/lib/libc_r/man/pthread_getconcurrency.3
index e744378..d71599a 100644
--- a/lib/libc_r/man/pthread_getconcurrency.3
+++ b/lib/libc_r/man/pthread_getconcurrency.3
@@ -27,7 +27,7 @@
 .Dt PTHREAD_GETCONCURRENCY 3
 .Os
 .Sh NAME
-.Nm pthread_getconcurrency,
+.Nm pthread_getconcurrency ,
 .Nm pthread_setconcurrency
 .Nd get or set level of concurrency
 .Sh LIBRARY
@@ -35,7 +35,7 @@
 .Sh SYNOPSIS
 .In pthread.h
 .Ft int
-.Fn pthread_getconcurrency "void"
+.Fn pthread_getconcurrency void
 .Ft int
 .Fn pthread_setconcurrency "int new_level"
 .Sh DESCRIPTION
@@ -43,29 +43,37 @@ The
 .Fn pthread_getconcurrency
 function allows an application to inform the threads implementation
 of its desired concurrency level,
-.Va new_level .
+.Fa new_level .
 The actual level of concurrency provided by the implementation
-as a result of this function call is unspecified.  If new_level is
-zero, it causes the implementation to maintain the concurrency
+as a result of this function call is unspecified.
+If
+.Fa new_level
+is zero, it causes the implementation to maintain the concurrency
 level at its discretion as if
 .Fn pthread_setconcurrency
-was never called.  The
+was never called.
+The
 .Fn pthread_getconcurrency
 function returns the value set by a previous call to the
 .Fn pthread_setconcurrency
-function.  If the
+function.
+If the
 .Fn pthread_setconcurrency
 function was not previously called, this function returns zero to
 indicate that the implementation is maintaining the concurrency
-level.  When an application calls
-.Fn pthread_setconcurrency
+level.
+When an application calls
+.Fn pthread_setconcurrency ,
 it is informing the implementation of its desired concurrency
-level.  The implementation uses this as a hint, not a requirement.
+level.
+The implementation uses this as a hint, not a requirement.
 .Sh RETURN VALUES
 If successful, the
 .Fn pthread_setconcurrency
-function returns zero.  Otherwise, an error number is returned
-to indicate the error.  The
+function returns zero.
+Otherwise, an error number is returned
+to indicate the error.
+The
 .Fn pthread_getconcurrency
 function always returns the concurrency level set by a previous
 call to
@@ -82,21 +90,21 @@ function will fail if:
 .Bl -tag -width Er
 .It Bq Er EINVAL
 The value specified by
-.Va new_level
+.Fa new_level
 is negative.
 .It Bq Er EAGAIN
-The value specific by
-.Va new_level
+The value specified by
+.Fa new_level
 would cause a system resource to be exceeded.
 .El
 .Sh APPLICATION USAGE
 Use of these functions changes the state of the underlying
-concurrency upon which the application depends.  Library
-developers are advised to not use the
+concurrency upon which the application depends.
+Library developers are advised to not use the
 .Fn pthread_getconcurrency
 and
 .Fn pthread_setconcurrency
-functions since their use may conflict with an applications
+functions since their use may conflict with an application's
 use of these functions.
 .Sh STANDARDS
 The
@@ -104,4 +112,4 @@ The
 and
 .Fn pthread_setconcurrency
 functions conform to
-.St -susv2
+.St -susv2 .
diff --git a/lib/libpam/modules/pam_chroot/pam_chroot.8 b/lib/libpam/modules/pam_chroot/pam_chroot.8
index f76dc4b..e55c908 100644
--- a/lib/libpam/modules/pam_chroot/pam_chroot.8
+++ b/lib/libpam/modules/pam_chroot/pam_chroot.8
@@ -3,7 +3,7 @@
 .\"
 .\" Portions of this software were developed for the FreeBSD Project by
 .\" ThinkSec AS and NAI Labs, the Security Research Division of Network
-.\" Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
+.\" Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
 .\" ("CBOSS"), as part of the DARPA CHATS research program.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -48,11 +48,11 @@
 The chroot service module for PAM chroots users into either a
 predetermined directory or one derived from their home directory.
 If a user's home directory as specified in the
-.Dv passwd
+.Vt passwd
 structure returned by
 .Xr getpwnam 3
 contains the string
-.Dq /./ ,
+.Dq Li /./ ,
 the portion of the directory name to the left of that string is used
 as the chroot directory, and the portion to the right will be the
 current working directory inside the chroot tree.
@@ -63,7 +63,7 @@ and
 options (see below) are used.
 .Bl -tag -width ".Cm also_root"
 .It Cm also_root
-Do not hold user id 0 exempt from the chroot requirement.
+Do not hold user ID 0 exempt from the chroot requirement.
 .It Cm always
 Report a failure if a chroot directory could not be derived from the
 user's home directory, and the
diff --git a/lib/libpthread/man/pthread_attr_get_np.3 b/lib/libpthread/man/pthread_attr_get_np.3
index bf856d4..82e1065 100644
--- a/lib/libpthread/man/pthread_attr_get_np.3
+++ b/lib/libpthread/man/pthread_attr_get_np.3
@@ -87,8 +87,9 @@ If successful,
 function returns 0.
 Otherwise, an error number is returned to indicate the error.
 .Sh ERRORS
+The
 .Fn pthread_attr_get_np
-will fail if:
+function will fail if:
 .Bl -tag -width Er
 .It Bq Er EINVAL
 Invalid value for one of given parameters.
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index bb8dbb1..17df6d0 100644
--- a/sbin/bsdlabel/bsdlabel.8
+++ b/sbin/bsdlabel/bsdlabel.8
@@ -47,29 +47,30 @@
 .Ar disk
 .Nm
 .Fl w
-.Op Fl nA
+.Op Fl \&An
 .Op Fl B Op Fl b Ar boot
 .Op Fl m Ar machine
-.Ar disk 
+.Ar disk
 .Op Ar type
 .Nm
 .Fl e
-.Op Fl nA
+.Op Fl \&An
 .Op Fl B Op Fl b Ar boot
 .Op Fl m Ar machine
 .Ar disk
 .Nm
 .Fl R
-.Op Fl nA
+.Op Fl \&An
 .Op Fl B Op Fl b Ar boot
 .Op Fl m Ar machine
 .Ar disk protofile
-.Pp
 .Sh DESCRIPTION
 The
 .Nm
 utility
-installs, examines or modifies the BSD label on a disk partition.
+installs, examines or modifies the
+.Bx
+label on a disk partition.
 In addition,
 .Nm
 can install bootstrap code.
@@ -81,10 +82,12 @@ path prefix may be omitted;
 the
 .Nm
 utility will automatically prepend it.
-.Ss General options
-The 
+.Ss General Options
+The
 .Fl A
-option enables processing of the historical parts of the BSD label.
+option enables processing of the historical parts of the
+.Bx
+label.
 If the option is not given, suitable values are set for these fields.
 .Pp
 The
@@ -120,31 +123,31 @@ To write a standard label, use the form
 .Pp
 .Nm
 .Fl w
-.Op Fl nA
+.Op Fl \&An
 .Op Fl m Ar machine
 .Ar disk
 .Op Ar type
 .Pp
-If the drive type if specified the entry of that name in the
+If the drive type is specified, the entry of that name in the
 .Xr disktab 5
-file is used, otherwise a default layout is used.
+file is used; otherwise a default layout is used.
 .Ss Editing an Existing Disk Label
 To edit an existing disk label, use the form
 .Pp
 .Nm
 .Fl e
-.Op Fl nA
+.Op Fl \&An
 .Op Fl m Ar machine
 .Ar disk
 .Pp
-This command opens the disklabel in the default editor and when the editor
-exits the label is validated and if OK written to disk.
+This command opens the disk label in the default editor, and when the editor
+exits, the label is validated and if OK written to disk.
 .Ss Restoring a Disk Label From a File
 To restore a disk label from a file, use the form
 .Pp
 .Nm
 .Fl R
-.Op Fl nA
+.Op Fl \&An
 .Op Fl m Ar machine
 .Ar disk protofile
 .Pp
@@ -360,7 +363,7 @@ option to restore the label at a later date.
 .Dl "bsdlabel -w /dev/da0s1"
 .Pp
 Create a label for
-.Pa da0s1
+.Pa da0s1 .
 .Pp
 .Dl "bsdlabel -e da0s1"
 .Pp
@@ -460,10 +463,10 @@ which could be used as a source file for
   g:      *        *    4.2BSD
 .Ed
 .Sh SEE ALSO
-.Xr geom 4 ,
 .Xr ccd 4 ,
+.Xr geom 4 ,
 .Xr md 4 ,
-.Xr disklabel 5 ,
+.\" Xr bsdlabel 5 ,
 .Xr disktab 5 ,
 .Xr boot0cfg 8 ,
 .Xr fdisk 8
diff --git a/sbin/mksnap_ffs/mksnap_ffs.8 b/sbin/mksnap_ffs/mksnap_ffs.8
index b20e435..7dc2210 100644
--- a/sbin/mksnap_ffs/mksnap_ffs.8
+++ b/sbin/mksnap_ffs/mksnap_ffs.8
@@ -39,7 +39,7 @@
 .Os
 .Sh NAME
 .Nm mksnap_ffs
-.Nd take a filesystem snapshot
+.Nd take a file system snapshot
 .Sh SYNOPSIS
 .Nm
 .Ar mountpoint
@@ -47,29 +47,29 @@
 .Sh DESCRIPTION
 The
 .Nm
-command creates a snapshot named
+utility creates a snapshot named
 .Ar snapshot_name
-on the filesystem mounted at
+on the file system mounted at
 .Ar mountpoint .
 The
 .Ar snapshot_name
-argument must be contained within the filesystem mounted at
+argument must be contained within the file system mounted at
 .Ar mountpoint .
 .Pp
 The group ownership of the file is set to
-.Dq operator ;
+.Dq Li operator ;
 the owner of the file remains
-.Dq root .
+.Dq Li root .
 The mode of the snapshot is set to be readable by the owner
 or members of the
-.Dq operator
+.Dq Li operator
 group.
 .Sh SEE ALSO
 .Xr chmod 2 ,
 .Xr chown 8 ,
 .Xr mount_ffs 8
 .Sh HISTORY
-A
+The
 .Nm
-command first appeared in
+utility first appeared in
 .Fx 5.0 .
diff --git a/share/man/man3/pthread_getconcurrency.3 b/share/man/man3/pthread_getconcurrency.3
index e744378..d71599a 100644
--- a/share/man/man3/pthread_getconcurrency.3
+++ b/share/man/man3/pthread_getconcurrency.3
@@ -27,7 +27,7 @@
 .Dt PTHREAD_GETCONCURRENCY 3
 .Os
 .Sh NAME
-.Nm pthread_getconcurrency,
+.Nm pthread_getconcurrency ,
 .Nm pthread_setconcurrency
 .Nd get or set level of concurrency
 .Sh LIBRARY
@@ -35,7 +35,7 @@
 .Sh SYNOPSIS
 .In pthread.h
 .Ft int
-.Fn pthread_getconcurrency "void"
+.Fn pthread_getconcurrency void
 .Ft int
 .Fn pthread_setconcurrency "int new_level"
 .Sh DESCRIPTION
@@ -43,29 +43,37 @@ The
 .Fn pthread_getconcurrency
 function allows an application to inform the threads implementation
 of its desired concurrency level,
-.Va new_level .
+.Fa new_level .
 The actual level of concurrency provided by the implementation
-as a result of this function call is unspecified.  If new_level is
-zero, it causes the implementation to maintain the concurrency
+as a result of this function call is unspecified.
+If
+.Fa new_level
+is zero, it causes the implementation to maintain the concurrency
 level at its discretion as if
 .Fn pthread_setconcurrency
-was never called.  The
+was never called.
+The
 .Fn pthread_getconcurrency
 function returns the value set by a previous call to the
 .Fn pthread_setconcurrency
-function.  If the
+function.
+If the
 .Fn pthread_setconcurrency
 function was not previously called, this function returns zero to
 indicate that the implementation is maintaining the concurrency
-level.  When an application calls
-.Fn pthread_setconcurrency
+level.
+When an application calls
+.Fn pthread_setconcurrency ,
 it is informing the implementation of its desired concurrency
-level.  The implementation uses this as a hint, not a requirement.
+level.
+The implementation uses this as a hint, not a requirement.
 .Sh RETURN VALUES
 If successful, the
 .Fn pthread_setconcurrency
-function returns zero.  Otherwise, an error number is returned
-to indicate the error.  The
+function returns zero.
+Otherwise, an error number is returned
+to indicate the error.
+The
 .Fn pthread_getconcurrency
 function always returns the concurrency level set by a previous
 call to
@@ -82,21 +90,21 @@ function will fail if:
 .Bl -tag -width Er
 .It Bq Er EINVAL
 The value specified by
-.Va new_level
+.Fa new_level
 is negative.
 .It Bq Er EAGAIN
-The value specific by
-.Va new_level
+The value specified by
+.Fa new_level
 would cause a system resource to be exceeded.
 .El
 .Sh APPLICATION USAGE
 Use of these functions changes the state of the underlying
-concurrency upon which the application depends.  Library
-developers are advised to not use the
+concurrency upon which the application depends.
+Library developers are advised to not use the
 .Fn pthread_getconcurrency
 and
 .Fn pthread_setconcurrency
-functions since their use may conflict with an applications
+functions since their use may conflict with an application's
 use of these functions.
 .Sh STANDARDS
 The
@@ -104,4 +112,4 @@ The
 and
 .Fn pthread_setconcurrency
 functions conform to
-.St -susv2
+.St -susv2 .