more wacky macro fixing;

8 files changed, 76 insertions, 70 deletions

diff --git a/usr.bin/cdio/cdio.1 b/usr.bin/cdio/cdio.1
index f8bf0604dc3..7fa3d7f935c 100644
--- a/usr.bin/cdio/cdio.1
+++ b/usr.bin/cdio/cdio.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cdio.1,v 1.56 2010/07/26 21:14:39 jmc Exp $
+.\" $OpenBSD: cdio.1,v 1.57 2010/09/19 21:30:04 jmc Exp $
 .\"
 .\" Copyright (c) 1995 Serge V. Vakulenko
 .\" All rights reserved.
@@ -29,7 +29,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 26 2010 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt CDIO 1
 .Os
 .Sh NAME
@@ -154,8 +154,10 @@ If we're at the last track, stop.
 Stop playing.
 Do not stop the disc.
 .It Xo Ic play
-.Oo Ar track1 Ns Op Ar .index1
-.Op Ar track2 Ns Op Ar .index2 Oc
+.Oo
+.Ar track1 Ns Op Ar .index1
+.Op Ar track2 Ns Op Ar .index2
+.Oc
 .Xc
 Play from
 .Ar track1
@@ -165,12 +167,14 @@ an optional index point can be specified for each track.
 If only one track is specified, play from that track to the end of the disc.
 If no tracks are specified, play the whole disc.
 .It Xo Ic play
-.Oo Op Ar tr1
+.Oo
+.Op Ar tr1
 .Ar m1 : Ns Ar s1 Ns Oo
 .Ar .f1 Oc
 .Op Ar tr2
 .Oo Ar m2 : Ns Ar s2 Ns
-.Op Ar .f2 Oc Oc
+.Op Ar .f2
+.Oc Oc
 .Xc
 Play from the absolute address
 (MSF) defined by
diff --git a/usr.bin/cvs/cvs.5 b/usr.bin/cvs/cvs.5
index 9371709e929..373b2d78857 100644
--- a/usr.bin/cvs/cvs.5
+++ b/usr.bin/cvs/cvs.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cvs.5,v 1.7 2008/02/11 07:58:28 jmc Exp $
+.\"	$OpenBSD: cvs.5,v 1.8 2010/09/19 21:30:04 jmc Exp $
 .\"
 .\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
 .\" Copyright (c) 2004-2008 Xavier Santolaria <xsa@openbsd.org>
@@ -24,7 +24,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 11 2008 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt CVS 5
 .Os
 .Sh NAME
@@ -350,7 +350,7 @@ cvslog*,
 *.ln,
 *.olb,
 *.core,
-.#*,
+\&.#*,
 *~,
 _$*,
 *$,
diff --git a/usr.bin/dc/dc.1 b/usr.bin/dc/dc.1
index 9ee767a1a5c..1d0ab3ddb38 100644
--- a/usr.bin/dc/dc.1
+++ b/usr.bin/dc/dc.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dc.1,v 1.24 2010/01/02 19:48:56 schwarze Exp $
+.\"	$OpenBSD: dc.1,v 1.25 2010/09/19 21:30:04 jmc Exp $
 .\"
 .\" Copyright (C) Caldera International Inc.  2001-2002.
 .\" All rights reserved.
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)dc.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: January 2 2010 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt DC 1
 .Os
 .Sh NAME
@@ -304,7 +304,7 @@ The length of a number is its number of digits, not counting the minus sign
 and decimal point.
 .It Ic z
 The stack level is pushed onto the stack.
-.It Cm [ Ns ... Ns Cm ]
+.It Cm \&[ Ns ... Ns Cm \&]
 Puts the bracketed
 .Tn ASCII
 string onto the top of the stack.
@@ -364,12 +364,12 @@ command.
 .It Ic \&?
 A line of input is taken from the input source (usually the terminal)
 and executed.
-.It Ic : Ns Ar r
+.It Ic \&: Ns Ar r
 Pop two values from the stack.
 The second value on the stack is stored into the array
 .Ar r
 indexed by the top of stack.
-.It Ic ; Ns Ar r
+.It Ic \&; Ns Ar r
 Pop a value from the stack.
 The value is used as an index into register
 .Ar r .
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index 0d91f6cc00e..be1f3d171b3 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,4 +1,4 @@
-.\"	@(#) $OpenBSD: m4.1,v 1.57 2010/03/22 20:40:44 espie Exp $
+.\"	@(#) $OpenBSD: m4.1,v 1.58 2010/09/19 21:30:04 jmc 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: March 22 2010 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt M4 1
 .Os
 .Sh NAME
@@ -74,7 +74,7 @@ Macro calls have the form name(argument1[, argument2, ..., argumentN]).
 .Pp
 There cannot be any space following the macro name and the open
 parenthesis
-.Pq Sq ( .
+.Pq Sq \&( .
 If the macro name is not followed by an open
 parenthesis it is processed with no arguments.
 .Pp
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index 9456119fb43..983615cc6f3 100644
--- a/usr.bin/mklocale/mklocale.1
+++ b/usr.bin/mklocale/mklocale.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mklocale.1,v 1.3 2007/05/31 19:20:13 jmc Exp $
+.\"	$OpenBSD: mklocale.1,v 1.4 2010/09/19 21:30:05 jmc Exp $
 .\"
 .\" $NetBSD: mklocale.1,v 1.13 2004/01/24 17:03:26 wiz Exp $
 .\" FreeBSD: src/usr.bin/mklocale/mklocale.1,v 1.6 1999/09/20 09:15:21 phantom Exp
@@ -35,7 +35,7 @@
 .\"
 .\"	@(#)mklocale.1	8.2 (Berkeley) 4/18/94
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt MKLOCALE 1
 .Os
 .Sh NAME
@@ -128,7 +128,7 @@ All are equivalent.
 .It Dv "\*(Gt \*(Ba ) \*(Ba ]"
 Used to end a mapping.
 All are equivalent.
-.It Dv :
+.It Dv \&:
 Used as a delimiter in mappings.
 .El
 .El
diff --git a/usr.bin/rpcgen/rpcgen.1 b/usr.bin/rpcgen/rpcgen.1
index d4f011b7e59..daad9a01be0 100644
--- a/usr.bin/rpcgen/rpcgen.1
+++ b/usr.bin/rpcgen/rpcgen.1
@@ -1,8 +1,8 @@
-.\" $OpenBSD: rpcgen.1,v 1.13 2007/11/17 11:50:00 jmc Exp $
+.\" $OpenBSD: rpcgen.1,v 1.14 2010/09/19 21:30:05 jmc Exp $
 .\" $NetBSD: rpcgen.1,v 1.5.2.1 1995/12/05 02:51:02 jtc Exp $
 .\" from: @(#)rpcgen.new.1	1.1 90/11/09 TIRPC 1.0; from 40.10 of 10/10/89
 .\" Copyright (c) 1988,1990 Sun Microsystems, Inc. - All Rights Reserved.
-.Dd $Mdocdate: November 17 2007 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt RPCGEN 1
 .Os
 .Sh NAME
@@ -16,17 +16,17 @@
 .Op Fl i Ar lines
 .Ar infile
 .Nm rpcgen
-.Fl c Li |
-.Fl h Li |
-.Fl l Li |
-.Fl m Li |
-.Fl t Li |
-.Fl S\&c Li |
-.Fl S\&s Li |
+.Fl c |
+.Fl h |
+.Fl l |
+.Fl m |
+.Fl t |
+.Fl S\&c |
+.Fl S\&s |
 .Op Fl o Ar outfile
 .Op Ar infile
 .Nm rpcgen
-.Fl c Li |
+.Fl c |
 .Ar nettype
 .Op Fl o Ar outfile
 .Op Ar infile
@@ -91,7 +91,7 @@ it backgrounds itself by default.
 A special define symbol
 .Dv RPC_SVC_FG
 can be used to run the server process in the foreground.
-.P
+.Pp
 The second synopsis provides special features which allow
 for the creation of more sophisticated
 .Tn RPC
diff --git a/usr.bin/ssh/sftp.1 b/usr.bin/ssh/sftp.1
index 777b02a5842..49d88de037b 100644
--- a/usr.bin/ssh/sftp.1
+++ b/usr.bin/ssh/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.83 2010/02/08 10:50:20 markus Exp $
+.\" $OpenBSD: sftp.1,v 1.84 2010/09/19 21:30:05 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 8 2010 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt SFTP 1
 .Os
 .Sh NAME
@@ -49,9 +49,11 @@
 .Oo Ar user Ns @ Oc Ns
 .Ar host Ns Op : Ns Ar
 .Nm sftp
-.Oo Ar user Ns @ Oc Ns
+.Oo
+.Ar user Ns @ Oc Ns
 .Ar host Ns Oo : Ns Ar dir Ns
-.Op Ar / Oc
+.Op Ar /
+.Oc
 .Nm sftp
 .Fl b Ar batchfile
 .Oo Ar user Ns @ Oc Ns Ar host
diff --git a/usr.bin/vgrind/vgrindefs.5 b/usr.bin/vgrind/vgrindefs.5
index bc911611271..04d18da4629 100644
--- a/usr.bin/vgrind/vgrindefs.5
+++ b/usr.bin/vgrind/vgrindefs.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vgrindefs.5,v 1.14 2010/01/03 14:31:01 schwarze Exp $
+.\"	$OpenBSD: vgrindefs.5,v 1.15 2010/09/19 21:30:05 jmc Exp $
 .\"	$NetBSD: vgrindefs.5,v 1.3 1994/11/17 08:28:07 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)vgrindefs.5	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: January 3 2010 $
+.Dd $Mdocdate: September 19 2010 $
 .Dt VGRINDEFS 5
 .Os
 .Sh NAME
@@ -65,39 +65,6 @@ The following table names and describes each field:
 .It "oc	bool	present means upper and lower case are equivalent"
 .It "kw	str	a list of keywords separated by spaces"
 .El
-.Sh EXAMPLES
-The following entry, which describes the C language, is
-typical of a language entry:
-.Bd -literal
-C|c:\
-:pb=^\ed?*?\ed?\ep\ed?\e(\ea?\e):bb={:be=}:cb=/*:ce=*/:sb=":se=\ee":\e
-:lb=':le=\ee':tl:\e
-:kw=asm auto break case char continue default do double else enum\e
-extern float for fortran goto if int long register return short\e
-sizeof static struct switch typedef union unsigned while #define\e
-#else #endif #if #ifdef #ifndef #include #undef # define else endif\e
-if ifdef ifndef include undef:
-.Ed
-.Pp
-Note that the first field is just the language name (and any variants
-of it).
-Thus the C language could be specified to
-.Xr vgrind 1
-as
-.Qq c
-or
-.Qq C .
-.Pp
-Entries may continue onto multiple lines by giving a \e as the last
-character of a line.
-Capabilities in
-.Nm vgrindefs
-are of two types:
-Boolean capabilities which indicate that the language has
-some particular feature
-and string
-capabilities which give a regular expression or
-keyword list.
 .Sh REGULAR EXPRESSIONS
 .Nm vgrindefs
 uses regular expressions which are very similar to those of
@@ -166,6 +133,39 @@ specified in lower case.
 .It Pa /usr/share/misc/vgrindefs
 file containing terminal descriptions
 .El
+.Sh EXAMPLES
+The following entry, which describes the C language, is
+typical of a language entry:
+.Bd -literal
+C|c:\
+:pb=^\ed?*?\ed?\ep\ed?\e(\ea?\e):bb={:be=}:cb=/*:ce=*/:sb=":se=\ee":\e
+:lb=':le=\ee':tl:\e
+:kw=asm auto break case char continue default do double else enum\e
+extern float for fortran goto if int long register return short\e
+sizeof static struct switch typedef union unsigned while #define\e
+#else #endif #if #ifdef #ifndef #include #undef # define else endif\e
+if ifdef ifndef include undef:
+.Ed
+.Pp
+Note that the first field is just the language name (and any variants
+of it).
+Thus the C language could be specified to
+.Xr vgrind 1
+as
+.Qq c
+or
+.Qq C .
+.Pp
+Entries may continue onto multiple lines by giving a \e as the last
+character of a line.
+Capabilities in
+.Nm vgrindefs
+are of two types:
+Boolean capabilities which indicate that the language has
+some particular feature
+and string
+capabilities which give a regular expression or
+keyword list.
 .Sh SEE ALSO
 .Xr troff 1 ,
 .Xr vgrind 1