let us not talk about ipsecadm and vpn anymore; ok reyk

5 files changed, 17 insertions, 31 deletions

diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4
index a4e2afcd39f..6cd93d2f77f 100644
--- a/share/man/man4/bridge.4
+++ b/share/man/man4/bridge.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bridge.4,v 1.59 2006/05/09 19:03:04 jmc Exp $
+.\"	$OpenBSD: bridge.4,v 1.60 2006/05/26 04:02:59 deraadt Exp $
 .\"
 .\" Copyright (c) 1999-2001 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -596,7 +596,7 @@ interface, the bridge will also perform transparent
 .Xr ipsec 4
 processing on the packets (encrypt or decrypt them), according to the
 policies set with the
-.Xr ipsecadm 8
+.Xr ipsecctl 8
 command by the administrator.
 If appropriate security associations (SAs) do not exist, any key
 management daemons such as
@@ -619,7 +619,7 @@ and certificates, to impersonate the protected host(s)).
 .Xr pf 4 ,
 .Xr bridgename.if 5 ,
 .Xr brconfig 8 ,
-.Xr ipsecadm 8 ,
+.Xr ipsecctl 8 ,
 .Xr isakmpd 8 ,
 .Xr netstart 8
 .Sh HISTORY
diff --git a/share/man/man4/enc.4 b/share/man/man4/enc.4
index cfbd8b2d9e7..b1b43f734ac 100644
--- a/share/man/man4/enc.4
+++ b/share/man/man4/enc.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: enc.4,v 1.20 2005/04/17 12:31:38 jmc Exp $
+.\"	$OpenBSD: enc.4,v 1.21 2006/05/26 04:02:59 deraadt Exp $
 .\"
 .\" Copyright (c) 1999 Angelos D. Keromytis
 .\" All rights reserved.
@@ -45,9 +45,6 @@ firewalls to filter
 .Xr ipsec 4
 traffic using
 .Xr pf 4 .
-The
-.Xr vpn 8
-manpage shows an example of such a setup.
 .Pp
 The
 .Nm
@@ -79,5 +76,5 @@ or all incoming packets after they have been similarly processed:
 .Xr ipsec 4 ,
 .Xr netintro 4 ,
 .Xr pf 4 ,
-.Xr tcpdump 8 ,
-.Xr vpn 8
+.Xr tcpdump 8
+
diff --git a/share/man/man4/ipcomp.4 b/share/man/man4/ipcomp.4
index 1f53cf6673f..dd24bfbba52 100644
--- a/share/man/man4/ipcomp.4
+++ b/share/man/man4/ipcomp.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipcomp.4,v 1.12 2005/04/08 18:44:03 jmc Exp $
+.\" $OpenBSD: ipcomp.4,v 1.13 2006/05/26 04:02:59 deraadt Exp $
 .\"
 .\" Copyright (c) 2001 Jean-Jacques Bernard-Gundol <jj@wabbitt.org>
 .\" All rights reserved.
@@ -68,10 +68,10 @@ Compression Parameter Index (CPI).
 An IPCA is the pendant of the SA (Security Association) for IPsec.
 .Pp
 Currently, IPCA can be created using the
-.Xr ipsecadm 8
+.Xr ipsecctl 8
 tool.
 Using
-.Xr ipsecadm 8
+.Xr ipsecctl 8
 it is also possible to create IPComp flows and SA/IPCA
 bundles.
 Such a bundle is used to create a combination of IPsec and IPComp
@@ -115,7 +115,7 @@ displays information about IPComp flows.
 .Xr ip 4 ,
 .Xr ipsec 4 ,
 .Xr netintro 4 ,
-.Xr ipsecadm 8 ,
+.Xr ipsecctl 8 ,
 .Xr sysctl 8
 .Sh HISTORY
 The
diff --git a/share/man/man4/ipsec.4 b/share/man/man4/ipsec.4
index cf30daf363d..7b8ba5eb670 100644
--- a/share/man/man4/ipsec.4
+++ b/share/man/man4/ipsec.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipsec.4,v 1.69 2005/12/12 11:56:47 jmc Exp $
+.\" $OpenBSD: ipsec.4,v 1.70 2006/05/26 04:02:59 deraadt Exp $
 .\"
 .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 .\" All rights reserved.
@@ -89,7 +89,7 @@ by replaying it verbatim cause the peer to think a new message
 (withdrawal request) had been received.
 WARNING: as per the standard's specification, replay protection is not
 performed when using manual-keyed IPsec (e.g. when using
-.Xr ipsecadm 8 ) .
+.Xr ipsecctl 8 ) .
 .El
 .Ss IPsec Protocols
 IPsec provides these services using two new protocols:
@@ -155,9 +155,7 @@ using the information in the other end's SA.
 The only issue remaining is to ensure that both ends have matching SAs.
 This may be done manually, or automatically using a key management daemon.
 .Pp
-Further information on manual SA establishment is described in both
-.Xr ipsecadm 8
-and
+Further information on manual SA establishment is described in
 .Xr ipsecctl 8 .
 Information on automated key management may be found in
 .Xr isakmpd 8 .
@@ -191,8 +189,6 @@ An SA will contain information specifying
 whether it is a tunnel or transport mode SA,
 and for tunnels it will contain values to fill in into the outer IP header.
 .Pp
-Further information on setting up VPNs is described in
-.Xr vpn 8 .
 .Ss Lifetimes
 The SA also holds a couple of other parameters, especially useful for
 automatic keying, called lifetimes, which puts a limit on how much we can
@@ -258,11 +254,9 @@ it is processed by the PF/NAT code.
 Unless PF drops the packet, it will then be IPsec-processed, even if the
 packet has been modified by NAT.
 .Pp
-Security Associations can be set up manually with the
-.Xr ipsecadm 8
-and
+Security Associations can be set up manually with
 .Xr ipsecctl 8
-utilities, or automatically with the
+or automatically with the
 .Xr isakmpd 8
 key management daemon.
 .Ss Additional Variables
@@ -391,11 +385,9 @@ flag (look for ``tdb'' and ``xform'' allocations).
 .Xr options 4 ,
 .Xr tcp 4 ,
 .Xr udp 4 ,
-.Xr ipsecadm 8 ,
 .Xr ipsecctl 8 ,
 .Xr isakmpd 8 ,
-.Xr sysctl 8 ,
-.Xr vpn 8
+.Xr sysctl 8
 .Sh HISTORY
 The IPsec protocol design process was started in 1992 by
 John Ioannidis, Phil Karn, and William Allen Simpson.
diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4
index f25973bf097..dda2d606aa7 100644
--- a/share/man/man4/tcp.4
+++ b/share/man/man4/tcp.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcp.4,v 1.17 2005/07/10 08:30:51 hshoexer Exp $
+.\"	$OpenBSD: tcp.4,v 1.18 2006/05/26 04:02:59 deraadt Exp $
 .\"	$NetBSD: tcp.4,v 1.3 1994/11/30 16:22:35 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -141,8 +141,6 @@ Use TCP MD5 signatures per RFC 2385.
 This requires
 .Em Security Associations
 to be set up, which can be done using
-.Xr ipsecadm 8
-or
 .Xr ipsecctl 8 .
 When a listening socket has
 .Em TCP_MD5SIG
@@ -210,7 +208,6 @@ exists.
 .Xr ip 4 ,
 .Xr ip6 4 ,
 .Xr netintro 4 ,
-.Xr ipsecadm 8 ,
 .Xr ipsecctl 8
 .Sh HISTORY
 The