Bump date for previous. Sort options to establish-sa.

Stop using Xo/Xc.

crypto/dist/ipsec-tools/src/racoon/racoonctl.8

@@ -1,4 +1,4 @@
-.\"	$NetBSD: racoonctl.8,v 1.21 2009/03/12 10:57:26 tteras Exp $
+.\"	$NetBSD: racoonctl.8,v 1.22 2009/03/12 14:01:09 wiz Exp $
 .\"
 .\" Id: racoonctl.8,v 1.6 2006/05/07 21:32:59 manubsd Exp
 .\"
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd January 23, 2009
+.Dd March 12, 2009
 .Dt RACOONCTL 8
 .Os
 .\"
@@ -64,9 +64,9 @@ delete-sa
 .Nm
 .Op opts
 establish-sa
-.Op Fl u Ar identity
-.Op Fl n Ar remoteconf
 .Op Fl w
+.Op Fl n Ar remoteconf
+.Op Fl u Ar identity
 .Ar saopts
 .Nm
 .Op opts
@@ -127,10 +127,7 @@ IPsec ESP SAs, IPsec AH SAs, or all IPsec SAs.
 Use
 .Fl l
 to increase verbosity.
-.It Xo get-sa-cert
-.Oo inet|inet6
-.Oc Ar src dst
-.Xc
+.It get-sa-cert Oo inet|inet6 Oc Ar src dst
 Output the raw certificate that was used to authenticate the phase 1
 matching
 .Ar src
@@ -139,14 +136,8 @@ and
 .It flush-sa Op isakmp|esp|ah|ipsec
 is used to flush all SAs if no SA class is provided, or a class of SAs,
 either ISAKMP SAs, IPsec ESP SAs, IPsec AH SAs, or all IPsec SAs.
-.It Xo establish-sa
-.Oo Fl u Ar username
-.Oc
-.Oo Fl n Ar remoteconf
-.Oc
-.Oo Fl w
-.Oc Ar saopts
-.Xc
+.It establish-sa Oo Fl w Oc Oo Fl n Ar remoteconf Oc Oo Fl u Ar username \
+Oc Ar saopts
 Establish an SA, either an ISAKMP SA, IPsec ESP SA, or IPsec AH SA.
 The optional
 .Fl u Ar username
@@ -170,10 +161,7 @@ has the following format:
 .It {esp|ah} {inet|inet6} Ar src/prefixlen/port Ar dst/prefixlen/port
 {icmp|tcp|udp|gre|any}
 .El
-.It Xo vpn-connect
-.Oo Fl u Ar username
-.Oc Ar vpn_gateway
-.Xc
+.It vpn-connect Oo Fl u Ar username Oc Ar vpn_gateway
 This is a particular case of the previous command.
 It will establish an ISAKMP SA with
 .Ar vpn_gateway .