28 files changed, 147 insertions, 147 deletions
diff --git a/bin/ksh/ksh.1 b/bin/ksh/ksh.1
index 21bfbbfa0a9..4d64d12feaa 100644
--- a/bin/ksh/ksh.1
+++ b/bin/ksh/ksh.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ksh.1,v 1.64 2004/01/15 22:08:45 jmc Exp $
+.\"	$OpenBSD: ksh.1,v 1.65 2004/01/23 23:08:45 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"     The Regents of the University of California.  All rights reserved.
@@ -561,7 +561,7 @@ if no
 .Ar list
 is executed, the exit status is zero.
 .It Xo Ic for Ar name No [
-.Ic in Ar word Ar ... term Ns No ]
+.Ic in Ar word Ar ... term Ns ]
 .Ic do Ar list Ic done
 .Xc
 For each
@@ -622,7 +622,7 @@ that is executed; if no non-conditional
 .Ar list
 is executed, the exit status is zero.
 .It Xo Ic select Ar name No [
-.Ic in Ar word Ar ... term Ns No ]
+.Ic in Ar word Ar ... term Ns ]
 .Ic do Ar list Ic done
 .Xc
 The
@@ -1103,7 +1103,7 @@ Lastly, parameters can be assigned values using assignment operators
 inside arithmetic expressions (see
 .Sx Arithmetic expressions
 below) or using the
-.Xo Ic ${ Ns Ar name Ns No =
+.Xo Ic ${ Ns Ar name Ns =
 .Ns Ar value Ns Ic \&}
 .Xc
 form of the parameter substitution (see below).
@@ -1116,7 +1116,7 @@ commands, or by parameter assignments followed by simple commands) are put in
 the environment (see
 .Xr environ 7 )
 of commands run by the shell as
-.Ar name Ns No = Ns Ar value
+.Ar name Ns = Ns Ar value
 pairs.
 The order in which parameters appear in the environment of a command is
 unspecified.
@@ -1169,7 +1169,7 @@ is set and not
 it is substituted; otherwise,
 .Ar word
 is printed on standard error (preceded by
-.Ar name Ns No \&: )
+.Ar name Ns \&: )
 and an error occurs (normally causing termination of a shell script, function
 or .-script).
 If word is omitted the string
@@ -1694,7 +1694,7 @@ The pattern elements have the following meaning:
 Matches any single character.
 .It Ic \&*
 Matches any sequence of characters.
-.It Ic \&[ Ns No .. Ns Ic \&]
+.It Ic \&[ Ns .. Ns Ic \&]
 Matches any of the characters inside the brackets.
 Ranges of characters can be
 specified by separating two characters by a
@@ -1715,9 +1715,9 @@ Also, a
 .Ql \&!
 appearing at the start of the list has special meaning (see below), so to
 represent itself it must be quoted or appear later in the list.
-.It Ic \&[\&! Ns No .. Ns Ic \&]
+.It Ic \&[\&! Ns .. Ns Ic \&]
 Like
-.Ic \&[ Ns No .. Ns Ic \&] ,
+.Ic \&[ Ns .. Ns Ic \&] ,
 except it matches any character not inside the brackets.
 .Sm off
 .It Xo Ic \&*( Ar pattern Ic \&| No \ ...\ 
@@ -1812,7 +1812,7 @@ Note that none of the above pattern elements match either a period
 at the start of a file name or a slash
 .Pq Sq / ,
 even if they are explicitly used in a
-.Ic \&[ Ns No .. Ns Ic \&]
+.Ic \&[ Ns .. Ns Ic \&]
 sequence; also, the names
 .Dq \&.
 and
@@ -1831,7 +1831,7 @@ The
 character classes (i.e.,
 .Ic \&[\&: Ns Ar class-name Ns Ic \&:\&]
 inside a
-.Ic \&[ Ns No .. Ns Ic \&]
+.Ic \&[ Ns .. Ns Ic \&]
 expression) are not yet implemented.
 .Ss Input/output redirection
 When a command is executed, its standard input, standard output, and standard
@@ -1962,7 +1962,7 @@ will print an error with a line number prepended to it.
 Integer arithmetic expressions can be used with the
 .Ic let
 command, inside
-.Ic $(( Ns No .. Ns Ic ))
+.Ic $(( Ns .. Ns Ic ))
 expressions, inside array references (e.g.,
 .Sm off
 .Ar name Ic \&[ Ar expr Ic \&] ) ,
@@ -2624,7 +2624,7 @@ above).
 .Pp
 When listing aliases, one of two formats is used.
 Normally, aliases are listed as
-.Ar name Ns No = Ns Ar value ,
+.Ar name Ns = Ns Ar value ,
 where
 .Ar value
 is quoted.
@@ -2913,7 +2913,7 @@ is used), and then executed by the shell.
 .It Xo Ic fc
 .Oo Fl e No \&- \&| Fl s Oc
 .Op Fl g
-.Op Ar old Ns No = Ns Ar new
+.Op Ar old Ns = Ns Ar new
 .Op Ar prefix
 .Xc
 Re-execute the selected command (the previous command by default) after
@@ -4602,7 +4602,7 @@ commands continue searching backward to the next previous occurrence of the
 pattern.
 The history buffer retains only a finite number of lines; the oldest
 are discarded as necessary.
-.It Ic set-mark-command ^[ Ns No <space>
+.It Ic set-mark-command ^[ Ns <space>
 Set the mark at the cursor position.
 .It Ic stuff
 On systems supporting it, pushes the bound character back onto the terminal
diff --git a/bin/ksh/ksh.1tbl b/bin/ksh/ksh.1tbl
index 7e7a4cdda8a..25aa5b99ea0 100644
--- a/bin/ksh/ksh.1tbl
+++ b/bin/ksh/ksh.1tbl
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ksh.1tbl,v 1.64 2004/01/15 22:08:45 jmc Exp $
+.\"	$OpenBSD: ksh.1tbl,v 1.65 2004/01/23 23:08:45 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"     The Regents of the University of California.  All rights reserved.
@@ -561,7 +561,7 @@ if no
 .Ar list
 is executed, the exit status is zero.
 .It Xo Ic for Ar name No [
-.Ic in Ar word Ar ... term Ns No ]
+.Ic in Ar word Ar ... term Ns ]
 .Ic do Ar list Ic done
 .Xc
 For each
@@ -622,7 +622,7 @@ that is executed; if no non-conditional
 .Ar list
 is executed, the exit status is zero.
 .It Xo Ic select Ar name No [
-.Ic in Ar word Ar ... term Ns No ]
+.Ic in Ar word Ar ... term Ns ]
 .Ic do Ar list Ic done
 .Xc
 The
@@ -1103,7 +1103,7 @@ Lastly, parameters can be assigned values using assignment operators
 inside arithmetic expressions (see
 .Sx Arithmetic expressions
 below) or using the
-.Xo Ic ${ Ns Ar name Ns No =
+.Xo Ic ${ Ns Ar name Ns =
 .Ns Ar value Ns Ic \&}
 .Xc
 form of the parameter substitution (see below).
@@ -1116,7 +1116,7 @@ commands, or by parameter assignments followed by simple commands) are put in
 the environment (see
 .Xr environ 7 )
 of commands run by the shell as
-.Ar name Ns No = Ns Ar value
+.Ar name Ns = Ns Ar value
 pairs.
 The order in which parameters appear in the environment of a command is
 unspecified.
@@ -1169,7 +1169,7 @@ is set and not
 it is substituted; otherwise,
 .Ar word
 is printed on standard error (preceded by
-.Ar name Ns No \&: )
+.Ar name Ns \&: )
 and an error occurs (normally causing termination of a shell script, function
 or .-script).
 If word is omitted the string
@@ -1694,7 +1694,7 @@ The pattern elements have the following meaning:
 Matches any single character.
 .It Ic \&*
 Matches any sequence of characters.
-.It Ic \&[ Ns No .. Ns Ic \&]
+.It Ic \&[ Ns .. Ns Ic \&]
 Matches any of the characters inside the brackets.
 Ranges of characters can be
 specified by separating two characters by a
@@ -1715,9 +1715,9 @@ Also, a
 .Ql \&!
 appearing at the start of the list has special meaning (see below), so to
 represent itself it must be quoted or appear later in the list.
-.It Ic \&[\&! Ns No .. Ns Ic \&]
+.It Ic \&[\&! Ns .. Ns Ic \&]
 Like
-.Ic \&[ Ns No .. Ns Ic \&] ,
+.Ic \&[ Ns .. Ns Ic \&] ,
 except it matches any character not inside the brackets.
 .Sm off
 .It Xo Ic \&*( Ar pattern Ic \&| No \ ...\ 
@@ -1812,7 +1812,7 @@ Note that none of the above pattern elements match either a period
 at the start of a file name or a slash
 .Pq Sq / ,
 even if they are explicitly used in a
-.Ic \&[ Ns No .. Ns Ic \&]
+.Ic \&[ Ns .. Ns Ic \&]
 sequence; also, the names
 .Dq \&.
 and
@@ -1831,7 +1831,7 @@ The
 character classes (i.e.,
 .Ic \&[\&: Ns Ar class-name Ns Ic \&:\&]
 inside a
-.Ic \&[ Ns No .. Ns Ic \&]
+.Ic \&[ Ns .. Ns Ic \&]
 expression) are not yet implemented.
 .Ss Input/output redirection
 When a command is executed, its standard input, standard output, and standard
@@ -1962,7 +1962,7 @@ will print an error with a line number prepended to it.
 Integer arithmetic expressions can be used with the
 .Ic let
 command, inside
-.Ic $(( Ns No .. Ns Ic ))
+.Ic $(( Ns .. Ns Ic ))
 expressions, inside array references (e.g.,
 .Sm off
 .Ar name Ic \&[ Ar expr Ic \&] ) ,
@@ -2624,7 +2624,7 @@ above).
 .Pp
 When listing aliases, one of two formats is used.
 Normally, aliases are listed as
-.Ar name Ns No = Ns Ar value ,
+.Ar name Ns = Ns Ar value ,
 where
 .Ar value
 is quoted.
@@ -2913,7 +2913,7 @@ is used), and then executed by the shell.
 .It Xo Ic fc
 .Oo Fl e No \&- \&| Fl s Oc
 .Op Fl g
-.Op Ar old Ns No = Ns Ar new
+.Op Ar old Ns = Ns Ar new
 .Op Ar prefix
 .Xc
 Re-execute the selected command (the previous command by default) after
@@ -4602,7 +4602,7 @@ commands continue searching backward to the next previous occurrence of the
 pattern.
 The history buffer retains only a finite number of lines; the oldest
 are discarded as necessary.
-.It Ic set-mark-command ^[ Ns No <space>
+.It Ic set-mark-command ^[ Ns <space>
 Set the mark at the cursor position.
 .It Ic stuff
 On systems supporting it, pushes the bound character back onto the terminal
diff --git a/bin/ksh/sh.1 b/bin/ksh/sh.1
index a7f19089213..183468cd162 100644
--- a/bin/ksh/sh.1
+++ b/bin/ksh/sh.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sh.1,v 1.43 2004/01/15 22:08:45 jmc Exp $
+.\"	$OpenBSD: sh.1,v 1.44 2004/01/23 23:08:45 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"     The Regents of the University of California.  All rights reserved.
@@ -540,7 +540,7 @@ if no
 .Ar list
 is executed, the exit status is zero.
 .It Xo Ic for Ar name No [
-.Ic in Ar word Ar ... term Ns No ]
+.Ic in Ar word Ar ... term Ns ]
 .Ic do Ar list Ic done
 .Xc
 For each
@@ -931,7 +931,7 @@ Lastly, parameters can be assigned values using assignment operators
 inside arithmetic expressions (see
 .Sx Arithmetic expressions
 below) or using the
-.Xo Ic ${ Ns Ar name Ns No =
+.Xo Ic ${ Ns Ar name Ns =
 .Ns Ar value Ns Ic \&}
 .Xc
 form of the parameter substitution (see below).
@@ -944,7 +944,7 @@ commands, or by parameter assignments followed by simple commands) are put in
 the environment (see
 .Xr environ 7 )
 of commands run by the shell as
-.Ar name Ns No = Ns Ar value
+.Ar name Ns = Ns Ar value
 pairs.
 The order in which parameters appear in the environment of a command is
 unspecified.
@@ -997,7 +997,7 @@ is set and not
 it is substituted; otherwise,
 .Ar word
 is printed on standard error (preceded by
-.Ar name Ns No \&: )
+.Ar name Ns \&: )
 and an error occurs (normally causing termination of a shell script, function
 or .-script).
 If word is omitted the string
@@ -1352,7 +1352,7 @@ The pattern elements have the following meaning:
 Matches any single character.
 .It Ic \&*
 Matches any sequence of characters.
-.It Ic \&[ Ns No .. Ns Ic \&]
+.It Ic \&[ Ns .. Ns Ic \&]
 Matches any of the characters inside the brackets.
 Ranges of characters can be
 specified by separating two characters by a
@@ -1373,9 +1373,9 @@ Also, a
 .Ql \&!
 appearing at the start of the list has special meaning (see below), so to
 represent itself it must be quoted or appear later in the list.
-.It Ic \&[\&! Ns No .. Ns Ic \&]
+.It Ic \&[\&! Ns .. Ns Ic \&]
 Like
-.Ic \&[ Ns No .. Ns Ic \&] ,
+.Ic \&[ Ns .. Ns Ic \&] ,
 except it matches any character not inside the brackets.
 .Sm on
 Matches any string of characters that matches zero or more occurrences of the
@@ -1466,7 +1466,7 @@ Note that none of the above pattern elements match either a period
 at the start of a file name or a slash
 .Pq Sq / ,
 even if they are explicitly used in a
-.Ic \&[ Ns No .. Ns Ic \&]
+.Ic \&[ Ns .. Ns Ic \&]
 sequence; also, the names
 .Dq \&.
 and
@@ -1485,7 +1485,7 @@ The
 character classes (i.e.,
 .Ic \&[\&: Ns Ar class-name Ns Ic \&:\&]
 inside a
-.Ic \&[ Ns No .. Ns Ic \&]
+.Ic \&[ Ns .. Ns Ic \&]
 expression) are not yet implemented.
 .Ss Input/output redirection
 When a command is executed, its standard input, standard output, and standard
@@ -1616,7 +1616,7 @@ will print an error with a line number prepended to it.
 Integer arithmetic expressions can be used with the
 .Ic let
 command, inside
-.Ic $(( Ns No .. Ns Ic ))
+.Ic $(( Ns .. Ns Ic ))
 expressions, inside array references (e.g.,
 .Sm off
 .Ar name Ic \&[ Ar expr Ic \&] ) ,
@@ -2217,7 +2217,7 @@ above).
 .Pp
 When listing aliases, one of two formats is used.
 Normally, aliases are listed as
-.Ar name Ns No = Ns Ar value ,
+.Ar name Ns = Ns Ar value ,
 where
 .Ar value
 is quoted.
@@ -2416,7 +2416,7 @@ If no command is given except for I/O redirection, the I/O redirection is
 permanent and the shell is
 not replaced.
 Any file descriptors which are opened or
-.Xr dup 2 Ns No 'd
+.Xr dup 2 Ns 'd
 in this way are made available to other executed commands (note that the Korn
 shell differs here: it does not pass on file descriptors greater than 2).
 .It Ic exit Op Ar status
@@ -2444,7 +2444,7 @@ A command that exits with a non-zero status.
 .It Xo Ic fc
 .Oo Fl e No \&- \&| Fl s Oc
 .Op Fl g
-.Op Ar old Ns No = Ns Ar new
+.Op Ar old Ns = Ns Ar new
 .Op Ar prefix
 .Xc
 Re-execute the selected command (the previous command by default) after
diff --git a/bin/ksh/sh.1tbl b/bin/ksh/sh.1tbl
index e13cc3aa0d1..abe2c7cb147 100644
--- a/bin/ksh/sh.1tbl
+++ b/bin/ksh/sh.1tbl
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sh.1tbl,v 1.43 2004/01/15 22:08:45 jmc Exp $
+.\"	$OpenBSD: sh.1tbl,v 1.44 2004/01/23 23:08:45 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"     The Regents of the University of California.  All rights reserved.
@@ -540,7 +540,7 @@ if no
 .Ar list
 is executed, the exit status is zero.
 .It Xo Ic for Ar name No [
-.Ic in Ar word Ar ... term Ns No ]
+.Ic in Ar word Ar ... term Ns ]
 .Ic do Ar list Ic done
 .Xc
 For each
@@ -931,7 +931,7 @@ Lastly, parameters can be assigned values using assignment operators
 inside arithmetic expressions (see
 .Sx Arithmetic expressions
 below) or using the
-.Xo Ic ${ Ns Ar name Ns No =
+.Xo Ic ${ Ns Ar name Ns =
 .Ns Ar value Ns Ic \&}
 .Xc
 form of the parameter substitution (see below).
@@ -944,7 +944,7 @@ commands, or by parameter assignments followed by simple commands) are put in
 the environment (see
 .Xr environ 7 )
 of commands run by the shell as
-.Ar name Ns No = Ns Ar value
+.Ar name Ns = Ns Ar value
 pairs.
 The order in which parameters appear in the environment of a command is
 unspecified.
@@ -997,7 +997,7 @@ is set and not
 it is substituted; otherwise,
 .Ar word
 is printed on standard error (preceded by
-.Ar name Ns No \&: )
+.Ar name Ns \&: )
 and an error occurs (normally causing termination of a shell script, function
 or .-script).
 If word is omitted the string
@@ -1352,7 +1352,7 @@ The pattern elements have the following meaning:
 Matches any single character.
 .It Ic \&*
 Matches any sequence of characters.
-.It Ic \&[ Ns No .. Ns Ic \&]
+.It Ic \&[ Ns .. Ns Ic \&]
 Matches any of the characters inside the brackets.
 Ranges of characters can be
 specified by separating two characters by a
@@ -1373,9 +1373,9 @@ Also, a
 .Ql \&!
 appearing at the start of the list has special meaning (see below), so to
 represent itself it must be quoted or appear later in the list.
-.It Ic \&[\&! Ns No .. Ns Ic \&]
+.It Ic \&[\&! Ns .. Ns Ic \&]
 Like
-.Ic \&[ Ns No .. Ns Ic \&] ,
+.Ic \&[ Ns .. Ns Ic \&] ,
 except it matches any character not inside the brackets.
 .Sm on
 Matches any string of characters that matches zero or more occurrences of the
@@ -1466,7 +1466,7 @@ Note that none of the above pattern elements match either a period
 at the start of a file name or a slash
 .Pq Sq / ,
 even if they are explicitly used in a
-.Ic \&[ Ns No .. Ns Ic \&]
+.Ic \&[ Ns .. Ns Ic \&]
 sequence; also, the names
 .Dq \&.
 and
@@ -1485,7 +1485,7 @@ The
 character classes (i.e.,
 .Ic \&[\&: Ns Ar class-name Ns Ic \&:\&]
 inside a
-.Ic \&[ Ns No .. Ns Ic \&]
+.Ic \&[ Ns .. Ns Ic \&]
 expression) are not yet implemented.
 .Ss Input/output redirection
 When a command is executed, its standard input, standard output, and standard
@@ -1616,7 +1616,7 @@ will print an error with a line number prepended to it.
 Integer arithmetic expressions can be used with the
 .Ic let
 command, inside
-.Ic $(( Ns No .. Ns Ic ))
+.Ic $(( Ns .. Ns Ic ))
 expressions, inside array references (e.g.,
 .Sm off
 .Ar name Ic \&[ Ar expr Ic \&] ) ,
@@ -2217,7 +2217,7 @@ above).
 .Pp
 When listing aliases, one of two formats is used.
 Normally, aliases are listed as
-.Ar name Ns No = Ns Ar value ,
+.Ar name Ns = Ns Ar value ,
 where
 .Ar value
 is quoted.
@@ -2416,7 +2416,7 @@ If no command is given except for I/O redirection, the I/O redirection is
 permanent and the shell is
 not replaced.
 Any file descriptors which are opened or
-.Xr dup 2 Ns No 'd
+.Xr dup 2 Ns 'd
 in this way are made available to other executed commands (note that the Korn
 shell differs here: it does not pass on file descriptors greater than 2).
 .It Ic exit Op Ar status
@@ -2444,7 +2444,7 @@ A command that exits with a non-zero status.
 .It Xo Ic fc
 .Oo Fl e No \&- \&| Fl s Oc
 .Op Fl g
-.Op Ar old Ns No = Ns Ar new
+.Op Ar old Ns = Ns Ar new
 .Op Ar prefix
 .Xc
 Re-execute the selected command (the previous command by default) after
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index cdbf7008171..901a9f7c90b 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pax.1,v 1.42 2003/11/21 20:54:02 jmc Exp $
+.\"	$OpenBSD: pax.1,v 1.43 2004/01/23 23:08:45 jmc Exp $
 .\"	$NetBSD: pax.1,v 1.3 1995/03/21 09:07:37 cgd Exp $
 .\"
 .\" Copyright (c) 1992 Keith Muller.
@@ -508,7 +508,7 @@ which is specific to the archive format specified by
 In general,
 .Ar options
 take the form:
-.Ar name Ns No = Ns Ar value .
+.Ar name Ns = Ns Ar value .
 .It Fl p Ar string
 Specify one or more file characteristic options (privileges).
 The
diff --git a/lib/libc/ohash/ohash_init.3 b/lib/libc/ohash/ohash_init.3
index ded763b3ec2..8b13376c1ff 100644
--- a/lib/libc/ohash/ohash_init.3
+++ b/lib/libc/ohash/ohash_init.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ohash_init.3,v 1.6 2003/05/07 08:52:43 jmc Exp $
+.\"	$OpenBSD: ohash_init.3,v 1.7 2004/01/23 23:08:45 jmc Exp $
 .\"
 .\" Copyright (c) 1999 Marc Espie.
 .\"
@@ -84,7 +84,7 @@ elements.
 holds the position of the key in each record, and two pointers to
 .Xr calloc 3
 and
-.Xr free 3 Ns No -like
+.Xr free 3 Ns -like
 functions, to use for managing the table internal storage.
 .Pp
 .Fn ohash_delete
diff --git a/lib/libc/stdlib/div.3 b/lib/libc/stdlib/div.3
index 460ab53137a..a75614310eb 100644
--- a/lib/libc/stdlib/div.3
+++ b/lib/libc/stdlib/div.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: div.3,v 1.6 2003/06/02 20:18:37 millert Exp $
+.\"	$OpenBSD: div.3,v 1.7 2004/01/23 23:08:46 jmc Exp $
 .\"
 .Dd April 19, 1991
 .Dt DIV 3
@@ -43,7 +43,7 @@
 The
 .Fn div
 function computes the value
-.Fa num Ns No / Ns Fa denom
+.Fa num Ns / Ns Fa denom
 and returns the quotient and remainder in a structure named
 .Fa div_t
 that contains two
diff --git a/lib/libc/stdlib/getenv.3 b/lib/libc/stdlib/getenv.3
index 25c325307d7..054004e1d8b 100644
--- a/lib/libc/stdlib/getenv.3
+++ b/lib/libc/stdlib/getenv.3
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: getenv.3,v 1.8 2003/06/02 20:18:37 millert Exp $
+.\"	$OpenBSD: getenv.3,v 1.9 2004/01/23 23:08:46 jmc Exp $
 .\"
 .Dd December 11, 1993
 .Dt GETENV 3
@@ -87,7 +87,7 @@ is zero, the variable is not reset, otherwise it is reset to the given
 The
 .Fn putenv
 function takes an argument of the form
-.Ar name Ns No = Ns Ar value
+.Ar name Ns = Ns Ar value
 and is equivalent to:
 .Bd -literal -offset indent
 setenv(name, value, 1);
diff --git a/lib/libc/stdlib/getsubopt.3 b/lib/libc/stdlib/getsubopt.3
index 83530653d25..8513cfb66aa 100644
--- a/lib/libc/stdlib/getsubopt.3
+++ b/lib/libc/stdlib/getsubopt.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: getsubopt.3,v 1.7 2003/06/02 20:18:37 millert Exp $
+.\" $OpenBSD: getsubopt.3,v 1.8 2004/01/23 23:08:46 jmc Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -67,7 +67,7 @@ in the string, or \-1 if the string contains no tokens or
 does not contain a matching string.
 .Pp
 If the token is of the form
-.Ar name Ns No = Ns Ar value ,
+.Ar name Ns = Ns Ar value ,
 the location referenced by
 .Fa valuep
 will be set to point to the start of the
diff --git a/lib/libc/stdlib/ldiv.3 b/lib/libc/stdlib/ldiv.3
index f4b5a5fa459..63e1f2165c1 100644
--- a/lib/libc/stdlib/ldiv.3
+++ b/lib/libc/stdlib/ldiv.3
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: ldiv.3,v 1.6 2003/06/02 20:18:37 millert Exp $
+.\"	$OpenBSD: ldiv.3,v 1.7 2004/01/23 23:08:46 jmc Exp $
 .\"
 .Dd June 29, 1991
 .Dt LDIV 3
@@ -45,7 +45,7 @@
 The
 .Fn ldiv
 function computes the value
-.Fa num Ns No / Ns Fa denom
+.Fa num Ns / Ns Fa denom
 and returns the quotient and remainder in a structure named
 .Li ldiv_t
 that contains two
diff --git a/lib/libc/stdlib/qdiv.3 b/lib/libc/stdlib/qdiv.3
index 597f951a992..5f17ec17d41 100644
--- a/lib/libc/stdlib/qdiv.3
+++ b/lib/libc/stdlib/qdiv.3
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: qdiv.3,v 1.5 2003/06/02 20:18:38 millert Exp $
+.\"	$OpenBSD: qdiv.3,v 1.6 2004/01/23 23:08:46 jmc Exp $
 .\"
 .Dd June 29, 1991
 .Dt QDIV 3
@@ -45,7 +45,7 @@
 The
 .Fn qdiv
 function computes the value
-.Fa num Ns No / Ns Fa denom
+.Fa num Ns / Ns Fa denom
 and returns the quotient and remainder in a structure named
 .Li qdiv_t
 that contains two
diff --git a/lib/libc/sys/reboot.2 b/lib/libc/sys/reboot.2
index d22a206a0d3..6d26fef7bd5 100644
--- a/lib/libc/sys/reboot.2
+++ b/lib/libc/sys/reboot.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: reboot.2,v 1.10 2003/06/02 20:18:39 millert Exp $
+.\"	$OpenBSD: reboot.2,v 1.11 2004/01/23 23:08:46 jmc Exp $
 .\"	$NetBSD: reboot.2,v 1.5 1995/02/27 12:36:02 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -61,7 +61,7 @@ The default, causing the system to reboot in its usual fashion.
 Interpreted by the bootstrap program itself, causing it to
 prompt on the console as to what file should be booted.
 Normally, the system is booted from the file
-.Dq Em xx Ns No (0,0)bsd ,
+.Dq Em xx Ns (0,0)bsd ,
 where
 .Em xx
 is the default disk name,
diff --git a/lib/libc/sys/select.2 b/lib/libc/sys/select.2
index 75d7ecdf90d..e12f654de2c 100644
--- a/lib/libc/sys/select.2
+++ b/lib/libc/sys/select.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: select.2,v 1.24 2003/07/30 13:03:07 henning Exp $
+.\"	$OpenBSD: select.2,v 1.25 2004/01/23 23:08:46 jmc Exp $
 .\"	$NetBSD: select.2,v 1.5 1995/06/27 22:32:28 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -61,7 +61,7 @@ The first
 .Fa nfds
 descriptors are checked in each set;
 i.e., the descriptors from 0 through
-.Fa nfds Ns No -1
+.Fa nfds Ns -1
 in the descriptor sets are examined.
 On return,
 .Fn select
diff --git a/lib/libm/man/math.3 b/lib/libm/man/math.3
index 1cafc91d340..23d83d32b61 100644
--- a/lib/libm/man/math.3
+++ b/lib/libm/man/math.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: math.3,v 1.19 2003/10/21 20:11:56 jmc Exp $
+.\"	$OpenBSD: math.3,v 1.20 2004/01/23 23:08:46 jmc Exp $
 .\" Copyright (c) 1985 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -114,10 +114,10 @@ instance, the programs are accurate to within the number of
 tabulated above; a
 .Em ulp
 is one
-.Em U Ns No nit
+.Em U Ns nit
 in the
-.Em L Ns No ast
-.Em P Ns No lace .
+.Em L Ns ast
+.Em P Ns lace .
 The functions have been cured of anomalies that
 afflicted the older math library in which incidents like
 the following had been reported:
diff --git a/sbin/isakmpd/isakmpd.8 b/sbin/isakmpd/isakmpd.8
index 08ad3352944..6a2a42442e9 100644
--- a/sbin/isakmpd/isakmpd.8
+++ b/sbin/isakmpd/isakmpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.8,v 1.59 2004/01/16 10:51:57 hshoexer Exp $
+.\" $OpenBSD: isakmpd.8,v 1.60 2004/01/23 23:08:46 jmc Exp $
 .\" $EOM: isakmpd.8,v 1.23 2000/05/02 00:30:23 niklas Exp $
 .\"
 .\" Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.
@@ -114,12 +114,12 @@ The
 .Fl d
 option is used to make the daemon run in the foreground, logging to stderr.
 .It Xo Fl D
-.Ar class Ns No = Ns Ar level
+.Ar class Ns = Ns Ar level
 .Xc
 Debugging class.
 It's possible to specify this argument many times.
 It takes a parameter of the form
-.Ar class Ns No = Ns Ar level ,
+.Ar class Ns = Ns Ar level ,
 where both
 .Ar class
 and
diff --git a/share/man/man4/ccd.4 b/share/man/man4/ccd.4
index 7a9cbca6229..5ef17c78d06 100644
--- a/share/man/man4/ccd.4
+++ b/share/man/man4/ccd.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ccd.4,v 1.15 2001/06/23 07:03:53 pjanzen Exp $
+.\"	$OpenBSD: ccd.4,v 1.16 2004/01/23 23:08:46 jmc Exp $
 .\"	$NetBSD: ccd.4,v 1.5 1995/10/09 06:09:09 thorpej Exp $
 .\"
 .\" Copyright (c) 1994 Jason Downs.
@@ -74,10 +74,10 @@ pseudo-device	ccd	4	# concatenated disk devices
 .Ed
 .Pp
 The count argument is how many
-.Nm ccd Ns No 's
+.Nm ccd Ns 's
 memory is allocated for at boot time.
 In this example, no more than 4
-.Nm ccd Ns No 's
+.Nm ccd Ns 's
 may be configured.
 .Pp
 A
@@ -120,7 +120,7 @@ geometry and size.
 Optimum striping cannot occur with different disk types.
 .Pp
 There is a run-time utility that is used for configuring
-.Nm ccd Ns No 's .
+.Nm ccd Ns 's .
 See
 .Xr ccdconfig 8
 for more information.
diff --git a/share/man/man4/cy.4 b/share/man/man4/cy.4
index afc85352980..cf96974b0dc 100644
--- a/share/man/man4/cy.4
+++ b/share/man/man4/cy.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cy.4,v 1.10 2003/11/09 16:06:07 jmc Exp $
+.\"	$OpenBSD: cy.4,v 1.11 2004/01/23 23:08:46 jmc Exp $
 .\"
 .\" Copyright (c) 1993 Andrew Herbert.
 .\" All rights reserved.
@@ -57,7 +57,7 @@ The device minor numbers for this driver are encoded as follows:
 .It "cy%d: tty input queue overflow"
 Incoming characters have been discarded due to a buffer overflow.
 This is caused by the process in control of the device not
-.Xr read 2 Ns No 'ing
+.Xr read 2 Ns 'ing
 characters fast enough.
 .It "cy%d: receive fifo overrun"
 Incoming characters have been discarded due to a CD1400 channel overrun.
diff --git a/share/man/man5/sysctl.conf.5 b/share/man/man5/sysctl.conf.5
index dc08c5565e3..49470c4360f 100644
--- a/share/man/man5/sysctl.conf.5
+++ b/share/man/man5/sysctl.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sysctl.conf.5,v 1.9 2003/06/17 21:56:24 millert Exp $
+.\" $OpenBSD: sysctl.conf.5,v 1.10 2004/01/23 23:08:46 jmc Exp $
 .\"
 .\" Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -31,7 +31,7 @@ early on in the boot sequence.
 The file is made up of
 .Xr sysctl 8
 variable assignments
-.Pq Ar variable Ns No = Ns Ar value
+.Pq Ar variable Ns = Ns Ar value
 with comments designated by a hash mark
 .Pq Sq # .
 .Sh FILES
diff --git a/share/man/man5/wsconsctl.conf.5 b/share/man/man5/wsconsctl.conf.5
index 5275d0fba09..739d2d52f2e 100644
--- a/share/man/man5/wsconsctl.conf.5
+++ b/share/man/man5/wsconsctl.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wsconsctl.conf.5,v 1.3 2003/06/06 13:28:13 jmc Exp $
+.\" $OpenBSD: wsconsctl.conf.5,v 1.4 2004/01/23 23:08:46 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Brian J. Kifiak <bk@rt.fm>
 .\" All rights reserved.
@@ -46,7 +46,7 @@ during the boot sequence.
 The file is made up of
 .Xr wsconsctl 8
 variable assignments
-.Pq Ar variable Ns No = Ns Ar value
+.Pq Ar variable Ns = Ns Ar value
 with comments designated by a hash mark
 .Pq Sq # .
 .Sh FILES
diff --git a/share/man/man7/environ.7 b/share/man/man7/environ.7
index c8432a8649b..ae1a7d7d62e 100644
--- a/share/man/man7/environ.7
+++ b/share/man/man7/environ.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: environ.7,v 1.12 2003/06/02 23:30:14 millert Exp $
+.\"	$OpenBSD: environ.7,v 1.13 2004/01/23 23:08:46 jmc Exp $
 .\"	$NetBSD: environ.7,v 1.4 1995/07/03 19:45:07 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -45,7 +45,7 @@ is made available by
 .Xr execve 2
 when a process begins.
 By convention these strings have the form
-.Ar name Ns No = Ns Ar value .
+.Ar name Ns = Ns Ar value .
 The following variables are recognized by various commands:
 .Bl -tag -width BLOCKSIZE
 .It Ev BLOCKSIZE
@@ -173,7 +173,7 @@ Deprecated synonym of
 Further names may be placed in the environment by the
 .Ic export
 command and
-.Ar name Ns No = Ns Ar value
+.Ar name Ns = Ns Ar value
 arguments in
 .Xr sh 1 ,
 or by the
diff --git a/share/man/man9/timeout.9 b/share/man/man9/timeout.9
index 949732ecf4b..e9125f0e4b8 100644
--- a/share/man/man9/timeout.9
+++ b/share/man/man9/timeout.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: timeout.9,v 1.21 2003/06/03 01:27:31 art Exp $
+.\"	$OpenBSD: timeout.9,v 1.22 2004/01/23 23:08:46 jmc Exp $
 .\"
 .\" Copyright (c) 2000 Artur Grabowski <art@openbsd.org>
 .\" All rights reserved.
@@ -98,7 +98,7 @@ The function
 schedules the execution of the
 .Fa to
 timeout in at least
-.Fa ticks Ns No /hz
+.Fa ticks Ns /hz
 seconds.
 Negative values of
 .Fa ticks
diff --git a/usr.bin/env/env.1 b/usr.bin/env/env.1
index e8403ddd167..51574c8d447 100644
--- a/usr.bin/env/env.1
+++ b/usr.bin/env/env.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: env.1,v 1.10 2003/06/10 09:12:10 jmc Exp $
+.\"	$OpenBSD: env.1,v 1.11 2004/01/23 23:08:46 jmc Exp $
 .\" Copyright (c) 1980, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -40,7 +40,7 @@
 .Nm env
 .Op Fl i
 .Oo
-.Ar name Ns No = Ns Ar value ...
+.Ar name Ns = Ns Ar value ...
 .Oc
 .Oo
 .Ar utility
@@ -53,7 +53,7 @@ executes
 after modifying the environment as
 specified on the command line.
 The option
-.Ar name Ns No = Ns Ar value
+.Ar name Ns = Ns Ar value
 specifies
 an environment variable,
 .Ar name ,
@@ -74,7 +74,7 @@ is specified,
 .Nm
 prints out the names and values
 of the variables in the environment, with one
-.Ar name Ns No = Ns Ar value
+.Ar name Ns = Ns Ar value
 pair per line.
 .Sh DIAGNOSTICS
 If the
diff --git a/usr.bin/less/less.1 b/usr.bin/less/less.1
index 89da0fbe2ed..8570836ceec 100644
--- a/usr.bin/less/less.1
+++ b/usr.bin/less/less.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: less.1,v 1.7 2003/11/30 14:27:52 jmc Exp $
+.\"	$OpenBSD: less.1,v 1.8 2004/01/23 23:08:47 jmc Exp $
 .\"
 .\" Copyright (C) 2002  Mark Nudelman
 .\"
@@ -528,7 +528,7 @@ By default, searches start at the second line on the screen
 (or after the last found line; see the -j option).
 .It Xo
 .Fl b Ns Ar n |
-.Fl -buffers Ns No = Ns Ar n
+.Fl -buffers Ns = Ns Ar n
 .Xc
 Specifies the amount of buffer space
 .Nm
@@ -617,7 +617,7 @@ to run somewhat faster than the default.
 The -G option suppresses all highlighting of strings found by search commands.
 .It Xo
 .Fl h Ns Ar n |
-.Fl -max-back-scroll Ns No = Ns Ar n
+.Fl -max-back-scroll Ns = Ns Ar n
 .Xc
 Specifies a maximum number of lines to scroll backward.
 If it is necessary to scroll backward more than n lines,
@@ -634,7 +634,7 @@ Like -i, but searches ignore case even if the pattern contains uppercase
 letters.
 .It Xo
 .Fl j Ns Ar n |
-.Fl -jump-target Ns No = Ns Ar n
+.Fl -jump-target Ns = Ns Ar n
 .Xc
 Specifies a line on the screen where the "target" line is to be positioned.
 A target line is the object of a text search,
@@ -655,7 +655,7 @@ The status column shows the lines that matched the current search.
 The status column is also used if the -w or -W option is in effect.
 .It Xo
 .Fl k Ns Ar filename |
-.Fl -lesskey-file Ns No = Ns Ar filename
+.Fl -lesskey-file Ns = Ns Ar filename
 .Xc
 Causes
 .Nm
@@ -714,7 +714,7 @@ Causes a line number to be displayed at the beginning of each line in the
 display.
 .It Xo
 .Fl o Ns Ar filename |
-.Fl -log-file Ns No = Ns Ar filename
+.Fl -log-file Ns = Ns Ar filename
 .Xc
 Causes
 .Nm
@@ -725,7 +725,7 @@ If the file already exists,
 will ask for confirmation before overwriting it.
 .It Xo
 .Fl O Ns Ar filename |
-.Fl -LOG-FILE Ns No = Ns Ar filename
+.Fl -LOG-FILE Ns = Ns Ar filename
 .Xc
 The -O option is like -o, but it will overwrite an existing
 file without asking for confirmation.
@@ -739,7 +739,7 @@ The "s" command is equivalent to specifying -o from within
 .Nm less .
 .It Xo
 .Fl p Ns Ar pattern |
-.Fl -pattern Ns No = Ns Ar pattern
+.Fl -pattern Ns = Ns Ar pattern
 .Xc
 The -p option on the command line is equivalent to specifying +/pattern;
 that is, it tells
@@ -747,7 +747,7 @@ that is, it tells
 to start at the first occurrence of pattern in the file.
 .It Xo
 .Fl P Ns Ar prompt |
-.Fl -prompt Ns No = Ns Ar prompt
+.Fl -prompt Ns = Ns Ar prompt
 .Xc
 Provides a way to tailor the three prompt styles to your own preference.
 This option would normally be put in the
@@ -820,7 +820,7 @@ The default is to fold long lines; that is, display the remainder
 on the next line.
 .It Xo
 .Fl t Ns Ar tag |
-.Fl -tag Ns No = Ns Ar tag
+.Fl -tag Ns = Ns Ar tag
 .Xc
 The -t option, followed immediately by a TAG,
 will edit the file containing that tag.
@@ -842,7 +842,7 @@ The command ":t" is equivalent to specifying -t from within
 .Nm less .
 .It Xo
 .Fl T Ns Ar tagsfile |
-.Fl -tag-file Ns No = Ns Ar tagsfile
+.Fl -tag-file Ns = Ns Ar tagsfile
 .Xc
 Specifies a tags file to be used instead of "tags".
 .It Fl u | -underline-special
@@ -883,7 +883,7 @@ Like -w, but temporarily highlights the first new line after any
 forward movement command larger than one line.
 .It Xo
 .Fl x Ns Ar n,... |
-.Fl -tabs Ns No = Ns Ar n,...
+.Fl -tabs Ns = Ns Ar n,...
 .Xc
 Sets tab stops.
 If only one n is specified, tab stops are set at multiples of n.
@@ -903,7 +903,7 @@ This is sometimes useful if the keypad strings make the numeric
 keypad behave in an undesirable manner.
 .It Xo
 .Fl y Ns Ar n |
-.Fl -max-forw-scroll Ns No = Ns Ar n
+.Fl -max-forw-scroll Ns = Ns Ar n
 .Xc
 Specifies a maximum number of lines to scroll forward.
 If it is necessary to scroll forward more than n lines,
@@ -913,7 +913,7 @@ the screen if desired.
 By default, any forward movement causes scrolling.
 .It Xo
 .Fl Oo Cm z Oc Ns Ar n |
-.Fl -window Ns No = Ns Ar n
+.Fl -window Ns = Ns Ar n
 .Xc
 Changes the default scrolling window size to n lines.
 The default is one screenful.
@@ -931,7 +931,7 @@ If the screen is resized to 40 lines,
 the scrolling window automatically changes to 36 lines.
 .It Xo
 .Ar -cc |
-.Fl -quotes Ns No = Ns Ar cc
+.Fl -quotes Ns = Ns Ar cc
 .Xc
 Changes the filename quoting character.
 This may be necessary if you are trying to name a file
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 35cecdc1783..6f67d2d4528 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: make.1,v 1.58 2003/11/22 11:52:49 espie Exp $
+.\"	$OpenBSD: make.1,v 1.59 2004/01/23 23:08:47 jmc Exp $
 .\"	$OpenPackages$
 .\"	$NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
 .\"
@@ -47,7 +47,7 @@
 .Op Fl j Ar max_jobs
 .Op Fl m Ar directory
 .Op Fl V Ar variable
-.Op Ar variable Ns No = Ns Ar value
+.Op Ar variable Ns = Ns Ar value
 .Bk -words
 .Op Ar target ...
 .Ek
@@ -121,7 +121,7 @@ before each command line in the makefile.
 .It Fl t
 Rather than re-building a target as specified in the makefile, create it
 or update its modification time to make it appear up-to-date.
-.It Ar variable Ns No = Ns Ar value
+.It Ar variable Ns = Ns Ar value
 Set the value of the variable
 .Ar variable
 to
@@ -776,7 +776,7 @@ potentially affected, the latter whether multiple substitutions can
 potentially occur within each affected word.
 .It Cm :T
 Replaces each word in the variable with its last component.
-.It Ar :old_string Ns No = Ns Ar new_string
+.It Ar :old_string Ns = Ns Ar new_string
 This is the
 .At V
 style variable substitution.
diff --git a/usr.bin/newsyslog/newsyslog.8 b/usr.bin/newsyslog/newsyslog.8
index 20f066516e0..e80609440c4 100644
--- a/usr.bin/newsyslog/newsyslog.8
+++ b/usr.bin/newsyslog/newsyslog.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: newsyslog.8,v 1.36 2003/06/10 09:12:11 jmc Exp $
+.\"	$OpenBSD: newsyslog.8,v 1.37 2004/01/23 23:08:47 jmc Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -225,11 +225,11 @@ Otherwise, the
 .Ar when
 field consists of an optional interval in hours, possibly followed
 by an
-.So Li \&@ Sc Ns No -sign
+.So Li \&@ Sc Ns -sign
 and a time in a restricted
 .Tn ISO 8601
 format or by a
-.So Li \&$ Sc Ns No -sign
+.So Li \&$ Sc Ns -sign
 and a time specification for logfile rotation at a fixed time once
 per day, per week or per month.
 .Pp
@@ -249,7 +249,7 @@ component in the current implementation, since the only comparison is
 The lead-in character for a restricted
 .Tn ISO 8601
 time is an
-.So Li \&@ Sc Ns No -sign .
+.So Li \&@ Sc Ns -sign .
 The particular format of the time in restricted
 .Tn ISO 8601
 is:
@@ -294,7 +294,7 @@ are all equivalent:
 .El
 .Ss Day, week and month time format
 The lead-in character for day, week and month specification is a
-.So Li \&$ Sc Ns No -sign .
+.So Li \&$ Sc Ns -sign .
 The particular format of day, week and month specification is:
 .Op Va D\&hh ,
 .Op Va W\&w Ns Op Va D\&hh
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 8845eec70cd..28d6af05e3a 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sed.1,v 1.19 2004/01/02 09:50:28 jmc Exp $
+.\"	$OpenBSD: sed.1,v 1.20 2004/01/23 23:08:47 jmc Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -257,7 +257,7 @@ Execute
 .Em function-list
 only when the pattern space is selected.
 .sp
-.It [1addr] Ns Em a Ns No \e
+.It [1addr] Ns Em a Ns \e
 .It Em text
 .br
 Write
@@ -267,13 +267,13 @@ whether by executing the
 .Sq N
 function or by beginning a new cycle.
 .sp
-.It [2addr] Ns Em b Ns No [label]
+.It [2addr] Ns Em b Ns [label]
 Branch to the
 .Sq \&:
 function with the specified label.
 If the label is not specified, branch to the end of the script.
 .sp
-.It [2addr] Ns Em c Ns No \e
+.It [2addr] Ns Em c Ns \e
 .It Em text
 .br
 Delete the pattern space.
@@ -304,7 +304,7 @@ pattern space.
 Append a newline character followed by the contents of the pattern space
 to the hold space.
 .sp
-.It [1addr] Ns Em i Ns No \e
+.It [1addr] Ns Em i Ns \e
 .It Em text
 .br
 Write
@@ -373,7 +373,7 @@ If
 cannot be read for any reason, it is silently ignored and no error
 condition is set.
 .sp
-.It [2addr] Ns Em s Ns No /re/replacement/flags
+.It [2addr] Ns Em s Ns /re/replacement/flags
 Substitute the replacement string for the first instance of the regular
 expression in the pattern space.
 Any character other than backslash or newline can be used instead of
@@ -421,7 +421,7 @@ If the replacement string is identical to that which it replaces, it
 is still considered to have been a replacement.
 .El
 .sp
-.It [2addr] Ns Em t Ns No [label]
+.It [2addr] Ns Em t Ns [label]
 Branch to the
 .Ql \&:
 function bearing the label if any substitutions have been made since the
@@ -437,7 +437,7 @@ Append the pattern space to the
 .It [2addr] Ns Em x
 Swap the contents of the pattern and hold spaces.
 .sp
-.It [2addr] Ns Em y Ns No /string1/string2/
+.It [2addr] Ns Em y Ns /string1/string2/
 Replace all occurrences of characters in
 .Em string1
 in the pattern space with the corresponding characters from
@@ -462,7 +462,7 @@ Apply the function or function-list only to the lines that are
 .Em not
 selected by the address(es).
 .sp
-.It [0addr] Ns Em : Ns No label
+.It [0addr] Ns Em : Ns label
 This function does nothing; it bears a label to which the
 .Sq b
 and
diff --git a/usr.bin/xlint/xlint/lint.1 b/usr.bin/xlint/xlint/lint.1
index d6ba4bdc3c8..8c85d5537d9 100644
--- a/usr.bin/xlint/xlint/lint.1
+++ b/usr.bin/xlint/xlint/lint.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lint.1,v 1.16 2003/09/22 05:04:53 jmc Exp $
+.\"	$OpenBSD: lint.1,v 1.17 2004/01/23 23:08:47 jmc Exp $
 .\"	$NetBSD: lint.1,v 1.3 1995/10/23 13:45:31 jpo Exp $
 .\"
 .\" Copyright (c) 1994, 1995 Jochen Pohl
@@ -409,10 +409,10 @@ like
 makes
 .Nm
 check the first
-.Pq Ar n Ns No -1
+.Pq Ar n Ns -1
 arguments as usual.
 The
-.Ar n Ns No -th
+.Ar n Ns -th
 argument is interpreted as a
 .Sy printf
 format string that is used to check the remaining arguments.
@@ -433,10 +433,10 @@ is zero, function prototypes will be treated normally.
 makes
 .Nm
 check the first
-.Pq Ar n Ns No -1
+.Pq Ar n Ns -1
 arguments as usual.
 The
-.Ar n Ns No -th
+.Ar n Ns -th
 argument is interpreted as a
 .Sy scanf
 format string that is used to check the remaining arguments.
@@ -486,7 +486,7 @@ to be used to
 .Nm
 only the source files that have been modified since the last
 time the set of source files were
-.Nm lint Ns No ed .
+.Nm lint Ns ed .
 .Sh ENVIRONMENT
 .Bl -tag -width Fl
 .It Ev LIBDIR
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index 66dd536cf46..e1a9d7e8501 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: adduser.8,v 1.34 2003/09/02 18:56:35 jmc Exp $
+.\"	$OpenBSD: adduser.8,v 1.35 2004/01/23 23:08:47 jmc Exp $
 .\"
 .\" Copyright (c) 1995-1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 .\" All rights reserved.
@@ -112,7 +112,7 @@ their owner.
 .\" don't allow group or world to write files and allow only owner
 .\" to read/execute/write .rhost, .Xauthority, .kermrc, .netrc, Mail,
 .\" prv, iscreen, term.
-.It Fl encryption Ns No , Fl e Ar method
+.It Fl encryption , e Ar method
 Encrypt local passwords using
 .Ar method
 of encryption as described in
@@ -145,8 +145,8 @@ Do not read the default configuration file.
 .It Fl shell Ar shell
 Specify the default shell for new users.
 .It Xo
-.Fl silent Ns No , Fl s Ns No ,
-.Fl quiet Ns No , Fl q
+.Fl silent , s ,
+.Fl quiet , q
 .Xc
 Causes the program to print fewer warnings, questions, and bug reports.
 .It Fl uid_start Ar uid
@@ -163,7 +163,7 @@ unencrypted.
 The password will be encrypted before it's added to the password file.
 Use of this option will leave username and cleartext password displayable
 for any user.
-.It Fl verbose Ns No , Fl v
+.It Fl verbose , v
 Causes the program to print many warnings and questions.
 This option is recommended for novice users.
 .El
@@ -210,7 +210,7 @@ Removes the user from the password database and all groups in the group
 database.
 If a group becomes empty and its name is the same as the username,
 the group is removed (this complements
-.Nm adduser Ns No 's
+.Nm adduser Ns 's
 unique per-user groups).
 .It
 Recursively deletes all files in the user's home directory and removes the