6 files changed, 62 insertions, 37 deletions
diff --git a/usr.sbin/pim6dd/pim6dd.8 b/usr.sbin/pim6dd/pim6dd.8
index e907072..064e660 100644
--- a/usr.sbin/pim6dd/pim6dd.8
+++ b/usr.sbin/pim6dd/pim6dd.8
@@ -30,7 +30,7 @@
 .\"
 .Dd Nov 17, 1998
 .Dt PIM6DD 8
-.Os KAME
+.Os
 .Sh NAME
 .Nm pim6dd
 .Nd PIM for IPv6 dense mode daemon
@@ -45,7 +45,7 @@ PIMv2(Protocol Independent Multicast Version 2) dense mode
 for IPv6.
 .Pp
 Options supported by
-.Nm pim6dd :
+.Nm Ns :
 .Bl -tag -width Ds
 .It Fl c Ar configfile
 Specify alternate location,
@@ -75,7 +75,11 @@ the "loopback interface").
 To override the default configuration,
 configuration commands may be placed in
 .Pa /etc/pim6dd.conf
-(or an alternative file, specified by the "\-c" option).
+.Po
+or an alternative file, specified by the 
+.Sq Fl c
+option
+.Pc .
 .\"
 .Sh FILES
 .Bl -tag -width /etc/pim6dd.conf -compact
@@ -101,6 +105,10 @@ Part of these two programs above has also been derived from
 .Nm Mrouted
 is COPYRIGHT 1989 by The Board of Trustees of
 Leland Stanford Junior University.
+.Pp
+IPv6 and IPsec support based on the KAME Project (http://www.kame.net/) stack
+was initialy integrated into
+.Fx 4.0
 .\"
 .Sh BUGS
 .Nm Pim6dd
diff --git a/usr.sbin/pim6dd/pim6dd.conf.5 b/usr.sbin/pim6dd/pim6dd.conf.5
index 1b750f2..566d16c 100644
--- a/usr.sbin/pim6dd/pim6dd.conf.5
+++ b/usr.sbin/pim6dd/pim6dd.conf.5
@@ -30,11 +30,10 @@
 .\"
 .Dd Nov 17, 1998
 .Dt PIM6DD.CONF 5
-.Os KAME
+.Os
 .Sh NAME
 .Nm pim6dd.conf
-.Nd "config file for pim6dd, PIM for IPv6 dense mode daemon"
-.\"
+.Nd config file for pim6dd, PIM for IPv6 dense mode daemon
 .Sh DESCRIPTION
 The file describes how the
 .Nm pim6dd
@@ -91,7 +90,7 @@ assert message on the interface.
 Specifies an output filter.
 If an incoming multicast packet's destination
 matches the specified
-.Ar groupaddrs,
+.Ar groupaddrs ,
 the packet is not sent on the
 .Ar interfaces.
 Moreover, if there is no other interface than the specified
@@ -130,8 +129,8 @@ specified in the form of "name unit".
 .\"
 .Sh EXAMPLE
 .Bd -literal -offset
-#phyint gif0 disable
-#phyint ep0 preference 101
+# phyint gif0 disable
+# phyint ep0 preference 101
 phyint de0 disable
 filter ff15::4000/120 gif1 gif2
 filter ff18::1000-ff18::1050 gif3
@@ -144,7 +143,7 @@ The
 command and the configuration file
 .Nm
 are based on
-.Nm pimdd,
+.Nm pimdd ,
 which is an IPv4 multicast routing daemon
 developed at the University of Oregon.
 .Nm Pimdd
@@ -156,5 +155,7 @@ Part of these two programs above has also been derived from
 .Nm Mrouted
 is COPYRIGHT 1989 by The Board of Trustees of
 Leland Stanford Junior University.
-.\" .Sh BUGS
-.\" (to be written)
+.Pp
+IPv6 and IPsec support based on the KAME Project (http://www.kame.net/) stack
+was initialy integrated into
+.Fx 4.0
diff --git a/usr.sbin/pim6sd/mtrace6/mtrace6.8 b/usr.sbin/pim6sd/mtrace6/mtrace6.8
index f0b437d..75f2d8cd 100644
--- a/usr.sbin/pim6sd/mtrace6/mtrace6.8
+++ b/usr.sbin/pim6sd/mtrace6/mtrace6.8
@@ -26,11 +26,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$Id: mtrace6.8,v 1.3 1999/09/12 17:03:18 jinmei Exp $
-.\"	$FreeBSD$
+.\" $FreeBSD$
 .\"
 .Dd Sep 12, 1999
 .Dt MTRACE6 8
-.Os KAME
+.Os
 .Sh NAME
 .Nm mtrace6
 .Nd print IPv6 multicast path from a source to
@@ -63,7 +63,7 @@ along the path, and then the response is returned to the requestor.
 .It Fl d Ar destination
 Specifies the multicast receiver that the query wants to trace.
 It is the host running
-.Nm mtrace6
+.Nm
 by default.
 .It Fl g Ar gateway
 Send the trace query via unicast directly to the multicast router
@@ -94,7 +94,7 @@ the path).
 .It Fl r Ar response_addr
 Specify the host that the trace response sends to.
 By default, the response will send to the host running
-.Nm mtrace6 .
+.Nm Ns .
 .It Fl w Ar waittime
 Set the time to wait for a trace response to
 .Ar waittime
@@ -102,9 +102,9 @@ seconds.
 The default is 3 seconds.
 .El
 .Sh SEE ALSO
+.Xr mtrace 8 ,
 .Xr pim6dd 8 ,
-.Xr pim6sd 8 ,
-.Xr mtrace 8
+.Xr pim6sd 8
 .Sh BUGS
 Multicast trace for IPv6 is experimental.
 MLD types for query and
@@ -116,5 +116,5 @@ specified by the
 option is currently meaningless.
 .Sh HISTORY
 The
-.Nm mtrace6
+.Nm
 command first appeared in WIDE/KAME IPv6 protocol stack kit.
diff --git a/usr.sbin/pim6sd/pim6sd.8 b/usr.sbin/pim6sd/pim6sd.8
index 8311df14..9b67b5b 100644
--- a/usr.sbin/pim6sd/pim6sd.8
+++ b/usr.sbin/pim6sd/pim6sd.8
@@ -26,11 +26,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$Id: pim6sd.8,v 1.4 1999/12/16 05:38:06 jinmei Exp $
-.\"	$FreeBSD$
+.\" $FreeBSD$
 .\"
 .Dd June 10, 1999
 .Dt PIM6SD 8
-.Os KAME
+.Os
 .Sh NAME
 .Nm pim6sd
 .Nd PIM for IPv6 sparse mode daemon
@@ -46,7 +46,7 @@ PIMv2(Protocol Independent Multicast Version 2) sparse mode
 for IPv6.
 .Pp
 Options supported by
-.Nm pim6sd :
+.Nm Ns :
 .Bl -tag -width Ds
 .It Fl c Ar configfile
 Specify alternate location,
@@ -84,12 +84,18 @@ the "loopback interface").
 To override the default configuration,
 configuration commands may be placed in
 .Pa /etc/pim6sd.conf
-(or an alternative file, specified by the "\-c" option).
+.Po
+or an alternative file, specified by the
+.Sq Fl c
+option
+.Pc .
 .Pp
 The
 .Nm
 program dumps its current routing information to a dump file when
-it receives a SIGUSR1 signal.
+it receives a
+.Dv SIGUSR1
+signal.
 The information includes a list of PIM neighbors,
 .Nm
 internal multicast routing table, and
@@ -105,7 +111,7 @@ reset its debug level.
 The
 .Nm
 program puts its logs to a separate file
-.Pa (/var/log/pim6sd.log).
+.Pa Pq /var/log/pim6sd.log .
 The log level can be configured by the
 .Fl d
 command line option or the configuration file.
@@ -140,6 +146,10 @@ which has also been derived from
 .Nm Mrouted
 is COPYRIGHT 1989 by The Board of Trustees of
 Leland Stanford Junior University.
+.Pp
+IPv6 and IPsec support based on the KAME Project (http://www.kame.net/) stack
+was initialy integrated into
+.Fx 4.0
 .\"
 .Sh BUGS
 .Nm Pim6sd
diff --git a/usr.sbin/pim6sd/pim6sd.conf.5 b/usr.sbin/pim6sd/pim6sd.conf.5
index 0256b8f..87a526f 100644
--- a/usr.sbin/pim6sd/pim6sd.conf.5
+++ b/usr.sbin/pim6sd/pim6sd.conf.5
@@ -26,11 +26,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$Id: pim6sd.conf.5,v 1.7 1999/12/03 07:31:45 jinmei Exp $
-.\"	$FreeBSD$
+.\" $FreeBSD$
 .\"
 .Dd Oct 6, 1999
 .Dt PIM6SD.CONF 5
-.Os KAME
+.Os
 .Sh NAME
 .Nm pim6sd.conf
 .Nd config file for pim6sd, PIM-SM daemon for IPv6
@@ -308,8 +308,8 @@ The default values are 50000 and 20, respectively.
 .\"
 .Sh EXAMPLE
 .Bd -literal -offset
-#phyint gif0 disable;
-#phyint ep0 preference 101;
+# phyint gif0 disable;
+# phyint ep0 preference 101;
 phyint de0 disable;
 #
 #followings are for a candidate Rendezvous Point, which should usually
@@ -331,5 +331,7 @@ which has also been derived from
 .Nm Mrouted
 is COPYRIGHT 1989 by The Board of Trustees of
 Leland Stanford Junior University.
-.\" .Sh BUGS
-.\" (to be written)
+.Pp
+IPv6 and IPsec support based on the KAME Project (http://www.kame.net/) stack
+was initialy integrated into
+.Fx 4.0
diff --git a/usr.sbin/pim6sd/pim6stat.1 b/usr.sbin/pim6sd/pim6stat.1
index fac61b1..38aac3e 100644
--- a/usr.sbin/pim6sd/pim6stat.1
+++ b/usr.sbin/pim6sd/pim6stat.1
@@ -26,11 +26,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     $Id: pim6stat.1,v 1.3 1999/12/16 05:38:06 jinmei Exp $
-.\"	$FreeBSD$
+.\" $FreeBSD$
 .\"
 .Dd July 28, 1999
 .Dt PIM6STAT 1
-.Os KAME
+.Os
 .Sh NAME
 .Nm pim6stat
 .Nd show PIM for IPv6 status
@@ -49,7 +49,7 @@ status to a file, waits for dumping, and outputs the content of the file
 to standard output.
 .Pp
 Options supported by
-.Nm pim6stat :
+.Nm Ns :
 .Bl -tag -width Ds
 .It Fl d
 specifies to show the status of a dense mode daemon (if running).
@@ -67,7 +67,7 @@ specifies the wait period in seconds between sending a signal to the
 daemon and outputs the dumpfile.
 .El
 .Sh FILES
-.Bl -tag -width /var/run/pim6sd.pid -compact
+.Bl -tag -width /var/run/pim6sd.pidX -compact
 .It Pa /var/run/pim6sd.pid
 The default PID file for a sparse mode daemon.
 .It Pa /var/run/pim6dd.pid
@@ -80,12 +80,16 @@ The default dump file for a dense mode daemon.
 The default statistics dump file for a sparse mode daemon.
 .El
 .Sh SEE ALSO
-.Xr pim6sd 8 ,
-.Xr pim6dd 8
+.Xr pim6dd 8 ,
+.Xr pim6sd 8
 .Sh HISTORY
 The
 .Nm
 command first appeared in KAME IPv6 protocol stack kit.
+.Pp
+IPv6 and IPsec support based on the KAME Project (http://www.kame.net/) stack
+was initialy integrated into
+.Fx 4.0
 .Sh BUGS
 .Nm Pim6stat
 needs superuser privilege.