Avoid use of direct troff requests in mdoc(7) manual pages.

18 files changed, 106 insertions, 133 deletions

diff --git a/usr.bin/colldef/colldef.1 b/usr.bin/colldef/colldef.1
index f36d0b4..4473c7b 100644
--- a/usr.bin/colldef/colldef.1
+++ b/usr.bin/colldef/colldef.1
@@ -123,12 +123,11 @@ names are separated from their values by TAB or
 SPACE characters. symbol-value can be specified in
 a hexadecimal (\ex\fI??\fR) or octal (\e\fI???\fR)
 representation, and can be only one character in length.
-.Pp
+.Bd -literal
 .Ar symbol-name1 symbol-value1
-.br
 .Ar symbol-name2 symbol-value2
-.br
 .Ar ...
+.Ed
 .Pp
 The
 .Ar charmap
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index 69c2873..eea118b 100644
--- a/usr.bin/compress/compress.1
+++ b/usr.bin/compress/compress.1
@@ -143,7 +143,6 @@ is encoded within the output, along with
 a magic number to ensure that neither decompression of random data nor
 recompression of compressed data is attempted.
 .Pp
-.ne 8
 The amount of compression obtained depends on the size of the
 input, the number of
 .Ar bits
diff --git a/usr.bin/doscmd/doscmd.1 b/usr.bin/doscmd/doscmd.1
index cb86bb6..d142d35 100644
--- a/usr.bin/doscmd/doscmd.1
+++ b/usr.bin/doscmd/doscmd.1
@@ -373,7 +373,7 @@ is specified the floppy will be read only.
 The
 .Ar density
 may be one of:
-.sp
+.Pp
 .Bl -tag -compact -width 1440x
 .It 180
 9 head 40 track single sided floppy
@@ -478,21 +478,20 @@ for
 .Cm C:
 will be set to the actual current directory.
 Note that this means that invocations such as:
-.sp
-	doscmd ../foo
-.sp
+.Pp
+.Dl "doscmd ../foo
+.Pp
 will not work as the
 .Cm C:
 directory will start with the current path.
 Also, the following environment variables will be defined if not
 already defined:
-
-.nf
+.Bd -literal
 .Cm "COMSPEC=C:\eCOMMAND.COM
 .Cm "PATH=C:\e
 .Cm "PROMPT=DOS> 
-.fi
-
+.Ed
+.Pp
 The
 .Cm PATH
 variable is also used to find
@@ -731,9 +730,9 @@ If
 .Nm doscmd
 encounters an interrupt which is unimplemented, it will print a message
 such as:
-.sp
-	Unknown interrupt 21 function 99
-.sp
+.Pp
+.Dl Unknown interrupt 21 function 99
+.Pp
 and exit.
 .Pp
 If
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index e4cef28..e50b396 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -163,22 +163,23 @@ between this version and System V
 is that this version treats any white space
 as a delimiter, so that spaces in pattern strings must be escaped.
 For example,
-.br
->10	string	language impress\ 	(imPRESS data)
-.br
+.Bd -literal -compact
+>10	string	language impress	(imPRESS data)
+.Ed
 in an existing magic file would have to be changed to
-.br
+.Bd -literal -compact
 >10	string	language\e impress	(imPRESS data)
-.br
+.Ed
+.Pp
 In addition, in this version, if a pattern string contains a backslash,
 it must be escaped.  For example
-.br
+.Bd -literal -compact
 0	string		\ebegindata	Andrew Toolkit document
-.br
+.Ed
 in an existing magic file would have to be changed to
-.br
+.Bd -literal -compact
 0	string		\e\ebegindata	Andrew Toolkit document
-.br
+.Ed
 .Pp
 SunOS releases 3.2 and later from Sun Microsystems include a
 .Xr file 1
@@ -186,8 +187,9 @@ command derived from the System V one, but with some extensions.
 My version differs from Sun's only in minor ways.
 It includes the extension of the `&' operator, used as,
 for example,
-.br
+.Bd -literal -compact
 >16	long&0x7fffffff	>0		not stripped
+.Ed
 .Sh MAGIC DIRECTORY
 The magic file entries have been collected from various sources,
 mainly USENET, and contributed by various authors.
diff --git a/usr.bin/indent/indent.1 b/usr.bin/indent/indent.1
index b7af9b4..b75fd78 100644
--- a/usr.bin/indent/indent.1
+++ b/usr.bin/indent/indent.1
@@ -143,7 +143,6 @@ turns off this option.  Default:
 Specifying
 .Fl \&bl
 lines-up compound statements like this:
-.ne 4
 .Bd -literal -offset indent
 if (...)
 {
@@ -154,7 +153,6 @@ if (...)
 Specifying
 .Fl \&br
 (the default) makes them look like this:
-.ne 3
 .Bd -literal -offset indent
 if (...) {
   code
@@ -170,7 +168,6 @@ is for these comments to start in the same column as those on code.
 Enables (disables) the placement of comment delimiters on blank lines.  With
 this option enabled, comments look like this:
 .Bd -literal -offset indent
-.ne 3
 	/*
 	 * this is a comment
 	 */
@@ -263,13 +260,11 @@ will be lined up to start at the character position just after the left
 paren.  For example, here is how a piece of continued code looks with
 .Fl nlp
 in effect:
-.ne 2
 .Bd -literal -offset indent
 p1 = first_procedure(second_procedure(p2, p3),
 \ \ third_procedure(p4, p5));
 .Ed
 .Pp
-.ne 5
 With
 .Fl lp
 in effect (the default) the code looks somewhat clearer:
@@ -278,7 +273,6 @@ p1\ =\ first_procedure(second_procedure(p2,\ p3),
 \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ third_procedure(p4,\ p5));
 .Ed
 .Pp
-.ne 5
 Inserting two more newlines we get:
 .Bd -literal -offset indent
 p1\ =\ first_procedure(second_procedure(p2,
@@ -444,7 +438,6 @@ command appeared in
 has even more switches than
 .Xr ls 1 .
 .Pp
-.ne 5
 A common mistake that often causes grief is typing:
 .Pp
 .Dl indent *.c
diff --git a/usr.bin/key/key.1 b/usr.bin/key/key.1
index a20dd41..9546929 100644
--- a/usr.bin/key/key.1
+++ b/usr.bin/key/key.1
@@ -6,7 +6,7 @@
 .Os
 .Sh NAME
 .Nm key
-.Nd stand\-alone program for computing responses to S/Key challenges
+.Nd stand-alone program for computing responses to S/Key challenges
 .Sh SYNOPSIS
 .Nm
 .Op Fl n Ar count
@@ -21,18 +21,15 @@ it prompts for the user's secret password, and produces both word
 and hex format responses.
 .Sh EXAMPLE
 Usage example:
-.sp 0
- 	>key \-n 5 99 th91334
-.sp 0
- 	Enter password: <your secret password is entered here>
-.sp 0
- 	OMEN US HORN OMIT BACK AHOY
-.sp 0
-	.... 4 more passwords.
-.sp 0
- 	>
+.Bd -literal -offset indent -compact
+>key -n 5 99 th91334
+Enter password: <your secret password is entered here>
+OMEN US HORN OMIT BACK AHOY
+\&.... 4 more passwords.
+>
+.Ed
 .Sh OPTIONS
-.Bl -tag -width indent
+.Bl -tag -width Fl
 .It Fl n Ar count
 The number of one time access passwords to print.
 The default is one.
diff --git a/usr.bin/keyinfo/keyinfo.1 b/usr.bin/keyinfo/keyinfo.1
index 789d367..db0d401 100644
--- a/usr.bin/keyinfo/keyinfo.1
+++ b/usr.bin/keyinfo/keyinfo.1
@@ -56,7 +56,7 @@ Original command by
 and
 .An John S. Walden .
 Rewritten in Perl by
-.An J\(:org \%Wunsch
+.An J\(:org Wunsch
 so that it could be made setuid, with the S/Key keys file read-protected
 from the users.
 Rewritten in C by
diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index dbfcf32..ec24471 100644
--- a/usr.bin/killall/killall.1
+++ b/usr.bin/killall/killall.1
@@ -141,9 +141,10 @@ The
 program was originally written in Perl and was contributed by
 .An Wolfram Schneider ,
 this manual page has been written by
-.if n Joerg Wunsch.
-.if t J\(:org Wunsch.
+.An J\(:org Wunsch .
 The current version of
 .Nm
-was rewritten in C by Peter Wemm using
+was rewritten in C by
+.An Peter Wemm
+using
 .Xr sysctl 3 .
diff --git a/usr.bin/lam/lam.1 b/usr.bin/lam/lam.1
index b1c9ed8..5644e99 100644
--- a/usr.bin/lam/lam.1
+++ b/usr.bin/lam/lam.1
@@ -110,7 +110,6 @@ joins 4 files together along each line.
 To merge the lines from four different files use
 .Bd -literal
 lam file1 \-S "\\
-.br
 " file2 file3 file4
 .Ed
 
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index cefda61..f9ce04e 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -1033,7 +1033,7 @@ File giving initial mail commands.
 Temporary files.
 .It Pa /usr/share/misc/mail.*help
 Help files.
-.sp
+.Pp
 .It Pa /usr/share/misc/mail.rc
 .It Pa /usr/local/etc/mail.rc
 .It Pa /etc/mail.rc
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index b2720fd..a55e3e3 100644
--- a/usr.bin/mklocale/mklocale.1
+++ b/usr.bin/mklocale/mklocale.1
@@ -128,7 +128,7 @@ Used to end a mapping.  All are equivalent.
 Used as a delimiter in mappings.
 .El
 .El
-.sp
+.Pp
 Key words which should only appear once are:
 .Bl -tag -width PHONOGRAM
 .It Dv ENCODING
@@ -165,11 +165,10 @@ A single
 .Dv RUNE
 follows and is used as the invalid rune for this locale.
 .El
-.sp
+.Pp
 The following keywords may appear multiple times and have the following
 format for data:
-.in +.5i
-.Bl -tag -width "<RUNE1 THRU RUNEn : RUNE2>"
+.Bl -tag -width "<RUNE1 THRU RUNEn : RUNE2>" -offset indent
 .It Dv <RUNE1 RUNE2>
 .Dv RUNE1
 is mapped to
@@ -185,7 +184,6 @@ through
 .Dv RUNE2
 + n-1.
 .El
-.in -.5i
 .Bl -tag -width PHONOGRAM
 .It Dv MAPLOWER
 Defines the tolower mappings.
@@ -210,11 +208,10 @@ Only values up to
 .Nm 255
 are allowed.
 .El
-.sp
+.Pp
 The following keywords may appear multiple times and have the following
 format for data:
-.in +.5i
-.Bl -tag -width "RUNE1 THRU RUNEn"
+.Bl -tag -width "RUNE1 THRU RUNEn" -offset indent
 .It Dv RUNE
 This rune has the property defined by the keyword.
 .It Dv "RUNE1 THRU RUNEn"
@@ -224,7 +221,6 @@ and
 .Dv RUNEn
 have the property defined by the keyword.
 .El
-.in -.5i
 .Bl -tag -width PHONOGRAM
 .It Dv ALPHA
 Defines runes which are alphabetic, printable and graphic.
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index 06d6bec..a036a2c 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -64,8 +64,7 @@ prompts for the new password twice in order to detect typing errors.
 The new password should be at least six characters long (which
 may be overridden using the
 .Xr login.conf 5
-.if t ``minpasswordlen''
-.if n "minpasswordlen"
+.Dq minpasswordlen
 setting for a user's login class) and not purely alphabetic.
 Its total length must be less than
 .Dv _PASSWORD_LEN
@@ -74,8 +73,7 @@ Its total length must be less than
 The new password should contain a mixture of upper and lower case
 characters (which may be overridden using the
 .Xr login.conf 5
-.if t ``mixpasswordcase''
-.if n "mixpasswordcase"
+.Dq mixpasswordcase
 setting for a user's login class).  Allowing lower case passwords may
 be useful where the password file will be used in situations where only
 lower case passwords are permissible, such as when using Samba to
@@ -97,8 +95,7 @@ is used to update the password databases.
 .El
 When changing local or NIS password, the next password change date
 is set according to 
-.if t ``passwordtime''
-.if n "passwordtime"
+.Dq passwordtime
 capability in the user's login class.
 .Pp
 To change another user's Kerberos password, one must first
@@ -115,8 +112,7 @@ If a user exists in the NIS password
 database but does not exist locally,
 .Nm passwd
 automatically switches into 
-.if t ``yppasswd''
-.if n "yppasswd"
+.Dq yppasswd
 mode.
 If the specified
 user does not exist in either the local password database of the
@@ -153,14 +149,12 @@ When NIS is enabled, the
 flag can be used to force
 .Nm passwd
 into 
-.if t ``local only''
-.if n "local only"
+.Dq local only
 mode.
 This flag can be used to change the entry
 for a local user when an NIS user exists with the same login name.
 For example, you will sometimes find entries for system 
-.if t ``placeholder''
-.if n "placeholder"
+.Dq placeholder
 users such as
 .Pa bin
 or
@@ -200,8 +194,7 @@ option and
 is unable to determine the name of the NIS master server (possibly because
 the local domainname isn't set), the name of the NIS master is assumed to
 be 
-.if t ``localhost''.
-.if n "localhost".
+.Dq localhost .
 This can be overridden with the
 .Fl h
 flag.
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index ff55112..f2fe693 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -102,15 +102,13 @@ utility is a printing and pagination filter for text files.
 When multiple input files are specified, each is read, formatted,
 and written to standard output.
 By default, the input is separated into 66-line pages, each with
-.sp
-.in +2
-.ti -2
-\(bu A 5-line header with the page number, date, time, and
+.Bl -bullet
+.It
+A 5-line header with the page number, date, time, and
 the pathname of the file.
-.sp
-.ti -2
-\(bu A 5-line trailer consisting of blank lines.
-.in -2
+.It
+A 5-line trailer consisting of blank lines.
+.El
 .Pp
 If standard output is associated with a terminal,
 diagnostic messages are suppressed until the
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 231bb9e..90efe4a 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -109,9 +109,9 @@ option suppresses this behavior.
 The form of a
 .Nm
 command is as follows:
-.sp
+.Pp
 .Dl [address[,address]]function[arguments]
-.sp
+.Pp
 Whitespace may be inserted before the first address and the function
 portions of the command.
 .Pp
@@ -178,7 +178,7 @@ flag is given.
 In addition,
 .Nm
 has the following two additions to regular expressions:
-.sp
+.Pp
 .Bl -enum -compact
 .It
 In a context address, any character other than a backslash
@@ -195,7 +195,7 @@ and the second
 .Dq x
 stands for itself, so that the regular expression is
 .Dq abcxdef .
-.sp
+.Pp
 .It
 The escape sequence \en matches a newline character embedded in the
 pattern space.
@@ -273,71 +273,68 @@ The function can be preceded by white space.
 The terminating
 .Dq }
 must be preceded by a newline or optional white space.
-.sp
+.Pp
 .Bl -tag -width "XXXXXX" -compact
 .It [2addr] function-list
 Execute function-list only when the pattern space is selected.
-.sp
+.Pp
 .It [1addr]a\e
 .It text
-.br
 Write
 .Em text
 to standard output immediately before each attempt to read a line of input,
 whether by executing the
 .Dq N
 function or by beginning a new cycle.
-.sp
+.Pp
 .It [2addr]b[label]
 Branch to the
 .Dq \&:
 function with the specified label.
 If the label is not specified, branch to the end of the script.
-.sp
+.Pp
 .It [2addr]c\e
 .It text
-.br
 Delete the pattern space.
 With 0 or 1 address or at the end of a 2-address range,
 .Em text
 is written to the standard output.
-.sp
+.Pp
 .It [2addr]d
 Delete the pattern space and start the next cycle.
-.sp
+.Pp
 .It [2addr]D
 Delete the initial segment of the pattern space through the first
 newline character and start the next cycle.
-.sp
+.Pp
 .It [2addr]g
 Replace the contents of the pattern space with the contents of the
 hold space.
-.sp
+.Pp
 .It [2addr]G
 Append a newline character followed by the contents of the hold space
 to the pattern space.
-.sp
+.Pp
 .It [2addr]h
 Replace the contents of the hold space with the contents of the
 pattern space.
-.sp
+.Pp
 .It [2addr]H
 Append a newline character followed by the contents of the pattern space
 to the hold space.
-.sp
+.Pp
 .It [1addr]i\e
 .It text
-.br
 Write
 .Em text
 to the standard output.
-.sp
+.Pp
 .It [2addr]l
 (The letter ell.)
 Write the pattern space to the standard output in a visually unambiguous
 form.
 This form is as follows:
-.sp
+.Pp
 .Bl -tag -width "carriage-returnXX" -offset indent -compact
 .It backslash
 \e\e
@@ -362,28 +359,28 @@ Long lines are folded, with the point of folding indicated by displaying
 a backslash followed by a newline.
 The end of each line is marked with a
 .Dq $ .
-.sp
+.Pp
 .It [2addr]n
 Write the pattern space to the standard output if the default output has
 not been suppressed, and replace the pattern space with the next line of
 input.
-.sp
+.Pp
 .It [2addr]N
 Append the next line of input to the pattern space, using an embedded
 newline character to separate the appended material from the original
 contents.
 Note that the current line number changes.
-.sp
+.Pp
 .It [2addr]p
 Write the pattern space to standard output.
-.sp
+.Pp
 .It [2addr]P
 Write the pattern space, up to the first newline character to the
 standard output.
-.sp
+.Pp
 .It [1addr]q
 Branch to the end of the script and quit without starting a new cycle.
-.sp
+.Pp
 .It [1addr]r file
 Copy the contents of
 .Em file
@@ -393,7 +390,7 @@ If
 .Em file
 cannot be read for any reason, it is silently ignored and no error
 condition is set.
-.sp
+.Pp
 .It [2addr]s/regular expression/replacement/flags
 Substitute the replacement string for the first instance of the regular
 expression in the pattern space.
@@ -443,7 +440,7 @@ if a replacement was made.
 If the replacement string is identical to that which it replaces, it
 is still considered to have been a replacement.
 .El
-.sp
+.Pp
 .It [2addr]t [label]
 Branch to the
 .Dq \&:
@@ -452,14 +449,14 @@ most recent reading of an input line or execution of a
 .Dq t
 function.
 If no label is specified, branch to the end of the script.
-.sp
+.Pp
 .It [2addr]w Em file
 Append the pattern space to the
 .Em file .
-.sp
+.Pp
 .It [2addr]x
 Swap the contents of the pattern and hold spaces.
-.sp
+.Pp
 .It [2addr]y/string1/string2/
 Replace all occurrences of characters in
 .Em string1
@@ -474,27 +471,27 @@ and
 a backslash followed by any character other than a newline is that literal
 character, and a backslash followed by an ``n'' is replaced by a newline
 character.
-.sp
+.Pp
 .It [2addr]!function
 .It [2addr]!function-list
 Apply the function or function-list only to the lines that are
 .Em not
 selected by the address(es).
-.sp
+.Pp
 .It [0addr]:label
 This function does nothing; it bears a label to which the
 .Dq b
 and
 .Dq t
 commands may branch.
-.sp
+.Pp
 .It [1addr]=
 Write the line number to the standard output followed by a newline
 character.
-.sp
+.Pp
 .It [0addr]
 Empty lines are ignored.
-.sp
+.Pp
 .It [0addr]#
 The
 .Dq #
diff --git a/usr.bin/tip/tip/tip.1 b/usr.bin/tip/tip/tip.1
index 8699cc0..35cf4dd 100644
--- a/usr.bin/tip/tip/tip.1
+++ b/usr.bin/tip/tip/tip.1
@@ -125,15 +125,13 @@ system is processed by the shell.
 Fork a child process on the local system to perform special protocols
 such as \s-1XMODEM\s+1.  The child program will be run with the following
 somewhat unusual arrangement of file descriptors:
-.nf
-.in +1i
+.Bd -literal -offset indent -compact
 0 <-> local tty in
 1 <-> local tty out
 2 <-> local tty out
 3 <-> remote tty in
 4 <-> remote tty out
-.in -1i
-.fi
+.Ed
 .It Ic \&~#
 Send a
 .Dv BREAK
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index 489577f..69dde03 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -143,7 +143,7 @@ the octal sequence to the full 3 octal digits.
 .It \echaracter
 A backslash followed by certain special characters maps to special
 values.
-.sp
+.Pp
 .Bl -column
 .It \ea	<alert character>
 .It \eb	<backspace>
@@ -153,14 +153,14 @@ values.
 .It \et	<tab>
 .It \ev	<vertical tab>
 .El
-.sp
+.Pp
 A backslash followed by any other character maps to that character.
 .It c-c
 Represents the range of characters between the range endpoints, inclusively.
 .It [:class:]
 Represents all characters belonging to the defined character class.
 Class names are:
-.sp
+.Pp
 .Bl -column
 .It alnum	<alphanumeric characters>
 .It alpha	<alphabetic characters>
@@ -234,18 +234,18 @@ The
 utility exits 0 on success, and >0 if an error occurs.
 .Sh EXAMPLES
 The following examples are shown as given to the shell:
-.sp
+.Pp
 Create a list of the words in file1, one per line, where a word is taken to
 be a maximal string of letters.
-.sp
+.Pp
 .D1 Li "tr -cs \*q[:alpha:]\*q \*q\en\*q < file1"
-.sp
+.Pp
 Translate the contents of file1 to upper-case.
-.sp
+.Pp
 .D1 Li "tr \*q[:lower:]\*q \*q[:upper:]\*q < file1"
-.sp
+.Pp
 Strip out non-printable characters from file1.
-.sp
+.Pp
 .D1 Li "tr -cd \*q[:print:]\*q < file1"
 .Sh COMPATIBILITY
 System V has historically implemented character ranges using the syntax
diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1
index bb0481a..0ecce11 100644
--- a/usr.bin/tset/tset.1
+++ b/usr.bin/tset/tset.1
@@ -48,7 +48,6 @@
 .Op Fl k Ar ch
 .Op Fl m Ar mapping
 .Op Ar terminal
-.br
 .Nm reset
 .Op Fl IQrSs
 .Op Fl
@@ -63,7 +62,7 @@ initializes terminals.
 .Nm Tset
 first determines the type of terminal that you are using.
 This determination is done as follows, using the first terminal type found.
-.sp
+.Pp
 .Bl -bullet -compact -offset indent
 .It
 The
diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1
index fd3a070..26edefc 100644
--- a/usr.bin/unifdef/unifdef.1
+++ b/usr.bin/unifdef/unifdef.1
@@ -148,11 +148,14 @@ as of the 4.1 Berkeley Software Distribution.
 .Sh SEE ALSO
 .Xr diff 1
 .Sh DIAGNOSTICS
+.Bl -item -compact
+.It
 Inappropriate else or endif.
-.br
+.It
 Premature
 .Tn EOF
 with line numbers of the unterminated #ifdefs.
+.El
 .Pp
 Exit status is 0 if output is exact copy of input, 1 if not, 2 if trouble.
 .Sh BUGS