now that we can handle >9 args, put "-D name=value" on one line: it's a bit

more readable, and fixes a spacing bug we had in smtpd.8;

10 files changed, 30 insertions, 49 deletions

diff --git a/usr.sbin/bgpd/bgpd.8 b/usr.sbin/bgpd/bgpd.8
index 09e1a15c287..44bfeea5474 100644
--- a/usr.sbin/bgpd/bgpd.8
+++ b/usr.sbin/bgpd/bgpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bgpd.8,v 1.36 2010/05/17 17:46:22 jmc Exp $
+.\" $OpenBSD: bgpd.8,v 1.37 2010/05/24 19:44:23 jmc Exp $
 .\"
 .\" Copyright (c) 2003, 2004 Henning Brauer <henning@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 17 2010 $
+.Dd $Mdocdate: May 24 2010 $
 .Dt BGPD 8
 .Os
 .Sh NAME
@@ -24,9 +24,7 @@
 .Nm bgpd
 .Bk -words
 .Op Fl cdnv
-.Oo
-.Fl D Ar macro Ns = Ns Ar value
-.Oc
+.Op Fl D Ar macro Ns = Ns Ar value
 .Op Fl f Ar file
 .Op Fl r Ar path
 .Op Fl s Ar path
diff --git a/usr.sbin/hostapd/hostapd.8 b/usr.sbin/hostapd/hostapd.8
index eff656db221..dde45606707 100644
--- a/usr.sbin/hostapd/hostapd.8
+++ b/usr.sbin/hostapd/hostapd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: hostapd.8,v 1.15 2010/02/23 21:30:40 schwarze Exp $
+.\" $OpenBSD: hostapd.8,v 1.16 2010/05/24 19:44:23 jmc Exp $
 .\"
 .\" Copyright (c) 2004, 2005 Reyk Floeter <reyk@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: February 23 2010 $
+.Dd $Mdocdate: May 24 2010 $
 .Dt HOSTAPD 8
 .Os
 .Sh NAME
@@ -23,9 +23,7 @@
 .Sh SYNOPSIS
 .Nm hostapd
 .Op Fl dv
-.Oo
-.Fl D Ar macro Ns = Ns Ar value
-.Oc
+.Op Fl D Ar macro Ns = Ns Ar value
 .Op Fl f Ar file
 .Sh DESCRIPTION
 .Nm
diff --git a/usr.sbin/ldpd/ldpd.8 b/usr.sbin/ldpd/ldpd.8
index f239053ee48..06e08d9d241 100644
--- a/usr.sbin/ldpd/ldpd.8
+++ b/usr.sbin/ldpd/ldpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ldpd.8,v 1.4 2010/02/24 07:40:58 jmc Exp $
+.\"	$OpenBSD: ldpd.8,v 1.5 2010/05/24 19:44:23 jmc Exp $
 .\"
 .\" Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
 .\" Copyright (c) 2004, 2005, 2006 Esben Norby <norby@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 24 2010 $
+.Dd $Mdocdate: May 24 2010 $
 .Dt LDPD 8
 .Os
 .Sh NAME
@@ -24,9 +24,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl dnv
-.Oo
-.Fl D Ar macro Ns = Ns Ar value
-.Oc
+.Op Fl D Ar macro Ns = Ns Ar value
 .Op Fl f Ar file
 .Sh DESCRIPTION
 .Nm
diff --git a/usr.sbin/ospf6d/ospf6d.8 b/usr.sbin/ospf6d/ospf6d.8
index e79a21bf955..98d5adaf4c7 100644
--- a/usr.sbin/ospf6d/ospf6d.8
+++ b/usr.sbin/ospf6d/ospf6d.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ospf6d.8,v 1.12 2010/03/06 23:14:43 stsp Exp $
+.\"	$OpenBSD: ospf6d.8,v 1.13 2010/05/24 19:44:23 jmc Exp $
 .\"
 .\" Copyright (c) 2004, 2005, 2007 Esben Norby <norby@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: March 6 2010 $
+.Dd $Mdocdate: May 24 2010 $
 .Dt OSPF6D 8
 .Os
 .Sh NAME
@@ -23,9 +23,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl dnv
-.Oo
-.Fl D Ar macro Ns = Ns Ar value
-.Oc
+.Op Fl D Ar macro Ns = Ns Ar value
 .Op Fl f Ar file
 .Sh DESCRIPTION
 .Nm
diff --git a/usr.sbin/ospfd/ospfd.8 b/usr.sbin/ospfd/ospfd.8
index 2e02b4e27ef..d2b09dc7c66 100644
--- a/usr.sbin/ospfd/ospfd.8
+++ b/usr.sbin/ospfd/ospfd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ospfd.8,v 1.27 2010/03/06 23:14:43 stsp Exp $
+.\"	$OpenBSD: ospfd.8,v 1.28 2010/05/24 19:44:23 jmc Exp $
 .\"
 .\" Copyright (c) 2004, 2005, 2007 Esben Norby <norby@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: March 6 2010 $
+.Dd $Mdocdate: May 24 2010 $
 .Dt OSPFD 8
 .Os
 .Sh NAME
@@ -23,9 +23,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl dnv
-.Oo
-.Fl D Ar macro Ns = Ns Ar value
-.Oc
+.Op Fl D Ar macro Ns = Ns Ar value
 .Op Fl f Ar file
 .Op Fl s Ar socket
 .Sh DESCRIPTION
diff --git a/usr.sbin/relayd/relayd.8 b/usr.sbin/relayd/relayd.8
index 8ccb3a63bdb..32bfa37734d 100644
--- a/usr.sbin/relayd/relayd.8
+++ b/usr.sbin/relayd/relayd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: relayd.8,v 1.22 2010/02/23 21:30:40 schwarze Exp $
+.\"	$OpenBSD: relayd.8,v 1.23 2010/05/24 19:44:23 jmc Exp $
 .\"
 .\" Copyright (c) 2006 Pierre-Yves Ritschard <pyr@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: February 23 2010 $
+.Dd $Mdocdate: May 24 2010 $
 .Dt RELAYD 8
 .Os
 .Sh NAME
@@ -23,9 +23,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl dnv
-.Oo
-.Fl D Ar macro Ns = Ns Ar value
-.Oc
+.Op Fl D Ar macro Ns = Ns Ar value
 .Op Fl f Ar file
 .Sh DESCRIPTION
 .Nm
diff --git a/usr.sbin/ripd/ripd.8 b/usr.sbin/ripd/ripd.8
index 3a824e372a4..85ae4abe1a7 100644
--- a/usr.sbin/ripd/ripd.8
+++ b/usr.sbin/ripd/ripd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ripd.8,v 1.8 2010/02/23 21:30:40 schwarze Exp $
+.\"	$OpenBSD: ripd.8,v 1.9 2010/05/24 19:44:23 jmc Exp $
 .\"
 .\" Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
 .\" Copyright (c) 2004, 2005, 2006 Esben Norby <norby@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 23 2010 $
+.Dd $Mdocdate: May 24 2010 $
 .Dt RIPD 8
 .Os
 .Sh NAME
@@ -24,9 +24,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl dnv
-.Oo
-.Fl D Ar macro Ns = Ns Ar value
-.Oc
+.Op Fl D Ar macro Ns = Ns Ar value
 .Op Fl f Ar file
 .Sh DESCRIPTION
 .Nm
diff --git a/usr.sbin/smtpd/smtpd.8 b/usr.sbin/smtpd/smtpd.8
index 7f2b7e309e2..8f875874f01 100644
--- a/usr.sbin/smtpd/smtpd.8
+++ b/usr.sbin/smtpd/smtpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: smtpd.8,v 1.11 2009/10/22 15:02:12 sobrado Exp $
+.\"	$OpenBSD: smtpd.8,v 1.12 2010/05/24 19:44:23 jmc Exp $
 .\"
 .\" Copyright (c) 2008, Gilles Chehade <gilles@openbsd.org>
 .\" Copyright (c) 2008, Pierre-Yves Ritschard <pyr@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: October 22 2009 $
+.Dd $Mdocdate: May 24 2010 $
 .Dt SMTPD 8
 .Os
 .Sh NAME
@@ -24,8 +24,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl dnv
-.Oo Fl D Ar macro Ns =
-.Ar value Oc
+.Op Fl D Ar macro Ns = Ns Ar value
 .Op Fl f Ar file
 .Sh DESCRIPTION
 .Nm
diff --git a/usr.sbin/snmpd/snmpd.8 b/usr.sbin/snmpd/snmpd.8
index 7c06771b6f9..bd5b513df7a 100644
--- a/usr.sbin/snmpd/snmpd.8
+++ b/usr.sbin/snmpd/snmpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: snmpd.8,v 1.12 2010/02/23 21:30:40 schwarze Exp $
+.\" $OpenBSD: snmpd.8,v 1.13 2010/05/24 19:44:23 jmc Exp $
 .\"
 .\" Copyright (c) 2007, 2008 Reyk Floeter <reyk@vantronix.net>
 .\"
@@ -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: February 23 2010 $
+.Dd $Mdocdate: May 24 2010 $
 .Dt SNMPD 8
 .Os
 .Sh NAME
@@ -23,9 +23,7 @@
 .Sh SYNOPSIS
 .Nm snmpd
 .Op Fl dNnv
-.Oo
-.Fl D Ar macro Ns = Ns Ar value
-.Oc
+.Op Fl D Ar macro Ns = Ns Ar value
 .Op Fl f Ar file
 .Op Fl r Ar path
 .Sh DESCRIPTION
diff --git a/usr.sbin/ypldap/ypldap.8 b/usr.sbin/ypldap/ypldap.8
index 4341385c266..68df070c3e6 100644
--- a/usr.sbin/ypldap/ypldap.8
+++ b/usr.sbin/ypldap/ypldap.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypldap.8,v 1.5 2010/02/23 21:30:40 schwarze Exp $
+.\"	$OpenBSD: ypldap.8,v 1.6 2010/05/24 19:44:23 jmc Exp $
 .\"
 .\" Copyright (c) 2008 Pierre-Yves Ritschard <pyr@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: February 23 2010 $
+.Dd $Mdocdate: May 24 2010 $
 .Dt YPLDAP 8
 .Os
 .Sh NAME
@@ -23,9 +23,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl dnv
-.Oo
-.Fl D Ar macro Ns = Ns Ar value
-.Oc
+.Op Fl D Ar macro Ns = Ns Ar value
 .Op Fl f Ar file
 .Sh DESCRIPTION
 .Nm