as with other list types, column lists generally do not need a Pp/-compact

construct;

this also sidesteps what seems to be a problem with mandoc, in that
"-column -compact" seems to mess up the formatting. thus these pages should
now have their lists formatted nicely (i.e. correctly aligned and with indent
applied);

as a side note, the fact that headers are not properly marked up is another
issue which will be addressed separately (a mandoc fix is needed, i think).
i have fudged a few of these to mark up properly, since the workaround does
make sense for some pages.

as another side note, i haven;t fixed man7, as i need to prepare a separate
diff for kristaps and ingo.

2 files changed, 11 insertions, 18 deletions

diff --git a/sbin/iked/iked.conf.5 b/sbin/iked/iked.conf.5
index 8590c95feb9..53069fea707 100644
--- a/sbin/iked/iked.conf.5
+++ b/sbin/iked/iked.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iked.conf.5,v 1.13 2011/01/21 12:34:11 jmc Exp $
+.\" $OpenBSD: iked.conf.5,v 1.14 2011/08/19 19:59:51 jmc Exp $
 .\" $vantronix: iked.conf.5,v 1.10 2010/06/03 16:13:40 reyk Exp $
 .\"
 .\" Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
@@ -16,7 +16,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: January 21 2011 $
+.Dd $Mdocdate: August 19 2011 $
 .Dt IKED.CONF 5
 .Os
 .Sh NAME
@@ -681,8 +681,7 @@ and all the traffic arrives with that source address.
 The following authentication types are permitted with the
 .Ic auth
 keyword:
-.Pp
-.Bl -column "authenticationXX" "Key Length" -offset indent -compact
+.Bl -column "authenticationXX" "Key Length" -offset indent
 .It Em Authentication	Key Length	Truncated Length
 .It Li hmac-md5 Ta "128 bits" Ta "96 bits"
 .It Li hmac-sha1 Ta "160 bits" Ta "96 bits"
@@ -694,8 +693,7 @@ keyword:
 The following pseudo-random function types are permitted with the
 .Ic prf
 keyword:
-.Pp
-.Bl -column "authenticationXX" "Key Length" -offset indent -compact
+.Bl -column "authenticationXX" "Key Length" -offset indent
 .It Em Authentication	Key Length
 .It Li hmac-md5 Ta "128 bits" Ta "[IKE only]"
 .It Li hmac-sha1 Ta "160 bits" Ta "[IKE only]"
@@ -707,8 +705,7 @@ keyword:
 The following cipher types are permitted with the
 .Ic enc
 keyword:
-.Pp
-.Bl -column "authenticationXX" "Key Length" -offset indent -compact
+.Bl -column "authenticationXX" "Key Length" -offset indent
 .It Em Cipher	Key Length
 .It Li des Ta "56 bits" Ta "[ESP only]"
 .It Li 3des Ta "168 bits"
@@ -745,8 +742,7 @@ This is useful in setups where AH can not be used, e.g. when NAT is involved.
 The following group types are permitted with the
 .Ic group
 keyword:
-.Pp
-.Bl -column "modpXXXX-XXX" "grpXX" "XXXX" "Alias" -offset indent -compact
+.Bl -column "modpXXXX-XXX" "grpXX" "XXXX" "Alias" -offset indent
 .It Em Name	Group	Size	Type
 .It Li modp768 Ta grp1 Ta 768 Ta "MODP"
 .It Li modp1024 Ta grp2 Ta 1024 Ta "MODP"
diff --git a/sbin/ipsecctl/ipsec.conf.5 b/sbin/ipsecctl/ipsec.conf.5
index 29c5861d048..06c1c45db2a 100644
--- a/sbin/ipsecctl/ipsec.conf.5
+++ b/sbin/ipsecctl/ipsec.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ipsec.conf.5,v 1.133 2011/07/07 04:17:53 deraadt Exp $
+.\"	$OpenBSD: ipsec.conf.5,v 1.134 2011/08/19 19:59:51 jmc Exp $
 .\"
 .\" Copyright (c) 2004 Mathieu Sauve-Frankel  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: July 7 2011 $
+.Dd $Mdocdate: August 19 2011 $
 .Dt IPSEC.CONF 5
 .Os
 .Sh NAME
@@ -589,8 +589,7 @@ $ openssl rand 20 | hexdump -e '20/1 "%02x"'
 The following authentication types are permitted with the
 .Ic auth
 keyword:
-.Pp
-.Bl -column "authenticationXX" "Key Length" -offset indent -compact
+.Bl -column "authenticationXX" "Key Length" -offset indent
 .It Em Authentication	Key Length
 .It Li hmac-md5 Ta "128 bits"
 .It Li hmac-ripemd160 Ta "160 bits" Ta "[phase 2 only]"
@@ -603,8 +602,7 @@ keyword:
 The following cipher types are permitted with the
 .Ic enc
 keyword:
-.Pp
-.Bl -column "authenticationXX" "Key Length" -offset indent -compact
+.Bl -column "authenticationXX" "Key Length" -offset indent
 .It Em Cipher	Key Length
 .It Li des Ta "56 bits"
 .It Li 3des Ta "168 bits"
@@ -642,8 +640,7 @@ This is useful in setups where AH can not be used, e.g. when NAT is involved.
 The following group types are permitted with the
 .Ic group
 keyword:
-.Pp
-.Bl -column "authenticationXX" "Key Length" -offset indent -compact
+.Bl -column "authenticationXX" "Key Length" -offset indent
 .It Em Group	Size
 .It Li modp768  Ta 768 Ta [DH group 1]
 .It Li modp1024 Ta 1024 Ta [DH group 2]