comment out references to ipf to be replaced in the future with whatever packet filter we end up using

2 files changed, 41 insertions, 35 deletions

diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4
index 8ece81932cf..6a275a2b867 100644
--- a/share/man/man4/bridge.4
+++ b/share/man/man4/bridge.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bridge.4,v 1.29 2000/12/30 21:57:21 angelos Exp $
+.\"	$OpenBSD: bridge.4,v 1.30 2001/05/30 03:24:15 millert Exp $
 .\"
 .\" Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -52,9 +52,10 @@ a transparent filter for
 .Xr ip 4
 datagrams.
 .Pp
-The bridges provided by this interface are learning bridges with
-IP filtering, see
-.Xr ipf 4 .
+.\"XXX - replace with ipfw when it is in-tree
+.\"The bridges provided by this interface are learning bridges with
+.\"IP filtering, see
+..\"Xr ipf 4 .
 In general a bridge works like a hub, forwarding traffic from one interface
 to another.
 It differs from a hub in that it will "learn" which machines
@@ -79,16 +80,17 @@ bridge will forward the packet only to the destination segment.
 If the destination is on the same segment as the origin segment, the bridge
 will drop the packet because the receiver has already had a chance to see
 the frame.
-Before forwarding a frame, the bridge will check to see if the packet
-contains an
-.Xr ip 4
-datagram; if so, the datagram is run through the
-.Xr ipf 4
-interface so that it can be filtered.
-Only the
-.Xr ipf 4
-input rules for the source interface are checked with the datagram;
-output rules have no effect.
+.\"XXX - replace with ipfw when it is in-tree
+.\"Before forwarding a frame, the bridge will check to see if the packet
+.\"contains an
+.\".Xr ip 4
+.\"datagram; if so, the datagram is run through the
+.\".Xr ipf 4
+.\"interface so that it can be filtered.
+.\"Only the
+.\".Xr ipf 4
+.\"input rules for the source interface are checked with the datagram;
+.\"output rules have no effect.
 .Sh IOCTLS
 A
 .Nm
@@ -518,7 +520,7 @@ No such member interface in the bridge.
 .Xr ioctl 2 ,
 .Xr gif 4 ,
 .Xr ip 4 ,
-.Xr ipf 4 ,
+.\".Xr ipf 4 ,
 .Xr netintro 4 ,
 .Xr bridgename.if 5 ,
 .Xr brconfig 8
@@ -542,8 +544,9 @@ kernel interface first appeared in
 There is currently no loop detection.
 Care must be taken to ensure that loops are not created when a bridge
 is brought up.
-.Pp
-Only
-.Xr ipf 4
-input rules are checked with incoming packet; there is no easy way to
-handle output rules.
+.\"XXX - replace with ipfw when it is in-tree
+.\".Pp
+.\"Only
+.\".Xr ipf 4
+.\"input rules are checked with incoming packet; there is no easy way to
+.\"handle output rules.
diff --git a/share/man/man4/enc.4 b/share/man/man4/enc.4
index 382b1a1c02b..8d2d4f68134 100644
--- a/share/man/man4/enc.4
+++ b/share/man/man4/enc.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: enc.4,v 1.11 2001/03/25 22:32:45 angelos Exp $
+.\"	$OpenBSD: enc.4,v 1.12 2001/05/30 03:24:16 millert Exp $
 .\"
 .Dd October 7, 1999
 .Dt ENC 4
@@ -9,21 +9,24 @@
 .Sh SYNOPSIS
 .Cd "pseudo-device enc 4"
 .Sh DESCRIPTION
+.\"XXX - replace with ipfw when it is in-tree
+.\"The
+.\".Nm
+.\"interface is a software loopback mechanism that allows hosts or
+.\"firewalls to filter
+.\".Xr ipsec 4
+.\"traffic using
+.\".Xr ipf 5 .
+.\"The
+.\".Xr vpn 8
+.\"manpage shows an example of such a setup.
+.\".Pp
+.\"The other use of the
+.\"XXX
 The
 .Nm
-interface is a software loopback mechanism that allows hosts or
-firewalls to filter
-.Xr ipsec 4
-traffic using
-.Xr ipf 5 .
-The
-.Xr vpn 8
-manpage shows an example of such a setup.
-.Pp
-The other use of the
-.Nm
-interface is to allow an administrator to see outgoing packets before
-they have been processed by
+interface is a software loopback mechanism that allows an administrator
+to see outgoing packets before they have been processed by
 .Xr ipsec 4 ,
 or incoming packets after they have been similarly processed, via
 .Xr tcpdump 8 .
@@ -52,5 +55,5 @@ or all incoming packets after they have been similarly processed:
 .Xr inet 4 ,
 .Xr ipsec 4 ,
 .Xr netintro 4 ,
-.Xr ipf 5 ,
+.\".Xr ipf 5 ,
 .Xr vpn 8