first stab at making this page easier to read:

various grammar/mdoc fixes;

1 files changed, 247 insertions, 168 deletions

diff --git a/sbin/isakmpd/isakmpd.conf.5 b/sbin/isakmpd/isakmpd.conf.5
index 668050b7dae..99984c4fa6c 100644
--- a/sbin/isakmpd/isakmpd.conf.5
+++ b/sbin/isakmpd/isakmpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.conf.5,v 1.99 2005/04/06 00:04:53 cloder Exp $
+.\" $OpenBSD: isakmpd.conf.5,v 1.100 2005/05/05 08:42:27 jmc Exp $
 .\" $EOM: isakmpd.conf.5,v 1.57 2000/12/21 14:43:17 ho Exp $
 .\"
 .\" Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
@@ -37,23 +37,23 @@
 .Sh DESCRIPTION
 .Nm
 is the configuration file for the
-.Nm isakmpd
-daemon managing security association and key management for the
+.Xr isakmpad 8
+daemon, managing security association and key management for the
 IPsec layer of the kernel's networking stack.
 .Pp
 The file is of a well known type of format called .INI style, named after
 the suffix used by an overrated windowing environment for its configuration
 files.
 This format consists of sections, each beginning with a line looking like:
-.Bd -literal
-[Section name]
+.Bd -unfilled
+.Bq Sy Section name
 .Ed
 Between the brackets is the name of the section following this section header.
 Inside a section many tag/value pairs can be stored, each one looking like:
-.Bd -literal
-Tag=Value
+.Bd -unfilled
+.Ar Tag Ns = Ns Ar Value
 .Ed
-If the value needs more space than fits on a single line it's possible to
+If the value needs more space than fits on a single line, it's possible to
 continue it on the next by ending the first with a backslash character
 immediately before the newline character.
 This method can extend a value for an arbitrary number of lines.
@@ -73,39 +73,79 @@ accepted values, inclusive.
 To activate changes to
 .Nm
 without restarting
-.Nm isakmpd ,
+.Xr isakmpd 8 ,
 send a
 .Dv SIGHUP
 signal to the daemon process.
-.Ss Auto-generated parts of the configuration
-.Pp
+.Sh AUTO-GENERATED PARTS OF THE CONFIGURATION
 Some predefined section names are recognized by the daemon, avoiding the need
 to fully specify the Main Mode transforms and Quick Mode suites, protocols,
 and transforms.
 .Pp
 For Main Mode:
-.Bd -filled -compact
-.Ar {DES,BLF,3DES,CAST,AES}-{MD5,SHA}[-GRP{1,2,5,14}][-{DSS,RSA_SIG}]
-.Ed
+.\" .Ar {DES,BLF,3DES,CAST,AES}-{MD5,SHA}[-GRP{1,2,5,14}][-{DSS,RSA_SIG}]
+.Bl -inset -compact
+.It Xo
+.Sm off
+.No {
+.Ar DES , BLF , 3DES , CAST , AES
+.No }-{
+.Ar MD5 , SHA
+.No }[-
+.Ar GRP
+.No {
+.Ar 1 , 2 , 5 , 14
+.No }]
+.No [-{
+.Ar DSS , RSA_SIG
+.No }]
+.Sm on
+.Xc
+.El
 .Pp
 For Quick Mode:
-.Bd -filled -compact
-.Ar QM-{proto}[-TRP]-{cipher}[-{hash}][-PFS[-{group}]]-SUITE
-.Ed
-.Bd -literal
-  where
-    {proto}  is either ESP or AH
-    {cipher} is either DES, 3DES, CAST, BLF or AES
-    {hash}   is either MD5, SHA, RIPEMD, SHA2-{256,384,512}
-    {group}  is either GRP1, GRP2, GRP5 or GRP14
-.Ed
+.\" .Ar QM-{proto}[-TRP]-{cipher}[-{hash}][-PFS[-{group}]]-SUITE
+.Bl -inset -compact
+.It Xo
+.Sm off
+.Ar QM
+.No -{
+.Ar proto
+.No }[-
+.Ar TRP
+.No ]-{
+.Ar cipher
+.No }[-{
+.Ar hash
+.No }]
+.No [-
+.Ar PFS
+.No [-{
+.Ar group
+.No }]]-
+.Ar SUITE
+.Sm on
+.Xc
+.El
+.Pp
+where:
+.Bl -tag -width "{cipher}" -offset indent -compact
+.It Ns { Ns Ar proto Ns }
+is either ESP or AH
+.It Ns { Ns Ar cipher Ns }
+is either DES, 3DES, CAST, BLF, or AES
+.It Ns { Ns Ar hash Ns }
+is either MD5, SHA, RIPEMD, or SHA2-{256,384,512}
+.It Ns { Ns Ar group Ns }
+is either GRP1, GRP2, GRP5, or GRP14
+.El
 .Pp
 For example, 3DES-SHA means: 3DES encryption, SHA hash, and authorization by
 pre-shared keys.
 Similarly, QM-ESP-3DES-SHA-PFS-SUITE means: ESP protocol, 3DES encryption,
 SHA hash, and use Perfect Forward Secrecy.
 .Pp
-Unless explicitly stated with -GRP1, 2, 5 or 14 transforms and PFS suites
+Unless explicitly stated with -GRP1, 2, 5, or 14, transforms and PFS suites
 use DH group 2.
 There are currently no predefined ESP+AH Quick Mode suites.
 .Pp
@@ -118,8 +158,8 @@ All autogenerated values can be overridden by manual entries by using the
 same section and tag names in the configuration file.
 In particular, the default phase 1 (Main or Aggressive Mode) and phase 2
 (Quick Mode) lifetimes can be overridden by these tags under the "General"
-section;
-.Bd -literal
+section:
+.Bd -literal -offset indent
 [General]
 Default-phase-1-lifetime=	3600,60:86400
 Default-phase-2-lifetime=	1200,60:86400
@@ -130,10 +170,11 @@ seconds, maximum 1 day).
 The Quick Mode lifetime defaults to 20 minutes
 (minimum 60 seconds, maximum 1 day).
 .Pp
-Also, the default phase 1 ID can be set by creating a <Phase1-ID>
+Also, the default phase 1 ID can be set by creating a
+.Aq Sy Phase1-ID
 section, as shown below, and adding this tag under the "General"
-section;
-.Bd -literal
+section:
+.Bd -literal -offset indent
 [General]
 Default-phase-1-ID=		Phase1-ID-name
 
@@ -141,11 +182,11 @@ Default-phase-1-ID=		Phase1-ID-name
 ID-type=			USER_FQDN
 Name=				foo@bar.com
 .Ed
-.Ss Roots
-.Bl -hang -width 12n
-.It Em General
+.Sh ROOTS
+.Bl -hang -width 8n
+.It Sy General
 Generic global configuration parameters
-.Bl -tag -width 12n
+.Bl -tag -width Ds
 .It Em Default-phase-1-ID
 Optional default phase 1 ID name.
 .It Em Default-phase-1-lifetime
@@ -160,14 +201,14 @@ SAs.
 If left unspecified, QM-ESP-3DES-SHA-PFS-SUITE is used as the default.
 .It Em Acquire-Only
 If this tag is defined,
-.Nm isakmpd
+.Xr isakmpd 8
 will not set up flows automatically.
 This is useful when flows are configured with
-.Xr ipsecadm 4
+.Xr ipsecadm 8
 or by other programs like
 .Xr bgpd 8 .
 Thus
-.Nm isakmpd
+.Xr isakmpd 8
 only takes care of the SA establishment.
 .It Em Check-interval
 The interval between watchdog checks of connections we want up at all
@@ -180,7 +221,7 @@ The default value is 0 (zero), which means DPD is disabled.
 How many seconds should an exchange maximally take to set up before we
 give up.
 .It Em Listen-on
-A list of IP-addresses OK to listen on.
+A list of IP addresses OK to listen on.
 This list is used as a filter for the set of addresses the interfaces
 configured provides.
 This means that we won't see if an address given here does not exist
@@ -196,19 +237,13 @@ are numbers.
 This is similar to the
 .Fl D
 command line switch of
-.Em isakmpd .
-See
-.Xr isakmpd 8
-for details.
+.Xr isakmpd 8 .
 .It Em Logverbose
 If this tag is defined, whatever the value is, verbose logging is enabled.
 This is similar to the
 .Fl v
 command line switch of
-.Em isakmpd .
-See
-.Xr isakmpd 8
-for details.
+.Xr isakmpd 8 .
 .It Em NAT-T-Keepalive
 The number of seconds between NAT-T keepalive messages, sent by the
 peer behind NAT to keep the mapping active.
@@ -217,18 +252,20 @@ Defaults to 20.
 The name of the file that contains
 .Xr keynote 4
 policies.
-The default is "/etc/isakmpd/isakmpd.policy".
+The default is
+.Pa /etc/isakmpd/isakmpd.policy .
 .It Em Pubkey-directory
 The directory in which
 .Nm
 looks for explicitly trusted public keys.
-The default is "/etc/isakmpd/pubkeys".
+The default is
+.Pa /etc/isakmpd/pubkeys .
 Read
 .Xr isakmpd 8
 for the required naming convention of the files in here.
 .It Em Renegotiate-on-HUP
 If this tag is defined, whatever the value is,
-.Nm isakmpd
+.Xr isakmpd 8
 will renegotiate all current phase 2 SAs when the daemon receives a
 .Dv SIGHUP
 signal, or an
@@ -259,41 +296,50 @@ other programs like
 or
 .Xr bgpd 8 .
 .El
-.It Em Phase 1
+.It Sy Phase 1
 ISAKMP SA negotiation parameter root
-.Bl -tag -width 12n
-.It Em <IP-address>
-A name of the ISAKMP peer at the given IP-address.
+.Bl -tag -width Ds
+.It Aq Em IP-address
+A name of the ISAKMP peer at the given IP address.
 .It Em Default
 A name of the default ISAKMP peer.
-Incoming phase 1 connections from other IP-addresses will use this peer name.
+Incoming phase 1 connections from other IP addresses will use this peer name.
 .It ""
 This name is used as the section name for further information to be found.
-Look at <ISAKMP-peer> below.
+Look at
+.Aq Sy ISAKMP-peer
+below.
 .El
-.It Em Phase 2
+.It Sy Phase 2
 IPsec SA negotiation parameter root
-.Bl -tag -width 12n
+.Bl -tag -width Ds
 .It Em Connections
 A list of directed IPsec "connection" names that should be brought up
 automatically, either on first use if the system supports it, or at
 startup of the daemon.
 These names are section names where further information can be found.
-Look at <IPsec-connection> below.
+Look at
+.Aq Sy IPsec-connection
+below.
 Normally any connections mentioned here are treated as part of the
-"Passive-connection" list we present below, however there is a
-flag: "Active-only" that disables this behaviour.
-This too is mentioned in the <IPsec-connection> section, in the "Flags" tag.
+"Passive-connection" list we present below; however there is a flag,
+.Em Active-only ,
+that disables this behaviour.
+This too is mentioned in the
+.Aq Sy IPsec-connection
+section, in the "Flags" tag.
 .It Em Passive-connections
 A list of IPsec "connection" names we recognize and accept initiations for.
 These names are section names where further information can be found.
-Look at <IPsec-connection> below.
+Look at
+.Aq Sy IPsec-connection
+below.
 Currently only the Local-ID and Remote-ID tags
 are looked at in those sections, as they are matched against the IDs given
 by the initiator.
 .El
-.It Em KeyNote
-.Bl -tag -width 12n
+.It Sy KeyNote
+.Bl -tag -width Ds
 .It Em Credential-directory
 A directory containing directories named after IDs (IP
 addresses,
@@ -326,8 +372,8 @@ authentication.
 If the directory (and the files) exist, they take precedence over X509-based
 authentication.
 .El
-.It Em X509-Certificates
-.Bl -tag -width 12n
+.It Sy X509-Certificates
+.Bl -tag -width Ds
 .It Em Accept-self-signed
 If this tag is defined, whatever the value is, certificates that
 do not originate from a trusted CA but are self-signed will be
@@ -355,57 +401,59 @@ The private key matching the public key of our certificate (which should be
 in the "Cert-directory", and have an appropriate subjectAltName field).
 .El
 .El
-.Ss Referred-to sections
-.Bl -hang -width 12n
-.It Em <ISAKMP-peer>
+.Sh REFERRED-TO SECTIONS
+.Bl -hang -width Ds
+.It Aq Sy ISAKMP-peer
 Parameters for negotiation with an ISAKMP peer
-.Bl -tag -width 12n
+.Bl -tag -width Ds
 .It Em Phase
 The constant
-.Li 1 ,
+.Sq 1 ,
 as ISAKMP-peers and IPsec-connections
-really are handled by the same code inside isakmpd.
+really are handled by the same code inside
+.Xr isakmpd 8 .
 .It Em Transport
-The name of the transport protocol, defaults to
-.Li UDP .
+The name of the transport protocol; defaults to UDP.
 .It Em Port
-In case of
-.Li UDP ,
-the
-.Li UDP
-port number to send to.
-This is optional, the
-default value is 500 which is the IANA-registered number for ISAKMP.
+For UDP, the UDP port number to send to.
+This is optional;
+the default value is 500 which is the IANA-registered number for ISAKMP.
 .It Em Local-address
-The Local IP-address to use, if we are multi-homed, or have aliases.
+The Local IP address to use, if we are multi-homed, or have aliases.
 .It Em Address
-If existent, the IP-address of the peer.
+If existent, the IP address of the peer.
 .It Em Configuration
 The name of the ISAKMP-configuration section to use.
-Look at <ISAKMP-configuration> below.
+Look at
+.Aq Sy ISAKMP-configuration
+below.
 If unspecified, defaults to "Default-phase-1-configuration".
 .It Em Authentication
 If existent, authentication data for this specific peer.
-In the case of preshared key, this is the key value itself.
+In the case of a pre-shared key, this is the key value itself.
 .It Em ID
 If existent, the name of the section that describes the
 local client ID that we should present to our peer.
 If not present, it
 defaults to the address of the local interface we are sending packets
 over to the remote daemon.
-Look at <Phase1-ID> below.
+Look at
+.Aq Sy Phase1-ID
+below.
 .It Em Remote-ID
 If existent, the name of the section that describes the remote client
 ID we expect the remote daemon to send us.
 If not present, it defaults to the address of the remote daemon.
-Look at <Phase1-ID> below.
+Look at
+.Aq Sy Phase1-ID
+below.
 .It Em Flags
 A comma-separated list of flags controlling the further
 handling of the ISAKMP SA.
 Currently there are no specific ISAKMP SA flags defined.
 .El
-.It Em <Phase1-ID>
-.Bl -tag -width 12n
+.It Aq Sy Phase1-ID
+.Bl -tag -width Ds
 .It Em ID-type
 The ID type as given by the RFC specifications.
 For phase 1 this is currently
@@ -414,7 +462,7 @@ For phase 1 this is currently
 .Li IPV6_ADDR ,
 .Li IPV6_ADDR_SUBNET ,
 .Li FQDN ,
-.Li USER_FQDN
+.Li USER_FQDN ,
 or
 .Li KEY_ID .
 .It Em Address
@@ -422,25 +470,25 @@ If the ID-type is
 .Li IPV4_ADDR
 or
 .Li IPV6_ADDR ,
-this tag should exist and be an IP-address.
+this tag should exist and be an IP address.
 .It Em Network
 If the ID-type is
 .Li IPV4_ADDR_SUBNET
 or
-.Li IPV6_ADDR_SUBNET
+.Li IPV6_ADDR_SUBNET ,
 this tag should exist and
 be a network address.
 .It Em Netmask
 If the ID-type is
 .Li IPV4_ADDR_SUBNET
 or
-.Li IPV6_ADDR_SUBNET
+.Li IPV6_ADDR_SUBNET ,
 this tag should exist and
 be a network subnet mask.
 .It Em Name
 If the ID-type is
 .Li FQDN ,
-.Li USER_FQDN
+.Li USER_FQDN ,
 or
 .Li KEY_ID ,
 this tag should exist and contain a domain name, user@domain, or
@@ -463,8 +511,8 @@ remote identities cannot be verified through this means, although it
 is still possible to do so through
 .Xr isakmpd.policy 5 .
 .El
-.It Em <ISAKMP-configuration>
-.Bl -tag -width 12n
+.It Aq Sy ISAKMP-configuration
+.Bl -tag -width Ds
 .It Em DOI
 The domain of interpretation as given by the RFCs.
 Normally
@@ -482,10 +530,12 @@ A list of proposed transforms to use for protecting the
 ISAKMP traffic.
 These are actually names for sections
 further describing the transforms.
-Look at <ISAKMP-transform> below.
+Look at
+.Aq Sy ISAKMP-transform
+below.
 .El
-.It Em <ISAKMP-transform>
-.Bl -tag -width 12n
+.It Aq Sy ISAKMP-transform
+.Bl -tag -width Ds
 .It Em ENCRYPTION_ALGORITHM
 The encryption algorithm as the RFCs name it, or ANY to denote that any
 encryption algorithm proposed will be accepted.
@@ -500,7 +550,7 @@ The authentication method as the RFCs name it, or ANY.
 .It Em GROUP_DESCRIPTION
 The group used for Diffie-Hellman exponentiations, or ANY.
 The names are symbolic, like
-.Li MODP_768 , MODP_1024 , EC_155
+.Li MODP_768 , MODP_1024 , EC_155 ,
 and
 .Li EC_185 .
 .It Em PRF
@@ -510,12 +560,14 @@ derivation and authentication in phase 1), or ANY.
 A list of lifetime descriptions, or ANY.
 In the former case, each
 element is in itself a name of the section that defines the lifetime.
-Look at <Lifetime> below.
+Look at
+.Aq Sy Lifetime
+below.
 If it is set to ANY, then any type of
 proposed lifetime type and value will be accepted.
 .El
-.It Em <Lifetime>
-.Bl -tag -width 12n
+.It Aq Sy Lifetime
+.Bl -tag -width Ds
 .It Em LIFE_TYPE
 .Li SECONDS
 or
@@ -523,49 +575,62 @@ or
 depending on the type of the duration.
 Notice that this field may NOT be set to ANY.
 .It Em LIFE_DURATION
-An offer/accept kind of value, see above.
+An offer/accept kind of value; see above.
 Can also be set to ANY.
 .El
-.It Em <IPsec-connection>
-.Bl -tag -width 12n
+.It Aq Sy IPsec-connection
+.Bl -tag -width Ds
 .It Em Phase
 The constant
-.Li 2 ,
+.Sq 2 ,
 as ISAKMP-peers and IPsec-connections
-really are handled by the same code inside isakmpd.
+really are handled by the same code inside
+.Xr isakmpd 8 .
 .It Em ISAKMP-peer
 The name of the ISAKMP-peer which to talk to in order to
 set up this connection.
-The value is the name of an <ISAKMP-peer> section.
+The value is the name of an
+.Aq Sy ISAKMP-peer
+section.
 See above.
 .It Em Configuration
 The name of the IPsec-configuration section to use.
-Look at <IPsec-configuration> below.
+Look at
+.Aq Sy IPsec-configuration
+below.
 .It Em Local-ID
 If existent, the name of the section that describes the
 optional local client ID that we should present to our peer.
 It is also used when we act as responders to find out what
-<IPsec-connection> we are dealing with.
-Look at <IPsec-ID> below.
+.Aq Sy IPsec-connection
+we are dealing with.
+Look at
+.Aq Sy IPsec-ID
+below.
 .It Em Remote-ID
 If existent, the name of the section that describes the
 optional remote client ID that we should present to our peer.
 It is also used when we act as responders to find out what
-<IPsec-connection> we are dealing with.
-Look at <IPsec-ID> below.
+.Aq Sy IPsec-connection
+we are dealing with.
+Look at
+.Aq Sy IPsec-ID
+below.
 .It Em Flags
 A comma-separated list of flags controlling the further
 handling of the IPsec SA.
 Currently only one flag is defined:
 .Bl -tag -width 12n
 .It Em Active-only
-If this flag is given and this <IPsec-connection> is part of the phase 2
+If this flag is given and this
+.Aq Sy IPsec-connection
+is part of the phase 2
 connections we automatically keep up, it will not automatically be used for
 accepting connections from the peer.
 .El
 .El
-.It Em <IPsec-configuration>
-.Bl -tag -width 12n
+.It Aq Sy IPsec-configuration
+.Bl -tag -width Ds
 .It Em DOI
 The domain of interpretation as given by the RFCs.
 Normally
@@ -579,41 +644,41 @@ For quick mode this is
 .It Em Suites
 A list of protection suites (bundles of protocols) usable for
 protecting the IP traffic.
-Each of the list elements is a name of an <IPsec-suite> section.
+Each of the list elements is a name of an
+.Aq Sy IPsec-suite
+section.
 See below.
 .El
-.It Em <IPsec-suite>
-.Bl -tag -width 12n
+.It Aq Sy IPsec-suite
+.Bl -tag -width Ds
 .It Em Protocols
 A list of the protocols included in this protection suite.
-Each of the list elements is a name of an <IPsec-protocol>
+Each of the list elements is a name of an
+.Aq Sy IPsec-protocol
 section.
 See below.
 .El
-.It Em <IPsec-protocol>
-.Bl -tag -width 12n
+.It Aq Sy IPsec-protocol
+.Bl -tag -width Ds
 .It Em PROTOCOL_ID
 The protocol as given by the RFCs.
-Acceptable values today are
+Acceptable values are currently
 .Li IPSEC_AH
 and
 .Li IPSEC_ESP .
 .It Em Transforms
 A list of transforms usable for implementing the protocol.
-Each of the list elements is a name of an <IPsec-transform>
+Each of the list elements is a name of an
+.Aq Sy IPsec-transform
 section.
 See below.
 .It Em ReplayWindow
 The size of the window used for replay protection.
 This is normally left alone.
-Look at the
-.Nm ESP
-and
-.Nm AH
-RFCs for a better description.
+Look at the ESP and AH RFCs for a better description.
 .El
-.It Em <IPsec-transform>
-.Bl -tag -width 12n
+.It Aq Sy IPsec-transform
+.Bl -tag -width Ds
 .It Em TRANSFORM_ID
 The transform ID as given by the RFCs.
 .It Em ENCAPSULATION_MODE
@@ -625,27 +690,30 @@ being an ESP transform.
 .It Em GROUP_DESCRIPTION
 An optional (provides PFS if present) Diffie-Hellman group
 description.
-The values are the same as GROUP_DESCRIPTION's
-in <ISAKMP-transform> sections shown above.
+The values are the same as those for GROUP_DESCRIPTION in
+.Aq Sy ISAKMP-transform
+sections shown above.
 .It Em Life
-List of lifetimes, each element is a <Lifetime> section name.
+List of lifetimes, each element is a
+.Aq Sy Lifetime
+section name.
 .El
-.It Em <IPsec-ID>
-.Bl -tag -width 12n
+.It Aq Sy IPsec-ID
+.Bl -tag -width Ds
 .It Em ID-type
 The ID type as given by the RFCs.
 For IPsec this is currently
 .Li IPV4_ADDR ,
 .Li IPV6_ADDR ,
-.Li IPV4_ADDR_SUBNET
+.Li IPV4_ADDR_SUBNET ,
 or
 .Li IPV6_ADDR_SUBNET .
 .It Em Address
 If the ID-type is
 .Li IPV4_ADDR
 or
-.Li IPV6_ADDR
-this tag should exist and be an IP-address, an interface name, or the
+.Li IPV6_ADDR ,
+this tag should exist and be an IP address, an interface name, or the
 .Em default
 keyword.
 If an interface is used, the first address of the appropriate
@@ -653,31 +721,31 @@ family will be used.
 The
 .Em default
 keyword uses the interface associated with the default route.
-In the case of IPv6 link-local addresses will be skipped if
+In the case of IPv6, link-local addresses will be skipped if
 addresses which are not link-local exist.
 If the address on the interface changes
-.Em isakmpd
+.Xr isakmpd 8
 will not track the change.
 The configuration must be reloaded to learn the new address.
 .It Em Network
 If the ID-type is
 .Li IPV4_ADDR_SUBNET
 or
-.Li IPV6_ADDR_SUBNET
+.Li IPV6_ADDR_SUBNET ,
 this tag should exist and be a network address, an interface, or the
 .Em default
 keyword.
-When an interface is specified the network is selected as with the
+When an interface is specified, the network is selected as with the
 .Em Address
 tag.
 .It Em Netmask
 If the ID-type is
 .Li IPV4_ADDR_SUBNET
 or
-.Li IPV6_ADDR_SUBNET
+.Li IPV6_ADDR_SUBNET ,
 this tag should exist and
 be a network subnet mask or an interface.
-When an interface is specified the netmask is the mask associated with the
+When an interface is specified, the netmask is the mask associated with the
 .Em Network .
 The
 .Em default
@@ -686,9 +754,9 @@ keyword uses the interface associated with the default route.
 If the ID-type is
 .Li IPV4_ADDR ,
 .Li IPV4_ADDR_SUBNET ,
-.Li IPV6_ADDR
+.Li IPV6_ADDR ,
 or
-.Li IPV6_ADDR_SUBNET
+.Li IPV6_ADDR_SUBNET ,
 this tag indicates what transport protocol should be transmitted over
 the SA.
 If left unspecified, all transport protocols between the two address
@@ -697,26 +765,29 @@ If left unspecified, all transport protocols between the two address
 If the ID-type is
 .Li IPV4_ADDR ,
 .Li IPV4_ADDR_SUBNET ,
-.Li IPV6_ADDR
+.Li IPV6_ADDR ,
 or
-.Li IPV6_ADDR_SUBNET
+.Li IPV6_ADDR_SUBNET ,
 this tag indicates what source or destination port is allowed to be
 transported over the SA (depending on whether this is a local or
 remote ID).
 If left unspecified, all ports of the given transport protocol
 will be transmitted (or permitted) over the SA.
-The Protocol tag must be specified in conjunction with this tag.
+The
+.Em Protocol
+tag must be specified in conjunction with this tag.
 .El
 .El
-.Ss Other sections
-.Bl -hang -width 12n
-.It Em <IKECFG-ID>
+.Sh OTHER SECTIONS
+.Bl -hang -width 8n
+.It Aq Sy IKECFG-ID
 Parameters to use with IKE mode-config.
 One ID per peer.
 .Pp
 An IKECFG-ID is written as [<ID-type>/<name>].
 The following ID types are supported:
-.Bl -tag -width 12n
+.Pp
+.Bl -tag -width "ASN1_DNXX" -offset indent -compact
 .It IPv4
 [ipv4/A.B.C.D]
 .It IPv6
@@ -734,7 +805,8 @@ starts with a
 Each section specifies what configuration values to return to the peer
 requesting IKE mode-config.
 Currently supported values are:
-.Bl -tag -width 12n
+.Pp
+.Bl -tag -width "WINS-serverXX" -offset indent -compact
 .It Em Address
 The peer's network address.
 .It Em Netmask
@@ -744,13 +816,15 @@ The IP address of a DNS nameserver.
 .It Em WINS-server
 The IP address of a WINS server.
 .El
-.It Em <Initiator-ID>
+.It Aq Sy Initiator-ID
 .Pp
 During phase 1 negotiation
-.Nm isakmpd
-looks for a pre-shared key in the <ISAKMP-peer> section.
+.Xr isakmpd 8
+looks for a pre-shared key in the
+.Aq Sy ISAKMP-peer
+section.
 If no Authentication data is specified in that section, and
-.Nm isakmpd
+.Xr isakmpd 8
 is not the initiator, it looks for Authentication data in a section named after
 the initiator's phase 1 ID.
 This allows mobile users with dynamic IP addresses
@@ -760,13 +834,15 @@ This only works for aggressive mode because in main mode the remote
 initiator ID would not yet be known.
 Note, however, that use of aggressive mode is discouraged.
 See
-.Sx CAVEATS
-section below.
+.Sx CAVEATS ,
+below.
 .Pp
-The name of the <Initiator-ID> section depends on the ID type sent by
-the initiator.
+The name of the
+.Aq Sy Initiator-ID
+section depends on the ID type sent by the initiator.
 Currently this can be:
-.Bl -tag -width 12n
+.Pp
+.Bl -tag -width "UFQDNXX" -offset indent -compact
 .It IPv4
 [A.B.C.D]
 .It IPv6
@@ -781,11 +857,11 @@ Currently this can be:
 .Bl -tag -width /etc/isakmpd/isakmpd.conf
 .It Pa /etc/isakmpd/isakmpd.conf
 The default
-.Nm isakmpd
+.Xr isakmpd 8
 configuration file.
 .It Pa /usr/share/ipsec/isakmpd/
 A directory containing some sample
-.Nm isakmpd
+.Xr isakmpd 8
 configuration files.
 .El
 .Sh EXAMPLES
@@ -1141,10 +1217,13 @@ LIFE_DURATION=		1000,768:1536
 .Ed
 .Sh SEE ALSO
 .Xr keynote 1 ,
+.Xr openssl 1 ,
 .Xr ipsec 4 ,
 .Xr keynote 4 ,
 .Xr isakmpd.policy 5 ,
-.Xr isakmpd 8
+.Xr certpatch 8 ,
+.Xr isakmpd 8 ,
+.Xr vpn 8
 .Sh CAVEATS
 Using aggressive mode is discouraged due to various design problems.
 If your peer only supports aggressive mode, please consider replacing that