improve line breaking in SYNOPSIS now that semantics of the .Bk macro

has changed to conform with modern groff releases.

diff for route6d(8) written mostly by schwarze@, with lots of useful
advice from jmc@.

ok jmc@, schwarze@

7 files changed, 29 insertions, 79 deletions

diff --git a/bin/ksh/ksh.1 b/bin/ksh/ksh.1
index 6f9876b325b..a66270028da 100644
--- a/bin/ksh/ksh.1
+++ b/bin/ksh/ksh.1
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: ksh.1,v 1.139 2011/03/09 09:30:39 okan Exp $
+.\"	$OpenBSD: ksh.1,v 1.140 2011/04/23 10:14:59 sobrado Exp $
 .\"
 .\"	Public Domain
 .\"
-.Dd $Mdocdate: March 9 2011 $
+.Dd $Mdocdate: April 23 2011 $
 .Dt KSH 1
 .Os
 .Sh NAME
@@ -13,12 +13,7 @@
 .Bk -words
 .Op Fl +abCefhiklmnpruvXx
 .Op Fl +o Ar option
-.Oo
-.Fl c Ar string \*(Ba
-.Fl s \*(Ba
-.Ar file
-.Op Ar argument ...
-.Oc
+.Op Fl c Ar string \*(Ba Fl s \*(Ba Ar file Op Ar argument ...
 .Ek
 .Sh DESCRIPTION
 .Nm
diff --git a/bin/ksh/sh.1 b/bin/ksh/sh.1
index 880863b30fb..1685761ab37 100644
--- a/bin/ksh/sh.1
+++ b/bin/ksh/sh.1
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: sh.1,v 1.89 2010/09/20 07:41:17 jmc Exp $
+.\"	$OpenBSD: sh.1,v 1.90 2011/04/23 10:14:59 sobrado Exp $
 .\"
 .\"	Public Domain
 .\"
-.Dd $Mdocdate: September 20 2010 $
+.Dd $Mdocdate: April 23 2011 $
 .Dt SH 1
 .Os
 .Sh NAME
@@ -13,12 +13,7 @@
 .Bk -words
 .Op Fl +abCefhiklmnpruvXx
 .Op Fl +o Ar option
-.Oo
-.Fl c Ar string \*(Ba
-.Fl s \*(Ba
-.Ar file
-.Op Ar argument ...
-.Oc
+.Op Fl c Ar string \*(Ba Fl s \*(Ba Ar file Op Ar argument ...
 .Ek
 .Sh DESCRIPTION
 .Nm
diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8
index fb500ce73a4..764068adfdc 100644
--- a/sbin/pfctl/pfctl.8
+++ b/sbin/pfctl/pfctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pfctl.8,v 1.153 2010/10/03 19:24:38 jmc Exp $
+.\" $OpenBSD: pfctl.8,v 1.154 2011/04/23 10:14:59 sobrado Exp $
 .\"
 .\" Copyright (c) 2001 Kjell Wooding.  All rights reserved.
 .\"
@@ -24,7 +24,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: October 3 2010 $
+.Dd $Mdocdate: April 23 2011 $
 .Dt PFCTL 8
 .Os
 .Sh NAME
@@ -40,23 +40,13 @@
 .Op Fl f Ar file
 .Op Fl i Ar interface
 .Op Fl K Ar host | network
-.Oo
-.Fl k
-.Ar host | network | label | id
-.Oc
+.Op Fl k Ar host | network | label | id
 .Op Fl L Ar statefile
 .Op Fl o Ar level
 .Op Fl p Ar device
 .Op Fl S Ar statefile
-.Oo
-.Fl s Ar modifier
-.Op Fl R Ar id
-.Oc
-.Oo
-.Fl t Ar table
-.Fl T Ar command
-.Op Ar address ...
-.Oc
+.Op Fl s Ar modifier Op Fl R Ar id
+.Op Fl t Ar table Fl T Ar command Op Ar address ...
 .Op Fl x Ar level
 .Ek
 .Sh DESCRIPTION
diff --git a/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index 715758252af..cbc4312dbe9 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rdist.1,v 1.38 2009/02/15 15:11:35 jmc Exp $
+.\"	$OpenBSD: rdist.1,v 1.39 2011/04/23 10:14:59 sobrado Exp $
 .\"
 .\" Copyright (c) 1983 Regents of the University of California.
 .\" All rights reserved.
@@ -30,7 +30,7 @@
 .\"	$From: rdist.man,v 6.34 1996/01/29 22:37:19 mcooper Exp $
 .\"	@(#)rdist.1	6.6 (Berkeley) 5/13/86
 .\"
-.Dd $Mdocdate: February 15 2009 $
+.Dd $Mdocdate: April 23 2011 $
 .Dt RDIST 1
 .Os
 .Sh NAME
@@ -44,9 +44,7 @@
 .Op Fl A Ar num
 .Op Fl a Ar num
 .Op Fl c Ar mini_distfile
-.Oo
-.Fl d Ar var Ns = Ns Ar value
-.Oc
+.Op Fl d Ar var Ns = Ns Ar value
 .Op Fl f Ar distfile
 .Op Fl L Ar remote_logopts
 .Op Fl l Ar local_logopts
diff --git a/usr.bin/skeyinit/skeyinit.1 b/usr.bin/skeyinit/skeyinit.1
index 8c70378bc90..a58a7ee354d 100644
--- a/usr.bin/skeyinit/skeyinit.1
+++ b/usr.bin/skeyinit/skeyinit.1
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: skeyinit.1,v 1.34 2007/05/31 19:20:16 jmc Exp $
+.\"	$OpenBSD: skeyinit.1,v 1.35 2011/04/23 10:14:59 sobrado Exp $
 .\"	$NetBSD: skeyinit.1,v 1.4 1995/07/07 22:24:09 jtc Exp $
 .\"	@(#)skeyinit.1	1.1 	10/28/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: April 23 2011 $
 .Dt SKEYINIT 1
 .Os
 .Sh NAME
@@ -14,9 +14,7 @@
 .Op Fl CDErsx
 .Op Fl a Ar auth-type
 .Op Fl n Ar count
-.Oo
-.Fl md4 | Fl md5 | rmd160 | sha1
-.Oc
+.Op Fl md4 | md5 | rmd160 | sha1
 .Op Ar user
 .Ek
 .Sh DESCRIPTION
diff --git a/usr.sbin/ndp/ndp.8 b/usr.sbin/ndp/ndp.8
index 99a5ce7cb33..942303774ca 100644
--- a/usr.sbin/ndp/ndp.8
+++ b/usr.sbin/ndp/ndp.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ndp.8,v 1.27 2010/09/03 11:22:36 jmc Exp $
+.\"	$OpenBSD: ndp.8,v 1.28 2011/04/23 10:14:59 sobrado Exp $
 .\"	$KAME: ndp.8,v 1.28 2002/07/17 08:46:33 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 3 2010 $
+.Dd $Mdocdate: April 23 2011 $
 .Dt NDP 8
 .Os
 .\"
@@ -47,11 +47,7 @@
 .Op Fl f Ar filename
 .Op Fl I Op Ar interface | Ic delete
 .Op Fl i Ar interface Op Ar flag ...
-.Oo
-.Fl s Ar nodename etheraddr
-.Op Ic temp
-.Op Ic proxy
-.Oc
+.Op Fl s Ar nodename etheraddr Oo Ic temp Oc Op Ic proxy
 .Op Ar hostname
 .Ek
 .\"
diff --git a/usr.sbin/route6d/route6d.8 b/usr.sbin/route6d/route6d.8
index 878684a2ebd..e25ea0ad400 100644
--- a/usr.sbin/route6d/route6d.8
+++ b/usr.sbin/route6d/route6d.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: route6d.8,v 1.20 2010/09/19 21:59:23 jmc Exp $
+.\"	$OpenBSD: route6d.8,v 1.21 2011/04/23 10:14:59 sobrado Exp $
 .\"	$KAME: route6d.8,v 1.11 2002/06/02 15:00:30 itojun Exp $
 .\"
 .\" Copyright (c) 1996 WIDE Project. All rights reserved.
@@ -15,56 +15,34 @@
 .\" LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 .\" A PARTICULAR PURPOSE.
 .\"
-.Dd $Mdocdate: September 19 2010 $
+.Dd $Mdocdate: April 23 2011 $
 .Dt ROUTE6D 8
 .Os
 .Sh NAME
 .Nm route6d
 .Nd RIP6 routing daemon
 .Sh SYNOPSIS
+.Bk -words
 .Nm route6d
 .Op Fl aDdhlnqSs
-.Oo
-.Fl A Ar prefix
 .Sm off
-.No / Ar preflen , if1\ \&
-.Op , Ar if2 , ...
-.Oc
+.Op Fl A No \~ Ar prefix No / Ar preflen , Ar if1 Op , Ar if2 , ...
 .Sm on
-.Bk -words
-.Oo
-.Fl L Ar prefix
 .Sm off
-.No / Ar preflen , if1\ \&
-.Op , Ar if2 , ...
-.Oc
+.Op Fl L No \~ Ar prefix No / Ar preflen , Ar if1 Op , Ar if2 , ...
 .Sm on
-.Ek
-.Oo
-.Fl N Ar if1
 .Sm off
-.Op , Ar if2 , ...
-.Oc
+.Op Fl N No \~ Ar if1 Op , Ar if2 , ...
 .Sm on
-.Bk -words
-.Oo
-.Fl O Ar prefix
 .Sm off
-.No / Ar preflen , if1\ \&
-.Op , Ar if2 , ...
-.Oc
+.Op Fl O No \~ Ar prefix No / Ar preflen , Ar if1 Op , Ar if2 , ...
 .Sm on
-.Ek
 .Op Fl R Ar routelog
-.Bk -words
-.Oo
-.Fl T Ar if1
 .Sm off
-.Op , Ar if2 , ...
-.Oc
+.Op Fl T No \~ Ar if1 Op , Ar if2 , ...
 .Sm on
-.Ek
 .Op Fl t Ar tag
+.Ek
 .Sh DESCRIPTION
 The
 .Nm