more macro simplification;

8 files changed, 29 insertions, 32 deletions

diff --git a/bin/md5/cksum.1 b/bin/md5/cksum.1
index dea323540c2..855e00e258c 100644
--- a/bin/md5/cksum.1
+++ b/bin/md5/cksum.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cksum.1,v 1.4 2005/02/25 10:32:06 jmc Exp $
+.\"	$OpenBSD: cksum.1,v 1.5 2005/03/07 23:41:53 jmc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -118,10 +118,7 @@ Additionally, multiple
 options may be specified on the command line.
 If an algorithm is repeated, only the first instance is used.
 Case is ignored when matching algorithms.
-.It Xo
-.Fl c
-.Oo Ar checklist ... Oc
-.Xc
+.It Fl c Op Ar checklist ...
 Compares all checksums contained in the file
 .Ar checklist
 with newly computed checksums for the corresponding files.
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2
index eac050e4c12..972eaa4f8cd 100644
--- a/lib/libc/sys/getsockopt.2
+++ b/lib/libc/sys/getsockopt.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getsockopt.2,v 1.20 2003/06/02 20:18:39 millert Exp $
+.\"	$OpenBSD: getsockopt.2,v 1.21 2005/03/07 23:41:53 jmc Exp $
 .\"	$NetBSD: getsockopt.2,v 1.7 1995/02/27 12:33:29 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -99,7 +99,7 @@ may be
 and any specified options are passed uninterpreted to the appropriate
 protocol module for interpretation.
 The include file
-.Ao Pa sys/socket.h Ac
+.Aq Pa sys/socket.h
 contains definitions for socket level options, described below.
 Options at other protocol levels vary in format and name;
 consult the appropriate entries in section 4 of the manual.
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libc/sys/gettimeofday.2
index 39c6f82599d..42dcafb3166 100644
--- a/lib/libc/sys/gettimeofday.2
+++ b/lib/libc/sys/gettimeofday.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gettimeofday.2,v 1.13 2004/04/15 19:52:18 jmc Exp $
+.\"	$OpenBSD: gettimeofday.2,v 1.14 2005/03/07 23:41:53 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -73,7 +73,7 @@ The structures pointed to by
 and
 .Fa tzp
 are defined in
-.Ao Pa sys/time.h Ac
+.Aq Pa sys/time.h
 as:
 .Bd -literal
 struct timeval {
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index a9831754361..4860760cd09 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: disklabel.8,v 1.58 2004/10/25 08:14:46 otto Exp $
+.\"	$OpenBSD: disklabel.8,v 1.59 2005/03/07 23:41:53 jmc Exp $
 .\"	$NetBSD: disklabel.8,v 1.9 1995/03/18 14:54:38 cgd Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1991, 1993
@@ -50,7 +50,7 @@
 .Op Fl c | d | r
 .Op Fl nv
 .Ar disk Ar disktype
-.Oo Ar packid Oc
+.Op Ar packid
 .Nm disklabel
 .Fl e
 .Op Fl c | d | r
@@ -77,7 +77,7 @@
 .Op Fl b Ar boot1
 .Op Fl s Ar boot2
 .Ar disk
-.Oo Ar disktype Oc
+.Op Ar disktype
 .Nm disklabel
 .Fl Bw
 .Op Fl nv
diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4
index e65f4d67572..244c4c77ea9 100644
--- a/share/man/man4/ddb.4
+++ b/share/man/man4/ddb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ddb.4,v 1.40 2005/01/04 10:28:35 jmc Exp $
+.\"	$OpenBSD: ddb.4,v 1.41 2005/03/07 23:41:54 jmc Exp $
 .\"	$NetBSD: ddb.4,v 1.5 1994/11/30 16:22:09 jtc Exp $
 .\"
 .\" Mach Operating System
@@ -70,7 +70,7 @@ command is:
 .Ar command
 .Oo Ic / Ns Ar modifiers Oc " "
 .Oo Ar address Oc Ns
-.Oo Ic \&, Ns Ar count Oc
+.Op Ic \&, Ns Ar count
 .Ed
 .Pp
 To save typing,
@@ -204,7 +204,7 @@ List the available commands.
 .\" --------------------
 .It Xo
 .Oo Ic e Oc Ns
-.Ic x Ns Oo Ic amine Oc
+.Ic x Ns Op Ic amine
 .Op Cm /bhlaAxzodurcsmiI
 .Op Ar addr Ns
 .Op Ic \&, Ns Ar count
@@ -323,7 +323,7 @@ ecx = yyyyyy
 .\" .Ar expr Op expr ...
 .\" .Xc
 .It Xo
-.Ic w Ns Oo Ic rite Oc
+.Ic w Ns Op Ic rite
 .Op Cm /bhl
 .Op Ar addr
 .Ar expr Op Ar expr ...
@@ -426,7 +426,7 @@ behavior.
 .\" .Op Ar addr | Ic # Ns Ar number
 .\" .Xc
 .It Xo
-.Ic d Ns Oo Ic elete Oc
+.Ic d Ns Op Ic elete
 .Op Ar addr | Ic # Ns Ar number
 .Xc
 Delete the break point set with the
@@ -437,7 +437,7 @@ command.
 .\" .Op Ic \&, Ns Ar count
 .\" .Xc
 .It Xo
-.Ic s Ns Oo Ic tep Oc
+.Ic s Ns Op Ic tep
 .Op Cm /p
 .Op Ic \&, Ns Ar count
 .Xc
@@ -469,7 +469,7 @@ The number of arguments is currently limited to 10.
 .\" --------------------
 .\" .It Ic c Ns Op Cm /c
 .It Xo
-.Ic c Ns Oo Ic ontinue Oc
+.Ic c Ns Op Ic ontinue
 .Op Cm /c
 .Xc
 Continue execution until a breakpoint or watchpoint.
@@ -823,7 +823,7 @@ if supported by an object format dependent routine:
 .It
 .Sm off
 .Oo Ar filename Li \&: Oc Ar func
-.Oo \&: Ar linenumber Oc
+.Op \&: Ar linenumber
 .It
 .Op Ar filename \&:
 .Ar variable
diff --git a/share/man/man4/man4.vax/ra.4 b/share/man/man4/man4.vax/ra.4
index 34b15dfe69e..2849823b9a6 100644
--- a/share/man/man4/man4.vax/ra.4
+++ b/share/man/man4/man4.vax/ra.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ra.4,v 1.4 2003/06/29 15:10:35 jmc Exp $
+.\"	$OpenBSD: ra.4,v 1.5 2005/03/07 23:41:54 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -88,7 +88,7 @@ A drive somehow changed from one kind to another, e.g., from an
 to an
 .Tn RA60 .
 The numbers printed are the encoded media identifiers (see
-.Ao Pa vax/mscp.h Ac
+.Aq Pa vax/mscp.h
 for the encoding).
 The driver believes the new type.
 .Pp
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index fbaaed5a2c6..e6f4b4a54ff 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/ssh.1
@@ -34,7 +34,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.
 .\"
-.\" $OpenBSD: ssh.1,v 1.204 2005/03/02 11:45:01 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.205 2005/03/07 23:41:54 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -585,7 +585,7 @@ Port forwardings can also be specified in the configuration file.
 IPv6 addresses can be specified with an alternative syntax:
 .Sm off
 .Xo
-.Oo Ar bind_address No / Oc
+.Op Ar bind_address No /
 .Ar port No / Ar host No /
 .Ar hostport
 .Xc
@@ -761,7 +761,7 @@ IPv6 addresses can be specified by enclosing the address in square braces or
 using an alternative syntax:
 .Sm off
 .Xo
-.Oo Ar bind_address No / Oc
+.Op Ar bind_address No /
 .Ar host No / Ar port No /
 .Ar hostport
 .Xc .
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index 32778edbbc5..06db04c27a7 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/ssh_config.5
@@ -34,7 +34,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.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.46 2005/03/01 14:55:23 jmc Exp $
+.\" $OpenBSD: ssh_config.5,v 1.47 2005/03/07 23:41:54 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
@@ -504,12 +504,12 @@ The first argument must be a port number, and the second must be
 .Xc .
 IPv6 addresses can be specified by enclosing addresses in square brackets or
 by using an alternative syntax:
-.Xo
 .Sm off
-.Oo Ar bind_address No / Oc
+.Xo
+.Op Ar bind_address No /
 .Ar host No / Ar port
-.Sm on
 .Xc .
+.Sm on
 Multiple forwardings may be specified, and additional forwardings can be
 given on the command line.
 Only the superuser can forward privileged ports.
@@ -641,12 +641,12 @@ The first argument must be a port number, and the second must be
 .Xc .
 IPv6 addresses can be specified by enclosing any addresses in square brackets
 or by using the alternative syntax:
-.Xo
 .Sm off
-.Oo Ar bind_address No / Oc
+.Xo
+.Op Ar bind_address No /
 .Ar host No / Ar port
-.Sm on
 .Xc .
+.Sm on
 Multiple forwardings may be specified, and additional
 forwardings can be given on the command line.
 Only the superuser can forward privileged ports.