Between groff-1.15 and groff-1.20.1, the .Ns macro was changed to no

longer suppress spacing when used at the beginning of an input line,
and mandoc now follows the same behaviour as new groff.
Thus, sweep the tree and remove useless .Ns.
Most places found by jmc@; ok jmc@ kristaps@.

8 files changed, 37 insertions, 53 deletions

diff --git a/share/man/man7/mdoc.7 b/share/man/man7/mdoc.7
index 83d44030a1e..9a99458f65b 100644
--- a/share/man/man7/mdoc.7
+++ b/share/man/man7/mdoc.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mdoc.7,v 1.64 2011/02/06 17:33:20 schwarze Exp $
+.\"	$OpenBSD: mdoc.7,v 1.65 2011/02/07 00:02:50 schwarze Exp $
 .\"
 .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2010 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: February 6 2011 $
+.Dd $Mdocdate: February 7 2011 $
 .Dt MDOC 7
 .Os
 .Sh NAME
@@ -283,11 +283,13 @@ a line.
 By doing so, front-ends will be able to apply the proper amount of
 spacing after the end of sentence (unescaped) period, exclamation mark,
 or question mark followed by zero or more non-sentence closing
-delimiters (
-.Ns Sq \&) ,
+delimiters
+.Po
+.Sq \&) ,
 .Sq \&] ,
 .Sq \&' ,
-.Sq \&" ) .
+.Sq \&"
+.Pc .
 .Pp
 The proper spacing is also intelligently preserved if a sentence ends at
 the boundary of a macro line.
diff --git a/share/man/man7/tbl.7 b/share/man/man7/tbl.7
index 1f5992bbfdb..d74a79b6a2c 100644
--- a/share/man/man7/tbl.7
+++ b/share/man/man7/tbl.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tbl.7,v 1.2 2011/01/22 19:38:51 schwarze Exp $
+.\"	$OpenBSD: tbl.7,v 1.3 2011/02/07 00:02:50 schwarze Exp $
 .\"
 .\" Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
@@ -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: January 22 2011 $
+.Dd $Mdocdate: February 7 2011 $
 .Dt TBL 7
 .Os
 .Sh NAME
@@ -207,8 +207,8 @@ Justify a number around its last decimal point.
 If the decimal point is not found on the number, it's assumed to trail
 the number.
 .It Cm s
-Horizontally span columns from the last non-
-.Ns Cm s
+Horizontally span columns from the last
+.No non- Ns Cm s
 data cell.
 It is an error if spanning columns follow a
 .Cm \-
@@ -220,8 +220,8 @@ This option is not supported by
 .It Cm a
 Left-justify a literal string and pad with one space.
 .It Cm ^
-Vertically span rows from the last non-
-.Ns Cm ^
+Vertically span rows from the last
+.No non- Ns Cm ^
 data cell.
 It is an error to invoke a vertical span on the first layout row.
 Unlike a horizontal spanner, you must specify an empty cell (if it not
diff --git a/usr.bin/awk/awk.1 b/usr.bin/awk/awk.1
index 6dad9ebbde2..73666d0ac87 100644
--- a/usr.bin/awk/awk.1
+++ b/usr.bin/awk/awk.1
@@ -1,5 +1,4 @@
-.\"	$OpenBSD: awk.1,v 1.37 2010/10/01 07:06:16 jmc Exp $
-.\" EX/EE is a Bd
+.\"	$OpenBSD: awk.1,v 1.38 2011/02/07 00:02:50 schwarze Exp $
 .\"
 .\" Copyright (C) Lucent Technologies 1997
 .\" All Rights Reserved
@@ -23,7 +22,7 @@
 .\" ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 .\" THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 1 2010 $
+.Dd $Mdocdate: February 7 2011 $
 .Dt AWK 1
 .Os
 .Sh NAME
@@ -35,8 +34,7 @@
 .Op Fl V
 .Op Fl d Ns Op Ar n
 .Op Fl F Ar fs
-.Oo Fl v Ar var Ns =
-.Ns Ar value Oc
+.Op Fl v Ar var Ns = Ns Ar value
 .Op Ar prog | Fl f Ar progfile
 .Ar
 .Sh DESCRIPTION
diff --git a/usr.bin/leave/leave.1 b/usr.bin/leave/leave.1
index cea29655240..3ed5f0bdbb8 100644
--- a/usr.bin/leave/leave.1
+++ b/usr.bin/leave/leave.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: leave.1,v 1.13 2007/05/31 19:20:12 jmc Exp $
+.\"	$OpenBSD: leave.1,v 1.14 2011/02/07 00:02:50 schwarze Exp $
 .\"	$NetBSD: leave.1,v 1.5 1995/08/31 22:32:10 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)leave.1	8.3 (Berkeley) 4/28/95
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: February 7 2011 $
 .Dt LEAVE 1
 .Os
 .Sh NAME
@@ -38,12 +38,7 @@
 .Nd remind you when you have to leave
 .Sh SYNOPSIS
 .Nm leave
-.Sm off
-.Oo
-.Op Cm \&+
-.Ns Ar hhmm
-.Oc
-.Sm on
+.Op Oo Cm \&+ Oc Ns Ar hhmm
 .Sh DESCRIPTION
 .Nm leave
 waits until the specified time, then reminds you that you
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index e3067882916..9b2c9c21200 100644
--- a/usr.sbin/pkg_add/pkg_add.1
+++ b/usr.sbin/pkg_add/pkg_add.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_add.1,v 1.103 2010/10/28 22:33:43 espie Exp $
+.\"	$OpenBSD: pkg_add.1,v 1.104 2011/02/07 00:02:50 schwarze Exp $
 .\"
 .\" Documentation and design originally from FreeBSD. All the code has
 .\" been rewritten since. We keep the documentation's notice:
@@ -15,7 +15,7 @@
 .\" Jordan K. Hubbard
 .\"
 .\"
-.Dd $Mdocdate: October 28 2010 $
+.Dd $Mdocdate: February 7 2011 $
 .Dt PKG_ADD 1
 .Os
 .Sh NAME
@@ -27,10 +27,7 @@
 .Op Fl acIimnqrsUuvxz
 .Op Fl A Ar arch
 .Op Fl B Ar pkg-destdir
-.Oo Fl D Ar name
-.Ns Oo Ns = Ns Ar value
-.Oc
-.Oc
+.Op Fl D Ar name Ns Op = Ns Ar value
 .Op Fl L Ar localbase
 .Op Fl l Ar file
 .Op Fl P Ar type
diff --git a/usr.sbin/pkg_add/pkg_check.8 b/usr.sbin/pkg_add/pkg_check.8
index cefe754b336..cb077950f56 100644
--- a/usr.sbin/pkg_add/pkg_check.8
+++ b/usr.sbin/pkg_add/pkg_check.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_check.8,v 1.3 2010/06/09 09:53:03 espie Exp $
+.\"	$OpenBSD: pkg_check.8,v 1.4 2011/02/07 00:02:50 schwarze Exp $
 .\"
 .\" Copyright (c) 2010 Marc Espie <espie@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: June 9 2010 $
+.Dd $Mdocdate: February 7 2011 $
 .Dt PKG_CHECK 8
 .Os
 .Sh NAME
@@ -24,10 +24,7 @@
 .Nm pkg_check
 .Bk -words
 .Op Fl fimnqvx
-.Oo Fl D Ar name
-.Ns Oo Ns = Ns Ar value
-.Oc
-.Oc
+.Op Fl D Ar name Ns Op = Ns Ar value
 .Ek
 .Sh DESCRIPTION
 .Nm
diff --git a/usr.sbin/pkg_add/pkg_create.1 b/usr.sbin/pkg_add/pkg_create.1
index 854c46f5be4..67ca99e9c28 100644
--- a/usr.sbin/pkg_add/pkg_create.1
+++ b/usr.sbin/pkg_add/pkg_create.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_create.1,v 1.71 2011/01/02 22:58:45 fgsch Exp $
+.\"	$OpenBSD: pkg_create.1,v 1.72 2011/02/07 00:02:50 schwarze Exp $
 .\"
 .\" Documentation and design originally from FreeBSD. All the code has
 .\" been rewritten since. We keep the documentation's notice:
@@ -21,7 +21,7 @@
 .\" [jkh] Took John's changes back and made some additional extensions for
 .\" better integration with FreeBSD's new ports collection.
 .\"
-.Dd $Mdocdate: January 2 2011 $
+.Dd $Mdocdate: February 7 2011 $
 .Dt PKG_CREATE 1
 .Os
 .Sh NAME
@@ -33,10 +33,7 @@
 .Op Fl mnQqvx
 .Op Fl A Ar arches
 .Op Fl B Ar pkg-destdir
-.Oo Fl D Ar name
-.Ns Oo Ns = Ns Ar value
-.Oc
-.Oc
+.Op Fl D Ar name Ns Op = Ns Ar value
 .Op Fl L Ar localbase
 .Op Fl M Ar displayfile
 .Op Fl P Ar pkg-dependency
diff --git a/usr.sbin/tcpdump/tcpdump.8 b/usr.sbin/tcpdump/tcpdump.8
index 1292d1ebc75..3f8eb942a95 100644
--- a/usr.sbin/tcpdump/tcpdump.8
+++ b/usr.sbin/tcpdump/tcpdump.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcpdump.8,v 1.72 2010/09/07 12:40:30 jmc Exp $
+.\"	$OpenBSD: tcpdump.8,v 1.73 2011/02/07 00:02:50 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: September 7 2010 $
+.Dd $Mdocdate: February 7 2011 $
 .Dt TCPDUMP 8
 .Os
 .Sh NAME
@@ -1493,14 +1493,14 @@ requests and replies are printed as:
 .Bd -ragged -offset indent
 .Ar src . Ns Ar xid
 >
-.Ar dst . Ns Ar nfs :
-.Ns Ar len
-.Ns Ar op args
+.Ar dst . Ns nfs :
+.Ar len op args
 .Pp
-.Ar src . Ns Ar nfs
+.Ar src . Ns nfs
 >
 .Ar dst . Ns Ar xid :
-.Ns Ar reply stat len op results
+reply
+.Ar stat len op results
 .Ed
 .Bd -unfilled -offset indent
 sushi.6709 > wrl.nfs: 112 readlink fh 21,24/10.73165
@@ -1626,10 +1626,8 @@ file may contain blank lines or comment lines
 .Ql # ) .
 .Pp
 AppleTalk addresses are printed in the form
-.Bd -ragged -offset indent
-.Ar net . Ns Ar host .
-.Ns Ar port
-.Ed
+.Pp
+.D1 Ar net . Ns Ar host . Ns Ar port
 .Pp
 For example:
 .Bd -unfilled -offset indent