Document the recent changes to the multicast routing in the kernel.

from jmc@

ok jmc@

2 files changed, 16 insertions, 12 deletions

diff --git a/share/man/man4/multicast.4 b/share/man/man4/multicast.4
index a7564ac8db0..ad9fe4e63dc 100644
--- a/share/man/man4/multicast.4
+++ b/share/man/man4/multicast.4
@@ -24,7 +24,7 @@
 .\" DEALINGS IN THE SOFTWARE.
 .\"
 .\" $FreeBSD: src/share/man/man4/multicast.4,v 1.4 2004/07/09 09:22:36 ru Exp $
-.\" $OpenBSD: multicast.4,v 1.3 2005/09/30 20:34:24 jaredy Exp $
+.\" $OpenBSD: multicast.4,v 1.4 2005/10/07 16:29:10 norby Exp $
 .\" $NetBSD: multicast.4,v 1.3 2004/09/12 13:12:26 wiz Exp $
 .\"
 .Dd September 4, 2003
@@ -72,11 +72,10 @@ and Protocol Independent Multicast \- Dense Mode (PIM-DM)
 were developed as well.
 .Pp
 To start multicast routing,
-the user must enable multicast forwarding in the kernel
-(see
-.Sx SYNOPSIS
-about the kernel configuration options),
-and must run a multicast routing capable user-level process,
+the user must enable multicast forwarding via the
+.Va net.inet.ip.mforwarding
+.Xr sysctl 8 .
+The user must also run a multicast routing capable user-level process,
 such as
 .Xr mrouted 8 .
 From a developer's point of view,
@@ -944,7 +943,8 @@ after the previous upcall.
 .Xr ip 4 ,
 .Xr ip6 4 ,
 .Xr pim 4 ,
-.Xr mrouted 8
+.Xr mrouted 8 ,
+.Xr sysctl 8
 .\"
 .Sh AUTHORS
 .An -nosplit
diff --git a/share/man/man4/pim.4 b/share/man/man4/pim.4
index 8efe111dd95..4e02be9d88c 100644
--- a/share/man/man4/pim.4
+++ b/share/man/man4/pim.4
@@ -24,7 +24,7 @@
 .\" DEALINGS IN THE SOFTWARE.
 .\"
 .\" $FreeBSD: src/share/man/man4/pim.4,v 1.2 2004/07/09 09:22:36 ru Exp $
-.\" $OpenBSD: pim.4,v 1.4 2005/10/04 08:45:23 jmc Exp $
+.\" $OpenBSD: pim.4,v 1.5 2005/10/07 16:29:10 norby Exp $
 .\" $NetBSD: pim.4,v 1.2 2004/09/12 13:06:14 wiz Exp $
 .\"
 .Dd September 4, 2003
@@ -74,11 +74,14 @@ to routers with no group membership information.
 Both PIM-SM and PIM-DM are fairly complex protocols,
 though PIM-SM is much more complex.
 To enable PIM-SM or PIM-DM multicast routing in a router,
-the user must enable multicast routing and PIM processing in the kernel
+the user must enable multicast forwarding via the
+.Va net.inet.ip.mforwarding
+.Xr sysctl 8
+and PIM processing in the kernel
 (see
 .Sx SYNOPSIS
-about the kernel configuration options),
-and must run a PIM-SM or PIM-DM capable user-level process.
+for the correct kernel configuration option).
+The user must also run a PIM-SM or PIM-DM capable user-level process.
 From a developer's point of view,
 the programming guide described in the
 .Sx "Programming Guide"
@@ -171,7 +174,8 @@ and
 .Xr inet 4 ,
 .Xr intro 4 ,
 .Xr ip 4 ,
-.Xr multicast 4
+.Xr multicast 4 ,
+.Xr sysctl 8
 .\"
 .Sh STANDARDS
 The PIM-SM protocol is specified in RFC 2362 (to be replaced by