7 files changed, 68 insertions, 48 deletions

diff --git a/usr.sbin/adduser/rmuser.8 b/usr.sbin/adduser/rmuser.8
index a4cf1ff521ff..2f1b9e9c0be7 100644
--- a/usr.sbin/adduser/rmuser.8
+++ b/usr.sbin/adduser/rmuser.8
@@ -34,7 +34,7 @@
 .Nd remove users from the system
 .Sh SYNOPSIS
 .Nm
-.Op Fl vy
+.Op Fl yv
 .Op Fl f Ar file
 .Op Ar username ...
 .Sh DESCRIPTION
@@ -129,14 +129,6 @@ If the file is owned by anyone other than a user with
 UID 0, or is writeable by anyone other than the owner,
 .Nm
 will refuse to continue.
-.It Fl v
-Enable verbose mode.
-Normally,
-the output inlcudes one line per removed user;
-however,
-with this option
-.Nm
-will be much more chatty about the steps taken.
 .It Fl y
 Implicitly answer
 .Dq Li yes
@@ -148,6 +140,14 @@ This option requires that either the
 .Fl f
 option be used, or one or more user names be given as command line
 arguments.
+.It Fl v
+Enable verbose mode.
+Normally,
+the output inlcudes one line per removed user;
+however,
+with this option
+.Nm
+will be much more chatty about the steps taken.
 .It Ar username
 Identifies one or more users to be removed; if not present,
 .Nm
diff --git a/usr.sbin/burncd/burncd.8 b/usr.sbin/burncd/burncd.8
index d8c146228012..291bd150a368 100644
--- a/usr.sbin/burncd/burncd.8
+++ b/usr.sbin/burncd/burncd.8
@@ -96,7 +96,7 @@ only those areas that make the media appear blank for further usage are erased.
 Erase a CD-RW medium.
 This erases the entire media.
 Can take up to 1 hour to finish.
-.It Cm format {dvd+rw | dvd-rw}
+.It Cm format Brq Cm dvd+rw | dvd-rw
 Formats a DVD+RW or DVD-RW media to the default max size and 2048 byte blocks.
 This operation can take a long time to finish.
 Progress reporting is done during the process.
diff --git a/usr.sbin/extattr/rmextattr.8 b/usr.sbin/extattr/rmextattr.8
index 7aa9b009f5e7..c51fa6d922fe 100644
--- a/usr.sbin/extattr/rmextattr.8
+++ b/usr.sbin/extattr/rmextattr.8
@@ -39,7 +39,7 @@
 .Nm lsextattr ,
 .Nm rmextattr ,
 .Nm setextattr
-.Nd manipulated extended attributes
+.Nd manipulate extended attributes
 .Sh SYNOPSIS
 .Nm getextattr
 .Op Fl fhqsx
@@ -64,12 +64,15 @@
 .Sh DESCRIPTION
 These
 utilities
-are user tools to manipulated a named extended attributes on files and
+are user tools to manipulate the named extended attributes on files and
 directories.
 The
 .Ar attrnamespace
 argument should be the namespace of the attribute to retrieve: legal
-values are "user" and "system".
+values are
+.Cm user
+and
+.Cm system .
 The
 .Ar attrname
 argument should be the name of the attribute,
@@ -79,41 +82,53 @@ the name of the target file or directory,
 a string to store in the attribute.
 .Pp
 The following options are available:
-.Bl -tag -width flag
+.Bl -tag -width indent
 .It Fl f
-(Force) Ignore errors on individual filenames and continue with
+(Force.)
+Ignore errors on individual filenames and continue with
 the remaining arguments.
 .It Fl h
-(No follow) If the file is a symbolic link, perform the operation on the
+(No follow.)
+If the file is a symbolic link, perform the operation on the
 link itself rather than the file that the link points to.
 .It Fl n
-(Nul-terminate) Nul-terminate the extent content written out.
+.Dv ( NUL Ns
+-terminate.)
+.Dv NUL Ns
+-terminate the extent content written out.
 .It Fl q
-(Quiet) Do not print out the pathname and suppress error messages.
+(Quiet.)
+Do not print out the pathname and suppress error messages.
 .It Fl s
-(Stringify) Escape nonprinting characters and put quotes around the output.
+(Stringify.)
+Escape nonprinting characters and put quotes around the output.
 .It Fl x
-(Hex) Print the output in hexadecimal.
+(Hex.)
+Print the output in hexadecimal.
 .El
 .Sh EXAMPLES
-.Dl # setextattr system md5 `md5 -q /boot/kernel/kernel` /boot/kernel/kernel 
-.Dl # getextattr system md5 /boot/kernel/kernel
-.Dl # lsextattr system /boot/kernel/kernel
-.Dl # rmextattr system md5 /boot/kernel/kernel
+.Bd -literal
+setextattr system md5 `md5 -q /boot/kernel/kernel` /boot/kernel/kernel
+getextattr system md5 /boot/kernel/kernel
+lsextattr system /boot/kernel/kernel
+rmextattr system md5 /boot/kernel/kernel
+.Ed
 .Sh SEE ALSO
 .Xr extattr 2 ,
 .Xr extattr 3 ,
 .Xr extattrctl 8 ,
 .Xr extattr 9
 .Sh HISTORY
-Extended attribute support was developed as part of the TrustedBSD Project,
+Extended attribute support was developed as part of the
+.Tn TrustedBSD
+Project,
 and introduced in
 .Fx 5.0 .
 It was developed to support security extensions requiring additional labels
 to be associated with each file or directory.
 .Sh AUTHORS
-Robert N M Watson and
-Poul-Henning Kamp
+.An Robert N M Watson
+.An Poul-Henning Kamp
 .Sh BUGS
 The
 .Nm setextattr
diff --git a/usr.sbin/getpmac/getpmac.8 b/usr.sbin/getpmac/getpmac.8
index 3e5f6b1345b1..307c9628f890 100644
--- a/usr.sbin/getpmac/getpmac.8
+++ b/usr.sbin/getpmac/getpmac.8
@@ -1,12 +1,12 @@
 .\" Copyright (c) 2003 Networks Associates Technology, Inc.
 .\" All rights reserved.
-.\" 
+.\"
 .\" This software was developed for the FreeBSD Project by Chris Costello
 .\" at Safeport Network Services and Network Associates Labs, the
 .\" Security Research Division of Network 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
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -15,7 +15,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -27,9 +27,10 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.\" 
+.\"
 .\" $FreeBSD$
-.Dd JANUARY 14, 2003
+.\"
+.Dd January 14, 2003
 .Dt GETPMAC 8
 .Os
 .Sh NAME
@@ -38,13 +39,13 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl l Ar list,of,labels
-.Op Ar
+.Op Fl p Ar pid
 .Sh DESCRIPTION
 The
 .Nm
 utility prints the text representation of the MAC label associated with the
-specified processes.
-If no processes are specified, it prints the label associated with its own
+specified process.
+If no process is specified, it prints the label associated with its own
 process.
 .Sh SEE ALSO
 .Xr mac 3 ,
diff --git a/usr.sbin/kernbb/kernbb.8 b/usr.sbin/kernbb/kernbb.8
index fd03110fc32d..7109d7ab2941 100644
--- a/usr.sbin/kernbb/kernbb.8
+++ b/usr.sbin/kernbb/kernbb.8
@@ -49,9 +49,9 @@ tool.
 .Pp
 At least one source file in the running kernel must have been compiled
 with the
-.Fl --test-coverage
+.Fl Fl test-coverage
 and
-.Fl --profile-arcs
+.Fl Fl profile-arcs
 options.
 .Pp
 The output is stored in the filenames compiled into the kernel by
@@ -60,7 +60,9 @@ If the absolute pathname cannot be written to, the directory part
 of the filename is discarded and the file stored in the current
 directory under its basename.
 .Pp
-The output files are named *.da, and the
+The output files are named
+.Pa *.da ,
+and the
 .Xr gcov 1
 program will extract the counts and merge them with the source
 file to show actual execution counts.
@@ -72,7 +74,7 @@ the default system
 the default memory
 .El
 .Sh SEE ALSO
-.Xr cc 1
+.Xr cc 1 ,
 .Xr gcov 1
 .Sh AUTHORS
 The
diff --git a/usr.sbin/mailwrapper/mailwrapper.8 b/usr.sbin/mailwrapper/mailwrapper.8
index 9efd6a749edb..b45c01852e03 100644
--- a/usr.sbin/mailwrapper/mailwrapper.8
+++ b/usr.sbin/mailwrapper/mailwrapper.8
@@ -115,7 +115,7 @@ the system at run time.
 .Pp
 Other configuration files may need to be altered when replacing
 .Xr sendmail 8 .
-For example, if the replacement MTA doesn't support the
+For example, if the replacement MTA does not support the
 .Fl A
 option with
 .Xr mailq 1 ,
diff --git a/usr.sbin/setpmac/setpmac.8 b/usr.sbin/setpmac/setpmac.8
index 42f50932a942..345db6403f2d 100644
--- a/usr.sbin/setpmac/setpmac.8
+++ b/usr.sbin/setpmac/setpmac.8
@@ -1,12 +1,12 @@
 .\" Copyright (c) 2003 Networks Associates Technology, Inc.
 .\" All rights reserved.
-.\" 
+.\"
 .\" This software was developed for the FreeBSD Project by Chris Costello
 .\" at Safeport Network Services and Network Associates Labs, the
 .\" Security Research Division of Network 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
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -15,7 +15,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -27,19 +27,20 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.\" 
+.\"
 .\" $FreeBSD$
-.Dd JANUARY 14, 2003
+.\"
+.Dd January 14, 2003
 .Os
 .Dt SETPMAC 8
 .Sh NAME
 .Nm setpmac
-.Nd run a command with a different MAC process label
+.Nd "run a command with a different MAC process label"
 .Sh SYNOPSIS
 .Nm
 .Ar label
 .Ar command
-.Op Ar args Op Ar ...
+.Op Ar arg ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -58,5 +59,6 @@ This software was contributed to the
 .Fx
 Project by Network Associates Labs,
 the Security Research Division of Network Associates
-Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
+Inc. under DARPA/SPAWAR contract N66001-01-C-8035
+.Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.