roughly 3 hours of slaving results in a much more beautiful mdoc man page.

1 files changed, 458 insertions, 546 deletions

diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index fb3b7003f13..4bbc2ce9a42 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -1,303 +1,279 @@
-.\"	$OpenBSD: ed.1,v 1.3 1996/12/10 09:05:56 deraadt Exp $
-.\"	$NetBSD: ed.1,v 1.13 1995/03/21 09:04:38 cgd Exp $
+.\"	$OpenBSD: ed.1,v 1.4 1997/08/03 10:44:32 deraadt Exp $
 .\"
-.TH ED 1 "21 May 1993"
-.SH NAME
-.\" ed, red \- text editor
-ed \- text editor
-.SH SYNOPSIS
-ed [-] [-sx] [-p \fIstring\fR] [\fIfile\fR]
-.\" .LP
-.\" red [-] [-sx] [-p \fIstring\fR] [\fIfile\fR]
-.SH DESCRIPTION
-.B ed
+.Dd May 2 1993
+.Dt ED 1
+.Sh NAME
+.Nm ed
+.Nd text editor
+.Sh SYNOPSIS
+.Nm ed
+.Op Fl
+.Op Fl sx
+.Op Fl p Ar string
+.Op Ar file
+.Sh DESCRIPTION
+.Nm
 is a line-oriented text editor.
 It is used to create, display, modify and otherwise manipulate text
 files.
-.\" .B red
-.\" is a restricted
-.\" .BR ed :
-.\" it can only edit files in the current
-.\" directory and cannot execute shell commands.
-
 If invoked with a
-.I file
+.Ar file
 argument, then a copy of
-.I file
+.Ar file
 is read into the editor's buffer.
 Changes are made to this copy and not directly to
-.I file
+.Ar file
 itself.
 Upon quitting
-.BR ed ,
-any changes not explicitly saved  with a
-.I `w'
+.Nm ed ,
+any changes not explicitly saved with a
+.Em w
 command are lost.
-
+.Pp
 Editing is done in two distinct modes:
-.I command
+.Pa command
 and
-.IR input .
+.Pa input No .
 When first invoked,
-.B ed
+.Nm
 is in command mode.
 In this mode commands are read from the standard input and
 executed to manipulate the contents of the editor buffer.
+.Pp
 A typical command might look like:
-.sp
-.RS
-,s/\fIold\fR/\fInew\fR/g
-.RE
-.sp
+.Bd -literal -offset indent
+,s/old/new/g
+.Ed
+.Pp
 which replaces all occurences of the string
-.I old
+.Pa old
 with
-.IR new .
-
+.Pa new No .
+.Pp
 When an input command, such as
-.I `a'
+.Em a
 (append),
-.I `i'
+.Em i
 (insert) or
-.I `c'
+.em c
 (change), is given,
-.B ed
+.Nm
 enters input mode.  This is the primary means
 of adding text to a file.
 In this mode, no commands are available;
 instead, the standard input is written
 directly to the editor buffer.  Lines consist of text up to and
 including a
-.IR newline
+.Em newline
 character.
 Input mode is terminated by
-entering a single period  (\fI.\fR) on a line.
-
+entering a single period
+.No ( Em \&. Ns No )
+on a line.
+.Pp
 All
-.B ed
+.Nm
 commands operate on whole lines or ranges of lines; e.g.,
 the
-.I `d'
+.Em d
 command deletes lines; the
-.I `m'
+.Em m
 command moves lines, and so on.
 It is possible to modify only a portion of a line by means of replacement,
 as in the example above.  However even here, the
-.I `s'
+.Em s
 command is applied to whole lines at a time.
-
+.Pp
 In general,
-.B ed
+.Nm
 commands consist of zero or more line addresses, followed by a single
 character command and possibly additional parameters; i.e.,
 commands have the structure:
-.sp
-.RS
-.I [address [,address]]command[parameters]
-.RE
-.sp
+.Bd -literal -offset indent
+[address [,address]]command[parameters]
+.Ed
+.Pp
 The address(es) indicate the line or range of lines to be affected by the
 command.  If fewer addresses are given than the command accepts, then
 default addresses are supplied.
-
-.SS OPTIONS
-.TP 8
--s
+.Pp
+.Ss OPTIONS
+.Bl -tag -width Ds
+.It Fl s
 Suppresses diagnostics. This should be used if
-.BR ed 's
+.Nm
 standard input is from a script.
-
-.TP 8
--x
+.It Fl x
 Prompts for an encryption key to be used in subsequent reads and writes
 (see the
-.I `x'
+.Em x
 command).
-
-.TP 8
-.RI \-p \ string
+.It Fl p Ar string
 Specifies a command prompt.  This may be toggled on and off with the
-.I `P'
+.Em P
 command.
-
-.TP 8
-.I file
+.It Ar file
 Specifies the name of a file to read.  If
-.I file
+.Ar file
 is prefixed with a
 bang (!), then it is interpreted as a shell command.  In this case,
 what is read is
 the standard output of
-.I file
+.Ar file
 executed via
-.IR sh (1).
+.Xr sh 1 .
 To read a file whose name begins with a bang, prefix the
-name with a backslash (\\).
+name with a
+.Em \e
+(backslash).
 The default filename is set to
-.I file
+.Ar file
 only if it is not prefixed with a bang.
-
-.SS LINE ADDRESSING
+.El
+.Pp
+.Ss LINE ADDRESSING
 An address represents the number of a line in the buffer.
-.B ed
+.Nm
 maintains a
 .I current address
 which is
 typically supplied to commands as the default address when none is specified.
-When a file is first read,  the current address is set to the last line
+When a file is first read, the current address is set to the last line
 of the file.  In general, the current address is set to the last line
 affected by a command.
-
+.Pp
 A line address is
 constructed from one of the bases in the list below, optionally followed
 by a numeric offset.  The offset may include any combination
 of digits, operators (i.e.,
-.IR + ,
-.I -
+.Em +
+,
+.Em -
 and
-.IR ^ )
+.Em ^
+)
 and whitespace.
 Addresses are read from left to right, and their values are computed
 relative to the current address.
-
+.Pp
 One exception to the rule that addresses represent line numbers is the
 address
-.I 0
+.Em 0
 (zero).
 This means "before the first line,"
 and is legal wherever it makes sense.
-
+.Pp
 An address range is two addresses separated either by a comma or
 semi-colon. The value of the first address in a range cannot exceed the
 value of the second.  If only one address is given in a range, then
 the second address is set to the given address.  If an
-.IR n- tuple
+.Em n Ns No -tuple
 of addresses is given where
-.I n > 2,
+.Em n > 2,
 then the corresponding range is determined by the last two addresses in
 the
-.IR n- tuple.
+.Em n Ns No -tuple.
 If only one address is expected, then the last address is used.
-
+.Pp
 Each address in a comma-delimited range is interpreted relative to the
 current address.  In a semi-colon-delimited range, the first address is
 used to set the current address, and the second address is interpreted
 relative to the first.
-
-
+.Pp
 The following address symbols are recognized.
-
-.TP 8
-\&.
+.Pp
+.Bl -tag -width Ds
+.It Em \&.
 The current line (address) in the buffer.
-
-.TP 8
-$
+.It Em $
 The last line in the buffer.
-
-.TP 8
-n
+.It Em n
 The
-.IR n th,
+.Em n
+th,
 line in the buffer
 where
-.I n
+.Em n
 is a number in the range
-.I [0,$].
-
-.TP 8
-- or ^
+.Em [0,$].
+.It Em - No or Em ^
 The previous line.
 This is equivalent to
-.I -1
+.Em -1
 and may be repeated with cumulative effect.
-
-.TP 8
--\fIn\fR or ^\fIn\fR
+.It Em -n No or Em ^
 The
-.IR n th
+.Em n No th
 previous line, where
-.I n
+.Em n
 is a non-negative number.
-
-.TP 8
-+
+.It Em +
 The
 next line.
 This is equivalent to
-.I +1
+.Em +1
 and may be repeated with cumulative effect.
-
-.TP 8
-+\fIn\fR or whitespace\fIn\fR
+.It Em +n No or whitespace Ns Em n
 The
-.IR n th
+.Em n No th
 next line, where
-.I n
+.Em n
 is a non-negative number.
-.I whitespace
+Whitespace
 followed by a number
-.I n
+.Em n
 is interpreted as
-.IR +n .
-
-.TP 8
-, \fRor\fB %
+.Em +n No .
+.It Em \&, No or Em %
 The first through last lines in the buffer.  This is equivalent to
 the address range
-.I 1,$.
-
-.TP 8
-;
+.Em 1,$.
+.It Em \&;
 The
 current through last lines in the buffer.  This is equivalent to
 the address range
-.I .,$.
-
-.TP 8
-.RI / re/
+.Em .,$.
+.It Em / Ns No re Ns Em /
 The
 next line containing the regular expression
-.IR re .
+.Em re .
 The search wraps to the beginning of the buffer and continues down to the
 current line, if necessary.
-// repeats the last search.
-
-.TP 8
-.RI ? re?
+.Em //
+repeats the last search.
+.It Em ? Ns No re Ns Em ?
 The
 previous line containing the regular expression
-.IR re .
+.Em re .
 The search wraps to the end of the buffer and continues up to the
 current line, if necessary.
-?? repeats the last search.
-
-.TP 8
-.RI \' lc
+.Em ??
+repeats the last search.
+.It Em \&\'lc
 The
 line previously marked by a
-.I `k'
+.Em k
 (mark) command, where
-.I lc
+.Em lc
 is a lower case letter.
-
-.SS REGULAR EXPRESSIONS
+.El
+.Pp
+.Ss REGULAR EXPRESSIONS
 Regular expressions are patterns used in selecting text.
 For example, the
-.B ed
+.Nm
 command
-.sp
-.RS
-g/\fIstring\fR/
-.RE
-.sp
+.Bd -literal -offset indent
+g/string/
+.Ed
+.Pp
 prints all lines containing
-.IR string .
+.Em string .
 Regular expressions are also
 used by the
-.I `s'
+.Em s
 command for selecting old text to be replaced with new.
-
+.Pp
 In addition to a specifying string literals, regular expressions can
 represent
 classes of strings.  Strings thus represented are said to be matched
@@ -305,698 +281,634 @@ by the corresponding regular expression.
 If it is possible for a regular expression
 to match several strings in a line, then the left-most longest match is
 the one selected.
-
+.Pp
 The following symbols are used in constructing regular expressions:
-
-.TP 8
-c
+.Bl -tag -width Dsasdfsd
+.It Em c
 Any character
-.I c
-not listed below, including `{', '}', `(', `)', `<' and `>',
+.Em c
+not listed below, including
+.Em { Ns No ,
+.Em } Ns No ,
+.Em \&( Ns No ,
+.Em \&) Ns No ,
+.Em < Ns No ,
+and
+.Em >
 matches itself.
-
-.TP 8
-\fR\e\fIc\fR
+.It Em \ec
 Any backslash-escaped character
-.IR c ,
-except for `{', '}', `(', `)', `<' and `>',
+.Em c Ns No ,
+except for
+.Em { Ns No ,
+.Em } Ns No ,
+.Em \&( Ns No ,
+.Em \&) Ns No ,
+.Em < Ns No , and
+.Em >
 matches itself.
-
-.TP 8
-\fR.\fR
+.It Em \&.
 Matches any single character.
-
-.TP 8
-.I [char-class]
+.It Em [char-class]
 Matches any single character in
-.IR char-class .
-To include a  `]'
+.Em char-class .
+To include a
+.Em ]
 in
-.IR char-class ,
+.Em char-class Ns No ,
 it must be the first character.
 A range of characters may be specified by separating the end characters
-of the range with a `-', e.g., `a-z' specifies the lower case characters.
+of the range with a
+.Em -
+e.g.,
+.Em a-z
+specifies the lower case characters.
 The following literal expressions can also be used in
-.I char-class
+.Em char-class
 to specify sets of characters:
 .sp
-\ \ [:alnum:]\ \ [:cntrl:]\ \ [:lower:]\ \ [:space:]
+.Em \ \ [:alnum:]\ \ [:cntrl:]\ \ [:lower:]\ \ [:space:]
 .PD 0
-\ \ [:alpha:]\ \ [:digit:]\ \ [:print:]\ \ [:upper:]
+.Em \ \ [:alpha:]\ \ [:digit:]\ \ [:print:]\ \ [:upper:]
 .PD 0
-\ \ [:blank:]\ \ [:graph:]\ \ [:punct:]\ \ [:xdigit:]
+.Em \ \ [:blank:]\ \ [:graph:]\ \ [:punct:]\ \ [:xdigit:]
 .sp
-If `-' appears as the first or last
-character of
-.IR char-class ,
+If
+.Em -
+appears as the first or last character of
+.Em char-class Ns No ,
 then it matches itself.
 All other characters in
-.I char-class
+.Em char-class
 match themselves.
-.sp
+.Pp
 Patterns in
-.I char-class
-of the form:
-.sp
-\ \ [.\fIcol-elm\fR.] or,
-.PD 0
-\ \ [=\fIcol-elm\fR=]
-.sp
+.Em char-class
+of the form
+.Em [.col-elm.] No or, Em [=col-elm=]
 where
-.I col-elm
+.Em col-elm
 is a
-.I collating element
+collating element
 are interpreted according to
-.IR locale (5)
+.Xr locale 5
 (not currently supported).
 See
-.IR regex (3)
+.Xr regex 3
 for an explanation of these constructs.
-
-.TP 8
-[^\fIchar-class\fR]
+.It Em [^char-class]
 Matches any single character, other than newline, not in
-.IR char-class .
-.IR char-class
+.Em char-class Ns No .
+.Em char-class
 is defined
 as above.
-
-.TP 8
-^
-If `^' is the first character of a regular expression, then it
+.It Em ^
+If
+.Em ^
+is the first character of a regular expression, then it
 anchors the regular expression to the beginning of a line.
 Otherwise, it matches itself.
-
-.TP 8
-$
-If `$' is the last character of a regular expression, it
+.It Em $
+If
+.Em $
+is the last character of a regular expression, it
 anchors the regular expression to the end of a line.
 Otherwise, it matches itself.
-
-.TP 8
-\fR\e<\fR
+.It Em \e<
 Anchors the single character regular expression or subexpression
 immediately following it to the beginning of a word.
 (This may not be available)
-
-.TP 8
-\fR\e>\fR
+.It Em \e>
 Anchors the single character regular expression or subexpression
 immediately following it to the end of a word.
 (This may not be available)
-
-.TP 8
-\fR\e(\fIre\fR\e)\fR
+.It Em \e( Ns No re Ns Em \e)
 Defines a subexpression
-.IR re .
+.Em re .
 Subexpressions may be nested.
-A subsequent backreference of the form \fI`\en'\fR, where
-.I n
+A subsequent backreference of the form
+.Em \en Ns No ,
+where
+.Em n
 is a number in the range [1,9], expands to the text matched by the
-.IR n th
+.Em n Ns No th
 subexpression.
-For example, the regular expression `\e(.*\e)\e1' matches any string
+For example, the regular expression
+.Em \e(.*\e)\e1
+matches any string
 consisting of identical adjacent substrings.
 Subexpressions are ordered relative to
 their left delimiter.
-
-.TP 8
-*
+.It Em *
 Matches the single character regular expression or subexpression
-immediately preceding it zero or more times.  If '*' is the first
+immediately preceding it zero or more times.  If
+.Em *
+is the first
 character of a regular expression or subexpression, then it matches
-itself.  The `*' operator sometimes yields unexpected results.
-For example, the regular expression `b*' matches the beginning of
-the string `abbb' (as opposed to the substring `bbb'), since a null match
+itself.  The
+.Em *
+operator sometimes yields unexpected results.
+For example, the regular expression
+.Em b*
+matches the beginning of
+the string
+.Em abbb
+(as opposed to the substring
+.Em bbb Ns No ),
+since a null match
 is the only left-most match.
-
-.TP 8
-\fR\e{\fIn,m\fR\e}\fR or \fR\e{\fIn,\fR\e}\fR or \fR\e{\fIn\fR\e}\fR
+.It Em \e{n,m\e} \e{n,\e} \e{n\e}
 Matches the single character regular expression or subexpression
 immediately preceding it at least
-.I n
+.Em n
 and at most
-.I m
+.Em m
 times.
 If
-.I m
+.Em m
 is omitted, then it matches at least
-.I n
+.Em n
 times.
 If the comma is also omitted, then it matches exactly
-.I n
+.Em n
 times.
-
-.LP
+.El
+.Pp
 Additional regular expression operators may be defined depending on the
 particular
 .IR regex (3)
 implementation.
-
-.SS COMMANDS
+.Ss COMMANDS
 All
-.B ed
+.Nm
 commands are single characters, though some require additonal parameters.
 If a command's parameters extend over several lines, then
 each line except for the last
-must be terminated with a backslash (\\).
-
+must be terminated with a
+.Em \e
+(backslash).
+.Pp
 In general, at most one command is allowed per line.
 However, most commands accept a print suffix, which is any of
-.I `p'
-(print),
-.I `l'
-(list) ,
+.Em p No (print),
+.Em l No (list),
 or
-.I `n'
-(enumerate),
+.Em n No (enumerate),
 to print the last line affected by the command.
-
+.Pp
 An interrupt (typically ^C) has the effect of aborting the current command
 and returning the editor to command mode.
-
-.B ed
+.Pp
+.Nm
 recognizes the following commands.  The commands are shown together with
 the default address or address range supplied if none is
-specified (in parenthesis).
-
-.TP 8
-(.)a
+specified (in parenthesis), and other possible arguments on the right.
+.Bl -tag -width Dxxs
+.It (.) Ns Em a
 Appends text to the buffer after the addressed line.
 Text is entered in input mode.
 The current address is set to last line entered.
-
-.TP 8
-(.,.)c
+.It (.,.) Ns Em c
 Changes lines in the buffer.  The addressed lines are deleted
 from the buffer, and text is appended in their place.
 Text is entered in input mode.
 The current address is set to last line entered.
-
-.TP 8
-(.,.)d
+.It (.,.) Ns Em d
 Deletes the addressed lines from the buffer.
 If there is a line after the deleted range, then the current address is set
 to this line. Otherwise the current address is set to the line
 before the deleted range.
-
-.TP 8
-.RI e \ file
+.It Em e No file
 Edits
-.IR file ,
+.Em file Ns No ,
 and sets the default filename.
 If
-.I file
-is not specified, then the  default filename is used.
+.Em file
+is not specified, then the default filename is used.
 Any lines in the buffer are deleted before
 the new file is read.
 The current address is set to the last line read.
-
-.TP 8
-.RI e \ !command
+.It Em e No !command
 Edits the standard output of
-.IR `!command' ,
+.Em !command Ns No ,
 (see
-.RI ! command
+.Em ! No command
 below).
 The default filename is unchanged.
 Any lines in the buffer are deleted before the output of
-.I command
+.Em command
 is read.
 The current address is set to the last line read.
-
-.TP 8
-.RI E \ file
+.It Em E Ns No file
 Edits
-.I file
+.Em file
 unconditionally.
 This is similar to the
-.I e
+.Em e
 command,
 except that unwritten changes are discarded without warning.
 The current address is set to the last line read.
-
-.TP 8
-.RI f \ file
+.It Em f No file
 Sets the default filename to
-.IR file .
+.Em file Ns No .
 If
-.I file
+.Em file
 is not specified, then the default unescaped filename is printed.
-
-.TP 8
-.RI (1,$)g /re/command-list
+.It (1,$) Ns Em g/re/command-list
 Applies
-.I command-list
+.Em command-list
 to each of the addressed lines matching a regular expression
-.IR re .
+.Em re Ns No .
 The current address is set to the
 line currently matched before
-.I command-list
+.Em command-list
 is executed.
 At the end of the
-.I `g'
+.Em g
 command, the current address is set to the last line affected by
-.IR command-list .
-
+.Em command-list Ns No .
+.Pp
 Each command in
-.I command-list
+.Em command-list
 must be on a separate line,
-and every line except for the last must be terminated by a backslash
-(\\).
+and every line except for the last must be terminated by
+.Em \e No (backslash).
 Any commands are allowed, except for
-.IR `g' ,
-.IR `G' ,
-.IR `v' ,
+.Em g Ns No ,
+.Em G Ns No ,
+.Em v Ns No ,
 and
-.IR `V' .
+.Em V Ns No .
 A newline alone in
-.I command-list
+.Em command-list
 is equivalent to a 
-.I `p'
+.Em p
 command.
-
-.TP 8
-.RI (1,$)G /re/
+.It (1,$) Ns Em G/re/
 Interactively edits the addressed lines matching a regular expression
-.IR re.
+.Em re Ns No .
 For each matching line,
 the line is printed,
 the current address is set,
 and the user is prompted to enter a 
-.IR command-list .
+.Em command-list Ns No .
 At the end of the
-.I `G'
+.Em g
 command, the current address
 is set to the last line affected by (the last)
-.IR command-list .
-
+.Em command-list Ns No .
+.Pp
 The format of
-.I command-list
+.Em command-list
 is the same as that of the
-.I `g'
+.Em g
 command.  A newline alone acts as a null command list.
-A single `&' repeats the last non-null command list.
-
-.TP 8
-H
+A single
+.Em &
+repeats the last non-null command list.
+.It Em H
 Toggles the printing of error explanations.
 By default, explanations are not printed.
 It is recommended that ed scripts begin with this command to
 aid in debugging.
-
-.TP 8
-h
+.It Em h
 Prints an explanation of the last error.
-
-.TP 8
-(.)i
+.It (.) Ns Em i
 Inserts text in the buffer before the current line.
 Text is entered in input mode.
 The current address is set to the last line entered.
-
-.TP 8
-(.,.+1)j
+.It (.,.+1) Ns Em j
 Joins the addressed lines.  The addressed lines are
 deleted from the buffer and replaced by a single
 line containing their joined text.
 The current address is set to the resultant line.
-
-.TP 8
-.RI (.)k lc
+.It (.) Ns Em klc
 Marks a line with a lower case letter
-.IR lc .
-The  line can then be addressed as
-.I 'lc
+.Em lc Ns No \&.
+The line can then be addressed as
+.Em \&'lc
 (i.e., a single quote followed by
-.I lc
-) in subsequent commands.  The mark is not cleared until the line is
-deleted or otherwise modified.
-
-.TP 8
-(.,.)l
+.Em lc Ns No )
+in subsequent commands.
+The mark is not cleared until the line is deleted or otherwise modified.
+.It (.,.) Ns Em l
 Prints the addressed lines unambiguously.
 If a single line fills for than one screen (as might be the case
 when viewing a binary file, for instance), a `--More--' 
 prompt is printed on the last line. 
-.B ed
+.Nm
 waits until the RETURN key is pressed
 before displaying the next screen. 
 The current address is set to the last line
 printed.
-
-.TP 8
-(.,.)m(.)
+.It (.,.) Ns Em m Ns No (.)
 Moves lines in the buffer.  The addressed lines are moved to after the
 right-hand destination address, which may be the address
-.IR 0
+.Em 0
 (zero).
 The current address is set to the
 last line moved.
-
-.TP 8
-(.,.)n
+.It (.,.) Ns Em n
 Prints the addressed lines along with
 their line numbers.  The current address is set to the last line
 printed.
-
-.TP 8
-(.,.)p
+.It (.,.) Ns Em p
 Prints the addressed lines. The current address is set to the last line
 printed.
-
-.TP 8
-P
+.It Em P
 Toggles the command prompt on and off.
 Unless a prompt was specified by with command-line option
-\fI-p string\fR, the command prompt is by default turned off.
-
-.TP 8
-q
+.Fl p Ar string Ns No ,
+the command prompt is by default turned off.
+.It Em q
 Quits ed.
-
-.TP 8
-Q
+.It Em Q
 Quits ed unconditionally.
 This is similar to the
-.I q
+.Em q
 command,
 except that unwritten changes are discarded without warning.
-
-.TP 8
-.RI ($)r \ file
+.It ($) Ns Em r No file
 Reads
-.I file
+.Em file
 to after the addressed line.  If
-.I file
+.Em file
 is not specified, then the default
 filename is used.  If there was no default filename prior to the command,
 then the default filename is set to
-.IR file .
+.Em file Ns No .
 Otherwise, the default filename is unchanged.
 The current address is set to the last line read.
-
-.TP 8
-.RI ($)r \ !command
+.It ($) Ns Em r No !command
 Reads
 to after the addressed line
 the standard output of
-.IR `!command' ,
+.Em !command Ns No ,
 (see the
-.RI ! command
-below).
+.Em !
+command below).
 The default filename is unchanged.
 The current address is set to the last line read.
-
-.HP
-.RI (.,.)s /re/replacement/
-.PD 0
-.HP
-.RI (.,.)s  /re/replacement/\fRg\fR
-.HP
-.RI (.,.)s  /re/replacement/n
-.br
+.It (.,.) Em s Ns No /re/replacement/
+.It (.,.) Em s Ns No /re/replacement/ Ns Em g
+.It (.,.) Em s Ns No /re/replacement/ Ns Em n
 Replaces text in the addressed lines
 matching a regular expression
-.I re
+.Em re
 with
-.IR replacement .
+.Em replacement Ns No .
 By default, only the first match in each line is replaced.
 If the
-.I `g'
+.Em g
 (global) suffix is given, then every match to be replaced.
 The
-.I `n'
+.Em n
 suffix, where
-.I n
+.Em n
 is a postive number, causes only the
-.IR n th
+.Em n Ns No th
 match to be replaced.
 It is an error if no substitutions are performed on any of the addressed
 lines.
 The current address is set the last line affected.
-
-.I re
+.Pp
+.Em re
 and
-.I replacement
+.Em replacement
 may be delimited by any character other than space and newline
 (see the
-.I `s'
+.Em s
 command below).
 If one or two of the last delimiters is omitted, then the last line
 affected is printed as though the print suffix
-.I `p'
+.Em p
 were specified.
-
-
-An unescaped `&' in
-.I replacement
+.Pp
+An unescaped
+.Em \e
+in
+.Em replacement
 is replaced by the currently matched text.
 The character sequence
-\fI`\em'\fR,
+.Em \em Ns No ,
 where
-.I m
+.Em m
 is a number in the range [1,9], is replaced by the
-.IR m th
+.Em m Ns No th
 backreference expression of the matched text.
 If
-.I replacement
-consists of a single `%', then
-.I replacement
+.Em replacement
+consists of a single
+.Em % Ns No ,
+then
+.Em replacement
 from the last substitution is used.
 Newlines may be embedded in
-.I replacement
-if they are escaped with a backslash (\\).
-
-.TP 8
-(.,.)s
+.Em replacement
+if they are escaped with a
+.Em \e
+(backslash).
+.It Em (.,.) Ns Em s
 Repeats the last substitution.
 This form of the
-.I `s'
+.Em s
 command accepts a count suffix
-.IR `n' ,
+.Em n Ns No ,
 or any combination of the characters
-.IR `r' ,
-.IR `g' ,
+.Em r Ns No ,
+.Em g Ns No ,
 and
-.IR `p' .
+.Em p Ns No .
 If a count suffix
-.I `n'
+.Em n
 is given, then only the
-.IR n th
+.Em n Ns No th
 match is replaced.
 The
-.I `r'
+.Em r
 suffix causes
 the regular expression of the last search to be used instead of the
 that of the last substitution.
 The
-.I `g'
+.Em g
 suffix toggles the global suffix of the last substitution.
 The
-.I `p'
+.Em p
 suffix toggles the print suffix of the last substitution
 The current address is set to the last line affected.
-
-.TP 8
-(.,.)t(.)
+.It (.,.) Ns Em t Ns No (.)
 Copies (i.e., transfers) the addressed lines to after the right-hand
 destination address, which may be the address
-.IR 0
+.Em 0
 (zero).
 The current address is set to the last line
 copied.
-
-.TP 8
-u
+.It Em u
 Undoes the last command and restores the current address
 to what it was before the command.
 The global commands
-.IR `g' ,
-.IR `G' ,
-.IR `v' ,
+.Em g Ns No ,
+.Em G Ns No ,
+.Em v Ns No ,
 and
-.IR `V' .
+.Em V Ns No .
 are treated as a single command by undo.
-.I `u'
+.Em u
 is its own inverse.
-
-.TP 8
-.RI (1,$)v /pat/command-list
+.It (1,$) Ns Em v Ns No /pat/command-list
 Applies
-.I command-list
+.Em command-list
 to each of the addressed lines not matching a regular expression
-.IR re .
+.Em re Ns No .
 This is similar to the
-.I `g'
+.Em g
 command.
-
-.TP 8
-.RI (1,$)V /re/
+.It (1,$) Ns Em V Ns No /re/
 Interactively edits the addressed lines not matching a regular expression
-.IR re.
+.Em re Ns No .
 This is similar to the
-.I `G'
+.Em G
 command.
-
-.TP 8
-.RI (1,$)w \ file
+.It (1,$) Ns Em w No file
 Writes the addressed lines to
-.IR file .
+.Em file Ns No .
 Any previous contents of
-.I file
+.Em file
 is lost without warning.
 If there is no default filename, then the default filename is set to
-.IR file,
+.Em file Ns No ,
 otherwise it is unchanged.  If no filename is specified, then the default
 filename is used.
 The current address is unchanged.
-
-.TP 8
-.RI (1,$)wq \ file
+.It (1,$) Ns Em wq No file
 Writes the addressed lines to
-.IR file ,
+.Em file Ns No ,
 and then executes a
-.I `q'
+.Em q
 command.
-
-.TP 8
-.RI (1,$)w \ !command
+.It (1,$) Ns Em w No !command
 Writes the addressed lines to the standard input of
-.IR `!command' ,
+.Em !command Ns No ,
 (see the
-.RI ! command
-below).
+.Em !
+command below).
 The default filename and current address are unchanged.
-
-.TP 8
-.RI (1,$)W \ file
+.It (1,$) Ns Em W No file
 Appends the addressed lines to the end of
-.IR file .
+.Em file Ns No .
 This is similar to the
-.I `w'
+.Em w
 command, expect that the previous contents of file is not clobbered.
 The current address is unchanged.
-
-.TP 8
-x
+.It Em x
 Prompts for an encryption key which is used in subsequent reads and
 writes.  If a newline alone is entered as the key, then encryption is
 turned off.  Otherwise, echoing is disabled while a key is read.
-Encryption/decryption is done using the bdes(1) algorithm.
-
-.TP 8
-.RI (.+1)z n
+Encryption/decryption is done using the
+.Xr bdes 1
+algorithm.
+.It (.+1) Ns Em z Ns No n
 Scrolls
-.I n
+.Em n
 lines at a time starting at addressed line.  If
-.I n
+.Em n
 is not specified, then the current window size is used.
 The current address is set to the last line printed.
-
-.TP 8
-.RI ! command
+.It ($) Ns Em =
+Prints the line number of the addressed line.
+.It (.+1) Ns Em newline
+Prints the addressed line, and sets the current address to
+that line.
+.It Em ! Ns No command
 Executes
-.I command
+.Em command
 via
-.IR sh (1).
+.Xr sh 1 .
 If the first character of
-.I command
-is `!', then it is replaced by text of the
-previous
-.IR `!command' .
-.B ed
+.Em command
+is
+.Em ! Ns No ,
+then it is replaced by text of the previous
+.Em !command Ns No .
+.Nm
 does not process
-.I command
-for backslash (\\) escapes.
+.Em command
+for
+.Em \e
+(backslash) escapes.
 However, an unescaped
-.I `%'
+.Em %
 is replaced by the default filename.
-When the shell returns from execution, a `!'
+When the shell returns from execution, a
+.Em !
 is printed to the standard output.
 The current line is unchanged.
-
-.TP 8
-($)=
-Prints the line number of the addressed line.
-
-.TP 8
-(.+1)newline
-Prints the addressed line, and sets the current address to
-that line.
-
-.SH FILES
-.TP 20
-/tmp/ed.*
+.El
+.Sh FILES
+.Bl -tag -width /etc/passwd -compact
+.It Pa /tmp/ed.*
 Buffer file
-.PD 0
-.TP 20
-ed.hup
+.It Pa ed.hup
 The file to which
-.B ed
-attempts to write the  buffer if the terminal hangs up.
-
-.SH SEE ALSO
-
-.IR vi (1),
-.IR sed (1),
-.IR regex (3),
-.IR bdes (1),
-.IR sh (1).
-
+.Nm
+attempts to write the buffer if the terminal hangs up.
+.El
+.Sh SEE ALSO
+.Xr vi 1 ,
+.Xr sed 1 ,
+.Xr regex 3 ,
+.Xr bdes 1 ,
+.Xr sh 1 .
+.Pp
 USD:12-13
-
+.Pp
 B. W. Kernighan and P. J. Plauger,
-.I Software Tools in Pascal ,
+.Em Software Tools in Pascal Ns No ,
 Addison-Wesley, 1981.
-
-.SH LIMITATIONS
-.B ed
+.Sh LIMITATIONS
+.Nm
 processes
-.I file
-arguments for backslash escapes, i.e.,  in a filename,
+.Em file
+arguments for backslash escapes, i.e., in a filename,
 any characters preceded by a backslash (\\) are
 interpreted literally.
-
+.Pp
 If a text (non-binary) file is not terminated by a newline character,
 then
-.B ed
+.Nm
 appends one on reading/writing it.  In the case of a binary file,
-.B ed
+.Nm
 does not append a newline on reading/writing.
-
-per line overhead: 4 ints
-
-.SH DIAGNOSTICS
+.Sh DIAGNOSTICS
 When an error occurs,
-.B ed
+.Nm
 prints a `?' and either returns to command mode
 or exits if its input is from a script.
 An explanation of the last error can be
 printed with the
-.I `h'
+.Em h
 (help) command.
-
+.Pp
 Since the 
-.I `g'
-(global) command  masks any errors from failed searches and substitutions,
+.Em g
+(global) command masks any errors from failed searches and substitutions,
 it can be used to perform conditional operations in scripts; e.g.,
-.sp
-.RS
-g/\fIold\fR/s//\fInew\fR/
-.RE
-.sp
+.Bd -literal -offset indent
+g/old/s//new/
+.Ed
+.Pp
 replaces any occurrences of
-.I old
+.Em old
 with
-.IR new .
+.Em new Ns No .
+.Pp
 If the
-.I `u'
+.Em u
 (undo) command occurs in a global command list, then
 the command list is executed only once.
-
+.Pp
 If diagnostics are not disabled, attempting to quit
-.B ed
+.Nm
 or edit another file before writing a modified buffer
 results in an error.
 If the command is entered a second time, it succeeds,