diff --git a/usr.sbin/acpi/iasl/iasl.8 b/usr.sbin/acpi/iasl/iasl.8
index af8f7afe3eb8..fa80aa7a84ac 100644
--- a/usr.sbin/acpi/iasl/iasl.8
+++ b/usr.sbin/acpi/iasl/iasl.8
@@ -25,7 +25,7 @@
 .\" (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$
+.\" $FreeBSD$
 .\"
 .Dd August 7, 2003
 .Dt IASL 8
@@ -62,80 +62,98 @@
 The
 .Nm
 utility is a compiler/decompiler for ACPI Source Language (ASL)
-and ACPI Machine Language (AML).  Major features of
+and ACPI Machine Language (AML).
+Major features of
 .Nm
 include:
-.Pp
-.Bl -bullet -compact -offset indent
+.Bl -bullet -offset indent
 .It
 Full support for the ACPI 2.0b Specification including ASL grammar
 elements and operators.
 .It
 Extensive compiler syntax and semantic error checking, especially in
-the area of control methods. This reduces the number of errors that are
+the area of control methods.
+This reduces the number of errors that are
 not discovered until the AML code is actually interpreted (i.e., the
-compile-time error checking reduces the number of run-time errors.)
+compile-time error checking reduces the number of run-time errors).
 .It
 Multiple types of output files, including formatted listing files with
 intermixed source, several types of AML files, and error messages.
 .El
 .Sh OPTIONS
 .Bl -tag -width indent
-.It Fl b Ar p|t|b
-Create compiler debug/trace file (*.txt). Types: Parse/Tree/Both
+.It Fl b Sm Cm p | t | b Sm
+Create compiler debug/trace file
+.Pq Pa *.txt .
+Types: Parse/Tree/Both.
 .It Fl c
-Parse only, no output generation
+Parse only, no output generation.
 .It Fl d Ar file
-Disassemble AML to ASL source code file (*.dsl)
+Disassemble AML to ASL source code file
+.Pq Pa *.dsl .
 .It Fl dc Ar file
-Disassemble AML and immediately compile it
-(Obtain DSDT from current system if no input file)
+Disassemble AML and immediately compile it.
+(Obtain DSDT from current system if no input file.)
 .It Fl e
-Generate External() statements for unresolved symbols
+Generate
+.Fn External
+statements for unresolved symbols.
 .It Fl f
-Ignore errors, force creation of AML output file(s)
+Ignore errors, force creation of AML output file(s).
 .It Fl g
-Get ACPI tables and write to files (*.dat)
+Get ACPI tables and write to files
+.Pq Pa *.dat .
 .It Fl h
-Additional help and compiler debug options
+Additional help and compiler debug options.
 .It Fl hc
-Display operators allowed in constant expressions
+Display operators allowed in constant expressions.
 .It Fl hr
-Display ACPI reserved method names
-.It Fl i Ar a|c
-Create assembler or C include file (*.inc or *.h)
+Display ACPI reserved method names.
+.It Fl i Sm Cm a | c Sm
+Create assembler or C include file
+.Pa ( *.inc
+or
+.Pa *.h ) .
 .It Fl l
-Create mixed listing file (ASL source and AML) (*.lst)
+Create mixed listing file (ASL source and AML)
+.Pq Pa *.lst .
 .It Fl ln
-Create namespace file (*.nsp)
+Create namespace file
+.Pq Pa *.nsp .
 .It Fl ls
-Create combined source file (expanded includes) (*.src)
+Create combined source file (expanded includes)
+.Pq Pa *.src .
 .It Fl oa
-Disable all optimizations (compatibility mode)
+Disable all optimizations (compatibility mode).
 .It Fl of
-Disable constant folding
+Disable constant folding.
 .It Fl oi
-Disable integer optimization to Zero/One/Ones
+Disable integer optimization to Zero/One/Ones.
 .It Fl on
-Disable named reference string optimization
+Disable named reference string optimization.
 .It Fl ot
-Display compile times
+Display compile times.
 .It Fl p Ar prefix
-Specify filename prefix for all output files (including .aml)
-.It Fl s Ar a|c
-Create AML in assembler or C source file (*.asm or *.c)
+Specify filename prefix for all output files (including
+.Pa .aml ) .
+.It Fl s Sm Cm a | c Sm
+Create AML in assembler or C source file
+.Pa ( *.asm
+or
+.Pa *.c ) .
 .It Fl t Ar a|c
-Create AML in assembler or C hex table (*.hex)
+Create AML in assembler or C hex table
+.Pq Pa *.hex .
 .It Fl vi
-Less verbose errors and warnings for use with IDEs
+Less verbose errors and warnings for use with IDEs.
 .It Fl vo
-Enable optimization comments
+Enable optimization comments.
 .It Fl vr
-Disable remarks
+Disable remarks.
 .It Fl vs
-Disable signon
+Disable signon.
 .It Fl x Ar level
-Set debug level for trace output
+Set debug level for trace output.
 .El
 .Sh SEE ALSO
 .Xr acpi 4 ,
@@ -143,7 +161,8 @@ Set debug level for trace output
 .Sh HISTORY
 The
 .Nm
-utility is provided with Intel ACPI-CA.  It first appeared in
+utility is provided with Intel ACPI-CA.
+It first appeared in
 .Fx 5.2 .
 .Sh AUTHORS
 .An -nosplit
diff --git a/usr.sbin/adduser/adduser.conf.5 b/usr.sbin/adduser/adduser.conf.5
index 90e37cef5e36..c00666d2ed15 100644
--- a/usr.sbin/adduser/adduser.conf.5
+++ b/usr.sbin/adduser/adduser.conf.5
@@ -30,9 +30,9 @@
 .Os
 .Sh NAME
 .Nm adduser.conf
-.Nd configuration file for the
+.Nd
 .Xr adduser 8
-utility
+configuration file
 .Sh DESCRIPTION
 The
 .Pa /etc/adduser.conf
@@ -42,8 +42,8 @@ the
 utility.
 When
 .Xr adduser 8
-is invoked, it will check to see if this file exists and
-if so the configuration will be used or offered as the
+is invoked, it will check to see if this file exists, and
+if so, the configuration will be used or offered as the
 default settings.
 The
 .Nm
@@ -77,7 +77,7 @@ In the second case,
 will read the configuration data unless a flag
 has been passed to override it.
 For example, the
-.Dq shell
+.Va defaultshell
 option.
 In the third case, the configuration will be utilized, but the
 user will never be prompted to modify the default setting by
@@ -85,74 +85,83 @@ either a flag or an
 .Xr adduser 8
 prompt.
 For example, the
-.Dq upwexpire
+.Va upwexpire
 setting.
 .Pp
 The following configuration options can be set in
 .Nm :
-.Bl -tag -width "defaultgroups" -offset indent
-.It defaultLgroup
+.Bl -tag -width ".Va defaultgroups" -offset indent
+.It Va defaultLgroup
 The default group new users will be added to.
-.It defaultclass
+.It Va defaultclass
 The default class to place users in as described in
 .Xr login.conf 5 .
-.It defaultgroups
+.It Va defaultgroups
 This option is used to specify what other groups the new account
 should be added to.
-.It passwdtype
+.It Va passwdtype
 May be one of
-.Cm no , Cm none , Cm random ,
+.Cm no , none , random ,
 or
-.Cm yes
+.Cm yes ,
 as described in
 .Xr adduser 8 .
 As such, the text is not duplicated here and may be
 read in
 .Xr adduser 8 .
-.It homeprefix
+.It Va homeprefix
 The default home directory prefix, usually
 .Pa /home .
-.It defaultshell
-The users default shell which may be any of the shells listed in
-.Pa /etc/shells .
-.It udotdir
+.It Va defaultshell
+The user's default shell which may be any of the shells listed in
+.Xr shells 5 .
+.It Va udotdir
 Defines the location of the default shell and environment
 configuration files.
-.It msgfile
+.It Va msgfile
 Location of the default new user message file.
 This message will be sent to all new users if specified
 here or at the
 .Xr adduser 8
 prompt.
-.It disableflag
+.It Va disableflag
 The default message enclosed in brackets for the
 lock account prompt.
-.It upwexpire
+.It Va upwexpire
 The default password expiration time.
 Format of the date is either a
 .Ux
 time in decimal, or a date in
 .Sm off
-.Ql dd-mmm-yy Bq yy
+.Ar dd No - Ar mmm No - Ar yy Op Ar yy
 .Sm on
-format, where dd is the day, mmm is the month in either numeric or
-alphabetic format and year is either a two or four digit year.
+format, where
+.Ar dd
+is the day,
+.Ar mmm
+is the month in either numeric or
+alphabetic format, and
+.Ar yy Ns Op Ar yy
+is either a two or four digit year.
 This option also accepts a relative date in the form of
 .Sm off
-.Sy n Bq mhdwoy
+.Ar n Op Ar m h d w o y
 .Sm on
 where
-.Sy n
-is a decimal, octal (leading 0) or hexadecimal (leading 0x) digit followed by the
-number of Minutes, Hours, Days, Weeks, Months or Years from the current date at
+.Ar n
+is a decimal, octal (leading 0) or hexadecimal (leading 0x) digit
+followed by the number of Minutes, Hours, Days, Weeks, Months or
+Years from the current date at
 which the expiration time is to be set.
-.It uexpire
+.It Va uexpire
 The default account expire time.
-The format is similar to the upwexpire option.
-.It ugecos
-The default information to be held in the gecos field of
+The format is similar to the
+.Va upwexpire
+option.
+.It Va ugecos
+The default information to be held in the GECOS field of
 .Pa /etc/master.passwd .
-.It uuid
+.It Va uuid
 The default user ID setting.
 This must be a number above 1000 and fewer than 65534.
 .El
@@ -163,7 +172,7 @@ file created with the
 .Fl C
 .Xr adduser 8
 flag and modified.
-.Bd -literal
+.Bd -literal -offset indent
 # Configuration file for adduser(8).
 # NOTE: only *some* variables are saved.
 # Last Modified on Fri Mar 30 14:04:05 EST 2004.
diff --git a/usr.sbin/arlcontrol/arlcontrol.8 b/usr.sbin/arlcontrol/arlcontrol.8
index 09eb5b11f71c..54698a36d98e 100644
--- a/usr.sbin/arlcontrol/arlcontrol.8
+++ b/usr.sbin/arlcontrol/arlcontrol.8
@@ -31,7 +31,7 @@
 .\" $FreeBSD$
 .\"
 .Dd March 15, 2004
-.Dt ARLCONFIG 8 i386
+.Dt ARLCONTROL 8 i386
 .Os
 .Sh NAME
 .Nm arlcontrol
@@ -40,9 +40,9 @@
 .Nm
 .Ar iface
 .Nm
-.Ar iface Cm country Ar country ( Cm 9-15 )
+.Ar iface Cm country Ar country Pq Cm 9 Ns - Ns Cm 15
 .Nm
-.Ar iface Cm priority Ar priority ( Cm normal, high, highest )
+.Ar iface Cm priority Ar priority Pq Cm normal , high , highest
 .Nm
 .Ar iface Cm txretry Ar txretry
 .Nm
@@ -60,7 +60,7 @@ Most of the parameters that can be changed are related to the
 Aironet protocol which the Aironet Arlan 655 card implements.
 The
 .Nm
-utility can also be used to view the current NIC status, configuration
+utility can also be used to view the current NIC status, configuration,
 and to dump out the values of the card's statistics counters.
 .Pp
 The
@@ -75,48 +75,49 @@ etc.) and must be specified.
 The options are as follows:
 .Bl -tag -width indent
 .It Ar iface
-Display current settings of specified wireless interface. 
-This retrieves current card settings from the driver and prints 
-them out. 
-.It Ar iface Cm country Ar country ( Cm 9-15 )
-Chose 
+Display current settings of the specified wireless interface.
+This retrieves current card settings from the driver and prints
+them out.
+.It Ar iface Cm country Ar country Pq Cm 9 Ns - Ns Cm 15
+Chose
 .Ar country , channel
- parameters that depend on the
-.Ar country 
+parameters that depend on the
+.Ar country
 according to the following table:
-.Bl -column ".Em Country" ".Em Channel" ".Em MHz" -offset indent indent
-.Em "Country      	Ch_Set	MHz"
+.Bl -column ".No North America" ".Em Channel" ".Em MHz"
+.Em "Country	Ch_Set	MHz"
 .It "North America" Ta 9 Ta "2412, 2427, 2442, 2457, 2465"
-.It "U.S.A        " Ta 9 Ta "2412, 2427, 2442, 2457, 2465"
-.It "Canada       " Ta 9 Ta "2412, 2427, 2442, 2457, 2465"
-.It "Mexico       " Ta 9 Ta "2412, 2427, 2442, 2457, 2465"
-.IT "New Zealand  " Ta 9 Ta "2412, 2427, 2442, 2457, 2465"
-.It "E.T.S.I      " Ta 10 Ta "2412, 2427, 2442, 2457, 2472"
-.It "Japan        " Ta 11 Ta "2484"
-.It "France       " Ta 12 Ta "2457, 2465, 2475"
-.It "Australia    " Ta 13 Ta "2411, 2425, 2439"
-.It "Germany      " Ta 14 Ta "2427, 2442, 2457"
+.It "U.S.A" Ta 9 Ta "2412, 2427, 2442, 2457, 2465"
+.It "Canada" Ta 9 Ta "2412, 2427, 2442, 2457, 2465"
+.It "Mexico" Ta 9 Ta "2412, 2427, 2442, 2457, 2465"
+.It "New Zealand" Ta 9 Ta "2412, 2427, 2442, 2457, 2465"
+.It "E.T.S.I" Ta 10 Ta "2412, 2427, 2442, 2457, 2472"
+.It "Japan" Ta 11 Ta "2484"
+.It "France" Ta 12 Ta "2457, 2465, 2475"
+.It "Australia" Ta 13 Ta "2411, 2425, 2439"
+.It "Germany" Ta 14 Ta "2427, 2442, 2457"
 .It "U.K.(MPT1349)" Ta 15 Ta "2460"
-.It "U.K.         " Ta 15 Ta "2460"
-.It "Spain        " Ta 15 Ta "2460"
+.It "U.K." Ta 15 Ta "2460"
+.It "Spain" Ta 15 Ta "2460"
 .El
-.It Ar iface Cm priority Ar priority ( Cm normal, high, highest )
+.It Ar iface Cm priority Ar priority Pq Cm normal , high , highest
 Use the
 .Ar priority
-parameter to set the priority of the Arlan 655 Radio Media Access Control 
-the values are 
+parameter to set the priority of the Arlan 655 Radio Media Access Control
+the values are
 .Cm normal , high
 or
 .Cm highest .
-The higher the priority set, the more likely this unit will be first 
-to successfully transmit a packet when multiple units are trying 
+The higher the priority is set, the more likely this unit will be the first
+to successfully transmit a packet when multiple units are trying
 to transmit at the same time.
 .Pp
 The percentage of units on your network that you set to values other than
-.Dq normal
-should be kept small - 10 percent or less.  
+.Cm normal
+should be kept small - 10 percent or less.
 .It Ar iface Cm txretry Ar txretry
-Set transmit retries. Default is 0.
+Set transmit retries.
+Default is 0.
 .It Ar iface Cm stat
 Print internal Arlan 655 statistics block.
 .It Ar iface Cm quality
@@ -129,31 +130,37 @@ Also the driver extracts values from ACK packets.
 .El
 .Sh EXAMPLES
 .Bd -literal -offset indent
-arlcontrol arl0 country 11 priority high 
-arlcontrol arl0 quality 
+arlcontrol arl0 country 11 priority high
+arlcontrol arl0 quality
 arlcontrol arl0 stat
 arlcontrol arl0
+.Ed
 .Pp
-You can configure the Arlan 655 card from /etc/start_if.arl0.
-For example: 
-.Pp
+You can configure the Arlan 655 card from
+.Pa /etc/start_if.arl0 .
+For example:
+.Bd -literal -offset indent
 #!/bin/sh
 /usr/sbin/arlcontrol country 9 priority highest
+.Ed
 .Sh SEE ALSO
-.Xr arl 4 ,
-.Xr "Arlan 655 ISA Wireless LAN Client Card User Guide" . 
+.Xr arl 4
+.Rs
+.%T "Arlan 655 ISA Wireless LAN Client Card User Guide"
+.Re
 .Sh HISTORY
 The
 .Nm
 utility first appeared in
 .Fx 5.3 .
 .Sh BUGS
-Aironet Arlan 640 bridges and Arlan 630 access points don't understand
+Aironet Arlan 640 bridges and Arlan 630 access points do not understand
 country codes other than 9.
 .Sh AUTHORS
+.An -nosplit
 The
 .Nm
 utility was written by
 .Aq ran@styx.aic.net .
-This manpage was written by 
-.An Yuri Kurenkov Aq y.kurenkov@init.ru .  
+This manpage was written by
+.An Yuri Kurenkov Aq y.kurenkov@init.ru .
diff --git a/usr.sbin/asf/asf.8 b/usr.sbin/asf/asf.8
index 889bb8c3201d..229d855f4cc2 100644
--- a/usr.sbin/asf/asf.8
+++ b/usr.sbin/asf/asf.8
@@ -83,7 +83,7 @@ Instead of reading from standard input, start a
 .Xr kldstat 8
 and read the information from it.
 .It Fl s
-Don't prepend a (guessed) subdirectory of the module path.
+Do not prepend a (guessed) subdirectory of the module path.
 .It Fl x
 Normally
 .Nm
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5 b/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5
index d27025f11016..189ca66606c5 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5
@@ -42,14 +42,16 @@ Bluetooth link keys/PIN codes management daemon.
 .Pp
 The
 .Nm
-file is a free-form ASCII text file.
+file is a free-form
+.Tn ASCII
+text file.
 It is parsed by the recursive-descent parser built into
 .Xr hcsecd 8 .
 The file may contain extra tabs and newlines for formatting purposes.
 Keywords in the file are case-sensitive.
 Comments may be placed anywhere within the file (except within quotes).
 Comments begin with the
-.Dq #
+.Ql #
 character and end at the end of the line.
 .Sh FILE FORMAT
 The
@@ -74,29 +76,29 @@ entry
 .Oc
 }
 .Pp
-The following section describes all supported options and arguments
+The following section describes all supported options and arguments.
 .Bl -tag -width indent
 .It Cm bdaddr Ar BD_ADDR
 Specify remote device BD_ADDR for the entry.
 .It Cm name Ar device_name
 Specify user friendly name for the entry.
-Name is a string in a straight double quotes.
+Name is a string in straight double quotes.
 .It Cm key Ar link_key
 Specify link key for the entry.
-Link key is hexadecimal string upto 32 characters in length starting with
-.Dq 0x .
+Link key is hexadecimal string up to 32 characters in length starting with
+.Ql 0x .
 .It Cm key nokey
 Specify no link key for the entry.
 .It Cm pin Ar PIN_code
 Specify PIN code for the entry.
-PIN code is a string upto 16 characters in length in a straight double quotes.
+PIN code is a string up to 16 characters in length in straight double quotes.
 .It Cm pin nopin
 Specify no PIN code for the entry.
 .El
 .Sh EXAMPLES
 A sample
 .Nm
-file
+file:
 .Bd -literal
 # Default entry is applied if no better match found
 # It MUST have 00:00:00:00:00:00 as bdaddr
diff --git a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8 b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
index b37c47d8dcf3..1478aeebbbc1 100644
--- a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
+++ b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
@@ -51,7 +51,7 @@ Remote SDP servers are identified by their BD_ADDRs.
 Connection to the local SDP server is made via control socket.
 The
 .Nm
-utility will use Service Search Attribute Request and will print results to 
+utility will use Service Search Attribute Request and will print results to
 the standard output and error messages to the standard error.
 .Pp
 The options are as follows:
@@ -95,6 +95,7 @@ utility only implements client side functionality.
 The
 .Nm
 utility only requests the following attributes from the SDP server:
+.Pp
 .Bl -enum -offset indent -compact
 .It
 Service Record Handle
diff --git a/usr.sbin/bluetooth/sdpd/sdpd.8 b/usr.sbin/bluetooth/sdpd/sdpd.8
index 38f4c6bf8269..3bd46c80ac9c 100644
--- a/usr.sbin/bluetooth/sdpd/sdpd.8
+++ b/usr.sbin/bluetooth/sdpd/sdpd.8
@@ -79,24 +79,24 @@ The default path is
 Specifies the group the
 .Nm
 should run as after it initializes.
-The value specified may be either a group name or a numeric group id.
+The value specified may be either a group name or a numeric group ID.
 This only works if
 .Nm
 was started as root.
 The default group name is
-.Dq nobody .
+.Dq Li nobody .
 .It Fl h
 Display usage message and exit.
 .It Fl u Ar user
 Specifies the user the
 .Nm
 should run as after it initializes.
-The value specified may be either a user name or a numeric user id.
+The value specified may be either a user name or a numeric user ID.
 This only works if
 .Nm
 was started as root.
 The default user name is
-.Dq nobody .
+.Dq Li nobody .
 .El
 .Sh CAVEAT
 The
@@ -107,21 +107,21 @@ will listen for incoming L2CAP connections on a wildcard BD_ADDR.
 In case of multiple Bluetooth devices connected to the same host it is
 possible to specify which services should be
 .Dq bound
-to which Bluetooth device. Such assigment should be done at service
-registration time.
+to which Bluetooth device.
+Such assigment should be done at service registration time.
 .Pp
 Access rights on the control socket define which application can register,
 remove or change the service.
 The application must be able to write to and read from the control socket
-in order to perform any query to the Service Database via control socket. 
+in order to perform any query to the Service Database via control socket.
 .Pp
 The
 .Nm
-daemon does not checks for duplicated Service Records.
-It only performs minimal check on the service data sent in the Service
+daemon does not check for duplicated Service Records.
+It only performs minimal checking on the service data sent in the Service
 Register request.
 It is assumed that application must obtain all required resources such
-as RFCOMM channels etc. before registering the service.
+as RFCOMM channels etc., before registering the service.
 .Sh BUGS
 Most likely.
 Please report if found.
diff --git a/usr.sbin/dconschat/dconschat.8 b/usr.sbin/dconschat/dconschat.8
index e11d224d3b5f..f560740d58c8 100644
--- a/usr.sbin/dconschat/dconschat.8
+++ b/usr.sbin/dconschat/dconschat.8
@@ -30,7 +30,8 @@
 .Os
 .Sh NAME
 .Nm dconschat
-.Nd user interface to dcons
+.Nd user interface to
+.Xr dcons 4
 .Sh SYNOPSIS
 .Nm
 .Op Fl brvwRT1
@@ -55,83 +56,121 @@ utility is designed to provide a way for users to access
 (dumb console device) on a local or remote system.
 The
 .Nm
-interacts with
+utility interacts with
 .Xr dcons 4
 using
 .Xr kvm 3
 or
-.Xr firewire 4 
-and interact with a user over tty or TCP/IP.
+.Xr firewire 4 ,
+and interacts with the user over TTY or TCP/IP.
 To access remote
 .Xr dcons 4
 using
 .Xr firewire 4 ,
-you have to specify target EUI64 address by
+you have to specify target EUI64 address using the
 .Fl t
 option.
 .Pp
 The
 .Nm
-and
+utility and the
 .Xr dcons 4
-communicate using 2 port, one for console port and the other for
-remote gdb port.
+driver communicate using 2 ports, one for the console port and another
+for remote
+.Xr gdb 1
+port.
 Users are supposed to access
 .Nm
-using tty, telnet and gdb.
-You can specify listen ports for console and gdb port by
+using TTY,
+.Xr telnet 1
+and
+.Xr gdb 1 .
+You can specify listen ports for console and
+.Xr gdb 1
+port using the
 .Fl C
 and
 .Fl G
-options respectively. The port number 0 has special meaning that
-current tty(stdin/out) is used instead of TCP/IP.
+options respectively.
+The port number 0 has special meaning that
+current TTY (stdin/stdout) is used instead of TCP/IP.
 A negative port number will disable the port.
-To quit dconschat, send a CR + '~' + '.' sequence to the console port
+To quit
+.Nm ,
+send a CR +
+.Ql ~
++
+.Ql \&.
+sequence to the console port,
 or send signal to the process.
 .Pp
 By analogy with
 .Xr pty 4
-device, the 
+device, the
 .Xr dcons 4
 acts as a slave device and
 .Nm
 acts as a master device with
 .Xr telnetd 8 .
-.Pp
-.Bl -tag -width indent 
+.Bl -tag -width indent
 .It Fl b
-Translate Ctrl-C to ALT_BREAK(CR + '~' + Ctrl-B) on gdb port.
+Translate Ctrl-C to ALT_BREAK (CR +
+.Ql ~
++ Ctrl-B) on
+.Xr gdb 1
+port.
 .It Fl r
 Replay old buffer on connection.
 .It Fl v
-Verbose debug output. Multiple '-v' increase verbosity.
+Verbose debug output.
+Multiple
+.Fl v
+options increase verbosity.
 .It Fl w
-Listen on wildcard address rather than localhost.
+Listen on a wildcard address rather than localhost.
 .It Fl R
-Read-only. Don't write anything on dcons buffer.
+Read-only.
+Do not write anything to the
+.Xr dcons 4
+buffer.
 .It Fl T
-Enable ad hoc workaround for telnet protocol to
+Enable ad-hoc workaround for the TELNET protocol to
 remove unnecessary byte sequences.
-It should be set when you access dconschat using telnet.
+It should be set when you access
+.Nm
+using
+.Xr telnet 1 .
 .It Fl 1
-One-Shot. Read available buffer then exit. This implies
+One-shot.
+Read available buffer, then exit.
+This implies the
 .Fl r
 option.
 .It Fl h Ar hz
-Specify polling rate. The default value is 100.
+Specify polling rate.
+The default value is 100.
 .It Fl C Ar console_port
-Specify console port. The default value is 0(stdin/stdout).
+Specify the console port.
+The default value is 0 (stdin/stdout).
 .It Fl G Ar gdb_port
-Specify gdb port.. The default value is -1(disabled).
+Specify
+.Xr gdb 1
+port.
+The default value is \-1 (disabled).
 .It Fl M Ar core
 Specify core file.
 .It Fl N Ar system
-Specify system file such as /boot/kernel/kernel.
+Specify system file such as
+.Pa /boot/kernel/kernel .
 .It Fl t Ar target_eui64
-Specify the 64bit extended unique identifier of the target and use FireWire to access remote
+Specify the 64-bit extended unique identifier of the target,
+and use FireWire to access remote
 .Xr dcons 4 .
 .It Fl a Ar address
-Specify the physical/IO address of the dcons buffer. See
+Specify the physical I/O address of the
+.Xr dcons 4
+buffer.
+See
 .Xr dcons 4
 for details.
 If this option is not specified,
@@ -141,19 +180,21 @@ You are supposed to enable
 .Xr dcons_crom 4
 on the target to omit this option.
 .It Fl u Ar bus_num
-Specify FireWire bus number. The default is 0.
+Specify FireWire bus number.
+The default is 0.
 .El
-.Sh EXAMPLE
+.Sh EXAMPLES
 To use
-.Nm 
+.Nm
 with FireWire for remote
-.Xr dcons ,
-you have to specify the eui64 of the target.
+.Xr dcons 4 ,
+you have to specify the EUI64 of the target.
 You can obtain EUI64 by running
-.Xr fwcontorl 4
+.Xr fwcontrol 8
 without options.
-The first EUI64 is of the host running fwcontrol and others on the
-bus follow.
+The first EUI64 is of the host running
+.Xr fwcontrol 8
+and others on the bus follow.
 .Bd -literal -offset indent
 # fwcontrol
 2 devices (info_len=2)
@@ -162,48 +203,80 @@ node           EUI64          status
    0  00-11-22-33-44-55-66-77      1
 .Ed
 .Pp
-The EUI64 doesn't change unless you change the hardware
+The EUI64 does not change unless you change the hardware
 as the ethernet address.
 .Pp
-Now we can run the
+Now we can run
 .Nm .
 .Bd -literal -offset indent
 # dconschat -br -G 12345 -t 00-11-22-33-44-55-66-77
 .Ed
 .Pp
-You'll get console output of the target and login prompt if a getty is
-running on dcons. You can break to DDB with ALT_BREAK (CR + '~' + Ctrl-B)
-if DDB and ALT_BREAK_TO_DEBUGGER is enabled in the target kernel.
-To quit the session, type CR + '~' + '.' in the console port.
+You will get console output of the target and login prompt if a
+.Xr getty 8
+is running on
+.Xr dcons 4 .
+You can break to DDB with ALT_BREAK (CR +
+.Ql ~
++ Ctrl-B)
+if
+.Dv DDB
+and
+.Dv ALT_BREAK_TO_DEBUGGER
+are enabled in the target kernel.
+To quit the session, type CR +
+.Ql ~
++
+.Ql \&.
+in the console port.
 .Pp
-Using gdb port is almost the same as remote gdb over serial line except
-using TCP/IP instead of /dev/cu*. See 
-"On-line Kernel Debugging Using Remote GDB"
-section of The FreeBSD Developers Handbook and
+Using
+.Xr gdb 1
+port is almost the same as remote
+.Xr gdb 1
+over serial line except
+using TCP/IP instead of
+.Pa /dev/cu* .
+See
+.Sx "On-line Kernel Debugging Using Remote GDB"
+section of
+.%T "The FreeBSD Developers Handbook"
+and
 .Xr gdb 4
-for detail. 
+for details.
 .Bd -literal -offset indent
 % gdb -k kernel.debug
 (kgdb) target remote :12345
 .Ed
 .Pp
-Once gdb is attached and you specified '-b' option to dconschat,
-typing "Ctrl-C" on gdb causes break to debugger.
+Once
+.Xr gdb 1
+is attached and you specified the
+.Fl b
+option to
+.Nm ,
+typing Ctrl-C in
+.Xr gdb 1
+causes a break to debugger.
 .Pp
-The following command get console log from crash dump:
+The following command gets the console log from the crash dump:
 .Bd -literal -offset indent
 # dconschat -1 -M vmcore.0 -N kernel.0
 .Ed
 .Pp
-If you want access to the console using telnet, try the following:
+If you want access to the console using
+.Xr telnet 1 ,
+try the following:
 .Bd -literal -offset indent
 # dconschat -rTC 5555 &
 # telnet localhost 5555
 .Ed
 .Pp
-You may want to keep logging console output of several machines. Conserve-com
-in the ports collection may help you. Insert the following lines
-in the conserver.cf.
+You may want to keep logging console output of several machines.
+.Nm conserver-com
+in the Ports collection may help you.
+Insert the following lines in
+.Pa conserver.cf :
 .Bd -literal -offset indent
 console local {
 	master localhost;
@@ -217,7 +290,7 @@ console remote {
 }
 .Ed
 .Sh FILES
-.Bl -tag -width indent
+.Bl -tag -width indent -compact
 .It Pa /dev/fwmem0.0
 .It Pa /dev/mem
 .It Pa /dev/kmem
@@ -237,5 +310,5 @@ console remote {
 .Sh AUTHORS
 .An Hidetoshi Shimokawa Aq simokawa@FreeBSD.org
 .Sh BUGS
-This utility is still under development.
-.Pp
+This utility is
+.Ud .
diff --git a/usr.sbin/ip6addrctl/ip6addrctl.8 b/usr.sbin/ip6addrctl/ip6addrctl.8
index 0ba942da77ef..018743b95051 100644
--- a/usr.sbin/ip6addrctl/ip6addrctl.8
+++ b/usr.sbin/ip6addrctl/ip6addrctl.8
@@ -2,7 +2,7 @@
 .\"
 .\" Copyright (C) 2001 WIDE Project.
 .\" All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -14,7 +14,7 @@
 .\" 3. Neither the name of the project nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE PROJECT 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,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\" $FreeBSD$
 .\"
 .Dd September 25, 2001
 .Dt IP6ADDRCTL 8
@@ -38,24 +38,24 @@
 .Nd configure address selection policy for IPv6 and IPv4
 .\"
 .Sh SYNOPSIS
-.Nm ip6addrctl
+.Nm
 .Op Cm show
-.Nm ip6addrctl
+.Nm
 .Cm add
 .Ar prefix precedence label
-.Nm ip6addrctl
+.Nm
 .Cm delete
 .Ar prefix
-.Nm ip6addrctl
+.Nm
 .Cm flush
-.Nm ip6addrctl
+.Nm
 .Cm install
 .Ar configfile
 .\"
 .Sh DESCRIPTION
 The
 .Nm
-command manages the policy table of source and destination address
+utility manages the policy table of source and destination address
 selection for outgoing IPv4 and IPv6 packets.
 When
 .Nm
@@ -65,53 +65,59 @@ it prints the content of the policy table currently installed in the
 kernel.
 .Pp
 To modify the table, the following operations are available:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Cm add Ar prefix precedence label
-add a policy entry.
-.Ar Prefix
+Add a policy entry.
+The
+.Ar prefix
+argument
 is an IPv6 prefix, which is a key for the entry.
 An IPv4 prefix should be specified with an IPv6 prefix using an
 IPv4-mapped IPv6 address.
-.Ar Precedence
+The
+.Ar precedence
 and
 .Ar label
+arguments
 are decimal numbers, which specify the precedence and label values
 for the entry, respectively.
 This operation should be performed without an existing entry for the
 prefix.
 .It Cm delete Ar prefix
-delete a policy entry specified by
+Delete a policy entry specified by
 .Ar prefix ,
 which should be an IPv6 prefix.
 A corresponding entry for the prefix should have already been
 installed.
 .It Cm flush
-delete all existing policy entries in the kernel.
+Delete all existing policy entries in the kernel.
 .It Cm install Ar configfile
-install policy entries from a configuration file named
+Install policy entries from a configuration file named
 .Ar configfile .
 The configuration file should contain a set of policy entries.
 Each entry is specified in a single line which contains an IPv6 prefix,
 a decimal precedence value, and a decimal label value, separated with
 white space or tab characters.
-In the configuration file, lines beginning with the pound-sign (#) are
+In the configuration file, lines beginning with the pound-sign
+.Pq Ql #
+are
 comments and are ignored.
 .El
 .\"
-.Sh RETURN VALUES
-The program exits with 0 on success, non-zero on failures.
+.Sh DIAGNOSTICS
+.Ex -std
 .\"
 .Sh SEE ALSO
-Richard Draves,
-.Do
-Default Address Selection for IPv6
-.Dc ,
-RFC 3484.
+.Rs
+.%A "Richard Draves"
+.%T "Default Address Selection for IPv6"
+.%N RFC 3484
+.Re
 .\"
 .Sh HISTORY
 The
 .Nm
-command first appeared in the KAME IPv6 protocol stack kit.
+utility first appeared in the KAME IPv6 protocol stack kit.
 The original command name was
 .Nm addrselect ,
 but it was then renamed to the current one so that the name would
diff --git a/usr.sbin/ndiscvt/ndiscvt.8 b/usr.sbin/ndiscvt/ndiscvt.8
index 7d6fb9cc1c2e..6ba8a5b4049d 100644
--- a/usr.sbin/ndiscvt/ndiscvt.8
+++ b/usr.sbin/ndiscvt/ndiscvt.8
@@ -35,22 +35,34 @@
 .Os
 .Sh NAME
 .Nm ndiscvt
-.Nd Convert Windows(r) NDIS drivers for use with FreeBSD
+.Nd convert
+.Tn Windows\[rg]
+NDIS drivers for use with
+.Fx
 .Sh SYNOPSIS
 .Nm
-.Op Fl i Ar <inffile>
-.Fl s Ar <sysfile>
+.Op Fl i Ar inffile
+.Fl s Ar sysfile
 .Op Fl n Ar devname
-.Op Fl o Ar <outfile>
+.Op Fl o Ar outfile
 .Sh DESCRIPTION
 The
 .Nm
-utility transforms a Windows(r) NDIS driver into a data file which
+utility transforms a
+.Tn Windows\[rg]
+NDIS driver into a data file which
 is used to build an
 .Xr ndis 4
-compatibility driver module. Windows(r) drivers consist of two main
-parts: a .SYS file, which contains the actual driver executable code,
-and a .INF file, which provides the Windows(r) installer with device
+compatibility driver module.
+.Tn Windows\[rg]
+drivers consist of two main parts: a
+.Pa .SYS
+file, which contains the actual driver executable code,
+and an
+.Pa .INF
+file, which provides the
+.Tn Windows\[rg]
+installer with device
 identifier information and a list of driver-specific registry keys.
 The
 .Nm
@@ -62,19 +74,27 @@ the
 .Fx
 kernel.
 .Pp
-The .INF file is typically required since only it contains device
+The
+.Pa .INF
+file is typically required since only it contains device
 identification data such as PCI vendor and device IDs or PCMCIA
-indentifier strings. The .INF file may be optionally omitted however,
+indentifier strings.
+The
+.Pa .INF
+file may be optionally omitted however,
 in which case the
 .Nm
-utility will only perform the conversion of the .SYS file. This is
-useful for debugging purposes only.
-.Pp
+utility will only perform the conversion of the
+.Pa .SYS
+file.
+This is useful for debugging purposes only.
 .Sh OPTIONS
 The options are as follows:
 .Bl -tag -width indent
-.It Op Fl i Ar <inffile>
-Open and parse the specified .INF file when performing conversion.
+.It Fl i Ar inffile
+Open and parse the specified
+.Pa .INF
+file when performing conversion.
 The
 .Nm
 utility will parse this file and emit a device identification
@@ -87,26 +107,38 @@ kernel subsystem.
 If this is omitted,
 .Nm
 will emit a dummy configuration structure only.
-.It Fl s Ar <sysfile>
-Open and parse the specified .SYS file. This file must contain
-a Windows(r) driver image. The
+.It Fl s Ar sysfile
+Open and parse the specified
+.Pa .SYS
+file.
+This file must contain a
+.Tn Windows\[rg]
+driver image.
+The
 .Nm
 utility will perform some manipulation of the sections within the
 executable file to make runtime linking within the kernel a little
 easier and then convert the image into a data array.
-.It Op Fl n Ar devname
+.It Fl n Ar devname
 Specify an alternate name for the network device/interface which will
-be created when the driver is instantiated. If you need to load more
-than one NDIS driver into your system (i.e. if you have two different
+be created when the driver is instantiated.
+If you need to load more
+than one NDIS driver into your system (i.e., if you have two different
 network cards in your system which require NDIS driver support), each
-module you create must have a unique name. Device can not be larger
-than IFNAMSIZ. If no name is specified, the driver will use the
-default a default name (``ndis'').
-.It Op Fl o Ar <outfile>
-Specify the output file in which to place the resulting data. This
-can be any file pathname. If
-.Ar <outfile>
-is a single dash, the data will be written to the standard output.
+module you create must have a unique name.
+Device can not be larger than
+.Dv IFNAMSIZ .
+If no name is specified, the driver will use the
+default a default name
+.Pq Dq Li ndis .
+.It Fl o Ar outfile
+Specify the output file in which to place the resulting data.
+This can be any file pathname.
+If
+.Ar outfile
+is a single dash
+.Pq Sq Fl ,
+the data will be written to the standard output.
 The
 .Pa if_ndis.c
 module expects to find the driver data in a file called
@@ -120,8 +152,9 @@ so it is recommended that this name be used.
 The
 .Nm
 utility first appeared in
-.Fx 5.3.
+.Fx 5.3 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Nm
 utility was written by
@@ -130,5 +163,6 @@ The
 .Xr lex 1
 and
 .Xr yacc 1
-INF file parser was written by
-.An Matthew Dodd Aq mdodd@freebsd.org .
+.Pa INF
+file parser was written by
+.An Matthew Dodd Aq mdodd@FreeBSD.org .
diff --git a/usr.sbin/newsyslog/newsyslog.conf.5 b/usr.sbin/newsyslog/newsyslog.conf.5
index 8a0d306df445..c6d69d886c31 100644
--- a/usr.sbin/newsyslog/newsyslog.conf.5
+++ b/usr.sbin/newsyslog/newsyslog.conf.5
@@ -21,12 +21,14 @@
 .\" the suitability of this software for any purpose.  It is
 .\" provided "as is" without express or implied warranty.
 .\"
-.Dd June 03, 2004
+.Dd June 3, 2004
 .Dt NEWSYSLOG.CONF 5
 .Os
 .Sh NAME
 .Nm newsyslog.conf
-.Nd configuration of the newsyslog utility
+.Nd
+.Xr newsyslog 8
+configuration file
 .Sh DESCRIPTION
 The
 .Nm
@@ -45,31 +47,30 @@ reads a configuration file,
 normally
 .Pa /etc/newsyslog.conf ,
 to determine which logs may potentially be rotated and archived.
-Each line has five mandatory fields and four optional fields
+Each line has five mandatory fields and four optional fields,
 separated with whitespace.
 Blank lines or lines beginning with
-.Dq #
+.Ql #
 are ignored.
 If
-.Dq #
+.Ql #
 is placed in the middle of the line, the
-.Dq #
+.Ql #
 character and the rest of the line after it is ignored.
 To prevent special meaning, the
-.Dq #
+.Ql #
 character may be escaped with
-.Dq \e\e ,
+.Ql \e\e ;
 in this case preceding
-.Dq \e\e
+.Ql \e\e
 is removed and
-.Dq #
-treated as ordinary character.
+.Ql #
+is treated as an ordinary character.
 The fields of the configuration file are as follows:
-.Pp
 .Bl -tag -width indent
 .It Ar logfile_name
 Name of the system log file to be archived, or the literal string
-.Dq Aq default .
+.Dq Aq Li default .
 The special default entry will only be used if a log file
 name is given as a command line argument to
 .Xr newsyslog 8 ,
@@ -78,7 +79,7 @@ line in the configuration file.
 .It Ar owner : Ns Ar group
 This optional field specifies the owner and group for the archive file.
 The
-.Dq \&:
+.Ql \&:
 is essential regardless if the
 .Ar owner
 or
@@ -98,7 +99,7 @@ When the size of the log file reaches
 .Ar size
 in kilobytes, the log file will be trimmed as described above.
 If this field contains an asterisk
-.Pq Ql \&* ,
+.Pq Ql * ,
 the log file will not be trimmed based on size.
 .It Ar when
 The
@@ -107,7 +108,7 @@ field may consist of an interval, a specific time, or both.
 If the
 .Ar when
 field contains an asterisk
-.Pq Ql \&*
+.Pq Ql * ,
 log rotation will solely depend on the contents of the
 .Ar size
 field.
@@ -120,9 +121,9 @@ and a time in restricted
 .Tn ISO 8601
 format.
 Additionally, the format may also be constructed with a
-.So Li \&$ Sc Ns No -sign
-along with a rotation time specification of once
-a day, once a week or once a month.
+.Ql $
+sign along with a rotation time specification of once
+a day, once a week, or once a month.
 .Pp
 If a time is specified, the log file will only be trimmed if
 .Xr newsyslog 8
@@ -136,43 +137,24 @@ take place.
 There is no provision for the specification of a timezone.
 There is little point in specifying an explicit minutes or
 seconds component in the current implementation, since the only comparison is
-.Sq within the hour .
+.Dq within the hour .
 .Pp
-.Sy ISO 8601 restricted time format:
+.Sy ISO 8601 restricted time format :
 .Pp
 The lead-in character for a restricted
 .Tn ISO 8601
 time is an
-.So Li \&@ Sc Ns No -sign .
+.Ql @
+sign.
 The particular format of the time in restricted
 .Tn ISO 8601
 is:
 .Sm off
 .Oo
+.Op Oo Oo Oo Va cc Oc Va yy Oc Va mm Oc Va dd
 .Oo
-.Oo
-.Oo
-.Oo
-.Va \&cc
-.Oc
-.Va \&yy
-.Oc
-.Va \&mm
-.Oc
-.Va \&dd
-.Oc
-.Oo
-.Li \&T
-.Oo
-.Va \&hh
-.Oo
-.Va \&mm
-.Oo
-.Va \&ss
-.Oc
-.Oc
-.Oc
-.Oc
+.Li T
+.Op Va hh Oo Va mm Oo Va ss Oc Oc Oc
 .Oc .
 .Sm on
 Optional date fields default to the appropriate component of the
@@ -198,69 +180,69 @@ equivalent:
 .It
 .Sq Li 22T
 .It
-.Sq Li \&T
+.Sq Li T
 .It
 .Sq Li \&
 .El
 .Pp
 .Sy Day, week, and month time format:
 .Pp
-The lead-in character for day, week, and month specification is an
-.So Li \&$ Sc Ns No -sign .
+The lead-in character for day, week, and month specification is a
+.Ql $
+sign.
 The particular format of day, week, and month specification is:
-.Op Va D\&hh ,
-.Op Va W\&w Ns Op Va D\&hh
+.Op Li D Ns Va hh ,
+.Op Li W Ns Va w Ns Op Li D Ns Va hh ,
 and
-.Op Va M\&dd Ns Op Va D\&hh
+.Op Li M Ns Va dd Ns Op Li D Ns Va hh ,
 respectively.
 Optional time fields default to midnight.
 The ranges for day and hour specifications are:
 .Pp
-.Bl -tag -width Ds -compact -offset indent
+.Bl -tag -width indent -offset indent -compact
 .It Ar hh
-hours, range 0 ... 23
+hours, range 0..23
 .It Ar w
-day of week, range 0 ... 6, 0 = Sunday
+day of week, range 0..6, 0 = Sunday
 .It Ar dd
-day of month, range 1 ... 31, or one of the letters
-.Em L
+day of month, range 1..31, or one of the letters
+.Ql L
 or
-.Em l
+.Ql l
 to specify the last day of the month.
 .El
 .Pp
 Some examples:
 .Pp
-.Bl -tag -width Ds -compact -offset indent
-.It Ar $D0
+.Bl -tag -width indent -offset indent -compact
+.It Li $D0
 rotate every night at midnight
 (same as
-.Ar @T00 )
-.It Ar $D23
-rotate every day at 23:00 hr
+.Li @T00 )
+.It Li $D23
+rotate every day at 23:00
 (same as
-.Ar @T23 )
-.It Ar $W0D23
-rotate every week on Sunday at 23:00 hr
-.It Ar $W5D16
-rotate every week on Friday at 16:00 hr
-.It Ar $M1D0
+.Li @T23 )
+.It Li $W0D23
+rotate every week on Sunday at 23:00
+.It Li $W5D16
+rotate every week on Friday at 16:00
+.It Li $M1D0
 rotate at the first day of every month at midnight
 (i.e., the start of the day; same as
-.Ar @01T00 )
-.It Ar $M5D6
-rotate on every 5th day of month at 6:00 hr
+.Li @01T00 )
+.It Li $M5D6
+rotate on every 5th day of month at 6:00
 (same as
-.Ar @05T06 )
+.Li @05T06 )
 .El
-.Pp
 .It Ar flags
 This optional field is made up of one or more characters
 that specify any special processing to be done for the log
 files matched by this line.
 The following are valid flags:
 .Bl -tag -width indent
-.It Sy B
+.It Cm B
 indicates that the log file is a binary file, or has some
 special format.
 Usually
@@ -271,23 +253,25 @@ message into a log file during rotation.
 This message is used to indicate
 when, and sometimes why the log file was rotated.
 If
-.Sy B
+.Cm B
 is specified, then that informational message will not be
 inserted into the log file.
-.It Sy C
+.It Cm C
 indicates that the log file should be created if it does not
 already exist, and if the
 .Fl C
 option was also specified on the command line.
-.It Sy D
+.It Cm D
 indicates that
 .Xr newsyslog 8
-should set the NODUMP flag when creating a new version of
+should set the
+.Dv UF_NODUMP
+flag when creating a new version of
 this log file.
 This option would effect how the
 .Xr dump 8
 command treats the log file when making a file system backup.
-.It Sy G
+.It Cm G
 indicates that the specified
 .Ar logfile_name
 is a shell pattern, and that
@@ -297,43 +281,43 @@ other options on this line.
 See
 .Xr glob 3
 for details on syntax and matching rules.
-.It Sy J
+.It Cm J
 indicates that
 .Xr newsyslog 8
 should attempt to save disk space by compressing the rotated
 log file using
 .Xr bzip2 1 .
-.It Sy N
+.It Cm N
 indicates that there is no process which needs to be signaled
 when this log file is rotated.
-.It Sy U
+.It Cm U
 indicates that the file specified by
 .Ar path_to_pid_file
-will contain the id for a process group instead of a process.
+will contain the ID for a process group instead of a process.
 This option also requires that the first line in that file
-be a negative value to distinguish it from a process id.
-.It Sy W
+be a negative value to distinguish it from a process ID.
+.It Cm W
 if used with the
-.Sy Z
+.Cm Z
 or
-.Sy J
+.Cm J
 flag, this indicates that
 .Xr newsyslog 8
 should wait for previously started compression jobs to complete before
 starting a new one for this entry.
 If this is used with the
-.Sy G
+.Cm G
 flag and if multiple log files match the given pattern, then
 .Xr newsyslog 8
 will compress those logs one by one.
 This ensures that only one compression job is running at a time.
-.It Sy Z
+.It Cm Z
 indicates that
 .Xr newsyslog 8
 should attempt to save disk space by compressing the rotated
 log file using
 .Xr gzip 1 .
-.It Sy -
+.It Fl
 a minus sign will not cause any special processing, but it
 can be used as a placeholder to create a
 .Ar flags
@@ -341,26 +325,26 @@ field when you need to specify any of the following fields.
 .El
 .It Ar path_to_pid_file
 This optional field specifies the file name containing a daemon's
-process id or to find a group process id if the
-.Sy U
+process ID or to find a group process ID if the
+.Cm U
 flag was specified.
 If this field is present, a
 .Ar signal_number
-is sent the process id contained in this file.
+is sent the process ID contained in this file.
 If this field is not present, then a
 .Dv SIGHUP
 signal will be sent to
 .Xr syslogd 8 ,
 unless the
-.Sy N
+.Cm N
 flag has been specified.
 This field must start with
-.Dq /
+.Ql /
 in order to be recognized properly.
 .It Ar signal_number
 This optional field specifies the signal number that will be sent
 to the daemon process (or to all processes in a process group, if the
-.Sy U
+.Cm U
 flag was specified).
 If this field is not present, then a
 .Dv SIGHUP
diff --git a/usr.sbin/nologin/nologin.5 b/usr.sbin/nologin/nologin.5
index 9d63c889e115..10ffbb805c07 100644
--- a/usr.sbin/nologin/nologin.5
+++ b/usr.sbin/nologin/nologin.5
@@ -57,12 +57,8 @@ Ignored by
 .Xr login 1
 for user root.
 .Sh FILES
-.Bl -tag -width /var/run/nologinxxx -compact
+.Bl -tag -width ".Pa /var/run/nologin" -compact
 .It Pa /var/run/nologin
-The
-.Nm
-file resides in
-.Pa /var/run .
 .El
 .Sh SEE ALSO
 .Xr login 1 ,
diff --git a/usr.sbin/watchdogd/watchdog.8 b/usr.sbin/watchdogd/watchdog.8
index 9ce8ea949abd..47835d18a044 100644
--- a/usr.sbin/watchdogd/watchdog.8
+++ b/usr.sbin/watchdogd/watchdog.8
@@ -38,7 +38,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility can be used to control the kernels watchdog facility.
+utility can be used to control the kernel's watchdog facility.
 .Pp
 The
 .Fl t Ar timeout
@@ -55,7 +55,7 @@ The
 utility and manual page were written by
 .An Sean Kelly Aq smkelly@FreeBSD.org
 and
-.An Poul-Henning Kamp Aq phk@FreeBSD.org
+.An Poul-Henning Kamp Aq phk@FreeBSD.org .
 .Pp
 Some contributions made by
 .An Jeff Roberson Aq jeff@FreeBSD.org .
diff --git a/usr.sbin/watchdogd/watchdogd.8 b/usr.sbin/watchdogd/watchdogd.8
index 673248ac2999..e20ec56a1f9c 100644
--- a/usr.sbin/watchdogd/watchdogd.8
+++ b/usr.sbin/watchdogd/watchdogd.8
@@ -30,7 +30,7 @@
 .Os
 .Sh NAME
 .Nm watchdogd
-.Nd Watchdog daemon
+.Nd watchdog daemon
 .Sh SYNOPSIS
 .Nm
 .Op Fl d
@@ -53,12 +53,12 @@ If
 is specified,
 .Nm
 will attempt to execute this command with
-.Xr system 3
+.Xr system 3 ,
 and only if the command returns with a zero exit code will the
 watchdog be reset.
 If
 .Fl e Ar cmd
-is not specified the daemon will perform a trivial file system
+is not specified, the daemon will perform a trivial file system
 check instead.
 .Pp
 The
@@ -91,7 +91,7 @@ The
 utility recognizes the following runtime options:
 .Bl -tag -width ".Fl I Ar file"
 .It Fl I Ar file
-Write the process id of the
+Write the process ID of the
 .Nm
 utility in the specified file.
 .It Fl d
diff --git a/usr.sbin/zzz/zzz.8 b/usr.sbin/zzz/zzz.8
index 918afe26e5e0..583d5fd963ae 100644
--- a/usr.sbin/zzz/zzz.8
+++ b/usr.sbin/zzz/zzz.8
@@ -37,7 +37,7 @@ The
 .Nm
 utility
 checks for
-.Tn ACPI 
+.Tn ACPI
 or
 .Tn APM
 support and then suspends the system appropriately.
@@ -61,5 +61,5 @@ will be issued.
 .Xr acpiconf 8 ,
 .Xr apm 8
 .Sh AUTHORS
-This manual page is written by
-.An Nate Lawson Aq njl@FreeBSD.ORG
+This manual page was written by
+.An Nate Lawson Aq njl@FreeBSD.org .