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

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

4 files changed, 18 insertions, 20 deletions

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