Avoid .Ns right after .Pf, it's pointless.

In some cases, do additional cleanup in the immediate vicinity.

19 files changed, 94 insertions, 121 deletions

diff --git a/bin/chmod/chown.8 b/bin/chmod/chown.8
index 87e9e991606..cebd52784ba 100644
--- a/bin/chmod/chown.8
+++ b/bin/chmod/chown.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chown.8,v 1.18 2014/01/23 08:18:12 jmc Exp $
+.\"	$OpenBSD: chown.8,v 1.19 2015/09/14 20:06:58 schwarze Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     from: @(#)chown.8	8.3 (Berkeley) 3/31/94
 .\"
-.Dd $Mdocdate: January 23 2014 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt CHOWN 8
 .Os
 .Sh NAME
@@ -50,7 +50,7 @@
 .Fl R
 .Op Fl H | L | P
 .Oc
-.Pf : Ns Ar group
+.Pf : Ar group
 .Ar
 .Sh DESCRIPTION
 .Nm
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index ed8db25bcd3..a4ffa701f80 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ed.1,v 1.64 2015/06/22 14:46:59 jmc Exp $
+.\"	$OpenBSD: ed.1,v 1.65 2015/09/14 20:06:58 schwarze Exp $
 .\"
 .\" Copyright (c) 1993 Andrew Moore, Talke Studio.
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 22 2015 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt ED 1
 .Os
 .Sh NAME
@@ -235,8 +235,8 @@ This is equivalent to
 .Ad \-1
 and may be repeated with cumulative effect.
 .It Xo
-.Pf - Ns Ar n No or\ \&
-.Pf ^ Ns Ar n
+.Pf - Ar n No or\ \&
+.Pf ^ Ar n
 .Xc
 The
 .Ar n Ns th
@@ -547,7 +547,7 @@ in
 .Ar replacement
 is replaced by the currently matched text.
 The character sequence
-.Pf \e Ns Ar m ,
+.Pf \e Ar m ,
 where
 .Ar m
 is a number in the range [1,9], is replaced by the
diff --git a/bin/ksh/ksh.1 b/bin/ksh/ksh.1
index 6f066e78b30..3e58f42c18e 100644
--- a/bin/ksh/ksh.1
+++ b/bin/ksh/ksh.1
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: ksh.1,v 1.160 2015/07/04 13:27:04 feinerer Exp $
+.\"	$OpenBSD: ksh.1,v 1.161 2015/09/14 20:06:58 schwarze Exp $
 .\"
 .\"	Public Domain
 .\"
-.Dd $Mdocdate: July 4 2015 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt KSH 1
 .Os
 .Sh NAME
@@ -900,15 +900,15 @@ There are three kinds of
 substitution: parameter, command, and arithmetic.
 Parameter substitutions,
 which are described in detail in the next section, take the form
-.Pf $ Ns Ar name
+.Pf $ Ar name
 or
-.Pf ${ Ns Ar ... Ns } ;
+.Pf ${ Ar ... Ns } ;
 command substitutions take the form
-.Pf $( Ns Ar command Ns \&)
+.Pf $( Ar command )
 or
-.Pf ` Ns Ar command Ns ` ;
+.Pf ` Ar command Ns ` ;
 and arithmetic substitutions take the form
-.Pf $(( Ns Ar expression Ns )) .
+.Pf $(( Ar expression ) ) .
 .Pp
 If a substitution appears outside of double quotes, the results of the
 substitution are generally subject to word or field splitting according to
@@ -984,11 +984,11 @@ brace expansion and file name expansion (see the relevant sections below).
 A command substitution is replaced by the output generated by the specified
 command, which is run in a subshell.
 For
-.Pf $( Ns Ar command Ns \&)
+.Pf $( Ar command )
 substitutions, normal quoting rules are used when
 .Ar command
 is parsed; however, for the
-.Pf ` Ns Ar command Ns `
+.Pf ` Ar command Ns `
 form, a
 .Ql \e
 followed by any of
@@ -1000,7 +1000,7 @@ is stripped (a
 .Ql \e
 followed by any other character is unchanged).
 As a special case in command substitutions, a command of the form
-.Pf \*(Lt Ar file
+.Pf < Ar file
 is interpreted to mean substitute the contents of
 .Ar file .
 Note that
@@ -1010,7 +1010,7 @@ has the same effect as
 but it is carried out more efficiently because no process is started.
 .Pp
 .Sy Note :
-.Pf $( Ns Ar command Ns \&)
+.Pf $( Ar command )
 expressions are currently parsed by finding the matching parenthesis,
 regardless of quoting.
 This should be fixed soon.
@@ -1039,11 +1039,11 @@ where
 .Ar expr
 is an arithmetic expression.
 Parameter substitutions take the form
-.Pf $ Ns Ar name ,
-.Pf ${ Ns Ar name Ns } ,
+.Pf $ Ar name ,
+.Pf ${ Ar name Ns } ,
 or
 .Sm off
-.Pf ${ Ar name Oo Ar expr Oc }
+.Pf ${ Ar name Bo Ar expr Bc }
 .Sm on
 where
 .Ar name
@@ -1115,9 +1115,7 @@ Lastly, parameters can be assigned values using assignment operators
 inside arithmetic expressions (see
 .Sx Arithmetic expressions
 below) or using the
-.Sm off
-.Pf ${ Ar name No = Ar value No }
-.Sm on
+.Pf ${ Ar name Ns = Ns Ar value Ns }
 form of the parameter substitution (see below).
 .Pp
 Parameters with the export attribute (set using the
@@ -1137,7 +1135,7 @@ from its environment and automatically sets the export attribute for those
 parameters.
 .Pp
 Modifiers can be applied to the
-.Pf ${ Ns Ar name Ns }
+.Pf ${ Ar name Ns }
 form of parameter substitution:
 .Bl -tag -width Ds
 .Sm off
@@ -1209,7 +1207,7 @@ is not needed, it is not evaluated.
 The following forms of parameter substitution can also be used:
 .Pp
 .Bl -tag -width Ds -compact
-.It Pf ${# Ns Ar name Ns \&}
+.It Pf ${# Ar name Ns }
 The number of positional parameters if
 .Ar name
 is
@@ -1218,21 +1216,13 @@ is
 or not specified; otherwise the length of the string value of parameter
 .Ar name .
 .Pp
-.It Pf ${# Ns Ar name Ns [*]}
-.It Pf ${# Ns Ar name Ns [@]}
+.It Pf ${# Ar name Ns [*]}
+.It Pf ${# Ar name Ns [@]}
 The number of elements in the array
 .Ar name .
 .Pp
-.Sm off
-.It Xo
-.Pf ${ Ar name
-.Pf # Ar pattern No }
-.Xc
-.It Xo
-.Pf ${ Ar name
-.Pf ## Ar pattern No }
-.Xc
-.Sm on
+.It Pf ${ Ar name Ns # Ns Ar pattern Ns }
+.It Pf ${ Ar name Ns ## Ns Ar pattern Ns }
 If
 .Ar pattern
 matches the beginning of the value of parameter
@@ -1243,16 +1233,8 @@ A single
 results in the shortest match, and two
 of them result in the longest match.
 .Pp
-.Sm off
-.It Xo
-.Pf ${ Ar name
-.Pf % Ar pattern No }
-.Xc
-.It Xo
-.Pf ${ Ar name
-.Pf %% Ar pattern No }
-.Xc
-.Sm on
+.It Pf ${ Ar name Ns % Ns Ar pattern Ns }
+.It Pf ${ Ar name Ns %% Ns Ar pattern Ns }
 Like ${..#..} substitution, but it deletes from the end of the value.
 .El
 .Pp
@@ -4714,7 +4696,7 @@ bound to by default, written using caret notation
 e.g. the ASCII ESC character is written as ^[.
 ^[A-Z] sequences are not case sensitive.
 A count prefix for a command is entered using the sequence
-.Pf ^[ Ns Ar n ,
+.Pf ^[ Ar n ,
 where
 .Ar n
 is a sequence of 1 or more digits.
diff --git a/bin/ksh/sh.1 b/bin/ksh/sh.1
index 97908fb5501..cf4ef67bd80 100644
--- a/bin/ksh/sh.1
+++ b/bin/ksh/sh.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sh.1,v 1.128 2015/05/04 19:34:13 jmc Exp $
+.\"	$OpenBSD: sh.1,v 1.129 2015/09/14 20:06:58 schwarze Exp $
 .\"
 .\" Copyright (c) 2015 Jason McIntyre <jmc@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 4 2015 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1339,7 +1339,7 @@ In that case the shell attempts arithmetic expansion first,
 then attempts command substitution if that fails.
 Or a non-ambiguous version can be used:
 .Pp
-.D1 $( Pf ( Ar command Ns Pf ) \ \&)
+.D1 "$( (" Ns Ar command Ns ") )"
 .Pp
 Arithmetic expansion works similarly,
 with an arithmetic expression being evaluated and substituted.
diff --git a/lib/libc/regex/re_format.7 b/lib/libc/regex/re_format.7
index 36f0942715f..da4b4b29a80 100644
--- a/lib/libc/regex/re_format.7
+++ b/lib/libc/regex/re_format.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: re_format.7,v 1.21 2015/02/28 21:51:57 bentley Exp $
+.\"	$OpenBSD: re_format.7,v 1.22 2015/09/14 20:06:58 schwarze Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
 .\"
@@ -35,7 +35,7 @@
 .\"
 .\"	@(#)re_format.7	8.3 (Berkeley) 3/20/94
 .\"
-.Dd $Mdocdate: February 28 2015 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt RE_FORMAT 7
 .Os
 .Sh NAME
@@ -679,7 +679,7 @@ Defines a subexpression
 .Ar re .
 Subexpressions may be nested.
 A subsequent backreference of the form
-.Pf \e Ns Ar n ,
+.Pf \e Ar n ,
 where
 .Ar n
 is a number in the range [1,9], expands to the text matched by the
diff --git a/lib/libkeynote/keynote.4 b/lib/libkeynote/keynote.4
index 271d3ff4810..9058a0e8ba2 100644
--- a/lib/libkeynote/keynote.4
+++ b/lib/libkeynote/keynote.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote.4,v 1.33 2015/09/10 17:55:21 schwarze Exp $
+.\" $OpenBSD: keynote.4,v 1.34 2015/09/14 20:06:58 schwarze Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -20,7 +20,7 @@
 .\" MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
 .\" PURPOSE.
 .\"
-.Dd $Mdocdate: September 10 2015 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt KEYNOTE 4
 .\" .TH KeyNote 4 local
 .Os
@@ -557,7 +557,7 @@ the possible compliance value set would contain the values
 (by clause (4)).
 If the ordered set of compliance values
 given in the query (in ascending order) is
-.Pf { Ns Qo no_access Qc ,
+.Pf { Qo no_access Qc ,
 .Qq guest_access ,
 .Qq user_access ,
 .Qo full_access Qc Ns } ,
@@ -822,7 +822,7 @@ A log entry is made if the amount is at least 100.
 .Ed
 .Pp
 Assume a query in which the ordered set of Compliance Values is
-.Pf { Ns Qo Reject Qc ,
+.Pf { Qo Reject Qc ,
 .Qq ApproveAndLog ,
 .Qo Approve Qc Ns } .
 Under policies E and G, and
diff --git a/lib/libkeynote/keynote.5 b/lib/libkeynote/keynote.5
index 80bef55b01c..b13396c8624 100644
--- a/lib/libkeynote/keynote.5
+++ b/lib/libkeynote/keynote.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote.5,v 1.23 2013/07/16 15:21:11 schwarze Exp $
+.\" $OpenBSD: keynote.5,v 1.24 2015/09/14 20:06:58 schwarze Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -20,7 +20,7 @@
 .\" MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
 .\" PURPOSE.
 .\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt KEYNOTE 5
 .\" .TH KeyNote 5 local
 .Os
@@ -79,7 +79,7 @@ therefore, can be separated from one another unambiguously by the use
 of blank lines between them.
 .Sh COMMENTS
 The octothorp character
-.Pf ( Ns Qo # Qc ,
+.Pf ( Sq # ,
 ASCII 35 decimal) can be used to
 introduce comments.
 Outside of quoted strings, all characters from the
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5
index 60692b3a3c2..4e114e9219c 100644
--- a/share/man/man5/pf.conf.5
+++ b/share/man/man5/pf.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pf.conf.5,v 1.545 2015/02/16 21:43:10 jmc Exp $
+.\"	$OpenBSD: pf.conf.5,v 1.546 2015/09/14 20:06:59 schwarze Exp $
 .\"
 .\" Copyright (c) 2002, Daniel Hartmeier
 .\" Copyright (c) 2003 - 2013 Henning Brauer <henning@openbsd.org>
@@ -28,7 +28,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 16 2015 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt PF.CONF 5
 .Os
 .Sh NAME
@@ -497,10 +497,7 @@ The packets will not be modified, so
 .Xr getsockname 2
 on the socket will return the original destination address of the packet.
 .Pp
-.It Xo Ar flags Aq Ar a
-.Pf / Ns Aq Ar b
-.No \&| Ar any
-.Xc
+.It Ar flags Ao Ar a Ac Ns / Ns Ao Ar b Ac | Ar any
 This rule only applies to TCP packets that have the flags
 .Aq Ar a
 set out of set
diff --git a/share/man/man5/spamd.conf.5 b/share/man/man5/spamd.conf.5
index 727cda14234..588203aa976 100644
--- a/share/man/man5/spamd.conf.5
+++ b/share/man/man5/spamd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: spamd.conf.5,v 1.14 2007/05/31 19:19:58 jmc Exp $
+.\"	$OpenBSD: spamd.conf.5,v 1.15 2015/09/14 20:06:59 schwarze Exp $
 .\"
 .\" Copyright (c) 2003 Jason L. Wright (jason@thought.net)
 .\" Copyright (c) 2003 Bob Beck
@@ -24,7 +24,7 @@
 .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt SPAMD.CONF 5
 .Os
 .Sh NAME
@@ -80,9 +80,9 @@ which specifies the order in which lists
 are to be applied.
 Lists are constructed by name:
 blacklists are identified by the capability
-.Pf : Ns Ar black : .
+.Pf : Ar black : .
 If a list is instead given the
-.Pf : Ns Ar white :
+.Pf : Ar white :
 capability,
 addresses in it will not be blacklisted.
 The addresses in such a list are removed from the preceding blacklist.
diff --git a/share/man/man7/mdoc.7 b/share/man/man7/mdoc.7
index 5b44b56789a..f750da37273 100644
--- a/share/man/man7/mdoc.7
+++ b/share/man/man7/mdoc.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mdoc.7,v 1.134 2015/03/13 19:58:41 jmc Exp $
+.\"	$OpenBSD: mdoc.7,v 1.135 2015/09/14 20:06:59 schwarze Exp $
 .\"
 .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2010, 2011, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 13 2015 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt MDOC 7
 .Os
 .Sh NAME
@@ -1642,7 +1642,7 @@ See also
 A function name.
 Its syntax is as follows:
 .Bd -ragged -offset indent
-.Pf \. Ns Sx \&Fn
+.Pf . Sx \&Fn
 .Op Ar functype
 .Ar funcname
 .Op Oo Ar argtype Oc Ar argname
diff --git a/share/man/man8/release.8 b/share/man/man8/release.8
index 3d7481ced33..1fff1978578 100644
--- a/share/man/man8/release.8
+++ b/share/man/man8/release.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: release.8,v 1.71 2015/09/10 15:16:43 schwarze Exp $
+.\"	$OpenBSD: release.8,v 1.72 2015/09/14 20:06:59 schwarze Exp $
 .\"
 .\"	Copyright (c) 2000 Marco S. Hyman
 .\"
@@ -9,7 +9,7 @@
 .\"	LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 .\"	FOR A PARTICULAR PURPOSE.
 .\"
-.Dd $Mdocdate: September 10 2015 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt RELEASE 8
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@ The following sections describe each of the required steps in detail.
 .Pp
 Commands to be run as a user with write permissions on the source and
 ports trees
-.Pf ( Ns Pa /usr/src
+.Pf ( Pa /usr/src
 and
 .Pa /usr/ports
 respectively)
diff --git a/usr.bin/awk/awk.1 b/usr.bin/awk/awk.1
index 3c9f24d82c6..ef736709f26 100644
--- a/usr.bin/awk/awk.1
+++ b/usr.bin/awk/awk.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: awk.1,v 1.43 2015/01/16 15:53:24 schwarze Exp $
+.\"	$OpenBSD: awk.1,v 1.44 2015/09/14 20:06:58 schwarze Exp $
 .\"
 .\" Copyright (C) Lucent Technologies 1997
 .\" All Rights Reserved
@@ -22,7 +22,7 @@
 .\" ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 .\" THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 16 2015 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt AWK 1
 .Os
 .Sh NAME
@@ -285,9 +285,9 @@ The
 .Ic print
 statement prints its arguments on the standard output
 (or on a file if
-.Pf > Ns Ar file
+.Pf > Ar file
 or
-.Pf >> Ns Ar file
+.Pf >> Ar file
 is present or on a pipe if
 .Pf |\ \& Ar cmd
 is present), separated by the current output field separator,
@@ -322,7 +322,7 @@ relational expressions, using the operators
 .Ic ~
 and
 .Ic !~ .
-.Pf / Ns Ar re Ns /
+.Pf / Ar re Ns /
 is a constant regular expression;
 any string (constant or variable) may be used
 as a regular expression, except in the position of an isolated regular expression
diff --git a/usr.bin/col/col.1 b/usr.bin/col/col.1
index e1db48d1bfa..02b8019892d 100644
--- a/usr.bin/col/col.1
+++ b/usr.bin/col/col.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: col.1,v 1.13 2015/05/09 20:36:18 schwarze Exp $
+.\"	$OpenBSD: col.1,v 1.14 2015/09/14 20:06:58 schwarze Exp $
 .\"	$NetBSD: col.1,v 1.4 1995/03/26 05:25:52 glass Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)col.1	8.1 (Berkeley) 6/29/93
 .\"
-.Dd $Mdocdate: May 9 2015 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt COL 1
 .Os
 .Sh NAME
@@ -61,7 +61,7 @@ This can be useful in processing the output of
 .Xr mandoc 1 .
 .It Fl f
 Forward half-line feeds are permitted
-.Pf ( Ns Dq fine
+.Pf ( Dq fine
 mode).
 Normally characters printed on a half-line boundary are printed
 on the following line.
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index 6cc3574806f..dcd9a38bacc 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,4 +1,4 @@
-.\"	@(#) $OpenBSD: m4.1,v 1.62 2014/04/14 07:00:47 jmc Exp $
+.\"	@(#) $OpenBSD: m4.1,v 1.63 2015/09/14 20:06:58 schwarze Exp $
 .\"
 .\" Copyright (c) 1989, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 14 2014 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt M4 1
 .Os
 .Sh NAME
@@ -95,9 +95,7 @@ recognized as special when not followed by an open parenthesis.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
-.It Fl D Ns Ar name Ns Oo
-.Pf = Ns Ar value
-.Oc
+.It Fl D Ns Ar name Ns Op = Ns Ar value
 Define the symbol
 .Ar name
 to have some value (or
diff --git a/usr.bin/vi/docs/USD.doc/vi.man/vi.1 b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
index 57d4ac632dc..0f503bc0950 100644
--- a/usr.bin/vi/docs/USD.doc/vi.man/vi.1
+++ b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vi.1,v 1.59 2015/03/17 10:08:18 bentley Exp $
+.\"	$OpenBSD: vi.1,v 1.60 2015/09/14 20:06:58 schwarze Exp $
 .\"
 .\" Copyright (c) 1994
 .\"     The Regents of the University of California.  All rights reserved.
@@ -14,7 +14,7 @@
 .\"
 .\"     @(#)vi.1	8.51 (Berkeley) 10/10/96
 .\"
-.Dd $Mdocdate: March 17 2015 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt VI 1
 .Os
 .Sh NAME
@@ -365,7 +365,7 @@ for later use.
 .Nm vi
 buffers are named with a single character preceded by a double quote,
 for example
-.Pf \&" Ns Aq c ;
+.Pf \&" Aq c ;
 .Nm ex
 buffers are the same,
 but without the double quote.
@@ -919,21 +919,21 @@ of the
 command.
 .Pp
 .It Xo
-.Pf / Ns Ar RE
+.Pf / Ar RE
 .Aq Li carriage-return
 .Xc
 .It Xo
-.Pf / Ns Ar RE Ns /
+.Pf / Ar RE Ns /
 .Op Ar offset
 .Op Cm z
 .Aq Li carriage-return
 .Xc
 .It Xo
-.Pf ?\& Ns Ar RE
+.Pf ? Ar RE
 .Aq Li carriage-return
 .Xc
 .It Xo
-.Pf ?\& Ns Ar RE Ns ?\&
+.Pf ? Ar RE Ns ?
 .Op Ar offset
 .Op Cm z
 .Aq Li carriage-return
diff --git a/usr.sbin/dhcpd/dhcp-options.5 b/usr.sbin/dhcpd/dhcp-options.5
index a1ac5794115..186a7f54780 100644
--- a/usr.sbin/dhcpd/dhcp-options.5
+++ b/usr.sbin/dhcpd/dhcp-options.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhcp-options.5,v 1.21 2015/06/02 16:02:45 sobrado Exp $
+.\"	$OpenBSD: dhcp-options.5,v 1.22 2015/09/14 20:06:59 schwarze Exp $
 .\"
 .\" Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.
 .\" All rights reserved.
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.Dd $Mdocdate: June 2 2015 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt DHCP-OPTIONS 5
 .Os
 .Sh NAME
@@ -122,7 +122,7 @@ or
 The documentation for the various options mentioned below is taken
 from the IETF draft document on DHCP options, RFC 2132.
 Options which are not listed by name may be defined by the name
-.Pf option\- Ns Ar nnn ,
+.Pf option- Ar nnn ,
 where
 .Ar nnn
 is the decimal number of the option code.
diff --git a/usr.sbin/pppd/pppd.8 b/usr.sbin/pppd/pppd.8
index 8ce0861d1f7..bc358980879 100644
--- a/usr.sbin/pppd/pppd.8
+++ b/usr.sbin/pppd/pppd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pppd.8,v 1.44 2015/07/27 17:28:39 sobrado Exp $
+.\" $OpenBSD: pppd.8,v 1.45 2015/09/14 20:06:59 schwarze Exp $
 .\" Id: pppd.8,v 1.27 1998/03/31 04:31:08 paulus Exp $
 .\"
 .\" Copyright (c) 1993-2003 Paul Mackerras <paulus@samba.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 27 2015 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt PPPD 8
 .Os
 .Sh NAME
@@ -836,14 +836,14 @@ Options can be taken from files as well as the command line.
 reads options from the files
 .Pa /etc/ppp/options , ~/.ppprc
 and
-.Pf /etc/ppp/options. Ns Ar ttyname
+.Pf /etc/ppp/options. Ar ttyname
 (in that order) before processing the options on the command line.
 (In fact, the command-line options are scanned to find the terminal name
 before the
-.Pf options. Ns Ar ttyname
+.Pf options. Ar ttyname
 file is read.)
 In forming the name of the
-.Pf options. Ns Ar ttyname
+.Pf options. Ar ttyname
 file,
 the initial /dev/ is removed from the terminal name, and any remaining
 / characters are replaced with dots.
@@ -966,7 +966,7 @@ if it has no secrets which could be used to do so.
 .Pp
 .Nm
 stores secrets for use in authentication in secrets files
-.Pf ( Ns Pa /etc/ppp/pap-secrets
+.Pf ( Pa /etc/ppp/pap-secrets
 for PAP,
 .Pa /etc/ppp/chap-secrets
 for CHAP).
@@ -1269,7 +1269,7 @@ System default options for
 read before user default options or command-line options.
 .It Pa ~/.ppprc
 User default options, read before
-.Pf /etc/ppp/options. Ns Ar ttyname .
+.Pf /etc/ppp/options. Ar ttyname .
 .It Pa /etc/ppp/options. Ns Ar ttyname
 System default options for the serial port being used, read after
 .Pa ~/.ppprc .
@@ -1382,7 +1382,7 @@ In particular, it is often useful to escape XON (^Q) and
 XOFF (^S), using
 .Cm asyncmap a0000 .
 If the path includes a telnet, you probably should escape ^] as well
-.Pf ( Ns Cm asyncmap 200a0000 ) .
+.Cm ( asyncmap 200a0000 ) .
 If the path includes an rlogin, you will need to use the
 .Cm escape ff
 option on the end which is running the rlogin client, since many
diff --git a/usr.sbin/tcpdump/tcpdump.8 b/usr.sbin/tcpdump/tcpdump.8
index cc9ce31027c..a458d4dd887 100644
--- a/usr.sbin/tcpdump/tcpdump.8
+++ b/usr.sbin/tcpdump/tcpdump.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcpdump.8,v 1.85 2015/07/18 16:55:31 stsp Exp $
+.\"	$OpenBSD: tcpdump.8,v 1.86 2015/09/14 20:06:59 schwarze Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996
 .\"	The Regents of the University of California.  All rights reserved.
@@ -19,7 +19,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.Dd $Mdocdate: July 18 2015 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt TCPDUMP 8
 .Os
 .Sh NAME
@@ -870,7 +870,7 @@ and
 is an arithmetic expression composed of integer constants
 .Pq expressed in standard C syntax ,
 the normal binary operators
-.Pf ( Ns Ql + ,
+.Ql ( + ,
 .Ql - ,
 .Ql * ,
 .Ql / ,
diff --git a/usr.sbin/traceroute/traceroute.8 b/usr.sbin/traceroute/traceroute.8
index dc18ad52f71..21eeadf0016 100644
--- a/usr.sbin/traceroute/traceroute.8
+++ b/usr.sbin/traceroute/traceroute.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: traceroute.8,v 1.62 2014/09/08 01:27:55 schwarze Exp $
+.\"	$OpenBSD: traceroute.8,v 1.63 2015/09/14 20:06:59 schwarze Exp $
 .\"	$NetBSD: traceroute.8,v 1.6 1995/10/12 03:05:50 mycroft Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)traceroute.8	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: September 8 2014 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt TRACEROUTE 8
 .Os
 .Sh NAME
@@ -352,12 +352,8 @@ That is, rip is really only 7 hops away.
 A reply that returns with a TTL of 1 is a clue this problem exists.
 .Nm
 prints a "!" after the time if the TTL is <= 1.
-Since vendors ship a lot of obsolete
-.Pf ( Tn DEC Ns \'s
-Ultrix, Sun 3.x) or
-non-standard
-.Pq Tn HP-UX
-software, expect to see this problem
+Since vendors ship a lot of obsolete (DEC's Ultrix, Sun 3.x) or
+non-standard (HP-UX) software, expect to see this problem
 frequently and/or take care picking the target host of your
 probes.
 .Pp