Fix .Oo .Xo .Oc .Xc mis-nesting by just dropping the .Xo and .Xc which,

in these cases, is useless anyway.
Found by and fixing the build with mandoc;
still fine with both old and new groff.
ok jmc@

9 files changed, 45 insertions, 45 deletions

diff --git a/usr.sbin/bgpd/bgpd.8 b/usr.sbin/bgpd/bgpd.8
index 5bcd838e930..9597aa1f118 100644
--- a/usr.sbin/bgpd/bgpd.8
+++ b/usr.sbin/bgpd/bgpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bgpd.8,v 1.33 2009/12/16 15:40:55 claudio Exp $
+.\" $OpenBSD: bgpd.8,v 1.34 2010/02/23 21:30:40 schwarze 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: December 16 2009 $
+.Dd $Mdocdate: February 23 2010 $
 .Dt BGPD 8
 .Os
 .Sh NAME
@@ -24,9 +24,9 @@
 .Nm bgpd
 .Bk -words
 .Op Fl cdnv
-.Oo Xo
-.Fl D Ar macro Ns = Ns Ar value Oc
-.Xc
+.Oo
+.Fl D Ar macro Ns = Ns Ar value
+.Oc
 .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 d8420d6540f..eff656db221 100644
--- a/usr.sbin/hostapd/hostapd.8
+++ b/usr.sbin/hostapd/hostapd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: hostapd.8,v 1.14 2007/05/31 19:20:24 jmc Exp $
+.\" $OpenBSD: hostapd.8,v 1.15 2010/02/23 21:30:40 schwarze 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: May 31 2007 $
+.Dd $Mdocdate: February 23 2010 $
 .Dt HOSTAPD 8
 .Os
 .Sh NAME
@@ -23,9 +23,9 @@
 .Sh SYNOPSIS
 .Nm hostapd
 .Op Fl dv
-.Oo Xo
-.Fl D Ar macro Ns = Ns Ar value Oc
-.Xc
+.Oo
+.Fl D Ar macro Ns = Ns Ar value
+.Oc
 .Op Fl f Ar file
 .Sh DESCRIPTION
 .Nm
diff --git a/usr.sbin/ldpd/ldpd.8 b/usr.sbin/ldpd/ldpd.8
index 219610025ab..70a406953ed 100644
--- a/usr.sbin/ldpd/ldpd.8
+++ b/usr.sbin/ldpd/ldpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ldpd.8,v 1.2 2009/10/27 16:22:15 sobrado Exp $
+.\"	$OpenBSD: ldpd.8,v 1.3 2010/02/23 21:30:40 schwarze 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: October 27 2009 $
+.Dd $Mdocdate: February 23 2010 $
 .Dt LDPD 8
 .Os
 .Sh NAME
@@ -24,9 +24,9 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl dnv
-.Oo Xo
-.Fl D Ar macro Ns = Ns Ar value Oc
-.Xc
+.Oo
+.Fl D Ar macro Ns = Ns Ar value
+.Oc
 .Op Fl f Ar file
 .Sh DESCRIPTION
 .Nm
diff --git a/usr.sbin/ospf6d/ospf6d.8 b/usr.sbin/ospf6d/ospf6d.8
index d2e70bcaf5b..953b1041caf 100644
--- a/usr.sbin/ospf6d/ospf6d.8
+++ b/usr.sbin/ospf6d/ospf6d.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ospf6d.8,v 1.10 2009/10/22 15:02:12 sobrado Exp $
+.\"	$OpenBSD: ospf6d.8,v 1.11 2010/02/23 21:30:40 schwarze 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: October 22 2009 $
+.Dd $Mdocdate: February 23 2010 $
 .Dt OSPF6D 8
 .Os
 .Sh NAME
@@ -23,9 +23,9 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl dnv
-.Oo Xo
-.Fl D Ar macro Ns = Ns Ar value Oc
-.Xc
+.Oo
+.Fl D Ar macro Ns = Ns Ar value
+.Oc
 .Op Fl f Ar file
 .Sh DESCRIPTION
 .Nm
diff --git a/usr.sbin/ospfd/ospfd.8 b/usr.sbin/ospfd/ospfd.8
index d8fb495d35f..268994bf107 100644
--- a/usr.sbin/ospfd/ospfd.8
+++ b/usr.sbin/ospfd/ospfd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ospfd.8,v 1.25 2009/10/22 15:02:12 sobrado Exp $
+.\"	$OpenBSD: ospfd.8,v 1.26 2010/02/23 21:30:40 schwarze 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: October 22 2009 $
+.Dd $Mdocdate: February 23 2010 $
 .Dt OSPFD 8
 .Os
 .Sh NAME
@@ -23,9 +23,9 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl dnv
-.Oo Xo
-.Fl D Ar macro Ns = Ns Ar value Oc
-.Xc
+.Oo
+.Fl D Ar macro Ns = Ns Ar value
+.Oc
 .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 ba414a44825..8ccb3a63bdb 100644
--- a/usr.sbin/relayd/relayd.8
+++ b/usr.sbin/relayd/relayd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: relayd.8,v 1.21 2009/11/22 16:02:44 tobias Exp $
+.\"	$OpenBSD: relayd.8,v 1.22 2010/02/23 21:30:40 schwarze 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: November 22 2009 $
+.Dd $Mdocdate: February 23 2010 $
 .Dt RELAYD 8
 .Os
 .Sh NAME
@@ -23,9 +23,9 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl dnv
-.Oo Xo
-.Fl D Ar macro Ns = Ns Ar value Oc
-.Xc
+.Oo
+.Fl D Ar macro Ns = Ns Ar value
+.Oc
 .Op Fl f Ar file
 .Sh DESCRIPTION
 .Nm
diff --git a/usr.sbin/ripd/ripd.8 b/usr.sbin/ripd/ripd.8
index 7c8651bf663..3a824e372a4 100644
--- a/usr.sbin/ripd/ripd.8
+++ b/usr.sbin/ripd/ripd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ripd.8,v 1.7 2009/10/22 15:02:12 sobrado Exp $
+.\"	$OpenBSD: ripd.8,v 1.8 2010/02/23 21:30:40 schwarze 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: October 22 2009 $
+.Dd $Mdocdate: February 23 2010 $
 .Dt RIPD 8
 .Os
 .Sh NAME
@@ -24,9 +24,9 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl dnv
-.Oo Xo
-.Fl D Ar macro Ns = Ns Ar value Oc
-.Xc
+.Oo
+.Fl D Ar macro Ns = Ns Ar value
+.Oc
 .Op Fl f Ar file
 .Sh DESCRIPTION
 .Nm
diff --git a/usr.sbin/snmpd/snmpd.8 b/usr.sbin/snmpd/snmpd.8
index dd0476dafa8..7c06771b6f9 100644
--- a/usr.sbin/snmpd/snmpd.8
+++ b/usr.sbin/snmpd/snmpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: snmpd.8,v 1.11 2008/12/23 18:33:36 reyk Exp $
+.\" $OpenBSD: snmpd.8,v 1.12 2010/02/23 21:30:40 schwarze 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: December 23 2008 $
+.Dd $Mdocdate: February 23 2010 $
 .Dt SNMPD 8
 .Os
 .Sh NAME
@@ -23,9 +23,9 @@
 .Sh SYNOPSIS
 .Nm snmpd
 .Op Fl dNnv
-.Oo Xo
-.Fl D Ar macro Ns = Ns Ar value Oc
-.Xc
+.Oo
+.Fl D Ar macro Ns = Ns Ar value
+.Oc
 .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 54d9a8fb5b0..4341385c266 100644
--- a/usr.sbin/ypldap/ypldap.8
+++ b/usr.sbin/ypldap/ypldap.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypldap.8,v 1.4 2008/09/30 16:24:16 aschrijver Exp $
+.\"	$OpenBSD: ypldap.8,v 1.5 2010/02/23 21:30:40 schwarze 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: September 30 2008 $
+.Dd $Mdocdate: February 23 2010 $
 .Dt YPLDAP 8
 .Os
 .Sh NAME
@@ -23,9 +23,9 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl dnv
-.Oo Xo
-.Fl D Ar macro Ns = Ns Ar value Oc
-.Xc
+.Oo
+.Fl D Ar macro Ns = Ns Ar value
+.Oc
 .Op Fl f Ar file
 .Sh DESCRIPTION
 .Nm