vpn.8 removal;

4 files changed, 9 insertions, 24 deletions

diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index b920d09b059..bc94a74cf08 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.3,v 1.152 2006/05/26 04:02:59 deraadt Exp $
+.\"	$OpenBSD: sysctl.3,v 1.153 2006/05/26 09:26:07 jmc Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -1251,9 +1251,7 @@ associations on behalf of the kernel.
 Such security associations can occur as a result of a process having
 requested some security level through
 .Xr setsockopt 2 ,
-or as a result of dynamic
-.Xr vpn 8
-entries.
+or as a result of dynamic VPN entries.
 Supported values are hmac-md5, hmac-sha1, and hmac-ripemd160.
 If set to any other value, it is left to the key management daemons to
 select an authentication algorithm for the security association.
@@ -1283,9 +1281,7 @@ associations on behalf of the kernel.
 Such security associations can occur as a result of a process having
 requested some security level through
 .Xr setsockopt 2 ,
-or as a result of dynamic
-.Xr vpn 8
-entries.
+or as a result of dynamic VPN entries.
 Supported values are aes, des, 3des, blowfish, cast128, and skipjack.
 If set to any other value, it is left to the key management daemons to
 select an encryption algorithm for the security association.
diff --git a/sbin/ipsecctl/ipsec.conf.5 b/sbin/ipsecctl/ipsec.conf.5
index 34ba0364a2e..1ee787d68a7 100644
--- a/sbin/ipsecctl/ipsec.conf.5
+++ b/sbin/ipsecctl/ipsec.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ipsec.conf.5,v 1.43 2006/05/18 21:27:24 miod Exp $
+.\"	$OpenBSD: ipsec.conf.5,v 1.44 2006/05/26 09:26:07 jmc Exp $
 .\"
 .\" Copyright (c) 2004 Mathieu Sauve-Frankel  All rights reserved.
 .\"
@@ -631,8 +631,7 @@ ike dynamic esp from 192.168.62.0/24 to 192.168.48.0/20 peer 192.168.3.12
 .Xr tcp 4 ,
 .Xr isakmpd.conf 5 ,
 .Xr ipsecctl 8 ,
-.Xr isakmpd 8 ,
-.Xr vpn 8
+.Xr isakmpd 8
 .Sh HISTORY
 The
 .Nm
diff --git a/sbin/isakmpd/isakmpd.8 b/sbin/isakmpd/isakmpd.8
index c9508bae438..cd7e15e5058 100644
--- a/sbin/isakmpd/isakmpd.8
+++ b/sbin/isakmpd/isakmpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.8,v 1.84 2006/05/26 04:02:59 deraadt Exp $
+.\" $OpenBSD: isakmpd.8,v 1.85 2006/05/26 09:26:07 jmc Exp $
 .\" $EOM: isakmpd.8,v 1.23 2000/05/02 00:30:23 niklas Exp $
 .\"
 .\" Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.
@@ -76,11 +76,6 @@ socket, and lastly by scheduled events triggered by timers running out.
 Most uses of
 .Nm
 will be to implement so called "virtual private networks" (VPNs).
-The
-.Xr vpn 8
-manual page describes how to set up
-.Nm
-for a simple VPN.
 For other uses, some more knowledge of IKE as a protocol is required.
 One source of information are the RFCs mentioned below.
 .Pp
@@ -483,9 +478,6 @@ A number of methods exist to allow authentication:
 .Bl -ohang -offset indent
 .It Passphrase:
 This method does not use keys at all, but relies on a shared passphrase.
-See
-.Xr vpn 8
-for an example implementation.
 .It Host Keys:
 Public keys are used to authenticate.
 See
@@ -753,8 +745,7 @@ command is issued in the command FIFO.
 .Xr isakmpd.conf 5 ,
 .Xr isakmpd.policy 5 ,
 .Xr ssl 8 ,
-.Xr tcpdump 8 ,
-.Xr vpn 8
+.Xr tcpdump 8
 .Sh HISTORY
 The ISAKMP/Oakley key management protocol is described in
 RFC 2407, RFC 2408, and RFC 2409.
diff --git a/sbin/isakmpd/isakmpd.conf.5 b/sbin/isakmpd/isakmpd.conf.5
index c098e642644..bfd6c2b171f 100644
--- a/sbin/isakmpd/isakmpd.conf.5
+++ b/sbin/isakmpd/isakmpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.conf.5,v 1.109 2006/05/26 04:02:59 deraadt Exp $
+.\" $OpenBSD: isakmpd.conf.5,v 1.110 2006/05/26 09:26:07 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.
@@ -1248,8 +1248,7 @@ LIFE_DURATION=		1000,768:1536
 .Xr ipsec 4 ,
 .Xr keynote 4 ,
 .Xr isakmpd.policy 5 ,
-.Xr isakmpd 8 ,
-.Xr vpn 8
+.Xr isakmpd 8
 .Sh CAVEATS
 Using aggressive mode is discouraged due to various design problems.
 If your peer only supports aggressive mode, please consider replacing that