Sync with latest KAME code.

Obtained from:	KAME

1 files changed, 17 insertions, 16 deletions

diff --git a/usr.sbin/pim6sd/pim6sd.conf.5 b/usr.sbin/pim6sd/pim6sd.conf.5
index 9df4b71..074d6b6 100644
--- a/usr.sbin/pim6sd/pim6sd.conf.5
+++ b/usr.sbin/pim6sd/pim6sd.conf.5
@@ -1,6 +1,6 @@
 .\" Copyright (C) 1999 WIDE Project.
 .\" All rights reserved.
-.\"
+.\" 
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -12,7 +12,7 @@
 .\" 3. Neither the name of the project nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\"
+.\" 
 .\" THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -25,8 +25,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: pim6sd.conf.5,v 1.7 1999/12/03 07:31:45 jinmei Exp $
-.\" $FreeBSD$
+.\"	$Id: pim6sd.conf.5,v 1.9 2000/05/05 14:57:14 sumikawa Exp $
+.\"	$FreeBSD$
 .\"
 .Dd Oct 6, 1999
 .Dt PIM6SD.CONF 5
@@ -65,8 +65,7 @@ The following statements can be specified in the configuration file.
 .Ar option...
 .Ic ;
 .Xc
-Specify debug messages to be printed out.
-Each
+Specify debug messages to be printed out. Each
 .Ar option
 usually specifies a subset of the messages to be printed.
 If an
@@ -74,8 +73,7 @@ If an
 begins with
 .Ic no ,
 it means that the set of the messages that are specified by the option
-will not be printed.
-For example,
+will not be printed. For example,
 .Ic `all nomld'
 means that all the messages except MLD related ones will be printed.
 Valid options are
@@ -147,8 +145,7 @@ The default preference is 1024.
 .It Ic default_source_metric Ar metric;
 Specifies a default metric value when sending a PIM assert message.
 It is recommended that preferences be set such that metrics are never
-consulted.
-However, default metrics may also be set and will default to
+consulted. However, default metrics may also be set and will default to
 1024.
 .\"
 .It Xo
@@ -169,8 +166,7 @@ the holdtime will be
 *
 .Ar coef .
 The default values of the period and the coefficient are 30 and 3.5,
-respectively.
-The default holdtime is 105 seconds as a result.
+respectively. The default holdtime is 105 seconds as a result.
 .\"
 .It Xo
 .Ic join_prune_period Ar period Ar coef;
@@ -184,8 +180,7 @@ the holdtime will be
 *
 .Ar coef .
 The default values of the period and the coefficient are 60 and 3.5,
-respectively.
-Consequently, the default holdtime is 210 seconds.
+respectively. Consequently, the default holdtime is 210 seconds.
 .\"
 .It Xo
 .Ic data_timeout Ar timer;
@@ -261,6 +256,7 @@ specifies a group prefix that the RP will handle.
 .Op Ar interface
 .Op Ic time Ar time
 .Op Ic priority Ar priority
+.Op Ic masklen Ar masklen
 .Ic ;
 .Xc
 Specifies to act as a candidate bootstrap router(BSR).
@@ -282,6 +278,11 @@ Another optional parameter
 .Ic priority
 specifies the priority of the RP.
 The default value is 0, which means the lowest priority.
+Hash mask length can also be specified by the
+.Ic masklen
+parametr. Its value,
+.Ar masklen ,
+must be no less than 0 and no greater than 128.
 .\"
 .It Xo
 .Ic switch_register_threshold Ic rate Ar rate Ic interval Ar interval;
@@ -312,8 +313,8 @@ The default values are 50000 and 20, respectively.
 # phyint ep0 preference 101;
 phyint de0 disable;
 #
-#followings are for a candidate Rendezvous Point, which should usually
-#be disabled.
+# followings are for a candidate Rendezvous Point, which should usually
+# be disabled.
 cand_bootstrap_router;
 cand_rp;
 .Ed