move what little info netstart(8) contains on multicast to the

multicast(4) page (where the same info is essentially present),
leaving an Xr in SEE ALSO; while there, tweak multicast(4) a little...

2 files changed, 14 insertions, 27 deletions

diff --git a/share/man/man4/multicast.4 b/share/man/man4/multicast.4
index 46b932aeb3f..5c56b62b72f 100644
--- a/share/man/man4/multicast.4
+++ b/share/man/man4/multicast.4
@@ -24,16 +24,16 @@
 .\" 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.11 2016/12/22 11:04:44 rzalamena Exp $
+.\" $OpenBSD: multicast.4,v 1.12 2018/03/07 09:54:23 jmc Exp $
 .\" $NetBSD: multicast.4,v 1.3 2004/09/12 13:12:26 wiz Exp $
 .\"
-.Dd $Mdocdate: December 22 2016 $
+.Dd $Mdocdate: March 7 2018 $
 .Dt MULTICAST 4
 .Os
 .\"
 .Sh NAME
 .Nm multicast
-.Nd Multicast Routing
+.Nd multicast routing
 .\"
 .Sh SYNOPSIS
 .Cd "options MROUTING"
@@ -52,8 +52,7 @@
 .Ft int
 .Fn setsockopt "int s" IPPROTO_IPV6 MRT6_INIT "const void *optval" "socklen_t optlen"
 .Sh DESCRIPTION
-.Tn "Multicast routing"
-is used to efficiently propagate data
+Multicast routing is used to efficiently propagate data
 packets to a set of multicast listeners in multipoint networks.
 If unicast is used to replicate the data to all listeners,
 then some of the network links may carry multiple copies of the same
@@ -75,7 +74,13 @@ the user must enable multicast forwarding via the
 variables
 .Va net.inet.ip.mforwarding
 and/or
-.Va net.inet.ip6.mforwarding .
+.Va net.inet.ip6.mforwarding ,
+and set
+.Va multicast
+to
+.Dq YES
+in
+.Xr rc.conf.local 8 .
 The user must also run a multicast routing capable user-level process,
 such as
 .Xr mrouted 8 .
@@ -121,8 +126,7 @@ In the case of
 kernels,
 it may be possible to open separate sockets
 for IGMP or MLD messages only.
-However, some other kernels (e.g.,
-.Tn Linux )
+However, some other kernels (e.g., Linux)
 require that the multicast
 routing socket must be used for sending and receiving of IGMP or MLD
 messages.
diff --git a/share/man/man8/netstart.8 b/share/man/man8/netstart.8
index 31d9cfa6c77..ea25e078468 100644
--- a/share/man/man8/netstart.8
+++ b/share/man/man8/netstart.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: netstart.8,v 1.22 2018/03/03 07:33:35 landry Exp $
+.\"	$OpenBSD: netstart.8,v 1.23 2018/03/07 09:54:23 jmc Exp $
 .\"
 .\" Copyright (c) 2002, Miodrag Vallat.
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\"
 .\"     @(#)rc.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: March 3 2018 $
+.Dd $Mdocdate: March 7 2018 $
 .Dt NETSTART 8
 .Os
 .Sh NAME
@@ -98,23 +98,6 @@ Using the
 .Fl n
 option reports the steps that would be taken,
 without actually configuring the interface.
-.Sh MULTICAST ROUTING
-To enable
-.Xr multicast 4
-routing, the
-.Va net.inet.ip.mforwarding
-and/or
-.Va net.inet6.ip6.mforwarding
-.Xr sysctl 8
-variables should be set to 1.
-Multicast routing is only enabled if
-.Va multicast
-is set to
-.Qq YES
-in
-.Xr rc.conf.local 8 .
-Other cases are configuration errors
-and will cause multicast routing not to be enabled.
 .Sh SEE ALSO
 .Xr multicast 4 ,
 .Xr defaultdomain 5 ,