From owner-man-jp@jp.freebsd.org  Thu Jun 15 12:55:18 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id MAA12302;
	Thu, 15 Jun 2000 12:55:18 +0900 (JST)
	(envelope-from owner-man-jp@jp.FreeBSD.org)
Received: from smtp1.interramp.com (smtp1.interramp.com [38.8.45.2])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id MAA12288
	for <man-jp@jp.freebsd.org>; Thu, 15 Jun 2000 12:55:01 +0900 (JST)
	(envelope-from horikawa@psinet.com)
Received: from [38.26.194.213] (helo=localhost)
	by smtp1.interramp.com with esmtp (Exim 1.90 #1)
	for man-jp@jp.freebsd.org
	id 132Qhq-0007Rr-00; Wed, 14 Jun 2000 23:52:39 -0400
To: man-jp@jp.freebsd.org
X-Mailer: Mew version 1.93 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
	boundary="--Next_Part(Wed_Jun_14_23:40:58_2000_518)--"
Content-Transfer-Encoding: 7bit
Message-Id: <20000614235036F.horikawa@psinet.com>
Date: Wed, 14 Jun 2000 23:50:36 -0400
From: Kazuo Horikawa <horikawa@psinet.com>
X-Dispatcher: imput version 980905(IM100)
Lines: 25061
Reply-To: man-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: man-jp 2532
Subject: [man-jp 2532] Re: 3.5-RELEASE
Errors-To: owner-man-jp@jp.freebsd.org
Sender: owner-man-jp@jp.freebsd.org
X-Originator: horikawa@psinet.com

----Next_Part(Wed_Jun_14_23:40:58_2000_518)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

 $BKY@n$G$9!#(B
 $B$G$O$d$j$^$7$g$&!#(B
 $BJ,$+$i$J$$$3$H$,$"$C$?$i!"$3$3(B (man-jp) $B$GJ9$$$F$/$@$5$$!#(B

[$B3d$jEv$F(B]
 o $B9b66$5$s(B man1
 o $B1n4]$5$s(B man567
 o $B7'C+$5$s(B man8 ($BA0$+$i(B)
 o $BKY@n(B     man8 ($B8e$m$+$i(B)
 o $BB>$N$R$H(B $B>e5-$N?M$+$i;E;v$r$b$i$&(B
# $B$GNI$$$G$9$+!)(B
 $B=*$C$??M$O=*$C$F$J$$?M$r<jEA$&!#(B

[$B4XO";qNA(B]
 (a) 3.4-RELEASE $B$NF|K\8l%^%K%e%"%k(B
     ftp://daemon.jp.FreeBSD.org/man-jp/work/jpman-3.4.0/
 (b) 4.0-RELEASE $B$NF|K\8l%^%K%e%"%k(B
     ftp://daemon.jp.FreeBSD.org/man-jp/work/jpman-4.0.0/
 (c) 3.4-RELEASE -> 3.4-20000614-JPSNAP $B:9J,(B
     $BE:IU(B
 (d) 3.4-20000614-JPSNAP $B86J8(B
     ftp://daemon.jp.FreeBSD.org/man-jp/work/fbsd-3.4-20000614-JPSNAP/
 (e) 3.4-RELEASE $B86J8(B
     ftp://daemon.jp.FreeBSD.org/man-jp/work/fbsd-340r/
 (f) 3.4-20000614-JPSNAP $B$NF|K\8l%^%K%e%"(B ($BDs=P$7$?$b$N(B)
     ftp://daemon.jp.FreeBSD.org/man-jp/work/jpman-3.4-20000614-JPSNAP/

[$BDs=PJ}K!(B]
 o $BC4EvJ,$r(B horikawa@jp.FreeBSD.org $B$XAw$k!#(B
 o $BKY@n$,(B (f) $B$r99?7!#(B

[$B$d$jJ}(B]
 (1) (c) $B$r(B (a) $B$KE,MQ$7$F$/$@$5$$!#(B
   - $B:9J,(B
     $BE,MQ$7$F$/$@$5$$(B ((2) $B;2>H(B)$B!#(B
   - Only in man1: read.1
     $B$J$I$H$"$k>l9g$O!"%U%!%$%k(B/$B%j%s%/$NDI2C$G$9!#(B
     $B%U%!%$%k$rDI2C$7$F!"(BMakefile $B$r=$@5$7$F$/$@$5$$(B ((2) $B;2>H(B)$B!#(B
     $B%U%!%$%k$NDI2C$O(B MAN1 = $B!D$KDI2C$7$F$/$@$5$$!#(B
     $B%j%s%/$NDI2C$O(B MLINKS+= $B!D$KDI2C$7$F$/$@$5$$!#(B
   - Only in /home/horikawa/man-jp/work/fbsd-340r/man/man1: cwd.1
     $B%U%!%$%k(B/$B%7%s%\%j%C%/%j%s%/$N:o=|$G$9!#(B
     $B%U%!%$%k$r:o=|$7$F!"(BMakefile $B$r=$@5$7$F$/$@$5$$!#(B
     $B%U%!%$%k$N:o=|$O(B MAN1 = $B$+$i:o=|$7$F$/$@$5$$!#(B
     $B%j%s%/$N:o=|$O(B MLINKS+= $B!D$+$i:o=|$7$F$/$@$5$$!#(B

 (2) CVSweb (http://www.FreeBSD.org/cgi/cvsweb.cgi) $B$J$I$G(B
     4.0-RELEASE $B$N$b$N$,;H$($k$+$I$&$+H=CG$9$k$HNI$$$+$b$7$l$^$;$s!#(B

     $BNc$($P!":9J,$,(B
-.\" %FreeBSD: src/sbin/ipfw/ipfw.8,v 1.47.2.9 1999/10/20 13:07:36 ru Exp %
+.\" %FreeBSD: src/sbin/ipfw/ipfw.8,v 1.47.2.12 2000/03/03 11:06:44 ru Exp %
     $B$G!"(B4.0-RELEASE $B$,(B
.\" %FreeBSD: src/sbin/ipfw/ipfw.8,v 1.63 2000/02/28 15:21:12 ru Exp %
     $B$N>l9g!'(B
     http://www.FreeBSD.org/cgi/cvsweb.cgi/src/sbin/ipfw/ipfw.8.diff?r1=1.63&r2=1.47.2.12
     $B$r!"(B4.0-RELEASE $B$NF|K\8l%^%K%e%"%k$KE,MQ$9$k$H!"(B
     $B:9J,$,Hs>o$K>/$J$/$J$j$^$9!#(B

     $B<j5v$K%j%]%8%H%j$,$"$k$R$H$O$=$l$r;H$C$F$/$@$5$$(B :-)

 (3) xntpd $B4XO"$O(B
     http://www.FreeBSD.org/cgi/cvsweb.cgi/src/usr.sbin/xntpd/doc/Attic/xntpd.8
     $BEy$N%3%_%C%H%m%0$r?.$8$F(B %FreeBSD: % $B$N=$@5$@$1$G$b$h$$$G$9!#(B
     $B;~4VE*$K2DG=$J$i!"?75l%P!<%8%g%sN>J}<hF@$7$F!"@07A:Q$N$b$N$N:9J,$r(B
     $B$H$k$H$h$$$+$b$7$l$^$;$s!#(B
--
$BKY@nOBM:(B

----Next_Part(Wed_Jun_14_23:40:58_2000_518)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: diff_3.4-20000614-JPSNAP_1
Content-Disposition: attachment; filename=diff_3.4-20000614-JPSNAP_1

diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/addftinfo.1 man1/addftinfo.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/addftinfo.1	Mon Dec 20 14:46:21 1999
+++ man1/addftinfo.1	Wed Jun 14 10:03:03 2000
@@ -16,7 +16,7 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
-.TH ADDFTINFO 1 "8 September 1996" "Groff Version 1.11"
+.TH ADDFTINFO 1 "8 September 1996" "Groff Version 1.15"
 .SH NAME
 addftinfo \- add information to troff font files for use with groff
 .SH SYNOPSIS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/apropos.1 man1/apropos.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/apropos.1	Mon Dec 20 14:46:38 1999
+++ man1/apropos.1	Wed Jun 14 10:03:16 2000
@@ -12,20 +12,21 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
+.\" %FreeBSD: src/gnu/usr.bin/man/apropos/apropos.man,v 1.5.2.2 2000/05/10 13:45:29 phantom Exp %
 .Dd Jan 15, 1991
 .Dt APROPOS 1
 .Os
 .Sh NAME
-.Nm apropos , whatis
+.Nm apropos ,
+.Nm whatis
 .Nd search the whatis database
 .Sh SYNOPSIS
 .Nm apropos
 .Ar keyword ...
-.br
 .Nm whatis
 .Ar keyword ...
 .Sh DESCRIPTION
-.Nm apropos 
+.Nm
 searches a set of database files containing short descriptions
 of system commands for keywords and displays the result on the
 standard output.
@@ -33,7 +34,7 @@
 displays only complete word matches. 
 .Sh RETURN VALUES
 The 
-.Nm apropos
+.Nm
 utility exits 0 on success, and 1 if no keyword matched.
 .Sh SEE ALSO
 .Xr makewhatis 1 ,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/biff.1 man1/biff.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/biff.1	Mon Dec 20 14:51:00 1999
+++ man1/biff.1	Wed Jun 14 10:06:24 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)biff.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/biff/biff.1,v 1.5.2.1 1999/08/29 15:25:31 peter Exp %
+.\" %FreeBSD: src/usr.bin/biff/biff.1,v 1.5.2.2 2000/03/06 11:34:08 sheldonh Exp %
 .\"
 .Dd June 6, 1993
 .Dt BIFF 1
@@ -85,5 +85,6 @@
 .Nm
 command appeared in 
 .Bx 4.0 .
-It was name after the dog of Heidi Stettner. He died
+It was name after the dog of Heidi Stettner.
+He died
 in August 1993, at 15.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/calendar.1 man1/calendar.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/calendar.1	Mon Dec 20 14:51:00 1999
+++ man1/calendar.1	Wed Jun 14 10:06:26 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)calendar.1  8.1 (Berkeley) 6/29/93
+.\" %FreeBSD: src/usr.bin/calendar/calendar.1,v 1.13.2.1 2000/03/06 11:34:10 sheldonh Exp %
 .\"
 .Dd June 29, 1993
 .Dt CALENDAR 1
@@ -85,7 +86,8 @@
 .Pp
 To handle calendars in your national code table you can specify
 .Dq LANG=<locale_name>
-in the calendar file as early as possible. To handle national Easter
+in the calendar file as early as possible.
+To handle national Easter
 names in the calendars
 .Dq Easter=<national_name>
 (for Catholic Easter) or
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/cdcontrol.1 man1/cdcontrol.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/cdcontrol.1	Mon Dec 20 14:52:29 1999
+++ man1/cdcontrol.1	Wed Jun 14 10:07:36 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.1,v 1.16.2.3 1999/08/29 15:40:15 peter Exp %
+.\" %FreeBSD: src/usr.sbin/cdcontrol/cdcontrol.1,v 1.16.2.4 2000/03/06 11:35:42 sheldonh Exp %
 .\"
 .Dd July 3, 1995
 .Dt CDCONTROL 1
@@ -13,7 +13,8 @@
 .Op Ar command ...
 .Sh DESCRIPTION
 .Nm Cdcontrol
-is a program to control audio features of a CD drive. The device is a name such
+is a program to control audio features of a CD drive.
+The device is a name such
 as
 .Pa cd0
 or
@@ -50,7 +51,8 @@
 .Pp
 The available commands are listed below.  Only as many
 characters as are required to uniquely identify a command
-need be specified. Word
+need be specified.
+Word
 .Em play
 can be omitted.
 .Bl -tag -width Cm
@@ -77,7 +79,8 @@
 .Ar end_s ,
 in seconds and 
 .Ar end_f
-(frame number). Minutes are in the range 0-99. Seconds are in the range 0-59.
+(frame number). Minutes are in the range 0-99.
+Seconds are in the range 0-59.
 Frame numbers are in the range 0-74.
 
 .It Cm play Op Ar #start_block Op length
@@ -88,10 +91,12 @@
 logical blocks.
 
 .It Cm pause
-Stop playing. Do not stop the disc.
+Stop playing.
+Do not stop the disc.
 
 .It Cm resume
-Resume playing. Used after the 
+Resume playing.
+Used after the 
 .Em pause
 command.
 
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/chflags.1 man1/chflags.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/chflags.1	Mon Dec 20 14:51:01 1999
+++ man1/chflags.1	Wed Jun 14 10:06:28 2000
@@ -32,10 +32,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)chflags.1	8.2 (Berkeley) 3/31/94
-.\" %FreeBSD: src/usr.bin/chflags/chflags.1,v 1.6.2.1 1999/08/29 15:26:09 peter Exp %
+.\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
+.\" %FreeBSD: src/usr.bin/chflags/chflags.1,v 1.6.2.3 2000/04/03 22:13:40 jdp Exp %
 .\"
-.Dd March 31, 1994
+.Dd May 2, 1995
 .Dt CHFLAGS 1
 .Os
 .Sh NAME
@@ -48,17 +48,17 @@
 .Op Fl H | Fl L | Fl P
 .Oc
 .Ar flags
-.Ar file ...
+.Ar
 .Sh DESCRIPTION
 The
-.Nm chflags
+.Nm
 utility modifies the file flags of the listed files
 as specified by the
 .Ar flags
 operand.
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl H
 If the
 .Fl R
@@ -77,11 +77,13 @@
 in the files instead of just the files themselves.
 .El
 .Pp
-Flags are a comma separated list of keywords.
+The flags are specified as an octal number or a comma separated list
+of keywords.
 The following keywords are currently defined:
 .Bd -literal -offset indent compact
 arch	set the archived flag (super-user only)
-dump	set the dump flag
+opaque	set the opaque flag (owner or super-user only)
+nodump	set the nodump flag (owner or super-user only)
 sappnd	set the system append-only flag (super-user only)
 schg	set the system immutable flag (super-user only)
 sunlnk	set the system undeletable flag (super-user only)
@@ -98,7 +100,7 @@
 before an option causes the flag to be turned off.
 For example:
 .Bd -literal -offset indent compact
-nodump	the file should never be dumped
+nouchg	the immutable bit should be cleared
 .Ed
 .Pp
 Symbolic links do not have flags, so unless the
@@ -106,7 +108,7 @@
 or
 .Fl L
 option is set,
-.Nm chflags
+.Nm
 on a symbolic link always succeeds and has no effect.
 The
 .Fl H ,
@@ -120,9 +122,9 @@
 command's actions are determined by the last one specified.
 .Pp
 You can use "ls -lo" to see the flags of existing files.
-.Pp
+.Sh DIAGNOSTICS
 The
-.Nm chflags
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
 .Xr ls 1 ,
@@ -132,6 +134,6 @@
 .Xr symlink 7
 .Sh HISTORY
 The
-.Nm chflags
+.Nm
 command first appeared in
 .Bx 4.4 .
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/chgrp.1 man1/chgrp.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/chgrp.1	Mon Dec 20 14:52:29 1999
+++ man1/chgrp.1	Wed Jun 14 10:07:36 2000
@@ -33,6 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chgrp.1	8.3 (Berkeley) 3/31/94
+.\" %FreeBSD: src/usr.sbin/chown/chgrp.1,v 1.4.2.1 1999/12/29 19:55:07 obrien Exp %
 .\"
 .Dd March 31, 1994
 .Dt CHGRP 1
@@ -48,8 +49,9 @@
 .Oc
 .Op Fl f
 .Op Fl h
+.Op Fl v
 .Ar group
-.Ar files ...
+.Ar
 .Sh DESCRIPTION
 The
 .Nm
@@ -59,8 +61,8 @@
 .Ar group
 ID specified by the group operand.
 .Pp
-Options:
-.Bl -tag -width Ds
+The following options are available:
+.Bl -tag -width indent
 .It Fl H
 If the
 .Fl R
@@ -83,6 +85,10 @@
 .It Fl h
 If the file is a symbolic link, the group ID of the link itself is changed
 rather than the file that is pointed to.
+.It Fl v
+Cause
+.Nm
+to be verbose, showing files as the group is modified.
 .El
 .Pp
 The
@@ -107,16 +113,20 @@
 .Nm
 must belong to the specified group and be the owner of the file,
 or be the super-user.
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh COMPATIBILITY
 In previous versions of this system, symbolic links did not have groups.
+.Pp
+The
+.Fl v
+option is non-standard and its use in scripts is not recommended.
 .Sh FILES
 .Bl -tag -width /etc/group -compact
 .It Pa /etc/group
-Group ID file
+group ID file
 .El
 .Sh SEE ALSO
 .Xr chown 2 ,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/chmod.1 man1/chmod.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/chmod.1	Mon Dec 20 14:44:40 1999
+++ man1/chmod.1	Wed Jun 14 10:01:53 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\" %FreeBSD: src/bin/chmod/chmod.1,v 1.10.2.5 1999/08/29 14:11:30 peter Exp %
+.\" %FreeBSD: src/bin/chmod/chmod.1,v 1.10.2.7 2000/02/17 03:18:24 unfurl Exp %
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1
@@ -47,6 +47,7 @@
 .Fl f
 .Fl R
 .Op Fl H | Fl L | Fl P
+.Fl v
 .Oc
 .Ar mode
 .Ar file ...
@@ -64,7 +65,8 @@
 If the
 .Fl R
 option is specified, symbolic links on the command line are followed.
-(Symbolic links encountered in the tree traversal are not followed.)
+(Symbolic links encountered in the tree traversal are not followed by
+default.)
 .It Fl L
 If the
 .Fl R
@@ -81,6 +83,10 @@
 .Nm
 could not modify the mode for
 .Va file .
+.It Fl v
+Cause
+.Nm
+to be verbose, showing files as the mode is modified.
 .El
 .Pp
 Symbolic links do not have modes, so unless the
@@ -166,9 +172,8 @@
 The symbolic mode is described by the following grammar:
 .Bd -literal -offset indent
 mode         ::= clause [, clause ...]
-clause       ::= [who ...] [action ...] last_action
+clause       ::= [who ...] [action ...] action
 action       ::= op [perm ...]
-last_action  ::= op [perm ...]
 who          ::= a | u | g | o
 op           ::= + | \- | =
 perm         ::= r | s | t | w | x | X | u | g | o
@@ -307,6 +312,10 @@
 There's no
 .Ar perm
 option for the naughty bits.
+.Sh COMPATIBILITY
+The
+.Fl v
+option is non-standard and its use in scripts is not recommended.
 .Sh SEE ALSO
 .Xr chflags 1 ,
 .Xr install 1 ,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/chpass.1 man1/chpass.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/chpass.1	Mon Dec 20 14:51:03 1999
+++ man1/chpass.1	Wed Jun 14 10:06:29 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/usr.bin/chpass/chpass.1,v 1.14.2.5 1999/11/18 16:06:50 phantom Exp %
+.\" %FreeBSD: src/usr.bin/chpass/chpass.1,v 1.14.2.8 2000/03/27 10:07:31 sheldonh Exp %
 .\"
 .Dd December 30, 1993
 .Dt CHPASS 1
@@ -47,8 +47,19 @@
 .Nm chpass
 .Op Fl a Ar list
 .Op Fl p Ar encpass
+.Op Fl e Ar expiretime
 .Op Fl s Ar newshell
 .Op user
+.Pp
+.Nm chpass
+.Op Fl oly
+.Op Fl a Ar list
+.Op Fl p Ar encpass
+.Op Fl e Ar expiretime
+.Op Fl s Ar newshell
+.Op Fl d Ar domain
+.Op Fl h Ar host
+.Op user
 .Sh DESCRIPTION
 The
 .Nm
@@ -77,6 +88,10 @@
 in the format used by
 .Xr crypt 3 ,
 as an argument.
+.It Fl e Ar expiretime
+Change the account expire time.
+This option is used to set the expire time
+from a script as if it was done in the interactive editor.
 .It Fl s Ar newshell
 Attempt to change the user's shell to
 .Ar newshell .
@@ -230,6 +245,12 @@
 update the user database itself.
 Only the user, or the super-user, may edit the information associated
 with the user.
+.Pp
+See
+.Xr pwd_mkdb 8
+for an explanation of the impact of setting the
+.Ev PW_SCAN_BIG_IDS
+environment variable.
 .Sh NIS INTERACTION
 .Nm Chpass
 can also be used in conjunction with NIS, however some restrictions
@@ -239,7 +260,8 @@
 can only make changes to the NIS passwd maps through
 .Xr rpc.yppasswdd 8 ,
 which normally only permits changes to a user's password, shell and GECOS
-fields. Except when invoked by the super-user on the NIS master server,
+fields.
+Except when invoked by the super-user on the NIS master server,
 .Nm
 (and, similarly,
 .Xr passwd 1 )
@@ -250,7 +272,8 @@
 Furthermore,
 .Xr rpc.yppasswdd 8
 requires password authentication before it will make any
-changes. The only user allowed to submit changes without supplying
+changes.
+The only user allowed to submit changes without supplying
 a password is the super-user on the NIS master server; all other users,
 including those with root privileges on NIS clients (and NIS slave
 servers) must enter a password.
@@ -288,11 +311,13 @@
 .Em "Password authentication is required" .
 .Nm Chpass
 will prompt for the user's NIS password before effecting
-any changes. If the password is invalid, all changes will be
+any changes.
+If the password is invalid, all changes will be
 discarded.
 .Pp
 Exception: the super-user on the NIS master server is allowed to
-submit changes without supplying a password. (The super-user may
+submit changes without supplying a password.
+(The super-user may
 choose to turn off this feature using the
 .Fl o
 flag, described below.)
@@ -325,7 +350,8 @@
 .Xr passwd 1
 or
 .Xr yppasswd 1
-to change their NIS passwords. The super-user is allowed to specify
+to change their NIS passwords.
+The super-user is allowed to specify
 a new password (even though the
 .Dq Password:
 field does not show
@@ -361,20 +387,24 @@
 .Nm Chpass
 uses the system domain name by default, as set by the
 .Xr domainname 1
-command. The
+command.
+The
 .Fl d
 option can be used to override a default, or to specify a domain
 when the system domain name is not set.
 .It Fl h Ar host
-Specify the name or address of an NIS server to query. Normally,
+Specify the name or address of an NIS server to query.
+Normally,
 .Nm
 will communicate with the NIS master host specified in the
 .Pa master.passwd
 or
 .Pa passwd
-maps. On hosts that have not been configured as NIS clients, there is
+maps.
+On hosts that have not been configured as NIS clients, there is
 no way for the program to determine this information unless the user
-provides the hostname of a server. Note that the specified hostname need
+provides the hostname of a server.
+Note that the specified hostname need
 not be that of the NIS master server; the name of any server, master or
 slave, in a given NIS domain will do.
 .Pp
@@ -402,7 +432,8 @@
 .Fl o
 flag can be used to force
 .Nm
-to use the standard update mechanism instead. This option is provided
+to use the standard update mechanism instead.
+This option is provided
 mainly for testing purposes.
 .El
 .Pp
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/colldef.1 man1/colldef.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/colldef.1	Mon Dec 20 14:51:05 1999
+++ man1/colldef.1	Wed Jun 14 10:06:30 2000
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.bin/colldef/colldef.1,v 1.5.2.1 1999/08/29 15:26:21 peter Exp %
+.\" %FreeBSD: src/usr.bin/colldef/colldef.1,v 1.5.2.2 2000/03/06 11:34:16 sheldonh Exp %
 .\"
 .Dd January, 27 1995
 .Dt COLLDEF 1
@@ -43,12 +43,14 @@
 .Fn strxfrm
 and
 .Fn strcoll
-functions. It is used to define the many ways in which
+functions.
+It is used to define the many ways in which
 strings can be ordered and collated.
 .Fn strxfrm
 transforms
 its first argument and places the result in its second
-argument. The transformed string is such that it can be
+argument.
+The transformed string is such that it can be
 correctly ordered with other transformed strings by using
 .Fn strcmp ,
 .Fn strncmp ,
@@ -89,18 +91,21 @@
 .Pp
 Of these, only the
 .Ar order
-statement is required. When
+statement is required.
+When
 .Ar charmap
 or
 .Ar substitute
 is
-supplied, these statements must be ordered as above. Any
+supplied, these statements must be ordered as above.
+Any
 statements after the order statement are ignored.
 .Pp
 Lines in the specification file beginning with a
 .Ar #
 are
-treated as comments and are ignored. Blank lines are also
+treated as comments and are ignored.
+Blank lines are also
 ignored.
 .Pp
 .Ar charmap charmapfile
@@ -112,7 +117,8 @@
 .Pp
 The format of
 .Ar charmapfile
-is shown below. Symbol
+is shown below.
+Symbol
 names are separated from their values by TAB or
 SPACE characters. symbol-value can be specified in
 a hexadecimal (\ex\fI??\fR) or octal (\e\fI???\fR)
@@ -152,7 +158,8 @@
 .Pp
 .Ar order_list
 is a list of symbols, separated by semi colons, that defines the
-collating sequence. The
+collating sequence.
+The
 special symbol
 .Ar ...
 specifies, in a short-hand
@@ -232,7 +239,8 @@
 .Pp
 The backslash character
 .Ar \e
-is used for continuation. In this case, no characters are permitted
+is used for continuation.
+In this case, no characters are permitted
 after the backslash character.
 .Sh EXIT STATUS
 .Nm Colldef
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/crunchgen.1 man1/crunchgen.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/crunchgen.1	Mon Dec 20 14:52:32 1999
+++ man1/crunchgen.1	Wed Jun 14 10:07:38 2000
@@ -22,6 +22,7 @@
 .\" Author: James da Silva, Systems Design and Analysis Group
 .\"			   Computer Science Department
 .\"			   University of Maryland at College Park
+.\" %FreeBSD: src/usr.sbin/crunch/crunchgen/crunchgen.1,v 1.7.2.2 2000/03/06 11:35:46 sheldonh Exp %
 .\"
 .Dd September 29, 1997
 .Dt CRUNCHGEN 1
@@ -32,6 +33,7 @@
 .Sh SYNOPSIS
 .Nm \&crunchgen
 .Op Fl fql
+.Op Fl h Ar makefile-header-name
 .Op Fl m Ar makefile-name
 .Op Fl c Ar c-file-name
 .Op Fl e Ar exec-file-name
@@ -88,6 +90,14 @@
 Flush cache.  Forces the recalculation of cached parameters.
 .It Fl l
 List names.  Lists the names this binary will respond to.
+.It Fl h Ar makefile-header-name
+Set the name of a file to be included at the beginning of the
+Makefiles generated by
+.Nm crunchgen .
+This is useful to define some make variables such as
+.Ar RELEASE_CRUNCH
+or similar, which might affect the behaviour of make and
+are annoying to pass through environment variables.
 .It Fl m Ar makefile-name
 Set output Makefile name to
 .Ar makefile-name .
@@ -178,6 +188,15 @@
 pathname to each file in the
 .Nm objs
 list.
+.It Nm special Ar progname Nm objvar Ar variable_name
+Sets the name of the Make variable which holds the list of
+object files for program
+.Ar progname .
+This is normally
+.Nm OBJS
+but some Makefiles might like to use other conventions or
+prepend the program's name to the variable, e.g.
+.Nm SSHD_OBJS .
 .It Nm special Ar progname Nm keep Ar symbol-name ...
 Add specified list of symbols to the keep list for program
 .Ar progname .
@@ -185,7 +204,8 @@
 .Fl k
 option for the
 .Xr crunchide 1
-phase. This option is to be used as a last resort as its use can cause a
+phase.
+This option is to be used as a last resort as its use can cause a
 symbol conflict, however in certain instances it may be the only way to
 have a symbol resolve.
 .El
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/csh.1 man1/csh.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/csh.1	Mon Dec 20 14:44:42 1999
+++ man1/csh.1	Wed Jun 14 10:01:54 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)csh.1	8.2 (Berkeley) 1/21/94
-.\" %FreeBSD: src/bin/csh/csh.1,v 1.11.2.4 1999/12/10 13:03:00 sheldonh Exp %
+.\" %FreeBSD: src/bin/csh/csh.1,v 1.11.2.6 2000/02/17 03:41:52 unfurl Exp %
 .\"
 .Dd January 21, 1994
 .Dt CSH 1
@@ -59,7 +59,7 @@
 It is used both as an interactive login shell and
 a shell script command processor.
 .Ss Argument list processing
-If the first argument (argument 0) to the shell is
+If the shell is executed with a program name starting with
 .Ql Fl \& ,
 then this is a login shell.
 A login shell also can be specified by invoking the shell with the 
@@ -132,12 +132,11 @@
 .Pa .cshrc
 is executed.
 .It Fl X
-Is to
-.Fl x
-as
-.Fl V
-is to
-.Fl v .
+Cause the
+.Ar echo
+variable to be set even before
+.Pa .cshrc
+is executed.
 .El
 .Pp
 After processing of flag arguments, if arguments remain but none of the
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/ctm.1 man1/ctm.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/ctm.1	Mon Dec 20 14:52:33 1999
+++ man1/ctm.1	Wed Jun 14 10:07:39 2000
@@ -10,7 +10,7 @@
 .\"
 .\" CTM and ctm(1) by <phk@login.dknet.dk>
 .\"
-.\" %FreeBSD: src/usr.sbin/ctm/ctm/ctm.1,v 1.14.2.1 1999/08/29 15:40:55 peter Exp %
+.\" %FreeBSD: src/usr.sbin/ctm/ctm/ctm.1,v 1.14.2.2 2000/06/08 06:30:30 kris Exp %
 .\"
 .Dd Mar 25, 1995
 .Os
@@ -222,7 +222,38 @@
 option.
 
 .El
-
+.Pp
+.Sh SECURITY
+.Pp
+On its own, CTM is an insecure protocol
+- there is no authentication performed that the
+changes applied to the source code were sent by a
+trusted party, and so care should be taken if the
+CTM deltas are obtained via an unauthenticated
+medium such as regular email.
+It is a relatively simple matter for an attacker
+to forge a CTM delta to replace or precede the
+legitimate one and insert malicious code into your
+source tree.
+If the legitimate delta is somehow prevented from
+arriving, this will go unnoticed until a later
+delta attempts to touch the same file, at which
+point the MD5 checksum will fail.
+.Pp
+To remedy this insecurity, CTM pieces generated by
+freebsd.org are cryptographically signed in a
+format compatible with the GNU Privacy Guard
+utility, available in /usr/ports/security/gpg, and
+the Pretty Good Privacy v5 utility,
+/usr/ports/security/pgp5.
+The relevant public key can be obtained by
+fingering ctm@freebsd.org.
+.Pp
+CTM deltas which are thus signed cannot be
+undetectably altered by an attacker.
+Therefore it is recommended that you make use of
+GPG or PGP5 to verify the signatures if you
+receive your CTM deltas via email.
 .Sh ENVIRONMENT
 .Ev TMPDIR,
 if set to a pathname, will cause ctm to use that pathname
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/ctm_rmail.1 man1/ctm_rmail.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/ctm_rmail.1	Mon Dec 20 14:52:33 1999
+++ man1/ctm_rmail.1	Wed Jun 14 10:07:39 2000
@@ -5,7 +5,7 @@
 .\"
 .\" Author: Stephen McKay
 .\"
-.\" %FreeBSD: src/usr.sbin/ctm/ctm_rmail/ctm_rmail.1,v 1.14.2.3 1999/10/30 15:59:34 phantom Exp %
+.\" %FreeBSD: src/usr.sbin/ctm/ctm_rmail/ctm_rmail.1,v 1.14.2.4 2000/06/08 06:29:04 kris Exp %
 .\"
 .Dd January 24, 1995
 .Dt CTM_MAIL 1
@@ -364,30 +364,36 @@
 .Xr ctm
 on the (non-FreeBSD) machine that this example was taken from.
 .Sh SECURITY
-If you automatically take your mail and pass it to a file tree patcher, you
-might think you are handing the keys to your system to the crackers!  Happily,
-the window for mischief is quite small.
-.Nm ctm_rmail
-is careful to write only to the directories given to it (by not believing any
-.Dq /
-characters in the delta name), and the latest
-.Xr ctm
-disallows absolute pathnames and
-.Dq \&\.\.
-in files it manipulates, so the worst you
-could lose are a few source tree files (recoverable from your deltas).
-Since
-.Xr ctm
-requires that a
-.Xr md5
-checksum match before it touches a file, only fellow
-source recipients would be able to generate a fake delta, and they're such
-nice folk that they wouldn't even think of it! :-)
-.Pp
-Even this possibility could be removed by using cryptographic signatures.
-A possible future enhancement would be to use
-.Nm PGP
-to provide a secure wrapper.
+.Pp
+On its own, CTM is an insecure protocol
+- there is no authentication performed that the
+changes applied to the source code were sent by a
+trusted party, and so care should be taken if the
+CTM deltas are obtained via an unauthenticated
+medium such as regular email.
+It is a relatively simple matter for an attacker
+to forge a CTM delta to replace or precede the
+legitimate one and insert malicious code into your
+source tree.
+If the legitimate delta is somehow prevented from
+arriving, this will go unnoticed until a later
+delta attempts to touch the same file, at which
+point the MD5 checksum will fail.
+.Pp
+To remedy this insecurity, CTM delta pieces generated by
+freebsd.org are cryptographically signed in a
+format compatible with the GNU Privacy Guard
+utility, available in /usr/ports/security/gpg, and
+the Pretty Good Privacy v5 utility,
+/usr/ports/security/pgp5.
+The relevant public key can be obtained by
+fingering ctm@freebsd.org.
+.Pp
+CTM deltas which are thus signed cannot be
+undetectably altered by an attacker.
+Therefore it is recommended that you make use of
+GPG or PGP5 to verify the signatures if you
+receive your CTM deltas via email.
 .\" This next request is for sections 1, 6, 7 & 8 only
 .Sh ENVIRONMENT
 If deltas are to be applied then
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/cursor.1 man1/cursor.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/cursor.1	Mon Dec 20 14:53:30 1999
+++ man1/cursor.1	Wed Jun 14 10:08:18 2000
@@ -28,6 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)cursor.1, 3.20, Last Edit-Date: [Mon Dec 19 20:30:40 1994]
+.\" %FreeBSD: src/usr.sbin/pcvt/cursor/cursor.1,v 1.3.2.1 2000/03/06 11:36:41 sheldonh Exp %
 .\"
 .Dd December 19, 1994
 .Dt CURSOR 1
@@ -51,7 +52,8 @@
 .It Fl d
 Specifies a device for which the cursor shape is set.
 .It Fl n
-Sets the virtual screen number to apply the following parameters to. Not
+Sets the virtual screen number to apply the following parameters to.
+Not
 specifying this parameter implies the current virtual screen or the screen
 referenced by the -d parameter.
 .It Fl s
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/cut.1 man1/cut.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/cut.1	Mon Dec 20 14:51:09 1999
+++ man1/cut.1	Wed Jun 14 10:06:33 2000
@@ -33,6 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cut.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/cut/cut.1,v 1.2.2.2 2000/03/06 11:34:17 sheldonh Exp %
 .\"
 .Dd June 6, 1993
 .Dt CUT 1
@@ -65,7 +66,8 @@
 The items specified by
 .Ar list
 can be in terms of column position or in terms of fields delimited
-by a special character. Column numbering starts from 1.
+by a special character.
+Column numbering starts from 1.
 .Pp
 .Ar list
 is a comma or whitespace separated set of increasing numbers and/or
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man1: cwd.1
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/date.1 man1/date.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/date.1	Mon Dec 20 14:44:42 1999
+++ man1/date.1	Wed Jun 14 10:01:55 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\" %FreeBSD: src/bin/date/date.1,v 1.26.2.4 1999/12/15 13:57:03 sheldonh Exp %
+.\" %FreeBSD: src/bin/date/date.1,v 1.26.2.5 2000/03/07 20:56:21 sheldonh Exp %
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
@@ -92,9 +92,14 @@
 .Nm
 from setting the time for other than the current machine.
 .It Fl r
-Print out the date and time in
+Print out the date and time that is
 .Ar seconds
-from the Epoch.
+from the Epoch
+.Po
+00:00:00 UTC, January 1, 1970;
+see
+.Xr time 3
+.Pc .
 .It Fl t
 Set the kernel's value for minutes west of
 .Tn GMT .
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/dd.1 man1/dd.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/dd.1	Mon Dec 20 14:44:43 1999
+++ man1/dd.1	Wed Jun 14 10:01:55 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\" %FreeBSD: src/bin/dd/dd.1,v 1.8.2.3 1999/12/12 01:54:04 green Exp %
+.\" %FreeBSD: src/bin/dd/dd.1,v 1.8.2.4 2000/02/23 01:06:40 gsutter Exp %
 .\"
 .Dd January 13, 1994
 .Dt DD 1
@@ -282,7 +282,8 @@
 .El
 .El
 .Pp
-Where sizes are specified, a decimal number of bytes is expected.
+Where sizes are specified, a decimal, octal, or hexadecimal number of
+bytes is expected.
 If the number ends with a ``b'', ``k'', ``m'', ``g'',  or ``w'', the
 number is multiplied by 512, 1024 (1K), 1048576 (1M), 1073741824 (1G)
 or the number of bytes in an integer, respectively.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/df.1 man1/df.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/df.1	Mon Dec 20 14:44:43 1999
+++ man1/df.1	Wed Jun 14 10:01:55 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\" %FreeBSD: src/bin/df/df.1,v 1.13.2.3 1999/08/29 14:12:14 peter Exp %
+.\" %FreeBSD: src/bin/df/df.1,v 1.13.2.5 2000/05/09 14:27:05 sheldonh Exp %
 .\"
 .Dd May 8, 1995
 .Dt DF 1
@@ -40,7 +40,11 @@
 .Nd display free disk space
 .Sh SYNOPSIS
 .Nm df
-.Op Fl ikn
+.Oo
+.Fl b | h | H | k |
+.Fl m | P
+.Oc
+.Op Fl in
 .Op Fl t Ar type
 .Op Ar file | Ar filesystem ...
 .Sh DESCRIPTION
@@ -59,6 +63,19 @@
 .Pp
 The following options are available:
 .Bl -tag -width Ds
+.It Fl b
+Use 512-byte blocks rather than the default.  Note that
+this overrides the
+.Ev BLOCKSIZE
+specification from the environment.
+.It Fl H
+"Human-readable" output.  Use unit suffixes: Byte, Kilobyte, Megabyte,
+Gigabyte, Terabyte and Petabyte in order to reduce the number of
+digits to three or less using base 10 for sizes.
+.It Fl h
+"Human-readable" output.  Use unit suffixes: Byte, Kilobyte, Megabyte,
+Gigabyte, Terabyte and Petabyte in order to reduce the number of
+digits to three or less using base 2 for sizes.
 .It Fl i
 Include statistics on the number of free inodes.
 .It Fl k
@@ -66,6 +83,11 @@
 this overrides the
 .Ev BLOCKSIZE
 specification from the environment.
+.It Fl m
+Use 1048576-byte (1-Mbyte) blocks rather than the default.  Note that
+this overrides the
+.Ev BLOCKSIZE
+specification from the environment.
 .It Fl n
 Print out the previously obtained statistics from the filesystems.
 This option should be used if it is possible that one or more
@@ -75,6 +97,11 @@
 .Nm
 will not request new statistics from the filesystems, but will respond
 with the possibly stale statistics that were previously obtained.
+.It Fl P
+Use POSIX compliant output of 512-byte blocks rather than the default. 
+Note that this overrides the
+.Ev BLOCKSIZE
+specification from the environment.
 .It Fl t
 Only print out statistics for filesystems of the specified types.
 More than one type may be specified in a comma separated list.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/du.1 man1/du.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/du.1	Mon Dec 20 14:51:10 1999
+++ man1/du.1	Wed Jun 14 10:06:35 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)du.1	8.2 (Berkeley) 4/1/94
-.\" %FreeBSD: src/usr.bin/du/du.1,v 1.11.2.1 1999/08/29 15:27:18 peter Exp %
+.\" %FreeBSD: src/usr.bin/du/du.1,v 1.11.2.2 2000/03/06 11:34:19 sheldonh Exp %
 .\"
 .Dd April 1, 1994
 .Dt DU 1
@@ -65,7 +65,8 @@
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl P
-No symbolic links are followed. (default)
+No symbolic links are followed.
+(default)
 .It Fl H
 Symbolic links on the command line are followed, symbolic links in file
 hierarchies are not followed.
@@ -74,7 +75,8 @@
 .It Fl a
 Display an entry for each file in a file hierarchy.
 .It Fl s
-Display an entry for each specified file. (Equivalent to
+Display an entry for each specified file.
+(Equivalent to
 .Fl d
 0 )
 .It Fl d Ar depth
@@ -114,7 +116,8 @@
 .Ev BLOCKSIZE
 is set, and the
 .Fl k
-option is not specified, the block counts will be displayed in 1024-byte blocks. If
+option is not specified, the block counts will be displayed in 1024-byte blocks.
+If
 .Ev BLOCKSIZE
 is not set, and the
 .Fl k
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/echo.1 man1/echo.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/echo.1	Mon Dec 20 14:44:45 1999
+++ man1/echo.1	Wed Jun 14 10:01:55 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\" %FreeBSD: src/bin/echo/echo.1,v 1.6.2.2 1999/08/29 14:12:19 peter Exp %
+.\" %FreeBSD: src/bin/echo/echo.1,v 1.6.2.3 2000/01/14 11:15:21 sheldonh Exp %
 .\"
 .Dd July 22, 1993
 .Dt ECHO 1
@@ -59,12 +59,22 @@
 achieved by appending `\ec' to the end of the string, as is done
 by iBCS2 compatible systems.
 .El
+.Pp
+Some shells may provide a builtin
+.Nm
+command which is similar or identical to this utility.
+Consult the
+.Xr builtin 1
+manual page.
 .Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
-.Xr printf 1
+.Xr builtin 1 ,
+.Xr csh 1 ,
+.Xr printf 1 ,
+.Xr sh 1
 .Sh STANDARDS
 The
 .Nm
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/ed.1 man1/ed.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/ed.1	Mon Dec 20 16:00:10 1999
+++ man1/ed.1	Wed Jun 14 10:23:32 2000
@@ -1,10 +1,11 @@
-.\" %FreeBSD: src/bin/ed/ed.1,v 1.14.2.1 1999/08/29 14:12:24 peter Exp %
+.\" %FreeBSD: src/bin/ed/ed.1,v 1.14.2.4 2000/05/10 10:01:27 sheldonh Exp %
 .Dd May 21, 1993
 .Dt ED 1
 .Os
 .Sh NAME
 .\" ed, red \- text editor
-.Nm ed
+.Nm ed ,
+.Nm red
 .Nd text editor
 .Sh SYNOPSIS
 .Nm ed
@@ -115,7 +116,8 @@
 The following options are available:
 .Bl -tag -width indent
 .It Fl s
-Suppress diagnostics. This should be used if
+Suppress diagnostics.
+This should be used if
 .Nm Ns 's
 standard input is from a script.
 .It Fl x
@@ -174,7 +176,8 @@
 and is legal wherever it makes sense.
 .Pp
 An address range is two addresses separated either by a comma or
-semi-colon. The value of the first address in a range cannot exceed the
+semi-colon.
+The value of the first address in a range cannot exceed the
 value of the second.  If only one address is given in a range, then
 the second address is set to the given address.  If an
 .Em n Ns -tuple
@@ -452,7 +455,8 @@
 .It (.,.)d
 Delete the addressed lines from the buffer.
 If there is a line after the deleted range, then the current address is set
-to this line. Otherwise the current address is set to the line
+to this line.
+Otherwise the current address is set to the line
 before the deleted range.
 .It e Ar file
 Edit
@@ -587,7 +591,8 @@
 their line numbers.  The current address is set to the last line
 printed.
 .It (.,.)p
-Print the addressed lines. The current address is set to the last line
+Print the addressed lines.
+The current address is set to the last line
 printed.
 .It P
 Toggle the command prompt on and off.
@@ -830,7 +835,8 @@
 USD:12-13
 
 .Rs
-.%A B. W. Kernighan and P. J. Plauger
+.%A B. W. Kernighan
+.%A P. J. Plauger
 .%B Software Tools in Pascal
 .%O Addison-Wesley
 .%D 1981
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/eqn.1 man1/eqn.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/eqn.1	Mon Dec 20 14:46:21 1999
+++ man1/eqn.1	Wed Jun 14 10:03:03 2000
@@ -27,7 +27,7 @@
 .\" The BSD man macros can't handle " in arguments to font change macros,
 .\" so use \(ts instead of ".
 .tr \(ts"
-.TH EQN 1 "7 September 1996" "Groff Version 1.11"
+.TH EQN 1 "7 September 1996" "Groff Version 1.15"
 .SH NAME
 eqn \- format equations for troff
 .SH SYNOPSIS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/fdformat.1 man1/fdformat.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/fdformat.1	Mon Dec 20 14:53:22 1999
+++ man1/fdformat.1	Wed Jun 14 10:08:13 2000
@@ -22,6 +22,8 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
+.\" %FreeBSD: src/usr.sbin/fdformat/fdformat.1,v 1.12.2.1 2000/03/06 11:35:49 sheldonh Exp %
+.\"
 .Dd September 16, 1993
 .Os
 .Dt FDFORMAT 1
@@ -74,7 +76,8 @@
 .It Fl f Ar capacity
 The normal way to specify the desired formatting parameters.
 .Ar Capacity
-is the number of kilobytes to format. Valid choices are 360, 720, 800, 820,
+is the number of kilobytes to format.
+Valid choices are 360, 720, 800, 820,
 1200, 1440, 1480 or 1720.
 .It Fl n
 Don't verify floppy after formatting.
@@ -104,7 +107,8 @@
 If the
 .Fl q
 flag has not been specified, the user is asked for a confirmation
-of the intended formatting process. In order to continue, an answer
+of the intended formatting process.
+In order to continue, an answer
 of
 .Dq y
 must be given.
@@ -134,7 +138,8 @@
 will finally change to
 .Sq Em E .
 .Pp
-An exit status of 0 is returned upon successful operation. Exit status
+An exit status of 0 is returned upon successful operation.
+Exit status
 1 is returned on any errors during floppy formatting, and an exit status
 of 2 reflects invalid arguments given to the program (along with an
 appropriate information written to diagnostic output).
@@ -147,7 +152,8 @@
 has been developed for 386BSD 0.1
 and upgraded to the new
 .Xr fdc 4
-floppy disk driver. It later became part of the
+floppy disk driver.
+It later became part of the
 .Fx 1.1
 system.
 .Sh AUTHORS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/fdwrite.1 man1/fdwrite.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/fdwrite.1	Mon Dec 20 14:53:22 1999
+++ man1/fdwrite.1	Wed Jun 14 10:08:13 2000
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" %FreeBSD: src/usr.sbin/fdwrite/fdwrite.1,v 1.9.2.1 1999/08/29 15:41:31 peter Exp %
+.\" %FreeBSD: src/usr.sbin/fdwrite/fdwrite.1,v 1.9.2.2 2000/03/06 11:35:51 sheldonh Exp %
 .\"
 .\"
 .Dd September 16, 1993
@@ -51,7 +51,8 @@
 R and C, which indicates completion of Input, Zero-fill, Format
 Write, Read and Compare of current track respectively.
 .It Fl y
-Don't ask for presence of a floppy disk in the drive. This non-interactive flag
+Don't ask for presence of a floppy disk in the drive.
+This non-interactive flag
 is useful for shell scripts.
 .It Fl f Ar inputfile
 Input file to read.  If none is given, stdin is assumed.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/fetch.1 man1/fetch.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/fetch.1	Mon Dec 20 14:51:13 1999
+++ man1/fetch.1	Wed Jun 14 10:06:37 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/fetch/fetch.1,v 1.27.2.3 1999/08/29 15:27:35 peter Exp %
+.\" %FreeBSD: src/usr.bin/fetch/fetch.1,v 1.27.2.4 2000/03/06 11:34:21 sheldonh Exp %
 .Dd February 22, 1999
 .Dt FETCH 1
 .Os FreeBSD 3.1
@@ -27,7 +27,8 @@
 .Tn FTP
 or the
 .Tn HTTP
-protocol. In the first form of the command, the
+protocol.
+In the first form of the command, the
 .Ar URL
 may be of the form 
 .Li http://site.domain/path/to/the/file
@@ -100,7 +101,8 @@
 .Tn FTP
 protocol.  This is useful for crossing certain sorts of firewalls.
 .It Fl q
-Quiet mode. Do not report transfer progress on the terminal.
+Quiet mode.
+Do not report transfer progress on the terminal.
 .It Fl R
 The filenames specified are ``precious'', and should not be deleted
 under any circumstances, even if the transfer failed or was incomplete.
@@ -120,7 +122,8 @@
 from downloading a file that is either incomplete or the wrong version,
 given the correct size of the file in advance.
 .It Fl s
-Ask server for size of file in bytes and print it to stdout. Do not
+Ask server for size of file in bytes and print it to stdout.
+Do not
 actually fetch the file.
 .It Fl T Ar seconds
 Set timeout value to
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/file.1 man1/file.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/file.1	Mon Dec 20 14:51:13 1999
+++ man1/file.1	Wed Jun 14 10:06:38 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/file/file.1,v 1.12.2.2 1999/09/20 09:49:56 phantom Exp %
+.\" %FreeBSD: src/usr.bin/file/file.1,v 1.12.2.3 2000/03/06 11:34:23 sheldonh Exp %
 .Dd July 30, 1997
 .Dt FILE 1 "Copyright but distributable"
 .Os
@@ -330,7 +330,8 @@
 program, and are not covered by the above restrictions.
 .Sh BUGS
 There must be a better way to automate the construction of the Magic
-file from all the glop in Magdir. What is it?
+file from all the glop in Magdir.
+What is it?
 Better yet, the magic file should be compiled into binary (say,
 .Xr ndbm 3
 or, better yet, fixed-length
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/finger.1 man1/finger.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/finger.1	Mon Dec 20 14:51:14 1999
+++ man1/finger.1	Wed Jun 14 10:06:38 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)finger.1	8.3 (Berkeley) 5/5/94
-.\" %FreeBSD: src/usr.bin/finger/finger.1,v 1.7.2.1 1999/08/29 15:27:54 peter Exp %
+.\" %FreeBSD: src/usr.bin/finger/finger.1,v 1.7.2.2 2000/03/06 11:34:25 sheldonh Exp %
 .\"
 .Dd August 1, 1997
 .Dt FINGER 1
@@ -55,7 +55,8 @@
 displays the user's login name, real name, terminal name and write
 status (as a ``*'' before the terminal name if write permission is
 denied), idle time, login time, and either office location and office
-phone number, or the remote host. If
+phone number, or the remote host.
+If
 .Fl h
 is given, the remote host is printed (the default).  If
 .Fl o
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/fmt.1 man1/fmt.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/fmt.1	Mon Dec 20 14:51:14 1999
+++ man1/fmt.1	Wed Jun 14 10:06:39 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fmt.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/fmt/fmt.1,v 1.4.2.1 2000/03/09 09:31:52 sheldonh Exp %
 .\"
 .Dd June 6, 1993
 .Dt FMT 1
@@ -39,7 +40,7 @@
 .Nd simple text formatter
 .Sh SYNOPSIS
 .Nm
-.Fl c
+.Op Fl c
 .Oo
 .Ar goal
 .Op Ar maximum
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/fpr.1 man1/fpr.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/fpr.1	Mon Dec 20 14:51:15 1999
+++ man1/fpr.1	Wed Jun 14 10:06:39 2000
@@ -32,6 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fpr.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/fpr/fpr.1,v 1.1.1.1.10.1 2000/03/03 11:43:17 sheldonh Exp %
 .\"
 .Dd June 6, 1993
 .Dt FPR 1
@@ -65,9 +66,12 @@
 .Ed
 .Pp
 A blank line is treated as if its first
-character is a blank. A blank that appears as a carriage control
-character is deleted. A zero is changed to a newline.  A one is
-changed to a form feed. The effects of a "+" are simulated using
+character is a blank.
+A blank that appears as a carriage control
+character is deleted.
+A zero is changed to a newline.  A one is
+changed to a form feed.
+The effects of a "+" are simulated using
 backspaces.
 .Sh EXAMPLES
 .Dl a.out \&| fpr \&| lpr
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/ftp.1 man1/ftp.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/ftp.1	Mon Dec 20 14:51:16 1999
+++ man1/ftp.1	Wed Jun 14 10:06:40 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/ftp/ftp.1,v 1.8.2.4 1999/08/29 15:28:12 peter Exp %
+.\" %FreeBSD: src/usr.bin/ftp/ftp.1,v 1.8.2.6 2000/03/10 14:47:32 sheldonh Exp %
 .\" 	$NetBSD: ftp.1,v 1.21 1997/06/10 21:59:58 lukem Exp %
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
@@ -661,7 +661,7 @@
 and display with the program defined in
 .Ev PAGER 
 (which defaults to
-.Xr less 1 ).
+.Xr more 1 ) .
 .It Ic passive
 Toggle passive mode.  If passive mode is turned on
 (default is off), the ftp client will
@@ -1153,7 +1153,7 @@
 is enabled,
 local file names are expanded
 according to the rules used in the
-.Xr csh  1  ;
+.Xr csh 1 ;
 c.f. the
 .Ic glob
 command.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/gcore.1 man1/gcore.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/gcore.1	Mon Dec 20 14:52:16 1999
+++ man1/gcore.1	Wed Jun 14 10:07:28 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)gcore.1	8.2 (Berkeley) 4/18/94
+.\" %FreeBSD: src/usr.bin/gcore/gcore.1,v 1.5.2.1 2000/03/06 11:34:28 sheldonh Exp %
 .\"
 .Dd April 18, 1994
 .Dt GCORE 1
@@ -52,7 +53,8 @@
 .Dq Pa core.<pid> .
 The process identifier,
 .Ar pid ,
-must be given on the command line. If no executable image is
+must be given on the command line.
+If no executable image is
 specified,
 .Nm
 will use
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/getopt.1 man1/getopt.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/getopt.1	Mon Dec 20 14:51:17 1999
+++ man1/getopt.1	Wed Jun 14 10:06:40 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/getopt/getopt.1,v 1.4.4.2 1999/09/18 15:53:26 phantom Exp %
+.\" %FreeBSD: src/usr.bin/getopt/getopt.1,v 1.4.4.3 2000/03/06 11:34:30 sheldonh Exp %
 .\"
 .Dd April 3, 1999
 .Dt GETOPT 1
@@ -96,7 +96,8 @@
 Written by
 .An Henry Spencer ,
 working from a Bell Labs manual page.
-Behavior believed identical to the Bell version. Example changed in
+Behavior believed identical to the Bell version.
+Example changed in
 .Fx
 version 3.2 and 4.0.
 .Sh BUGS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/grep.1 man1/grep.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/grep.1	Mon Dec 20 14:46:19 1999
+++ man1/grep.1	Wed Jun 14 10:03:01 2000
@@ -1,18 +1,29 @@
-.TH GREP 1 "1992 September 10" "GNU Project"
+.\" grep man page
+.\" %FreeBSD: src/gnu/usr.bin/grep/grep.1,v 1.6.2.1 1999/12/31 09:55:53 ru Exp %
+.de Id
+.ds Dt \\$4
+..
+.Id %Id: grep.1,v 1.1 1998/11/22 06:45:20 alainm Exp %
+.TH GREP 1 \*(Dt "GNU Project"
 .SH NAME
 grep, egrep, fgrep, zgrep \- print lines matching a pattern
 .SH SYNOPSIS
 .B grep
-[\-[AB] num]
-[\-HRPS]
-[\-CEFGLVabchilnqsvwx]
-[\-e expr]
-[\-f file]
-files...
-
+[-[AB] NUM] [-CEFGVZabchiLlnqrsvwxyUu] [-e PATTERN | -f FILE]
+[-d ACTION] [--directories=ACTION]
+[--extended-regexp] [--fixed-strings] [--basic-regexp]
+[--regexp=PATTERN] [--file=FILE] [--ignore-case] [--word-regexp]
+[--line-regexp] [--line-regexp] [--no-messages] [--revert-match]
+[--version] [--help] [--byte-offset] [--line-number]
+[--with-filename] [--no-filename] [--quiet] [--silent] [--text]
+[--files-without-match] [--files-with-matcces] [--count]
+[--before-context=NUM] [--after-context=NUM] [--context]
+[--binary] [--unix-byte-offsets] [--recursive]
+[--decompress]
+.I files...
 .SH DESCRIPTION
 .PP
-.B Grep
+.B grep
 searches the named input
 .I files
 (or standard input if no files are named, or
@@ -30,17 +41,17 @@
 controlled by the following options.
 .PD 0
 .TP
-.B \-G
+.B \-G, --basic-regexp
 Interpret
 .I pattern
 as a basic regular expression (see below).  This is the default.
 .TP
-.B \-E
+.B \-E, --extended-regexp
 Interpret
 .I pattern
 as an extended regular expression (see below).
 .TP
-.B \-F
+.B \-F, --fixed-strings
 Interpret
 .I pattern
 as a list of fixed strings, separated by newlines,
@@ -51,19 +62,17 @@
 and
 .B fgrep
 are available.
-.B Egrep
+.B egrep
 is similar (but not identical) to
 .BR "grep\ \-E" ,
 and is compatible with the historical Unix
 .BR egrep .
-.B Fgrep
+.B fgrep
 is the same as
 .BR "grep\ \-F" .
-When called as 
-.BR zgrep , 
-the 
-.BR \-Z
-option is assumed.
+.B zgrep
+is the same as
+.BR "grep\ \-Z" .
 .PD
 .LP
 All variants of
@@ -71,90 +80,157 @@
 understand the following options:
 .PD 0
 .TP
-.BI \- num
-Matches will be printed with
-.I num
-lines of leading and trailing context.  However,
-.B grep
-will never print any given line more than once.
-.TP
-.BI \-A " num"
+.BI \-A " NUM" ", --after-context=" NUM
 Print
-.I num
+.I NUM
 lines of trailing context after matching lines.
 .TP
-.BI \-B " num"
+.BI \-B " NUM" ", --before-context=" NUM
 Print
-.I num
+.I NUM
 lines of leading context before matching lines.
 .TP
-.B \-C
-Equivalent to
-.BR \-2 .
+.BI \-C ,\  --context"[=NUM]"
+Print 
+.I NUM
+lines (default 2) of output context.
 .TP
-.B \-V
+.BI \- NUM \ 
+Same as --context=NUM lines of leading and trailing context.  However,
+.B grep
+will never print any given line more than once.
+.TP
+.B \-V, --version
 Print the version number of
 .B grep
 to standard error.  This version number should
 be included in all bug reports (see below).
 .TP
-.B \-a
-Don't search in binary files.
-.TP
-.B \-b
+.B \-b, --byte-offset
 Print the byte offset within the input file before
 each line of output.
 .TP
-.B \-c
+.B \-c, --count
 Suppress normal output; instead print a count of
 matching lines for each input file.
 With the
-.B \-v
+.B \-v, --revert-match
 option (see below), count non-matching lines.
 .TP
-.BI \-e " pattern"
+.BI \-d " ACTION" ", --directories=" ACTION
+If an input file is a directory, use
+.I ACTION
+to process it.  By default,
+.I ACTION
+is
+.BR read ,
+which means that directories are read just as if they were ordinary files.
+If
+.I ACTION
+is
+.BR skip ,
+directories are silently skipped.
+If
+.I ACTION
+is
+.BR recurse ,
+.B
+grep reads all files under each directory, recursively;
+this is equivalent to the
+.B \-r
+option.
+.TP
+.BI \-e " PATTERN" ", --regexp=" PATTERN
 Use
-.I pattern
+.I PATTERN
 as the pattern; useful to protect patterns beginning with
 .BR \- .
 .TP
-.BI \-f " file"
-Obtain the pattern from
-.IR file .
+.BI \-f " FILE" ", --file=" FILE
+Obtain patterns from
+.IR FILE ,
+one per line.
+The empty file contains zero patterns, and therfore matches nothing.
 .TP
-.B \-h
+.B \-h, --no-filename
 Suppress the prefixing of filenames on output
 when multiple files are searched.
 .TP
-.B \-i
+.B \-i, --ignore-case
 Ignore case distinctions in both the
 .I pattern
 and the input files.
 .TP
-.B \-L
+.B \-L, --files-without-match
 Suppress normal output; instead print the name
 of each input file from which no output would
-normally have been printed.
+normally have been printed. The scanning will stop
+on the first match.
 .TP
-.B \-l
+.B \-l, --files-with-matches
 Suppress normal output; instead print
 the name of each input file from which output
-would normally have been printed.
+would normally have been printed. The scanning will
+stop on the first match.
 .TP
-.B \-n
+.B \-n, --line-number
 Prefix each line of output with the line number
 within its input file.
 .TP
-.B \-q
-Quiet; suppress normal output.
-.TP
+.B \-q, --quiet, --silent
+Quiet; suppress normal output. The scanning will stop
+on the first match.
+Also see the
 .B \-s
+or
+.B --no-messages
+option below.
+.TP
+.B \-r, --recursive
+Read all files under each directory, recursively;
+this is equivalent to the
+.B "\-d recurse"
+option.
+.TP
+.B \-s, --no-messages
 Suppress error messages about nonexistent or unreadable files.
+Portability note: unlike GNU
+.BR grep ,
+BSD
+.B grep
+does not comply with POSIX.2, because BSD
+.B grep
+lacks a
+.B \-q
+option and its
+.B \-s
+option behaves like GNU
+.BR grep 's
+.B \-q
+option.
+Shell scripts intended to be portable to BSD
+.B grep
+should avoid both
+.B \-q
+and
+.B \-s
+and should redirect output to /dev/null instead.
 .TP
-.B \-v
+.B \-a, --text
+Do not suppress output lines that contain binary data.
+Normally, if the first few bytes of a file indicate that
+the file contains binary data,
+.B grep
+outputs only a message saying that the file matches the pattern.
+This option causes
+.B grep
+to act as if the file is a text file,
+even if it would otherwise be treated as binary.
+.TP
+.B \-v, --revert-match
 Invert the sense of matching, to select non-matching lines.
 .TP
-.B \-w
+.B \-w, --word-regexp
 Select only those lines containing matches that form whole words.
 The test is that the matching substring must either be at the
 beginning of the line, or preceded by a non-word constituent
@@ -162,44 +238,48 @@
 or followed by a non-word constituent character.  Word-constituent
 characters are letters, digits, and the underscore.
 .TP
-.B \-x
+.B \-x, --line-regexp
 Select only those matches that exactly match the whole line.
-
-.PP
-Following options are only available if compiled with FTS library:
-.PD 0
 .TP
-.BI \-H
-If the 
-.I \-R
-option is specified, symbolic links on the command line
-are followed.  (Symbolic links encountered in the tree traversal
-are not followed.)
-.TP
-.BI \-L
-If the 
-.I \-R
-option is specified, all symbolic links are followed.
-.TP
-.BI \-P
-If the 
-.I \-R
-option is specified, no symbolic links are followed.
-.TP
-.BI \-R
-Search in the file hierarchies
-rooted in the files instead of just the files themselves.
-
+.B \-y
+Obsolete synonym for
+.BR \-i .
+.TP
+.B \-U, --binary
+Treat the file(s) as binary.  By default, under MS-DOS and MS-Windows,
+.BR grep
+guesses the file type by looking at the contents of the first 32KB
+read from the file.  If
+.BR grep
+decides the file is a text file, it strips the CR characters from the
+original file contents (to make regular expressions with
+.B ^
+and
+.B $
+work correctly).  Specifying
+.B \-U
+overrules this guesswork, causing all files to be read and passed to the
+matching mechanism verbatim; if the file is a text file with CR/LF
+pairs at the end of each line, this will cause some regular
+expressions to fail.  This option is only supported on MS-DOS and
+MS-Windows.
+.TP
+.B \-u, --unix-byte-offsets
+Report Unix-style byte offsets.  This switch causes
+.B grep
+to report byte offsets as if the file were Unix-style text file, i.e. with
+CR characters stripped off.  This will produce results identical to running
+.B grep
+on a Unix machine.  This option has no effect unless
+.B \-b
+option is also used; it is only supported on MS-DOS and MS-Windows.
+.PD
 .LP
-Following option is only available if compiled with zlib library:
+Following option is only available if compiled with zlib(3) library:
 .PD 0
 .TP
-.BI \-Z
-If the 
-.I \-Z
-option is specified, the input data will be
-decompressed before searching.
-.TP
+.B \-Z, --decompress
+Decompress the input data before searching.
 .PD
 .SH "REGULAR EXPRESSIONS"
 .PP
@@ -207,7 +287,7 @@
 Regular expressions are constructed analogously to arithmetic
 expressions, by using various operators to combine smaller expressions.
 .PP
-.B Grep
+.B grep
 understands two different versions of regular expression syntax:
 ``basic'' and ``extended.''  In
 .RB "GNU\ " grep ,
@@ -251,7 +331,7 @@
 .BR [:upper:] ,
 and
 .BR [:xdigit:].
-For example, 
+For example,
 .B [[:alnum:]]
 means
 .BR [0-9A-Za-z] ,
@@ -300,8 +380,7 @@
 .I not
 at the edge of a word.
 .PP
-A regular expression matching a single character may be followed
-by one of several repetition operators:
+A regular expression may be followed by one of several repetition operators:
 .PD 0
 .TP
 .B ?
@@ -383,6 +462,14 @@
 .B {
 loses its special meaning; instead use
 .BR \e{ .
+.SH ENVIRONMENT
+The environment variable
+.B GREP_OPTIONS
+can hold a set of default
+options for
+.I grep.
+These options are interpreted first and can be overwritten by explicit command
+line parameters.
 .SH DIAGNOSTICS
 .PP
 Normally, exit status is 0 if matches were found,
@@ -395,7 +482,7 @@
 .SH BUGS
 .PP
 Email bug reports to
-.BR bug-gnu-utils@prep.ai.mit.edu .
+.BR bug-gnu-utils@gnu.org .
 Be sure to include the word ``grep'' somewhere in the ``Subject:'' field.
 .PP
 Large repetition counts in the
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/grodvi.1 man1/grodvi.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/grodvi.1	Mon Dec 20 14:46:21 1999
+++ man1/grodvi.1	Wed Jun 14 10:03:03 2000
@@ -24,7 +24,7 @@
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
-.TH GRODVI 1 "7 September 1996" "Groff Version 1.11"
+.TH GRODVI 1 "7 September 1996" "Groff Version 1.15"
 .SH NAME
 grodvi \- convert groff output to TeX dvi format
 .SH SYNOPSIS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/groff.1 man1/groff.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/groff.1	Mon Dec 20 14:46:22 1999
+++ man1/groff.1	Wed Jun 14 10:03:04 2000
@@ -1,5 +1,5 @@
 .ig \"-*- nroff -*-
-Copyright (C) 1989-1995 Free Software Foundation, Inc.
+Copyright (C) 1999 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -15,6 +15,9 @@
 versions, except that this permission notice may be included in
 translations approved by the Free Software Foundation instead of in
 the original English.
+
+	%FreeBSD: src/contrib/groff/groff/groff.man,v 1.2.4.2 2000/03/09 20:08:51 asmodai Exp %
+
 ..
 .de TQ
 .br
@@ -27,13 +30,13 @@
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
-.TH GROFF 1 "18 March 1999" "Groff Version 1.11"
+.TH GROFF 1 "10 March 2000" "Groff Version 1.15"
 .SH NAME
 groff \- front end for the groff document formatting system
 .SH SYNOPSIS
 .B groff
 [
-.B \-tpeszaivhblCENRSVXZ
+.B \-abehilpstvzCENRSUVXZ
 ]
 [
 .BI \-w name
@@ -48,6 +51,9 @@
 .BI \-F dir
 ]
 [
+.BI \-I dir
+]
+[
 .BI \-T dev
 ]
 [
@@ -72,6 +78,9 @@
 .BI \-P arg
 ]
 [
+.BI \-L arg
+]
+[
 .IR files \|.\|.\|.\|
 ]
 .SH DESCRIPTION
@@ -87,16 +96,16 @@
 For PostScript printers and previewers
 .TP
 .B dvi
-For TeX dvi format
+For TeX dvi format.
 .TP
 .B X75
-For a 75 dpi X11 previewer
+For a 75 dpi X11 previewer.
 .TP
 .B X100
-For a 100dpi X11 previewer
+For a 100dpi X11 previewer.
 .TP
 .B ascii
-For typewriter-like devices
+For typewriter-like devices.
 .TP
 .B latin1
 For typewriter-like devices using the ISO Latin-1 character set.
@@ -106,6 +115,9 @@
 .TP
 .B koi8-r
 For typewriter-like devices using the russian KOI8-R character set.
+.TP
+.B html
+To produce HTML output.
 .LP
 The postprocessor to be used for a device is specified by the
 .B postpro
@@ -151,6 +163,13 @@
 .B \-s
 Preprocess with soelim.
 .TP
+.BI \-I dir
+This option is as described in
+.BR soelim (1) .
+This option implies the
+.B \-s
+option.
+.TP
 .B \-R
 Preprocess with refer.
 No mechanism is provided for passing arguments to 
@@ -258,6 +277,10 @@
 .B \%\-msafer
 macros with
 .BR troff .
+(enabled by default)
+.TP
+.B \-U
+Unsafe mode.  Reverts to the old unsafe behaviour.
 .TP
 .B \-a
 .TQ
@@ -306,13 +329,15 @@
 .BR tbl ,
 .BR pic ,
 .BR eqn ,
-.B refer
+.BR refer ,
 and
 .BR soelim .
 It does not apply to
 .BR grops ,
 .BR grodvi ,
-.BR grotty
+.BR grotty ,
+.BR grolj4 ,
+.BR grohtml ,
 and
 .BR gxditview .
 .TP
@@ -364,12 +389,12 @@
 .SH AUTHOR
 James Clark <jjc@jclark.com>
 .SH BUGS
-Report bugs to bug-groff@prep.ai.mit.edu.
+Report bugs to bug-groff@gnu.org.
 Include a complete, self-contained example
 that will allow the bug to be reproduced,
 and say which version of groff you are using.
 .SH COPYRIGHT
-Copyright \(co 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+Copyright \(co 1989, 1990, 1991, 1992, 1999 Free Software Foundation, Inc.
 .LP
 groff is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -386,10 +411,9 @@
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 .SH AVAILABILITY
 The most recent released version of groff is always available for
-anonymous ftp from prep.ai.mit.edu (18.71.0.38) in the directory
-pub/gnu.
+anonymous ftp from ftp.gnu.org in the directory gnu/groff.
 .SH "SEE ALSO"
-.\" .BR grog (1),
+.BR grog (1),
 .BR troff (1),
 .BR tbl (1),
 .BR pic (1),
@@ -399,10 +423,12 @@
 .BR grops (1),
 .BR grodvi (1),
 .BR grotty (1),
-.\" .BR gxditview (1),
+.BR grohtml (1),
+.BR grohtml (1),
 .BR groff_font (5),
 .BR groff_out (5),
+.BR groff_man (7),
 .BR groff_ms (7),
-.BR me (7),
+.BR groff_me (7),
 .BR groff_char (7),
-.BR msafer (7)
+.BR groff_msafer (7)
Only in man1: grog.1
Only in man1: grohtml.1
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/grolj4.1 man1/grolj4.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/grolj4.1	Mon Dec 20 14:46:22 1999
+++ man1/grolj4.1	Wed Jun 14 10:03:05 2000
@@ -1,5 +1,5 @@
 .ig \"-*- nroff -*-
-Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1999 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -22,7 +22,7 @@
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
-.TH GROLJ4 1 "7 September 1996" "Groff Version 1.11"
+.TH GROLJ4 1 "10 March 2000" "Groff Version 1.15"
 .SH NAME
 grolj4 \- groff driver for HP Laserjet 4 family
 .SH SYNOPSIS
@@ -30,6 +30,10 @@
 [
 .B \-lv
 ] [
+.B \-d
+[\c
+.IR n ]
+] [
 .BI \-c n
 ] [
 .BI \-p paper_size
@@ -67,6 +71,12 @@
 .TP
 .B \-l
 Print the document with a landscape orientation.
+.TP
+.BI "\-d [" n ]
+Use duplex mode 
+.IR n :
+1\ is long-side binding; 2\ is short-side binding;
+default is\ 1.
 .TP
 .BI \-p size
 Set the paper size to
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/grops.1 man1/grops.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/grops.1	Mon Dec 20 14:46:24 1999
+++ man1/grops.1	Wed Jun 14 10:03:05 2000
@@ -22,7 +22,7 @@
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
-.TH GROPS 1 "8 September 1996" "Groff Version 1.11"
+.TH GROPS 1 "8 September 1996" "Groff Version 1.15"
 .SH NAME
 grops \- PostScript driver for groff
 .SH SYNOPSIS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/grotty.1 man1/grotty.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/grotty.1	Mon Dec 20 14:46:25 1999
+++ man1/grotty.1	Wed Jun 14 10:03:05 2000
@@ -16,7 +16,7 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
-.TH GROTTY 1 "8 September 1996" "Groff Version 1.11"
+.TH GROTTY 1 "8 September 1996" "Groff Version 1.15"
 .SH NAME
 grotty \- groff driver for typewriter-like devices
 .SH SYNOPSIS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/hostname.1 man1/hostname.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/hostname.1	Mon Dec 20 14:44:46 1999
+++ man1/hostname.1	Wed Jun 14 10:01:56 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hostname.1	8.2 (Berkeley) 4/28/95
-.\" %FreeBSD: src/bin/hostname/hostname.1,v 1.8.2.1 1999/08/29 14:12:37 peter Exp %
+.\" %FreeBSD: src/bin/hostname/hostname.1,v 1.8.2.2 1999/12/22 01:35:49 jhb Exp %
 .\"
 .Dd April 28, 1995
 .Dt HOSTNAME 1
@@ -50,6 +50,10 @@
 .Pa /etc/rc.network ,
 normally run at boot
 time.
+This script uses the
+.Va hostname
+variable in
+.Pa /etc/rc.conf .
 .Pp
 Options:
 .Bl -tag -width flag
@@ -58,7 +62,8 @@
 name.
 .El
 .Sh SEE ALSO
-.Xr gethostname 3
+.Xr gethostname 3 , 
+.Xr rc.conf 5
 .Sh HISTORY
 The
 .Nm
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/indxbib.1 man1/indxbib.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/indxbib.1	Mon Dec 20 14:46:25 1999
+++ man1/indxbib.1	Wed Jun 14 10:03:05 2000
@@ -16,7 +16,7 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
-.TH INDXBIB 1 "7 September 1996" "Groff Version 1.11"
+.TH INDXBIB 1 "7 September 1996" "Groff Version 1.15"
 .SH NAME
 indxbib \- make inverted index for bibliographic databases
 .SH SYNOPSIS
Only in man1: info.1
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/install-info.1 man1/install-info.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/install-info.1	Mon Dec 20 14:46:48 1999
+++ man1/install-info.1	Wed Jun 14 10:03:21 2000
@@ -1,60 +1,84 @@
-.\"
-.\" Copyright (c) 1997 David E. O'Brien (obrien@FreeBSD.org)
-.\"
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE DEVELOPERS BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" %FreeBSD: src/gnu/usr.bin/texinfo/install-info/install-info.1,v 1.2.2.2 1999/09/23 13:43:31 phantom Exp %
-.\"
-.\" .TH install-info 1
-.Dd August 29, 1997
-.Dt INSTALL-INFO 1
-.Os BSD
-.Sh NAME
-.Nm install-info
-.Nd edits info/dir file for the GNU info hypertext system
-.Sh SYNOPSIS
-.Nm install-info
-.Ar program.info info/dir
-.Sh DESCRIPTION
-.Nm
-is often used within the
-.Fx
-ports collection.
-.Sh FILES
-.Bl -tag -width "/usr/share/info/dir" -compact
-.It Pa "/usr/share/info/dir"
-.It Pa "/usr/local/info/dir"
-.El
-.I F
-.Sh SEE ALSO
-.Xr info 1
-.\" .Sh DIAGNOSTICS
-.\" none.
-.\" .Sh BUGS
-.\" none known.
-.Sh AUTHORS
-This man page has been written by
-.An David O'Brien Aq obrien@NUXI.com
-.\" .Sh HISTORY
-.\" .Nm 
-.\" appeared in FreeBSD 2.1.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.013.
+.TH INSTALL-INFO "1" "September 1999" "GNU texinfo 4.0" FSF
+.SH NAME
+install-info \- update info/dir entries
+.SH SYNOPSIS
+.B install-info
+[\fIOPTION\fR]... [\fIINFO-FILE \fR[\fIDIR-FILE\fR]]
+.SH DESCRIPTION
+.PP
+Install or delete dir entries from INFO-FILE in the Info directory file
+DIR-FILE.
+.SH OPTIONS
+.TP
+\fB\-\-delete\fR
+delete existing entries for INFO-FILE from DIR-FILE;
+.IP
+don't insert any new entries.
+.TP
+\fB\-\-dir\-file\fR=\fINAME\fR
+specify file name of Info directory file.
+.IP
+This is equivalent to using the DIR-FILE argument.
+.TP
+\fB\-\-entry\fR=\fITEXT\fR
+insert TEXT as an Info directory entry.
+.IP
+TEXT should have the form of an Info menu item line
+plus zero or more extra lines starting with whitespace.
+If you specify more than one entry, they are all added.
+If you don't specify any entries, they are determined
+from information in the Info file itself.
+.TP
+\fB\-\-help\fR
+display this help and exit.
+.TP
+\fB\-\-info\-file\fR=\fIFILE\fR
+specify Info file to install in the directory.
+.IP
+This is equivalent to using the INFO-FILE argument.
+.TP
+\fB\-\-info\-dir\fR=\fIDIR\fR
+same as \fB\-\-dir\-file\fR=\fIDIR\fR/dir.
+.TP
+\fB\-\-item\fR=\fITEXT\fR
+same as \fB\-\-entry\fR TEXT.
+.IP
+An Info directory entry is actually a menu item.
+.TP
+\fB\-\-quiet\fR
+suppress warnings.
+.TP
+\fB\-\-remove\fR
+same as \fB\-\-delete\fR.
+.TP
+\fB\-\-section\fR=\fISEC\fR
+put this file's entries in section SEC of the directory.
+.IP
+If you specify more than one section, all the entries
+are added in each of the sections.
+If you don't specify any sections, they are determined
+from information in the Info file itself.
+.TP
+\fB\-\-version\fR
+display version information and exit.
+.SH "REPORTING BUGS"
+Email bug reports to bug-texinfo@gnu.org,
+general questions and discussion to help-texinfo@gnu.org.
+.SH "SEE ALSO"
+The full documentation for
+.B install-info
+is maintained as a Texinfo manual.  If the
+.B info
+and
+.B install-info
+programs are properly installed at your site, the command
+.IP
+.B info install-info
+.PP
+should give you access to the complete manual.
+.SH COPYRIGHT
+Copyright \(co 1999 Free Software Foundation, Inc.
+There is NO warranty.  You may redistribute this software
+under the terms of the GNU General Public License.
+For more information about these matters, see the files named COPYING.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/install.1 man1/install.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/install.1	Mon Dec 20 14:52:07 1999
+++ man1/install.1	Wed Jun 14 10:07:20 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)install.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/xinstall/install.1,v 1.13.2.1 1999/08/29 15:34:56 peter Exp %
+.\" %FreeBSD: src/usr.bin/xinstall/install.1,v 1.13.2.2 2000/03/06 11:35:31 sheldonh Exp %
 .\"
 .Dd September 22, 1996
 .Dt INSTALL 1
@@ -106,7 +106,8 @@
 .Xr chflags 1
 for a list of possible flags and their meanings.
 .It Fl g
-Specify a group. A numeric GID is allowed.
+Specify a group.
+A numeric GID is allowed.
 .It Fl M
 Disable all use of
 .Xr mmap 2 .
@@ -117,7 +118,8 @@
 .Xr chmod  1
 for a description of possible mode values.
 .It Fl o
-Specify an owner. A numeric UID is allowed.
+Specify an owner.
+A numeric UID is allowed.
 .It Fl p
 Preserve the modification time.
 Copy the file, as if the
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/ipcrm.1 man1/ipcrm.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/ipcrm.1	Mon Dec 20 14:51:22 1999
+++ man1/ipcrm.1	Wed Jun 14 10:06:43 2000
@@ -21,15 +21,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\" 
-.\" %FreeBSD: src/usr.bin/ipcrm/ipcrm.1,v 1.5.2.2 1999/08/29 15:28:53 peter Exp %
+.\" %FreeBSD: src/usr.bin/ipcrm/ipcrm.1,v 1.5.2.3 2000/05/09 14:27:11 sheldonh Exp %
 .\""
 .Dd August 8, 1994
 .Dt IPCRM 1
 .Os
 .Sh NAME
 .Nm ipcrm
-.Nd remove the specified message queues, semaphore sets, and shared memory
-segments
+.Nd "remove the specified message queues, semaphore sets, and shared segments"
 .Sh SYNOPSIS
 .Nm
 .Op Fl q Ar msqid
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/kbdcontrol.1 man1/kbdcontrol.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/kbdcontrol.1	Mon Dec 20 14:52:39 1999
+++ man1/kbdcontrol.1	Wed Jun 14 10:07:42 2000
@@ -11,7 +11,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)kbdcontrol.1
-.\" %FreeBSD: src/usr.sbin/kbdcontrol/kbdcontrol.1,v 1.11.2.4 1999/11/18 16:10:46 phantom Exp %
+.\" %FreeBSD: src/usr.sbin/kbdcontrol/kbdcontrol.1,v 1.11.2.5 2000/05/09 14:27:12 sheldonh Exp %
 .\"
 .Dd June 30, 1999
 .Dt KBDCONTROL 1
@@ -65,9 +65,11 @@
 the bell will not be rung when the ringing process is in the background vty.
 .It Fl r Ar delay.repeat | Ar speed
 Set keyboard
-.Ar delay (250, 500, 750, 1000)
+.Ar delay
+(250, 500, 750, 1000)
 and
-.Ar repeat (34, 38, 42, 46, 50, 55, 59, 63, 68, 76, 84, 92, 100, 110, 118, 126, 
+.Ar repeat
+(34, 38, 42, 46, 50, 55, 59, 63, 68, 76, 84, 92, 100, 110, 118, 126, 
 136, 152, 168, 184, 200, 220, 236, 252, 272, 304, 336, 368, 400, 440,
 472, 504)
 rates, or if a
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/kbdmap.1 man1/kbdmap.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/kbdmap.1	Mon Dec 20 14:52:39 1999
+++ man1/kbdmap.1	Wed Jun 14 10:07:42 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/kbdmap/kbdmap.1,v 1.14.2.1 1999/08/29 15:42:41 peter Exp %
+.\" %FreeBSD: src/usr.sbin/kbdmap/kbdmap.1,v 1.14.2.2 2000/03/06 11:36:11 sheldonh Exp %
 
 .Dd Mar 25, 1995
 .Dt KBDMAP 1
@@ -55,7 +55,8 @@
 It is strongly recommended to not choose 
 .Tn MSDOS 
 codepage keymaps
-or fonts. Use the 
+or fonts.
+Use the 
 .Tn ISO 
 standard version if available! 
 .Tn X11 
@@ -72,7 +73,8 @@
 Run as command
 .Xr vidfont 1 .
 .It Fl d , Fl default
-Use default language. Ignore $LANG.
+Use default language.
+Ignore $LANG.
 .It Fl h , Fl help
 Print options and exit.
 .It Fl l , Fl lang Ar language
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/kcon.1 man1/kcon.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/kcon.1	Mon Dec 20 14:53:31 1999
+++ man1/kcon.1	Wed Jun 14 10:08:18 2000
@@ -28,6 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)kcon.1, 3.20, Last Edit-Date: [Wed Jan 25 16:34:56 1995]
+.\" %FreeBSD: src/usr.sbin/pcvt/kcon/kcon.1,v 1.4.2.1 2000/03/06 11:36:44 sheldonh Exp %
 .\"
 .Dd January 25, 1995
 .Dt KCON 1
@@ -55,7 +56,8 @@
 .Bl -tag -width flag
 .It Fl d Ar delay
 Specifies the delay after which the last key entered will be repeated by the
-Keyboard. Valid values are 0..3 corresponding to delays of 250, 500, 750 and
+Keyboard.
+Valid values are 0..3 corresponding to delays of 250, 500, 750 and
 1000 milliseconds.
 .It Fl l
 Displays the current keyboard map in use by the driver.
@@ -75,7 +77,8 @@
 .Fl l
 option.
 .It Fl r Ar rate
-Specifies the character repetition rate. Valid argument values are 0...31
+Specifies the character repetition rate.
+Valid argument values are 0...31
 corresponding to rates of 30 characters/second ... 2 characters/second.
 .It Fl R
 Reset the Keyboard.
@@ -91,7 +94,8 @@
 Switches display of control codes to hexadecimal in the listing of the current map.
 To be used in conjunction with the
 .Fl l
-option. This is the default behaviour.
+option.
+This is the default behaviour.
 .Sh FILES
 .Bl -tag -width /usr/share/misc/keycap.pcvt -compact
 .It Pa /usr/share/misc/keycap.pcvt
@@ -103,10 +107,13 @@
 .Xr keycap 5
 .Sh BUGS
 .Nm kcon
-detects several inconsistencies in the keycap database. In case of errors
+detects several inconsistencies in the keycap database.
+In case of errors
 .Nm kcon
-exits with an error message. If this happens, the keyboard may remain in
-an undefined state. To recover from such situation, execute
+exits with an error message.
+If this happens, the keyboard may remain in
+an undefined state.
+To recover from such situation, execute
 .Nm kcon -m default
 .Sh EXAMPLES
 The command
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/keyinit.1 man1/keyinit.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/keyinit.1	Mon Dec 20 14:51:25 1999
+++ man1/keyinit.1	Wed Jun 14 10:06:45 2000
@@ -1,4 +1,5 @@
 .\"	@(#)keyinit.1	1.0 (Bellcore) 7/20/93
+.\" %FreeBSD: src/usr.bin/keyinit/keyinit.1,v 1.5.2.1 2000/03/06 11:34:32 sheldonh Exp %
 .\"
 .Dd July 20, 1993
 .Dt KEYINIT 1
@@ -14,7 +15,8 @@
 .Nm Keyinit
 initializes the system so you can use S/Key one-time passwords to
 login.  The program will ask you to enter a secret pass phrase; enter a
-phrase of several words in response. After the S/Key database has been
+phrase of several words in response.
+After the S/Key database has been
 updated you can login using either your regular UNIX password or using
 S/Key one-time passwords. 
 .Pp
@@ -31,8 +33,10 @@
 .Pp
 .Nm Keyinit
 requires you to type your secret password, so it should
-be used only on a secure terminal. For example, on the console of a
-workstation. If you are using
+be used only on a secure terminal.
+For example, on the console of a
+workstation.
+If you are using
 .Nm
 while logged in over an
 untrusted network, follow the instructions given below with the
@@ -63,7 +67,8 @@
 then run
 .Nm key
 in another window to generate the correct 6 English words
-for that count and seed. You can then
+for that count and seed.
+You can then
 "cut" and "paste" them or copy them into the
 .Nm
 window.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/keylogin.1 man1/keylogin.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/keylogin.1	Mon Dec 20 14:51:25 1999
+++ man1/keylogin.1	Wed Jun 14 10:06:45 2000
@@ -1,6 +1,8 @@
 .\" @(#)keylogin.1 1.5 91/03/11 TIRPC 1.0;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
 .\"
+.\" %FreeBSD: src/usr.bin/keylogin/keylogin.1,v 1.2.2.1 2000/03/06 11:34:34 sheldonh Exp %
+.\"
 .Dd September 9, 1987
 .Dt KEYLOGIN 1
 .Os
@@ -14,7 +16,8 @@
 prompts the user for their login password, and uses it to decrypt
 the user's secret key stored in the
 .Xr publickey 5
-database. Once decrypted, the user's key is stored by the local
+database.
+Once decrypted, the user's key is stored by the local
 key server process
 .Xr keyserv 8
 to be used by any secure network services, such as NFS.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/kill.1 man1/kill.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/kill.1	Mon Dec 20 14:44:47 1999
+++ man1/kill.1	Wed Jun 14 10:01:56 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kill.1	8.2 (Berkeley) 4/28/95
-.\" %FreeBSD: src/bin/kill/kill.1,v 1.8.2.1 1999/08/29 14:12:40 peter Exp %
+.\" %FreeBSD: src/bin/kill/kill.1,v 1.8.2.2 2000/01/14 11:15:23 sheldonh Exp %
 .\"
 .Dd April 28, 1995
 .Dt KILL 1
@@ -110,17 +110,14 @@
 TERM (software termination signal)
 .El
 .Pp
-.Nm Kill
-is a built-in to
-.Xr csh  1  ;
-it allows job specifiers of the form ``%...'' as arguments
-so process id's are not as often used as
+Some shells may provide a builtin
 .Nm
-arguments.
-See
-.Xr csh 1
-for details.
+command which is similar or identical to this utility.
+Consult the
+.Xr builtin 1
+manual page.
 .Sh SEE ALSO
+.Xr builtin 1 ,
 .Xr csh 1 ,
 .Xr killall 1 ,
 .Xr ps 1 ,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/last.1 man1/last.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/last.1	Mon Dec 20 14:51:26 1999
+++ man1/last.1	Wed Jun 14 10:06:46 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)last.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/last/last.1,v 1.3.2.1 2000/03/06 11:34:35 sheldonh Exp %
 .\"
 .Dd June 6, 1993
 .Dt LAST 1
@@ -97,7 +98,8 @@
 .Dq Li "last root -t console"
 would list all of
 .Dq Li root Ns 's
-sessions as well as all sessions on the console terminal. If no
+sessions as well as all sessions on the console terminal.
+If no
 users, hostnames or terminals are specified,
 .Nm last
 prints a record of
@@ -127,7 +129,8 @@
 .Xr ac 8
 .Sh BUGS
 If a login shell should terminate abnormally for some reason, it is likely
-that a logout record won't be written to the wtmp file. In this case,
+that a logout record won't be written to the wtmp file.
+In this case,
 .Nm last
 will indicate the logout time as "shutdown".
 .Sh HISTORY
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/ldd.1 man1/ldd.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/ldd.1	Mon Dec 20 14:51:27 1999
+++ man1/ldd.1	Wed Jun 14 10:06:46 2000
@@ -1,3 +1,4 @@
+.\" %FreeBSD: src/usr.bin/ldd/ldd.1,v 1.10.2.3 2000/05/10 15:47:30 phantom Exp %
 .Dd October 22, 1993
 .Dt LDD 1
 .Os FreeBSD
@@ -10,20 +11,24 @@
 .Op Fl f Ar format
 .Ar program ...
 .Sh DESCRIPTION
-.Nm ldd
+.Nm
 displays all shared objects that are needed to run the given program.
-Contrary to nm(1), the list includes
+Contrary to
+.Xr nm 1 ,
+the list includes
 .Dq indirect
 dependencies that are the result of needed shared objects which themselves
 depend on yet other shared objects.
 .Pp
 Zero, one or two
 .Fl f
-options may be given. The argument is a format string passed to
+options may be given.
+The argument is a format string passed to
 .Xr rtld 1
 and allows customization of
-.Nm ldd Ns 's
-output. See
+.Nm Ns 's
+output.
+See
 .Xr rtld 1
 for a list of recognized conversion characters.
 .Pp
@@ -34,14 +39,14 @@
 files for the definitive meaning of all the fields.
 .Sh SEE ALSO
 .Xr ld 1 ,
-.Xr ld.so 1 ,
 .Xr nm 1
 .Sh HISTORY
 A
-.Nm ldd
-utility first appeared in SunOS 4.0, it appeared in its current form
-in FreeBSD 1.1.
+.Nm
+utility first appeared in SunOS 4.0, it appeared in its current form in
+.Fx 1.1 .
 .Pp
 The
 .Fl v
-support is based on code written by John Polstra <jdp@polstra.com>
+support is based on code written by
+.An John Polstra Aq jdp@polstra.com
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/lint.1 man1/lint.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/lint.1	Mon Dec 20 14:52:09 1999
+++ man1/lint.1	Wed Jun 14 10:07:21 2000
@@ -1,4 +1,5 @@
 .\"	$NetBSD: lint.1,v 1.3 1995/10/23 13:45:31 jpo Exp %
+.\" %FreeBSD: src/usr.bin/xlint/xlint/lint.1,v 1.5.2.1 2000/03/06 11:35:33 sheldonh Exp %
 .\"
 .\" Copyright (c) 1994, 1995 Jochen Pohl
 .\" All Rights Reserved.
@@ -59,7 +60,8 @@
 .Nm
 attempts to detect features of the named C program files
 that are likely to be bugs, to be non-portable, or to be
-wasteful. It also performs stricter type checking then does
+wasteful.
+It also performs stricter type checking then does
 the C compiler.
 .Nm
 runs the C preprocessor as its first phase, with the
@@ -75,7 +77,8 @@
 Among the possible problems that are currently noted are
 unreachable statements, loops not entered at the top,
 variables declared and not used, and logical expressions
-with constant values. Function calls are checked for
+with constant values.
+Function calls are checked for
 inconsistencies, such as calls to functions that return
 values in some places and not in others, functions called
 with varying numbers of arguments, function calls that
@@ -86,7 +89,8 @@
 .Pp
 Filename arguments ending with
 .Pa \&.c
-are taken to be C source files. Filename arguments with
+are taken to be C source files.
+Filename arguments with
 names ending with
 .Pa \&.ln
 are taken to be the result of an earlier invocation of
@@ -96,7 +100,8 @@
 .Fl o
 or
 .Fl C
-option in effect. The
+option in effect.
+The
 .Pa \&.ln
 files are analogous to the
 .Pa \&.o
@@ -121,7 +126,8 @@
 .Nm
 appends the standard C lint library
 .Pq Pa llib-lc.ln
-to the end of the list of files. When the
+to the end of the list of files.
+When the
 .Fl i
 option is used, the
 .Pa \&.ln
@@ -132,13 +138,15 @@
 .Fl i
 options are used, the
 .Pa llib-l Ns Ar library Ns Pa \&.ln
-files are ignored. When the
+files are ignored.
+When the
 .Fl i
 option is
 .Em omitted
 the second pass of
 .Nm
-checks this list of files for mutual compatibility. At this point,
+checks this list of files for mutual compatibility.
+At this point,
 if a complaint stems not from a given source file, but from one of
 its included files, the source filename will be printed followed by
 a question mark.
@@ -160,7 +168,8 @@
 .It Fl b
 Report
 .Sy break
-statements that cannot be reached. This is not the default
+statements that cannot be reached.
+This is not the default
 because, unfortunately, most
 .Xr lex 1
 and many
@@ -178,11 +187,13 @@
 .It Fl g
 Don't print warnings for some extensions of
 .Xr gcc 1
-to the C language. Currently these are nonconstant initializers in
+to the C language.
+Currently these are nonconstant initializers in
 automatic aggregate initializations, arithmetic on pointer to void,
 zero sized structures, subscripting of non-lvalue arrays, prototypes
 overriding old style function declarations and long long
-integer types. The
+integer types.
+The
 .Fl g
 flag also turns on the keywords
 .Sy asm
@@ -201,7 +212,8 @@
 .Pa \&.ln
 file for every
 .Pa \&.c
-file on the command line. These
+file on the command line.
+These
 .Pa \&.ln
 files are the product of
 .Nm lint Ns 's
@@ -215,7 +227,8 @@
 In case of redeclarations report the position of the
 previous declaration.
 .It Fl s
-Strict ANSI C mode. Issue warnings and errors required by ANSI C.
+Strict ANSI C mode.
+Issue warnings and errors required by ANSI C.
 Also do not produce warnings for constructs which behave
 differently in traditional C and ANSI C. With the
 .Fl s
@@ -225,14 +238,17 @@
 .It Fl t
 Traditional C mode.
 .Li __STDC__
-is not predefined in this mode. Warnings are printed for constructs
+is not predefined in this mode.
+Warnings are printed for constructs
 not allowed in traditional C. Warnings for constructs which behave
-differently in traditional C and ANSI C are suppressed. Preprocessor
+differently in traditional C and ANSI C are suppressed.
+Preprocessor
 macros describing the machine type (e.g.
 .Li sun3 Ns )
 and machine architecture (e.g.
 .Li m68k Ns )
-are defined without leading and trailing underscores. The keywords
+are defined without leading and trailing underscores.
+The keywords
 .Sy const Ns ,
 .Sy volatile
 and
@@ -264,7 +280,8 @@
 .Pa \&.c
 and
 .Pa \&.ln
-input files. After all global definitions of functions and
+input files.
+After all global definitions of functions and
 variables in these files are written to the newly created library,
 .Nm
 checks all input files, including libraries specified with the
@@ -277,7 +294,8 @@
 .Xr cpp 1 ,
 as if by a
 .Li #define
-directive. If no definition is given,
+directive.
+If no definition is given,
 .Ar name
 is defined as 1.
 .It Fl I Ns Ar directory
@@ -307,16 +325,19 @@
 .Ar outputfile .
 The output file produced is the input that is given to
 .Nm lint Ns 's
-second pass. The
+second pass.
+The
 .Fl o
-option simply saves this file in the named output file. If the
+option simply saves this file in the named output file.
+If the
 .Fl i
 option is also used the files are not checked for compatibility.
 To produce a
 .Pa llib-l Ns Ar library Ns Pa \&.ln
 without extraneous messages, use of the
 .Fl u
-option is suggested. The
+option is suggested.
+The
 .Fl v
 option is useful if the source file(s) for the lint library
 are just external interfaces.
@@ -360,7 +381,8 @@
 .Sy case
 or
 .Sy default
-labelled statement. This directive should be placed immediately
+labelled statement.
+This directive should be placed immediately
 preceding the label.
 .It Li /* LINTLIBRARY */
 At the beginning of a file, mark all functions and variables defined
@@ -375,7 +397,8 @@
 .Li */
 .Xc
 Suppresses any intra-file warning except those dealing with
-unused variables or functions. This directive should be placed
+unused variables or functions.
+This directive should be placed
 on the line immediately preceding where the lint warning occurred.
 .It Li /* LONGLONG */
 Suppress complaints about use of long long integer types.
@@ -389,7 +412,8 @@
 .Nm
 check the first
 .Pq Ar n Ns No -1
-arguments as usual. The
+arguments as usual.
+The
 .Ar n Ns No -th
 argument is interpreted as a
 .Sy printf
@@ -400,10 +424,12 @@
 to treat function declaration prototypes as function definitions
 if
 .Ar n
-is non-zero. This directive can only be used in conjunction with
+is non-zero.
+This directive can only be used in conjunction with
 the
 .Li /* LINTLIBRARY */
-directive. If
+directive.
+If
 .Ar n
 is zero, function prototypes will be treated normally.
 .It Li /* SCANFLIKE Ns Ar n Li */
@@ -411,14 +437,16 @@
 .Nm
 check the first
 .Pq Ar n Ns No -1
-arguments as usual. The
+arguments as usual.
+The
 .Ar n Ns No -th
 argument is interpreted as a
 .Sy scanf
 format string that is used to check the remaining arguments.
 .It Li /* VARARGS Ns Ar n Li */
 Suppress the usual checking for variable numbers of arguments in
-the following function declaration. The data types of the first
+the following function declaration.
+The data types of the first
 .Ar n
 arguments are checked; a missing
 .Ar n
@@ -431,16 +459,19 @@
 .Fl o
 options allows for incremental use of
 .Nm
-on a set of C source files. Generally, one invokes
+on a set of C source files.
+Generally, one invokes
 .Nm
 once for each source file with the
 .Fl i
-option. Each of these invocations produces a
+option.
+Each of these invocations produces a
 .Pa \&.ln
 file that corresponds to the
 .Pa \&.c
 file, and prints all messages that are about just that
-source file. After all the source files have been separately
+source file.
+After all the source files have been separately
 run through
 .Nm lint ,
 it is invoked once more (without the
@@ -449,7 +480,8 @@
 .Pa \&.ln
 files with the needed
 .Fl l Ns Ar library
-options. this will print all the inter-file inconsistencies. This
+options. this will print all the inter-file inconsistencies.
+This
 scheme works well with
 .Xr make 1 ;
 it allows
@@ -464,7 +496,8 @@
 .It Ev LIBDIR
 the directory where the lint libraries specified by the
 .Fl l Ns Ar library
-option must exist. If this environment variable is undefined,
+option must exist.
+If this environment variable is undefined,
 then the default path
 .Pa /usr/libdata/lint
 will be used to search for the libraries.
@@ -503,7 +536,8 @@
 runs, cause certain errors that were reported when the libraries
 were created to be reported again, and cause line numbers and file
 names from the original source used to create those libraries
-to be reported in error messages. For these reasons, it is recommended
+to be reported in error messages.
+For these reasons, it is recommended
 to use the
 .Fl C
 option to create lint libraries.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/lkbib.1 man1/lkbib.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/lkbib.1	Mon Dec 20 14:46:25 1999
+++ man1/lkbib.1	Wed Jun 14 10:03:06 2000
@@ -24,7 +24,7 @@
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
-.TH LKBIB 1 "7 September 1996" "Groff Version 1.11"
+.TH LKBIB 1 "7 September 1996" "Groff Version 1.15"
 .SH NAME
 lkbib \- search bibliographic databases
 .SH SYNOPSIS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/ln.1 man1/ln.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/ln.1	Mon Dec 20 14:44:47 1999
+++ man1/ln.1	Wed Jun 14 10:01:57 2000
@@ -33,23 +33,26 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ln.1	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/bin/ln/ln.1,v 1.6.2.2 1999/08/29 14:12:42 peter Exp %
+.\" %FreeBSD: src/bin/ln/ln.1,v 1.6.2.3 1999/12/29 19:37:50 obrien Exp %
 .\"
 .Dd December 30, 1993
 .Dt LN 1
 .Os BSD 4
 .Sh NAME
-.Nm ln
+.Nm ln ,
+.Nm link
 .Nd make links
 .Sh SYNOPSIS
 .Nm ln
-.Op Fl fs
+.Op Fl fsv
 .Ar source_file
 .Op target_file
 .Nm ln
-.Op Fl fs
+.Op Fl fsv
 .Ar source_file ...
 .Op target_dir
+.Nm link
+.Ar source_file Ar target_file
 .Sh DESCRIPTION
 The
 .Nm
@@ -72,6 +75,10 @@
 Unlink any already existing file, permitting the link to occur.
 .It Fl s
 Create a symbolic link.
+.It Fl v
+Cause
+.Nm
+to be verbose, showing files as they are processed.
 .El
 .Pp
 By default,
@@ -118,6 +125,15 @@
 .Ar target_dir
 to all the named source files.
 The links made will have the same name as the files being linked to.
+.Pp
+When the utility is called as
+.Nm link ,
+exactly two arguments must be supplied,
+neither of which may specify a directory.
+No options may be supplied in this simple mode of operation,
+which performs a
+.Xr link 2
+operation using the two passed arguments.
 .Sh SEE ALSO
 .Xr link 2 ,
 .Xr lstat 2 ,
@@ -125,8 +141,16 @@
 .Xr stat 2 ,
 .Xr symlink 2 ,
 .Xr symlink 7
+.Sh COMPATIBILITY
+The 
+.Fl v
+option is non-standard and its use in scripts is not recommended.
 .Sh HISTORY
 An
 .Nm
 command appeared in
 .At v1 .
+The simplified
+.Nm link
+command conforms to
+.St -susv2 .
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/loadfont.1 man1/loadfont.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/loadfont.1	Mon Dec 20 14:53:31 1999
+++ man1/loadfont.1	Wed Jun 14 10:08:18 2000
@@ -28,6 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)loadfont.1, 3.20, Last Edit-Date: [Tue Apr  4 13:06:00 1995]
+.\" %FreeBSD: src/usr.sbin/pcvt/loadfont/loadfont.1,v 1.6.2.1 2000/03/06 11:36:48 sheldonh Exp %
 .\"
 .Dd April 4, 1995
 .Dt LOADFONT 1
@@ -50,7 +51,8 @@
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl c
-Specifies the slot, the font is to load into. EGA boards have four 
+Specifies the slot, the font is to load into.
+EGA boards have four 
 slots and VGA boards have eight slots available for downloading fonts.
 .It Fl d
 Specifies the devicefile to use.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/locate.1 man1/locate.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/locate.1	Mon Dec 20 14:51:29 1999
+++ man1/locate.1	Wed Jun 14 10:06:48 2000
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)locate.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/locate/locate/locate.1,v 1.11.2.1 1999/08/29 15:29:50 peter Exp %
+.\" %FreeBSD: src/usr.bin/locate/locate/locate.1,v 1.11.2.3 2000/03/06 11:34:39 sheldonh Exp %
 .\"
 .Dd June 6, 1993
 .Dt LOCATE 1
@@ -85,7 +85,8 @@
 and NUL
 .Pq Sq \e0 .
 The 8-bit character support doesn't waste extra space for
-plain ASCII file names. Characters less than 32 or greater than 127
+plain ASCII file names.
+Characters less than 32 or greater than 127
 are stored in 2 bytes.
 
 The following options are available:
@@ -107,7 +108,8 @@
 
 The option
 .Ar database
-may be a colon-separated list of databases. A single colon is a reference
+may be a colon-separated list of databases.
+A single colon is a reference
 to the default database.
 
 $ locate -d $HOME/lib/mydb: foo
@@ -164,7 +166,9 @@
 .Xr mmap 2 
 instead of the 
 .Xr stdio 3 
-library. This is the default behavior. Usually faster in most cases.
+library.
+This is the default behavior.
+Usually faster in most cases.
 .It Fl s
 Use the
 .Xr stdio 3
@@ -217,20 +221,22 @@
 database was built by user 
 .Dq nobody .
 .Xr find 1
-skip directories,
+skips directories,
 which are not readable for user 
 .Dq nobody , 
 group
 .Dq nobody ,
 or
-world. E.g. if your HOME directory ist not world-readable, all your
+world.
+E.g. if your HOME directory is not world-readable, all your
 files are 
 .Ar not
 in the database.
 
 The
 .Nm
-database is not byte order independent. It is not possible
+database is not byte order independent.
+It is not possible
 to share the databases between machines with different byte order.
 The current 
 .Nm
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/login.1 man1/login.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/login.1	Mon Dec 20 15:01:41 1999
+++ man1/login.1	Wed Jun 14 10:13:18 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)login.1	8.2 (Berkeley) 5/5/94
-.\" %FreeBSD: src/usr.bin/login/login.1,v 1.13.2.2 1999/08/29 15:30:01 peter Exp %
+.\" %FreeBSD: src/usr.bin/login/login.1,v 1.13.2.3 2000/01/14 11:15:25 sheldonh Exp %
 .\"
 .Dd May 5, 1994
 .Dt LOGIN 1
@@ -143,13 +143,12 @@
 limits granted to a login, process priorities and many other aspects of
 a user's login environment.
 .Pp
-The standard shells,
-.Xr csh 1
-and
-.Xr sh 1 ,
-do not fork before executing the
+Some shells may provide a builtin
 .Nm
-utility.
+command which is similar or identical to this utility.
+Consult the
+.Xr builtin 1
+manual page.
 .Sh FILES
 .Bl -tag -width /var/mail/userXXX -compact
 .It Pa /etc/fbtab
@@ -180,7 +179,9 @@
 configure authentication services
 .El
 .Sh SEE ALSO
+.Xr builtin 1 ,
 .Xr chpass 1 ,
+.Xr csh 1 ,
 .Xr passwd 1 ,
 .Xr rlogin 1 ,
 .Xr skey 1 ,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/lookbib.1 man1/lookbib.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/lookbib.1	Mon Dec 20 14:46:26 1999
+++ man1/lookbib.1	Wed Jun 14 10:03:06 2000
@@ -16,7 +16,7 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
-.TH LOOKBIB 1 "7 September 1996" "Groff Version 1.11"
+.TH LOOKBIB 1 "7 September 1996" "Groff Version 1.15"
 .SH NAME
 lookbib \- search bibliographic databases
 .SH SYNOPSIS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/lp.1 man1/lp.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/lp.1	Mon Dec 20 14:52:40 1999
+++ man1/lp.1	Wed Jun 14 10:07:43 2000
@@ -31,7 +31,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/lpr/lp/lp.1,v 1.7.2.1 1999/08/29 15:43:16 peter Exp %
+.\" %FreeBSD: src/usr.sbin/lpr/lp/lp.1,v 1.7.2.3 2000/03/08 10:18:10 sheldonh Exp %
 .\"
 .Dd January 22, 1995
 .Dt LP 1
@@ -41,7 +41,8 @@
 .Nd front-end to the print spooler
 .Sh SYNOPSIS
 .Nm lp
-.Op Fl c
+.Op Fl cs
+.Op Fl o Ar option
 .Op Fl d Ar printer
 .Op Fl n Ar num
 .Op Ar name ...
@@ -52,7 +53,7 @@
 specification.  It effectively invokes
 .Xr lpr 1
 with the proper set of arguments.
-
+.Pp
 It generally prints the named files on the destination printer.
 .Pp
 The following options are available:
@@ -64,7 +65,8 @@
 longer required.  The application can then safely delete or modify the
 files without affecting the output operation.
 .It Fl d Ar dest
-Specify a particular printer. If no
+Specify a particular printer.
+If no
 .Fl d
 is provided on the command line, the contents of the environment
 variables
@@ -77,6 +79,15 @@
 Specify that
 .Ar num
 copies of each of the named files shall be printed.
+.It Fl o Ar option
+Printer specific options.
+Not supported, provided only as a compatibility
+option for SVR.
+.It Fl s
+Silent operation.
+Not supported,
+provided only as a compatibility option for
+.St -susv2 .
 .El
 .Sh ENVIRONMENT
 As described above, the variables
@@ -84,7 +95,6 @@
 and
 .Ev PRINTER
 are examined to select the destination printer.
-
 .Sh SEE ALSO
 .Xr lpr 1
 .Sh STANDARDS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/lpr.1 man1/lpr.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/lpr.1	Mon Dec 20 14:52:41 1999
+++ man1/lpr.1	Wed Jun 14 10:07:44 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From @(#)lpr.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.sbin/lpr/lpr/lpr.1,v 1.8.2.1 1999/08/29 15:43:28 peter Exp %
+.\" %FreeBSD: src/usr.sbin/lpr/lpr/lpr.1,v 1.8.2.2 2000/03/06 11:36:19 sheldonh Exp %
 .\" "
 .Dd June 6, 1993
 .Dt LPR 1
@@ -57,7 +57,8 @@
 become available.  If no names appear, the standard input is assumed.
 .Pp
 The following single letter options are used to notify the line printer
-spooler that the files are not standard text files. The spooling daemon will
+spooler that the files are not standard text files.
+The spooling daemon will
 use the appropriate filters to print the data accordingly.
 .Bl -tag -width indent
 .It Fl c
@@ -143,7 +144,8 @@
 cat foo.c bar.c more.c \&| lpr \-#3
 .Ed
 .Pp
-will give three copies of the concatenation of the files. Often
+will give three copies of the concatenation of the files.
+Often
 a site will disable this feature to encourage use of a photocopier
 instead.
 .It Xo
@@ -249,5 +251,6 @@
 .Xr troff 1
 and
 .Xr tex
-reside on the host with the printer. It is currently not possible to
+reside on the host with the printer.
+It is currently not possible to
 use local font libraries.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/ls.1 man1/ls.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/ls.1	Mon Dec 20 14:44:47 1999
+++ man1/ls.1	Wed Jun 14 10:01:57 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\" %FreeBSD: src/bin/ls/ls.1,v 1.26.2.3 1999/08/29 14:12:47 peter Exp %
+.\" %FreeBSD: src/bin/ls/ls.1,v 1.26.2.4 2000/03/03 14:58:53 sheldonh Exp %
 .\"
 .Dd July 29, 1994
 .Dt LS 1
@@ -100,7 +100,8 @@
 options are specified.
 .It Fl L
 If argument is a symbolic link, list the file or directory the link references
-rather than the link itself. This option cancels the
+rather than the link itself.
+This option cancels the
 .Fl P
 option.
 .It Fl P
@@ -145,7 +146,8 @@
 option is specified, print the file size allocation in kilobytes,
 not blocks.  This option overrides the environment variable BLOCKSIZE.
 .It Fl l
-(The lowercase letter ``ell.'')  List in long format. (See below.)
+(The lowercase letter ``ell.'')  List in long format.
+(See below.)
 If the output is to a terminal, a total sum for all the file
 sizes is output on a line before the long listing.
 .It Fl o
@@ -252,7 +254,8 @@
 .Pp
 If the file is a character special or block special file,
 the major and minor device numbers for the file are displayed
-in the size field. If the file is a symbolic link the pathname of the
+in the size field.
+If the file is a symbolic link the pathname of the
 linked-to file is preceded by
 .Dq \-> .
 .Pp
@@ -317,7 +320,8 @@
 searchable.
 .It Sy \-
 The file is neither readable, writable, executable,
-nor set-user-ID nor set-group-ID mode, nor sticky. (See below.)
+nor set-user-ID nor set-group-ID mode, nor sticky.
+(See below.)
 .El
 .Pp
 These next two apply only to the third character in the last group
@@ -327,7 +331,8 @@
 The sticky bit is set
 (mode
 .Li 1000 ) ,
-but not execute or search permission. (See
+but not execute or search permission.
+(See
 .Xr chmod 1
 or
 .Xr sticky 8 . )
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/m4.1 man1/m4.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/m4.1	Mon Dec 20 14:51:31 1999
+++ man1/m4.1	Wed Jun 14 10:06:49 2000
@@ -1,5 +1,5 @@
 .\"
-.\"	@(#) %FreeBSD: src/usr.bin/m4/m4.1,v 1.7.2.2 1999/08/29 15:30:09 peter Exp %
+.\"	@(#) %FreeBSD: src/usr.bin/m4/m4.1,v 1.7.2.3 2000/06/08 06:11:23 kris Exp %
 .\"
 .Dd January 26, 1993
 .Dt M4 1
@@ -132,7 +132,7 @@
 0 if none.
 .It m4wrap
 Allows you to define what happens at the final EOF, usually for cleanup
-purposes (e.g., m4wrap("cleanup(tempfile)") causes the macro cleanup to
+purposes (e.g., m4wrap("cleanup(tempfile)") causes the macro cleanup to be
 invoked after all other processing is done.)
 .It maketemp
 Translates the string XXXXX in the first argument with the current process
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/mail.1 man1/mail.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/mail.1	Mon Dec 20 14:51:31 1999
+++ man1/mail.1	Wed Jun 14 10:06:50 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mail.1	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/usr.bin/mail/mail.1,v 1.15.2.2 1999/11/22 10:33:49 jkoshy Exp %
+.\" %FreeBSD: src/usr.bin/mail/mail.1,v 1.15.2.3 2000/03/06 11:34:42 sheldonh Exp %
 .\"
 .Dd December 30, 1993
 .Dt MAIL 1
@@ -1037,7 +1037,8 @@
 .It Pa /usr/share/misc/mail.rc
 .It Pa /usr/local/etc/mail.rc
 .It Pa /etc/mail.rc
-System-wide initialization files. Each file will be sourced, in order,
+System-wide initialization files.
+Each file will be sourced, in order,
 if it exists.
 .El
 .Sh SEE ALSO
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/make.1 man1/make.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/make.1	Mon Dec 20 14:51:32 1999
+++ man1/make.1	Wed Jun 14 10:06:50 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
-.\" %FreeBSD: src/usr.bin/make/make.1,v 1.16.2.5 1999/12/05 12:36:19 cracauer Exp %
+.\" %FreeBSD: src/usr.bin/make/make.1,v 1.16.2.8 2000/05/20 20:18:49 will Exp %
 .\"
 .Dd March 19, 1994
 .Dt MAKE 1
@@ -109,6 +109,9 @@
 on error.
 .It Ar j
 Print debugging information about running multiple shells.
+.It Ar l
+Print commands in Makefiles regardless of whether or not they are prefixed
+by @ or other "quiet" flags.  Also known as "loud" behavior.
 .It Ar m
 Print debugging information about making targets, including modification
 dates.
@@ -149,7 +152,8 @@
 .It Fl j Ar max_jobs
 Specify the maximum number of jobs that
 .Nm make
-may have running at any one time. Turns compatibility mode off, unless the
+may have running at any one time.
+Turns compatibility mode off, unless the
 .Ar B
 flag is also specified.
 .It Fl k
@@ -410,7 +414,7 @@
 .Ql \&$$
 expands to a single dollar
 sign.
-.It Va .MAKE
+.It Va MAKE
 The name that
 .Nm make
 was executed with
@@ -558,7 +562,8 @@
 .Ar %
 then it is assumed that they are
 anchored at the end of each word, so only suffixes or entire
-words may be replaced. Otherwise
+words may be replaced.
+Otherwise
 .Ar %
 is the substring of
 .Ar old_string
@@ -588,7 +593,8 @@
 Un-define the specified global variable.
 Only global variables may be un-defined.
 .It Ic \&.error Ar message
-Terminate processing of the makefile immediately. The filename of the
+Terminate processing of the makefile immediately.
+The filename of the
 makefile, the line on which the error was encountered and the specified
 message are printed to standard output and
 .Nm make
@@ -792,7 +798,8 @@
 .El
 After the for
 .Ic expression
-is evaluated, it is split into words. The
+is evaluated, it is split into words.
+The
 iteration
 .Ic variable
 is successively set to each word, and substituted in the
@@ -854,7 +861,8 @@
 If special
 .Ic .WAIT
 source is appears in a dependency line, the sources that precede it are
-made before the sources that succeed it in the line. Loops are not being
+made before the sources that succeed it in the line.
+Loops are not being
 detected and targets that form loops will be silently ignored.
 .El
 .Sh "SPECIAL TARGETS"
@@ -931,7 +939,8 @@
 .It Ic .PHONY
 Apply the
 .Ic .PHONY
-attribute to any specified sources. Targets with this attribute are always
+attribute to any specified sources.
+Targets with this attribute are always
 considered to be out of date.
 .It Ic .PRECIOUS
 Apply the
Only in man1: makeinfo.1
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/man.1 man1/man.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/man.1	Mon Dec 20 14:46:37 1999
+++ man1/man.1	Wed Jun 14 10:03:15 2000
@@ -12,6 +12,8 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
+.\" %FreeBSD: src/gnu/usr.bin/man/man/man.man,v 1.6.2.3 2000/04/05 14:02:35 sheldonh Exp %
+.\"
 .Dd Jan 5, 1991
 .Dt MAN 1
 .Os
@@ -116,9 +118,9 @@
 is set, its value is used to determine the set of preprocessors run
 before running nroff or troff.  By default, pages are passed through
 the table preprocessor before nroff.
-.It Ev MANSEC
+.It Ev MANSECT
 If
-.Ev MANSEC
+.Ev MANSECT
 is set, its value is used to determine which manual sections to search.
 .It Ev PAGER
 If
@@ -128,6 +130,17 @@
 .Nm more -s
 is used.
 .El
+.Sh EXAMPLES
+.Pp
+Normally, to look at the relevant manpage information for getopt,
+one would use:
+.Dl man getopt
+.Pp
+However, when referred to a specific section of the manual,
+such as
+.Xr getopt 3 ,
+one would use:
+.Dl man 3 getopt
 .Sh SEE ALSO
 .Xr apropos 1 ,
 .Xr groff 1 ,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/mcon.1 man1/mcon.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/mcon.1	Mon Dec 20 14:53:32 1999
+++ man1/mcon.1	Wed Jun 14 10:08:20 2000
@@ -28,6 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)mcon.1, 3.00, Last Edit-Date: [Mon Jan 10 21:28:22 1994]
+.\" %FreeBSD: src/usr.sbin/pcvt/mcon/mcon.1,v 1.5.2.1 2000/03/06 11:36:49 sheldonh Exp %
 .\"
 .Dd January 3, 1994
 .Dt MCON 1
@@ -61,10 +62,12 @@
 .Nm
 program must be called with an argument
 .Ar device
-that specifies the device node used for the mouse emulation. This is
+that specifies the device node used for the mouse emulation.
+This is
 usually the first device node of the
 .Xr pcvt 4
-driver not being used as a virtual terminal device. E.\ g., if you
+driver not being used as a virtual terminal device.
+E.\ g., if you
 have configured eight virtual terminals
 .Pq the default value ,
 named
@@ -90,7 +93,8 @@
 .Ar button key
 to emulate either the left, middle, or right mouse button.
 .Ar Button key
-is the usual name for that key. Normal ASCII keys are denoted by the
+is the usual name for that key.
+Normal ASCII keys are denoted by the
 character they're labeled with, function keys are named
 .Em f1
 through
@@ -107,8 +111,10 @@
 .It Fl a Ar accel-time
 Set the time limit for the internal accelerator to
 .Ar accel-time
-milliseconds. Key events occurring after a longer time than this limit
-will move the mouse cursor in single steps. Key events arriving more
+milliseconds.
+Key events occurring after a longer time than this limit
+will move the mouse cursor in single steps.
+Key events arriving more
 frequently will move the cursor accelerated by a factor of 6. Note that
 despite of
 .Em milliseconds
@@ -120,9 +126,11 @@
 .It Fl s Ar 1 | true | yes
 The first form disables, the second form enables the
 .Em sticky
-behaviour of the mouse buttons. Sticky mouse keys behave much like
+behaviour of the mouse buttons.
+Sticky mouse keys behave much like
 toggle-buttons: on first press, they become active, on second press,
-they're deactivated. Pressing another button will deactivate any
+they're deactivated.
+Pressing another button will deactivate any
 other sticky button anyway.
 
 Sticky buttons might be more convenient since you don't need 20 fingers
@@ -143,7 +151,8 @@
 .Sh BUGS
 The key names used to map the button-emulating keys to scan codes
 .Pq and vica verse
-are based on the American keyboard layout. This would usually not
+are based on the American keyboard layout.
+This would usually not
 cause any trouble since the
 .Dq button-of-choice
 is certainly some function key that should be equal for any national
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/mk_cmds.1 man1/mk_cmds.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/mk_cmds.1	Mon Dec 20 14:51:32 1999
+++ man1/mk_cmds.1	Wed Jun 14 10:06:51 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.bin/mk_cmds/mk_cmds.1,v 1.1.2.1 1999/12/12 03:04:11 chris Exp %
+.\" %FreeBSD: src/usr.bin/mk_cmds/mk_cmds.1,v 1.1.2.2 1999/12/20 09:41:41 asmodai Exp %
 .Dd November 14, 1999
 .Dt MK_CMDS 1
 .Os FreeBSD
@@ -83,7 +83,7 @@
 .Qq This is the explanation for anothertest ,
 anothertest, (dont_list, dont_summarize);
 .Pp
-unimplemented ss_lasttest
+unimplemented ss_lasttest,
 .Qq This is the explanation for lasttest ,
 lasttest, lt;
 .Sh HISTORY
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/mklocale.1 man1/mklocale.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/mklocale.1	Mon Dec 20 14:51:33 1999
+++ man1/mklocale.1	Wed Jun 14 10:06:51 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mklocale.1	8.2 (Berkeley) 4/18/94
-.\"	%FreeBSD: src/usr.bin/mklocale/mklocale.1,v 1.3.2.1 1999/09/20 09:49:57 phantom Exp %
+.\"	%FreeBSD: src/usr.bin/mklocale/mklocale.1,v 1.3.2.2 1999/12/17 14:38:53 phantom Exp %
 .\"
 .Dd April 18, 1994
 .Dt MKLOCALE 1
@@ -43,8 +43,14 @@
 .Nd make LC_CTYPE locale files
 .Sh SYNOPSIS
 .Nm mklocale
+.Op Fl d
 .Ar "< src-file"
 .Ar "> language/LC_CTYPE"
+.Nm mklocale
+.Op Fl d
+.Fl o
+.Ar language/LC_CTYPE
+.Ar src-file
 .Sh DESCRIPTION
 The
 .Nm mklocale
@@ -62,6 +68,14 @@
 associated data following.  C style comments are used
 to place comments in the file.
 .Pp
+Following options are available:
+.Bl -tag -width indent
+.It Fl d
+Turns on debuging messages.
+.It Fl o
+Specify output file.
+.El
+.Pp
 Besides the keywords which will be listed below,
 the following are valid tokens in
 .Ar src-file :
@@ -242,7 +256,7 @@
 Defines runes which are phonograms, printable and graphic.
 .El
 .Sh SEE ALSO
-.Xr mklocale 1 ,
+.Xr colldef 1 ,
 .Xr mbrune 3 ,
 .Xr rune 3 ,
 .Xr setlocale 3 ,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/mkstr.1 man1/mkstr.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/mkstr.1	Mon Dec 20 14:51:36 1999
+++ man1/mkstr.1	Wed Jun 14 10:06:54 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkstr.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/mkstr/mkstr.1,v 1.4.2.1 2000/03/06 11:34:46 sheldonh Exp %
 .\"
 .Dd June 6, 1993
 .Dt MKSTR 1
@@ -128,7 +129,8 @@
 .Sh BUGS
 .Nm
 was intended for the limited architecture of the PDP 11 family.
-Very few programs actually use it. The Pascal interpreter,
+Very few programs actually use it.
+The Pascal interpreter,
 .Xr \&pi 1
 and the editor,
 .Xr \&ex 1
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/mktemp.1 man1/mktemp.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/mktemp.1	Mon Dec 20 14:51:36 1999
+++ man1/mktemp.1	Wed Jun 14 10:06:54 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.3.2.1 1999/10/30 14:05:49 phantom Exp %
+.\" %FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.3.2.2 2000/03/06 11:34:48 sheldonh Exp %
 .\" From: $OpenBSD: mktemp.1,v 1.8 1998/03/19 06:13:37 millert Exp %
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -87,7 +87,8 @@
 .Ar prefix
 and the
 .Ev TMPDIR
-environment variable if set. The default location if
+environment variable if set.
+The default location if
 .Ev TMPDIR
 is not set is
 .Pa /tmp .
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/more.1 man1/more.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/more.1	Mon Dec 20 14:51:37 1999
+++ man1/more.1	Wed Jun 14 10:06:55 2000
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)more.1	8.2 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/more/more.1,v 1.7.2.6 1999/08/29 15:31:17 peter Exp %
+.\" %FreeBSD: src/usr.bin/more/more.1,v 1.7.2.7 2000/03/06 11:34:50 sheldonh Exp %
 .\"
 .Dd April 18, 1994
 .Dt MORE 1
@@ -135,7 +135,8 @@
 .Fl x
 option sets tab stops every
 .Ar N
-positions. The default for
+positions.
+The default for
 .Ar N
 is 8.
 .It Fl /
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/msgs.1 man1/msgs.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/msgs.1	Mon Dec 20 14:51:37 1999
+++ man1/msgs.1	Wed Jun 14 10:06:55 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)msgs.1	8.2 (Berkeley) 4/28/95
+.\" %FreeBSD: src/usr.bin/msgs/msgs.1,v 1.5.2.2 2000/03/06 11:34:52 sheldonh Exp %
 .\"
 .Dd April 28, 1995
 .Dt MSGS 1
@@ -86,7 +87,8 @@
 will pick up where it last left off.
 .It Fl s
 Append the current message to the file ``Messages'' in the current directory;
-`s\-' will save the previously displayed message. A `s' or `s\-' may
+`s\-' will save the previously displayed message.
+A `s' or `s\-' may
 be followed by a space and a file name to receive the message replacing
 the default ``Messages''.
 .It Fl m
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/mt.1 man1/mt.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/mt.1	Mon Dec 20 14:51:37 1999
+++ man1/mt.1	Wed Jun 14 10:06:56 2000
@@ -31,6 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mt.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/mt/mt.1,v 1.12.2.4 2000/03/06 11:34:54 sheldonh Exp %
 .\"
 .Dd June 6, 1993
 .Dt MT 1
@@ -93,17 +94,26 @@
 .Ar count
 setmarks.
 .It Cm rdhpos
-Read Hardware block position. Some drives do not support this. The block
-number reported is specific for that hardware only. The count argument is
+Read Hardware block position.
+Some drives do not support this.
+The block
+number reported is specific for that hardware only.
+The count argument is
 ignored.
 .It Cm rdspos
-Read SCSI logical block position. Some drives do not support this. The
+Read SCSI logical block position.
+Some drives do not support this.
+The
 count argument is ignored.
 .It Cm sethpos
-Set Hardware block position. Some drives do not support this. The count
+Set Hardware block position.
+Some drives do not support this.
+The count
 argument is interpreted as a hardware block to which to position the tape.
 .It Cm setspos
-Set SCSI logical block position. Some drives do not support this. The count
+Set SCSI logical block position.
+Some drives do not support this.
+The count
 argument is interpreted as a SCSI logical block to which to position the tape.
 .It Cm rewind
 Rewind the tape
@@ -118,20 +128,26 @@
 Re-tension the tape
 (one full wind forth and back, Count is ignored).
 .It Cm status
-Print status information about the tape unit. For SCSI magnetic tape devices,
+Print status information about the tape unit.
+For SCSI magnetic tape devices,
 the current operating modes of density, blocksize, and whether compression
-is enabled is reported. The current state of the driver (what it thinks that
-it is doing with the device) is reported. If the driver knows the relative
-position from BOT (in terms of filemarks and records), it prints that. Note
+is enabled is reported.
+The current state of the driver (what it thinks that
+it is doing with the device) is reported.
+If the driver knows the relative
+position from BOT (in terms of filemarks and records), it prints that.
+Note
 that this information is not definitive (only BOT, End of Recorded Media, and
 hardware or SCSI logical block position (if the drive supports such) are
 considered definitive tape positions).
 .It Cm errstat
-Print (and clear) error status information about this device. For every normal
+Print (and clear) error status information about this device.
+For every normal
 operation (e.g., a read or a write) and every control operation (e.g,, a
 rewind), the driver stores up the last command executed and it's associated
 status and any residual counts (if any). This command retrieves and prints this
-information. If possible, this also clears any latched error information.
+information.
+If possible, this also clears any latched error information.
 .It Cm blocksize
 Set the block size for the tape unit.  Zero means variable-length
 blocks.
@@ -146,18 +162,21 @@
 exactly, an informational message is printed about what the given
 string has been taken for.
 .It Cm geteotmodel
-Fetch and print out the current EOT filemark model. The model states how
+Fetch and print out the current EOT filemark model.
+The model states how
 many filemarks will be written at close if a tape was being written.
 .It Cm seteotmodel
 Set (from the
 .Ar count
 argument)
-and print out the current and EOT filemark model. Typically this will be
+and print out the current and EOT filemark model.
+Typically this will be
 .Ar 2
 filemarks, but some devices (typically QIC cartridge drives) can
 only write
 .Ar 1
-filemark. Currently you can only choose a value of
+filemark.
+Currently you can only choose a value of
 .Ar 1
 or
 .Ar 2 .
@@ -281,7 +300,7 @@
 2. Parallel recorded.
 3. Old format known as QIC-11.
 5. Helical scan.
-6. This is not an American National Standard. The reference is based on
+6. This is not an American National Standard.  The reference is based on
    an industry standard definition of the media format.
 .Ed
 
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/neqn.1 man1/neqn.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/neqn.1	Mon Dec 20 14:46:21 1999
+++ man1/neqn.1	Wed Jun 14 10:03:03 2000
@@ -1,4 +1,4 @@
-.TH NEQN 1 "14 September 1997" "Groff Version 1.11"
+.TH NEQN 1 "14 September 1997" "Groff Version 1.15"
 .SH NAME
 neqn \- format equations for ascii output
 .SH SYNOPSIS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/netstat.1 man1/netstat.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/netstat.1	Mon Dec 20 14:51:39 1999
+++ man1/netstat.1	Wed Jun 14 10:06:56 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)netstat.1	8.8 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/netstat/netstat.1,v 1.11.2.3 1999/10/30 14:42:19 phantom Exp %
+.\" %FreeBSD: src/usr.bin/netstat/netstat.1,v 1.11.2.5 2000/03/06 11:34:56 sheldonh Exp %
 .\"
 .Dd April 18, 1994
 .Dt NETSTAT 1
@@ -40,7 +40,7 @@
 .Nd show network status
 .Sh SYNOPSIS
 .Nm netstat
-.Op Fl Aan
+.Op Fl AaLn
 .Op Fl f Ar address_family
 .Op Fl M Ar core
 .Op Fl N Ar system
@@ -148,6 +148,12 @@
 for each Ethernet interface and for each IP interface address.
 Multicast addresses are shown on separate lines following the interface
 address with which they are associated.
+.It Fl L
+Show the size of the various listen queues.
+The first count shows the
+number of unaccepted connections.
+The second count shows the amount of unaccepted incomplete connections.
+The third count is the maximum number of queued connections.
 .It Fl M
 Extract values associated with the name list from the specified core
 instead of the default
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/nice.1 man1/nice.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/nice.1	Mon Dec 20 14:51:39 1999
+++ man1/nice.1	Wed Jun 14 10:06:56 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nice.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/nice/nice.1,v 1.7.2.2 1999/08/29 15:31:40 peter Exp %
+.\" %FreeBSD: src/usr.bin/nice/nice.1,v 1.7.2.3 2000/01/14 11:15:26 sheldonh Exp %
 .\"
 .Dd June 6, 1993
 .Dt NICE 1
@@ -54,8 +54,8 @@
 is not given
 .Nm 
 assumed the value 10.
-The priority is a value in the range -20 to 20. The default priority
-is 0, priority 20 is the lowest possible. 
+The priority is a value in the range -20 to 20.
+The default priority is 0, priority 20 is the lowest possible. 
 .Nm Nice
 will execute
 .Ar command
@@ -73,6 +73,13 @@
 The returned exit status is the exit value from the
 command executed by
 .Nm nice .
+.Pp
+Some shells may provide a builtin
+.Nm
+command which is similar or identical to this utility.
+Consult the
+.Xr builtin 1
+manual page.
 .Sh EXAMPLES
 .Pp
 $ nice -5 date
@@ -89,6 +96,7 @@
 at priority -19 assuming the priority of the
 shell is 0 and you are the super-user.
 .Sh SEE ALSO
+.Xr builtin 1 ,
 .Xr csh 1 ,
 .Xr idprio 1 ,
 .Xr rtprio 1 ,
@@ -100,21 +108,3 @@
 .Nm
 command appeared in
 .At v6 .
-.Sh BUGS
-.Nm Nice
-is particular to
-.Xr sh  1  .
-If you use
-.Xr csh  1  ,
-then commands executed with ``&'' are automatically immune to hangup
-signals while in the background.
-.Pp
-.Nm Nice
-is built into
-.Xr csh  1
-with a slightly different syntax than described here.  The form
-.Ql nice +10
-nices to positive nice, and
-.Ql nice \-10
-can be used
-by the super-user to give a process more of the processor.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/nohup.1 man1/nohup.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/nohup.1	Mon Dec 20 14:51:40 1999
+++ man1/nohup.1	Wed Jun 14 10:06:57 2000
@@ -33,6 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nohup.1	8.1 (Berkeley) 6/6/93
+.\"	%FreeBSD: src/usr.bin/nohup/nohup.1,v 1.2.2.1 2000/01/14 11:15:27 sheldonh Exp %
 .\"
 .Dd June 6, 1993
 .Dt NOHUP 1
@@ -53,7 +54,8 @@
 its arguments
 and at this time sets the signal
 .Dv SIGHUP
-to be ignored. The signal
+to be ignored.
+The signal
 .Dv SIGQUIT
 may also be set
 to be ignored.
@@ -67,6 +69,13 @@
 .Nm Nohup
 exits 1 if an error occurs, otherwise the exit status is that of
 .Ar command  .
+.Pp
+Some shells may provide a builtin
+.Nm
+command which is similar or identical to this utility.
+Consult the
+.Xr builtin 1
+manual page.
 .Sh ENVIRONMENT
 The following variable is utilized by
 .Nm nohup .
@@ -81,6 +90,8 @@
 to create the file.
 .El
 .Sh SEE ALSO
+.Xr builtin 1 ,
+.Xr csh 1 ,
 .Xr signal 3
 .Sh STANDARDS
 The
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/nroff.1 man1/nroff.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/nroff.1	Mon Dec 20 14:46:27 1999
+++ man1/nroff.1	Wed Jun 14 10:03:07 2000
@@ -1,5 +1,5 @@
 .ig \"-*- nroff -*-
-Copyright (C) 1989-1995 Free Software Foundation, Inc.
+Copyright (C) 1989-1999 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -16,10 +16,10 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 
-	%FreeBSD: src/contrib/groff/nroff/nroff.man,v 1.2.4.1 1999/11/02 12:33:21 phantom Exp %
+	%FreeBSD: src/contrib/groff/nroff/nroff.man,v 1.2.4.2 2000/03/09 20:11:06 asmodai Exp %
 
 ..
-.TH NROFF 1 "2 November 1999" "Groff Version 1.11"
+.TH NROFF 1 "10 March 2000" "Groff Version 1.15"
 .SH NAME
 nroff \- emulate nroff command with groff
 .SH SYNOPSIS
@@ -94,6 +94,13 @@
 .B \-q
 or
 .BR \-s .
+Options 
+.B \-S
+(safer) and
+.B \-U
+(unsafe) are passed to groff. 
+.B \-S
+is passed by default.
 .SH "SEE ALSO"
 .BR groff (1),
 .BR troff (1),
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/passwd.1 man1/passwd.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/passwd.1	Mon Dec 20 14:51:43 1999
+++ man1/passwd.1	Wed Jun 14 10:06:58 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)passwd.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/passwd/passwd.1,v 1.11.2.2 1999/08/29 15:31:54 peter Exp %
+.\" %FreeBSD: src/usr.bin/passwd/passwd.1,v 1.11.2.3 2000/03/06 11:34:58 sheldonh Exp %
 .\"
 .Dd June 6, 1993
 .Dt PASSWD 1
@@ -92,10 +92,12 @@
 if only the local password is modified.
 .Sh NIS INTERACTION
 .Nm Passwd
-has built-in support for NIS. If a user exists in the NIS password
+has built-in support for NIS.
+If a user exists in the NIS password
 database but does not exist locally,
 .Nm passwd
-automatically switches into ``yppasswd'' mode. If the specified
+automatically switches into ``yppasswd'' mode.
+If the specified
 user does not exist in either the local password database of the
 NIS password maps,
 .Nm passwd
@@ -108,9 +110,11 @@
 it will allow any changes to the NIS password maps).
 This restriction applies even to the
 super-user, with one important exception: the password authentication is
-bypassed for the super-user on the NIS master server. This means that
+bypassed for the super-user on the NIS master server.
+This means that
 the super-user on the NIS master server can make unrestricted changes to
-anyone's NIS password. The super-user on NIS client systems and NIS slave
+anyone's NIS password.
+The super-user on NIS client systems and NIS slave
 servers still needs to provide a password before the update will be processed.
 .Pp
 The following additional options are supported for use with NIS:
@@ -127,35 +131,43 @@
 .Fl l
 flag can be used to force
 .Nm passwd
-into ``local only'' mode. This flag can be used to change the entry
+into ``local only'' mode.
+This flag can be used to change the entry
 for a local user when an NIS user exists with the same login name.
 For example, you will sometimes find entries for system ``placeholder''
 users such as
 .Pa bin
 or
 .Pa daemon
-in both the NIS password maps and the local user database. By
+in both the NIS password maps and the local user database.
+By
 default,
 .Nm passwd
-will try to change the NIS password. The
+will try to change the NIS password.
+The
 .Fl l
 flag can be used to change the local password instead.
 .It Fl d Ar domain
-Specify what domain to use when changing an NIS password. By default,
+Specify what domain to use when changing an NIS password.
+By default,
 .Nm passwd
-assumes that the system default domain should be used. This flag is
+assumes that the system default domain should be used.
+This flag is
 primarily for use by the superuser on the NIS master server: a single
-NIS server can support multiple domains. It is also possible that the
+NIS server can support multiple domains.
+It is also possible that the
 domainname on the NIS master may not be set (it is not necessary for
 an NIS server to also be a client) in which case the
 .Nm passwd
 command needs to be told what domain to operate on.
 .It Fl s Ar host
-Specify the name of an NIS server. This option, in conjunction
+Specify the name of an NIS server.
+This option, in conjunction
 with the
 .Fl d
 option, can be used to change an NIS password on a non-local NIS
-server. When a domain is specified with the
+server.
+When a domain is specified with the
 .Fl d
 option and
 .Nm passwd
@@ -163,14 +175,16 @@
 the local domainname isn't set), the name of the NIS master is assumed to
 be ``localhost''. This can be overidden with the
 .Fl s
-flag. The specified hostname need not be the name of an NIS master: the
+flag.
+The specified hostname need not be the name of an NIS master: the
 name of the NIS master for a given map can be determined by querying any
 NIS server (master or slave) in a domain, so specifying the name of a
 slave server will work equally well.
 .Pp
 .It Fl o
 Do not automatically override the password authentication checks for the
-super-user on the NIS master server; assume 'old' mode instead. This
+super-user on the NIS master server; assume 'old' mode instead.
+This
 flag is of limited practical use but is useful for testing.
 .El
 .Sh FILES
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/pax.1 man1/pax.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/pax.1	Mon Dec 20 14:44:49 1999
+++ man1/pax.1	Wed Jun 14 10:01:59 2000
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
-.\" %FreeBSD: src/bin/pax/pax.1,v 1.8.2.2 1999/08/29 14:13:08 peter Exp %
+.\" %FreeBSD: src/bin/pax/pax.1,v 1.8.2.3 2000/03/03 14:58:54 sheldonh Exp %
 .\"
 .Dd April 18, 1994
 .Dt PAX 1
@@ -480,7 +480,8 @@
 .It Fl k
 Do not overwrite existing files.
 .It Fl l
-Link files. (The letter ell).
+Link files.
+(The letter ell).
 In the
 .Em copy
 mode (
@@ -623,7 +624,8 @@
 .Cm g
 continues to apply the substitution expression to the pathname substring
 which starts with the first character following the end of the last successful
-substitution. The first unsuccessful substitution stops the operation of the
+substitution.
+The first unsuccessful substitution stops the operation of the
 .Cm g
 option.
 The optional trailing
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/pfbtops.1 man1/pfbtops.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/pfbtops.1	Mon Dec 20 14:46:28 1999
+++ man1/pfbtops.1	Wed Jun 14 10:03:07 2000
@@ -16,7 +16,7 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
-.TH PFBTOPS 1 "7 September 1996" "Groff Version 1.11"
+.TH PFBTOPS 1 "7 September 1996" "Groff Version 1.15"
 .SH NAME
 pfbtops \- translate a PostScript font in .pfb format to ASCII
 .SH SYNOPSIS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/pic.1 man1/pic.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/pic.1	Mon Dec 20 14:46:28 1999
+++ man1/pic.1	Wed Jun 14 10:03:08 2000
@@ -1,5 +1,5 @@
 .ig \"-*- nroff -*-
-Copyright (C) 1989-1995 Free Software Foundation, Inc.
+Copyright (C) 1989-1999 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -29,13 +29,13 @@
 .\" The BSD man macros can't handle " in arguments to font change macros,
 .\" so use \(ts instead of ".
 .tr \(ts"
-.TH PIC 1 "7 September 1996" "Groff Version 1.11"
+.TH PIC 1 "10 March 2000" "Groff Version 1.15"
 .SH NAME
 pic \- compile pictures for troff or TeX
 .SH SYNOPSIS
 .B pic
 [
-.B \-nvC
+.B \-nvCSU
 ]
 [
 .I filename
@@ -45,7 +45,7 @@
 .B pic
 .B \-t
 [
-.B \-cvzC
+.B \-cvzCSU
 ]
 [
 .I filename
@@ -104,6 +104,11 @@
 .B sh
 commands.
 This can be useful when operating on untrustworthy input.
+(enabled by default)
+.TP
+.B \-U
+Unsafe mode; revert the default option
+.BR \-S .
 .TP
 .B \-n
 Don't use the groff extensions to the troff drawing commands.
@@ -734,10 +739,11 @@
 .br
 Tpic: Pic for \*(tx
 .br
-AT&T Bell Laboratories, Computing Science Technical Report No.\ 116,
-PIC \(em A Graphics Language for Typesetting.
-(This can be obtained by sending a mail message to netlib@research.att.com
-with a body of `send\ 116\ from\ research/cstr'.)
+Brian W. Kernighan,
+PIC \(em A Graphics Language for Typesetting (User Manual).
+AT&T Bell Laboratories, Computing Science Technical Report No.\ 116
+<URL:http://cm.bell-labs.com/cm/cs/cstr/116.ps.gz>
+(revised May, 1991).
 .SH BUGS
 .LP
 Input characters that are illegal for
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/pkg_add.1 man1/pkg_add.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/pkg_add.1	Mon Dec 20 14:52:50 1999
+++ man1/pkg_add.1	Wed Jun 14 10:07:51 2000
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_add.1
-.\" %FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.29.2.5 1999/09/01 14:05:07 billf Exp %
+.\" %FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.29.2.6 2000/03/06 11:36:58 sheldonh Exp %
 .\"
 .Dd November 25, 1994
 .Dt PKG_ADD 1
@@ -70,7 +70,8 @@
 .It Ar pkg-name [... pkg-name]
 The named packages are installed.  A package name of - will cause
 .Nm
-to read from stdin. If the packages are not found in the current
+to read from stdin.
+If the packages are not found in the current
 working directory, 
 .Nm
 will search them in each directory named by
@@ -88,7 +89,8 @@
 that you cannot deinstall it later, so only use this option if
 you know what you are doing!
 .It Fl r
-Use the remote fetching feature. This will determine the appropriate
+Use the remote fetching feature.
+This will determine the appropriate
 package directory and then fetch and install the package. 
 .It Fl f
 Force installation to proceed even if prerequisite packages are not
@@ -338,7 +340,8 @@
 .Ar PRE-INSTALL
 is that this allows you to write a single
 .Ar install
-script that does both ``before and after'' actions. But, separating the
+script that does both ``before and after'' actions.
+But, separating the
 functionality is more advantageous and easier from a maintainence viewpoint.
 .It
 After installation is complete, a copy of the packing list,
@@ -372,7 +375,8 @@
 .Ev PKG_PATH
 is used if a given package can't be found.  The environment variable
 should be a series of entries seperated by colons.  Each entry
-consists of a directory name. The current directory may be indicated
+consists of a directory name.
+The current directory may be indicated
 implicitly by an empty directory name, or explicitly by a single
 period.
 .Pp
@@ -401,7 +405,8 @@
 .Ev PACKAGESITE
 specifies an alternate location for 
 .Nm
-to fetch from. This variable subverts the automatic directory logic
+to fetch from.
+This variable subverts the automatic directory logic
 that
 .Nm
 uses when the 
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/pkg_create.1 man1/pkg_create.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/pkg_create.1	Mon Dec 20 14:52:50 1999
+++ man1/pkg_create.1	Wed Jun 14 10:07:51 2000
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_create.1
-.\" %FreeBSD: src/usr.sbin/pkg_install/create/pkg_create.1,v 1.27.2.3 1999/08/29 15:45:15 peter Exp %	
+.\" %FreeBSD: src/usr.sbin/pkg_install/create/pkg_create.1,v 1.27.2.4 2000/03/06 11:36:59 sheldonh Exp %	
 .\"
 .\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords,
 .\" added dependency tracking, etc.
@@ -106,7 +106,8 @@
 .Ar iscript
 to be the pre-install procedure for the package.  This can be any executable
 program (or shell script).  It will be invoked automatically when the
-package is later installed. It will be passed the package's name as the
+package is later installed.
+It will be passed the package's name as the
 first argument.
 
 .Cm Note:
@@ -124,7 +125,8 @@
 .Ar piscript
 to be the post-install procedure for the package.  This can be any
 executable program (or shell script).  It will be invoked automatically
-when the package is later installed. It will be passed the package's name as
+when the package is later installed.
+It will be passed the package's name as
 the first argument.
 .It Fl P Ar pkgs
 Set the initial package dependency list to
@@ -143,7 +145,8 @@
 .Ar dscript
 to be the de-install procedure for the package.  This can be any executable
 program (or shell script).  It will be invoked automatically when the
-package is later (if ever) de-installed. It will be passed the package's
+package is later (if ever) de-installed.
+It will be passed the package's
 name as the first argument.
 
 .Cm Note:
@@ -161,7 +164,8 @@
 .Ar pdscript
 to be the post-deinstall procedure for the package.  This can be any
 executable program (or shell script).  It will be invoked automatically when
-the package is later de-installed. It will be passed the package's name as
+the package is later de-installed.
+It will be passed the package's name as
 the first argument.
 
 .It Fl r Ar rscript
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/pkg_version.1 man1/pkg_version.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/pkg_version.1	Mon Dec 20 14:52:51 1999
+++ man1/pkg_version.1	Wed Jun 14 10:07:53 2000
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	%FreeBSD: src/usr.sbin/pkg_install/version/pkg_version.1,v 1.2.2.2 1999/12/03 06:18:04 billf Exp %
+.\"	%FreeBSD: src/usr.sbin/pkg_install/version/pkg_version.1,v 1.2.2.3 2000/03/06 11:37:01 sheldonh Exp %
 .Dd July 17, 1998
 .Dt PKG_VERSION 1
 .Os FreeBSD
@@ -125,11 +125,13 @@
 .Dl % pkg_version ftp://ftp.FreeBSD.org/pub/FreeBSD/ports-current/INDEX
 .Pp
 The command below generates a file of commands to run to update the installed
-files. It is
+files.
+It is
 .Bf Em
 not
 .Ef
-suggested that you run these commands automatically. Always review the
+suggested that you run these commands automatically.
+Always review the
 suggestions, and then cut-and-paste (or retype) the commands you want to run.
 .Pp
 .Dl % pkg_version -c > do_update
@@ -149,7 +151,8 @@
 that don't change the version number (e.g. small delta bugfixes in the
 package/port itself) aren't detected.
 .Pp
-Commands output doesn't know about dependencies between packages. For
+Commands output doesn't know about dependencies between packages.
+For
 example, you might have two versions of Tcl installed because two other
 packages require the different versions.
 .Nm
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/pr.1 man1/pr.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/pr.1	Mon Dec 20 14:51:44 1999
+++ man1/pr.1	Wed Jun 14 10:06:58 2000
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pr.1	8.3 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/pr/pr.1,v 1.5.2.2 1999/12/06 04:43:22 kris Exp %
+.\" %FreeBSD: src/usr.bin/pr/pr.1,v 1.5.2.3 2000/03/06 11:35:00 sheldonh Exp %
 .\"
 .Dd April 18, 1994
 .Dt PR 1
@@ -159,7 +159,8 @@
 .Fl column
 option.
 .It Fl d
-Produce output that is double spaced. An extra
+Produce output that is double spaced.
+An extra
 .Em <newline>
 character is output following every
 .Em <newline>
@@ -266,7 +267,8 @@
 If
 .Ar char
 (any nondigit character) is given, it is appended to the line number to
-separate it from whatever follows. The default for
+separate it from whatever follows.
+The default for
 .Ar char
 is a
 .Em <tab> .
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/printf.1 man1/printf.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/printf.1	Mon Dec 20 14:51:44 1999
+++ man1/printf.1	Wed Jun 14 10:06:59 2000
@@ -33,6 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)printf.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/printf/printf.1,v 1.3.2.2 2000/01/19 04:20:16 chris Exp %
 .\"
 .Dd June 6, 1993
 .Dt PRINTF 1
@@ -249,11 +250,21 @@
 In no case does a non-existent or small field width cause truncation of
 a field; padding takes place only if the specified field width exceeds
 the actual width.
+.Pp
+Some shells may provide a builtin
+.Nm
+command which is similar or identical to this utility.
+Consult the
+.Xr builtin 1
+manual page.
 .Sh RETURN VALUES
 .Nm Printf
 exits 0 on success, 1 on failure.
 .Sh SEE ALSO
-.Xr printf 3
+.Xr builtin 1 ,
+.Xr csh 1 ,
+.Xr printf 3 ,
+.Xr sh 1
 .Sh HISTORY
 The
 .Nm
@@ -270,3 +281,9 @@
 .Pp
 .Tn ANSI
 hexadecimal character constants were deliberately not provided.
+.Pp
+The escape sequence \e000 is the string terminator.  When present in the
+.Ar format  ,
+the 
+.Ar format
+will be truncated at the \e000 character.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/psbb.1 man1/psbb.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/psbb.1	Mon Dec 20 14:46:28 1999
+++ man1/psbb.1	Wed Jun 14 10:03:08 2000
@@ -16,7 +16,7 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
-.TH PSBB 1 "7 September 1996" "Groff Version 1.11"
+.TH PSBB 1 "7 September 1996" "Groff Version 1.15"
 .SH NAME
 psbb \- extract bounding box from PostScript document
 .SH SYNOPSIS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/psroff.1 man1/psroff.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/psroff.1	Mon Dec 20 14:46:27 1999
+++ man1/psroff.1	Wed Jun 14 10:03:07 2000
@@ -1,4 +1,4 @@
-.TH PSROFF 1 "15 September 1997" "Groff Version 1.11"
+.TH PSROFF 1 "15 September 1997" "Groff Version 1.15"
 .SH NAME
 psroff \- sent troff to PostScript printer
 .SH SYNOPSIS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/pwd.1 man1/pwd.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/pwd.1	Mon Dec 20 14:44:50 1999
+++ man1/pwd.1	Wed Jun 14 10:01:59 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pwd.1	8.2 (Berkeley) 4/28/95
-.\" %FreeBSD: src/bin/pwd/pwd.1,v 1.6.2.2 1999/08/29 14:13:23 peter Exp %
+.\" %FreeBSD: src/bin/pwd/pwd.1,v 1.6.2.3 2000/01/14 11:15:30 sheldonh Exp %
 .\"
 .Dd April 28, 1995
 .Dt PWD 1
@@ -47,6 +47,13 @@
 .Nm Pwd
 writes the absolute pathname of the current working directory to
 the standard output.
+.Pp
+Some shells may provide a builtin
+.Nm
+command which is similar or identical to this utility.
+Consult the
+.Xr builtin 1
+manual page.
 .Sh DIAGNOSTICS
 The
 .Nm
@@ -58,14 +65,17 @@
 .St -p1003.2
 compatible.
 .Sh SEE ALSO
+.Xr builtin 1 ,
 .Xr cd 1 ,
 .Xr csh 1 ,
-.Xr getcwd 3
+.Xr getcwd 3 ,
+.Xr sh 1
 .Sh BUGS
 In
 .Xr csh  1
 the command
 .Ic dirs
-is always faster (although it can give a different answer in the rare case
+is always faster because it is built into that shell.
+However, it can give a different answer in the rare case
 that the current directory or a containing directory was moved after
-the shell descended into it).
+the shell descended into it.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/rcp.1 man1/rcp.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/rcp.1	Mon Dec 20 14:44:51 1999
+++ man1/rcp.1	Wed Jun 14 10:02:00 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rcp.1	8.1 (Berkeley) 5/31/93
-.\" %FreeBSD: src/bin/rcp/rcp.1,v 1.7.2.1 1999/08/29 14:13:27 peter Exp %
+.\" %FreeBSD: src/bin/rcp/rcp.1,v 1.7.2.2 2000/01/07 13:16:51 phantom Exp %
 .\"
 .Dd May 31, 1993
 .Dt RCP 1
@@ -55,7 +55,9 @@
 or
 .Ar directory
 argument is either a remote file name of the
-form ``rname@rhost:path'', or a local file name (containing no `:' characters,
+form
+.Dq rname@rhost:path ,
+or a local file name (containing no `:' characters,
 or a `/' before any `:'s).
 .Pp
 The following options are available:
@@ -69,7 +71,7 @@
 for the remote host in realm
 .Ar realm
 instead of the remote host's realm as determined by
-.Xr krb_realmofhost  3  .
+.Xr krb_realmofhost 3 .
 .It Fl p
 Cause
 .Nm
@@ -129,7 +131,9 @@
 .Xr cp 1 ,
 .Xr ftp 1 ,
 .Xr rlogin 1 ,
-.Xr rsh 1
+.Xr rsh 1 ,
+.Xr auth.conf 5 ,
+.Xr hosts.equiv 5 .
 .Sh HISTORY
 The
 .Nm
@@ -152,7 +156,8 @@
 file on the remote host.
 .Pp
 The destination user and hostname may have to be specified as
-``rhost.rname'' when the destination machine is running the
+.Dq rhost.rname
+when the destination machine is running the
 .Bx 4.2
 version of
 .Nm Ns  .
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/rdist.1 man1/rdist.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/rdist.1	Mon Dec 20 14:51:45 1999
+++ man1/rdist.1	Wed Jun 14 10:07:00 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rdist.1	8.3 (Berkeley) 3/17/94
+.\" %FreeBSD: src/usr.bin/rdist/rdist.1,v 1.10.2.1 2000/03/06 11:35:02 sheldonh Exp %
 .\"
 .Dd March 17, 1994
 .Dt RDIST 1
@@ -89,7 +90,8 @@
 will update all of the files and directories listed in
 .Ar distfile  .
 Otherwise, the argument is taken to be the name of a file to be updated
-or the label of a command to execute. If label and file names conflict,
+or the label of a command to execute.
+If label and file names conflict,
 it is assumed to be a label.
 These may be used together to update specific files
 using specific commands.
@@ -140,7 +142,8 @@
 can be the empty string, one name, or a list of names surrounded by
 parentheses and separated by tabs and/or spaces.
 .It Fl h
-Follow symbolic links. Copy the file that the link points to rather than the
+Follow symbolic links.
+Copy the file that the link points to rather than the
 link itself.
 .It Fl i
 Ignore unresolved links.
@@ -148,42 +151,53 @@
 will normally try to maintain the link structure of files being transferred
 and warn the user if all the links cannot be found.
 .It Fl m Ar host
-Limit which machines are to be updated. Multiple
+Limit which machines are to be updated.
+Multiple
 .Fl m
 arguments can be given to limit updates to a subset of the hosts listed in the
 .Ar distfile  .
 .It Fl n
-Print the commands without executing them. This option is
+Print the commands without executing them.
+This option is
 useful for debugging
 .Ar distfile  .
 .It Fl q
-Quiet mode. Files that are being modified are normally
-printed on standard output. The
+Quiet mode.
+Files that are being modified are normally
+printed on standard output.
+The
 .Fl q
 option suppresses this.
 .It Fl R
-Remove extraneous files. If a directory is being updated, any files that exist
+Remove extraneous files.
+If a directory is being updated, any files that exist
 on the remote host that do not exist in the master directory are removed.
 This is useful for maintaining truly identical copies of directories.
 .It Fl v
-Verify that the files are up to date on all the hosts. Any files
+Verify that the files are up to date on all the hosts.
+Any files
 that are out of date will be displayed but no files will be changed
 nor any mail sent.
 .It Fl w
-Whole mode. The whole file name is appended to the destination directory
-name. Normally, only the last component of a name is used when renaming files.
+Whole mode.
+The whole file name is appended to the destination directory
+name.
+Normally, only the last component of a name is used when renaming files.
 This will preserve the directory structure of the files being
-copied instead of flattening the directory structure. For example,
+copied instead of flattening the directory structure.
+For example,
 renaming a list of files such as ( dir1/f1 dir2/f2 ) to dir3 would create
 files dir3/dir1/f1 and dir3/dir2/f2 instead of dir3/f1 and dir3/f2.
 .It Fl y
-Younger mode. Files are normally updated if their
+Younger mode.
+Files are normally updated if their
 .Ar mtime
 and
 .Ar size
 (see
 .Xr stat  2  )
-disagree. The
+disagree.
+The
 .Fl y
 option causes
 .Nm
@@ -198,7 +212,8 @@
 .Ar Distfile
 contains a sequence of entries that specify the files
 to be copied, the destination hosts, and what operations to perform
-to do the updating. Each entry has one of the following formats.
+to do the updating.
+Each entry has one of the following formats.
 .Pp
 .Bd -literal -offset indent -compact
 <variable name> `=' <name list>
@@ -222,10 +237,12 @@
 if the file is out of date on the host which is being updated (second format) or
 the file is newer than the time stamp file (third format).
 .Pp
-Labels are optional. They are used to identify a command for partial updates.
+Labels are optional.
+They are used to identify a command for partial updates.
 .Pp
 Newlines, tabs, and blanks are only used as separators and are
-otherwise ignored. Comments begin with `#' and end with a newline.
+otherwise ignored.
+Comments begin with `#' and end with a newline.
 .Pp
 Variables to be expanded begin with `$' followed by one character or
 a name enclosed in curly braces (see the examples at the end).
Only in man1: read.1
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/refer.1 man1/refer.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/refer.1	Mon Dec 20 14:46:29 1999
+++ man1/refer.1	Wed Jun 14 10:03:08 2000
@@ -30,7 +30,7 @@
 .\" The BSD man macros can't handle " in arguments to font change macros,
 .\" so use \(ts instead of ".
 .tr \(ts"
-.TH REFER 1 "7 September 1996" "Groff Version 1.11"
+.TH REFER 1 "7 September 1996" "Groff Version 1.15"
 .SH NAME
 refer \- preprocess bibliographic references for groff
 .SH SYNOPSIS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/rlogin.1 man1/rlogin.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/rlogin.1	Mon Dec 20 14:51:46 1999
+++ man1/rlogin.1	Wed Jun 14 10:07:00 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rlogin.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/rlogin/rlogin.1,v 1.6.2.1 2000/01/07 13:17:00 phantom Exp %
 .\"
 .Dd June 6, 1993
 .Dt RLOGIN 1
@@ -82,7 +83,9 @@
 .It Fl L
 The
 .Fl L
-option allows the rlogin session to be run in ``litout'' (see
+option allows the rlogin session to be run in
+.Dq litout
+(see
 .Xr tty 4 )
 mode.
 .It Fl d
@@ -95,7 +98,8 @@
 The
 .Fl e
 option allows user specification of the escape character, which is
-``~'' by default.
+.Dq ~
+by default.
 This specification may be as a literal character, or as an octal
 value in the form \ennn.
 .It Fl k
@@ -126,13 +130,23 @@
 increased security.
 .El
 .Pp
-A line of the form ``<escape char>.'' disconnects from the remote host.
-Similarly, the line ``<escape char>^Z'' will suspend the
+A line of the form
+.Dq Aq escape char .
+disconnects from the remote host.
+Similarly, the line
+.Dq Ao escape char Ac Ns ^Z
+will suspend the
 .Nm
-session, and ``<escape char><delayed-suspend char>'' suspends the
+session, and
+.Dq Ao escape char Ac Ao delayed-suspend char Ac
+suspends the
 send portion of the rlogin, but allows output from the remote system.
-By default, the tilde (``~'') character is the escape character, and
-normally control-Y (``^Y'') is the delayed-suspend character.
+By default, the tilde
+.Pq Dq ~
+character is the escape character, and
+normally control-Y
+.Pq Dq ^Y
+is the delayed-suspend character.
 .Pp
 All echoing takes place at the remote site, so that (except for delays)
 the
@@ -171,13 +185,13 @@
 is used instead.
 .Sh ENVIRONMENT
 The following environment variable is utilized by
-.Nm rlogin :
+.Nm Ns :
 .Bl -tag -width TERM
 .It Ev TERM
 Determines the user's terminal type.
 .El
 .Sh SEE ALSO
-.Xr login ,
+.Xr login 1 ,
 .Xr rsh 1 ,
 .Xr telnet 1 ,
 .Xr setsockopt 2 ,
@@ -186,19 +200,21 @@
 .Xr krb_sendauth 3 ,
 .Xr ruserok 3 ,
 .Xr tty 4 ,
+.Xr auth.conf 5 ,
+.Xr hosts.equiv 5 ,
 .Xr hosts 5 ,
 .Xr rlogind 8 ,
-.Xr rshd 8
-
+.Xr rshd 8 .
 .Sh FILES
 .Bl -tag -width /etc/hosts -compact
 .It Pa /etc/hosts
 .It Pa /etc/hosts.equiv
 .It Pa /etc/auth.conf
-.It Pa $HOME/.rhosts
-.It Pa $HOME/.klogin
+.Sm off
+.It Pa Ev $HOME /.rhosts
+.It Pa Ev $HOME /.klogin
+.Sm on
 .El
-
 .Sh HISTORY
 The
 .Nm
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/rm.1 man1/rm.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/rm.1	Mon Dec 20 14:44:52 1999
+++ man1/rm.1	Wed Jun 14 10:02:01 2000
@@ -33,18 +33,21 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
-.\" %FreeBSD: src/bin/rm/rm.1,v 1.12.2.3 1999/12/06 05:00:50 kris Exp %
+.\" %FreeBSD: src/bin/rm/rm.1,v 1.12.2.4 1999/12/29 19:39:46 obrien Exp %
 .\"
 .Dd January 28, 1999
 .Dt RM 1
 .Os
 .Sh NAME
-.Nm rm
+.Nm rm ,
+.Nm unlink
 .Nd remove directory entries
 .Sh SYNOPSIS
 .Nm rm
 .Op Fl dfiPRrvW
 .Ar file ...
+.Nm unlink
+.Ar file
 .Sh DESCRIPTION
 The
 .Nm
@@ -116,6 +119,16 @@
 or
 .Dq .. .
 .Pp
+When the utility is called as
+.Nm unlink ,
+only one argument,
+which must not be a directory,
+may be supplied.
+No options may be supplied in this simple mode of operation,
+which performs an
+.Xr unlink 2
+operation on the passed argument.
+.Pp
 The
 .Nm
 utility exits 0 if all of the named files or file hierarchies were removed,
@@ -193,6 +206,11 @@
 behavior of
 .Nm
 with respect to directories.
+.Pp
+The simplified
+.Nm unlink
+command conforms to
+.St -susv2 .
 .Sh HISTORY
 A
 .Nm
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/rpcgen.1 man1/rpcgen.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/rpcgen.1	Mon Dec 20 14:51:46 1999
+++ man1/rpcgen.1	Wed Jun 14 10:07:01 2000
@@ -1,6 +1,6 @@
 .\" @(#)rpcgen.1 1.35 93/06/02 SMI
 .\" Copyright 1985-1993 Sun Microsystems, Inc.
-.\" %FreeBSD: src/usr.bin/rpcgen/rpcgen.1,v 1.6.2.1 1999/10/30 15:27:57 phantom Exp %
+.\" %FreeBSD: src/usr.bin/rpcgen/rpcgen.1,v 1.6.2.2 2000/03/06 11:35:04 sheldonh Exp %
 .Dd March 28, 1993
 .Dt RPCGEN 1
 .Os
@@ -87,7 +87,8 @@
 .Pp
 .Nm Rpcgen
 can also generate sample client and server files
-that can be customized to suit a particular application. The
+that can be customized to suit a particular application.
+The
 .Fl \&Sc ,
 .Fl \&Ss
 and
@@ -95,7 +96,8 @@
 options generate sample client, server and makefile, respectively. 
 The
 .Fl a
-option generates all files, including sample files. If the
+option generates all files, including sample files.
+If the
 .Ar infile
 is
 .Pa proto.x ,
@@ -286,7 +288,8 @@
 dispatch tables.
 .It Fl i Ar size
 Size at which to start generating inline code.
-This option is useful for optimization. The default size is 5.
+This option is useful for optimization.
+The default size is 5.
 .Pp
 Note: in order to provide backwards compatibility with the older
 .Nm
@@ -371,8 +374,10 @@
 routine to do initialization.
 .It Fl M
 Generate multithread-safe stubs for passing arguments and results between
-rpcgen generated code and user written code. This option is useful 
-for users who want to use threads in their code. However, the
+rpcgen generated code and user written code.
+This option is useful 
+for users who want to use threads in their code.
+However, the
 .Xr rpc_svc_calls 3
 functions are not yet MT-safe, which means that rpcgen generated server-side
 code will not be MT-safe.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/rsh.1 man1/rsh.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/rsh.1	Mon Dec 20 14:51:46 1999
+++ man1/rsh.1	Wed Jun 14 10:07:01 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rsh.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/rsh/rsh.1,v 1.6.2.1 1999/10/30 15:27:58 phantom Exp %
+.\" %FreeBSD: src/usr.bin/rsh/rsh.1,v 1.6.2.2 2000/01/07 13:17:02 phantom Exp %
 .\"
 .Dd June 6, 1993
 .Dt RSH 1
@@ -143,9 +143,11 @@
 .Xr krb_sendauth 3 ,
 .Xr rcmd 3 ,
 .Xr ruserok 3 ,
+.Xr auth.conf 5 ,
+.Xr hosts.equiv 5 ,
 .Xr hosts 5 ,
 .Xr rlogind 8 ,
-.Xr rshd 8
+.Xr rshd 8 .
 .Sh HISTORY
 The
 .Nm
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/rtprio.1 man1/rtprio.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/rtprio.1	Mon Dec 20 14:53:00 1999
+++ man1/rtprio.1	Wed Jun 14 10:07:58 2000
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/rtprio/rtprio.1,v 1.15.2.2 1999/08/29 15:48:06 peter Exp %
+.\" %FreeBSD: src/usr.sbin/rtprio/rtprio.1,v 1.15.2.3 2000/03/06 11:37:13 sheldonh Exp %
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 1
@@ -198,7 +198,8 @@
 starve normal priority processes.
 .Sh AUTHORS
 .An Henrik Vestergaard Draboel Aq hvd@terry.ping.dk
-is the original author. This
+is the original author.
+This
 implementation in
 .Bx Free
 was substantially rewritten by
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/rusers.1 man1/rusers.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/rusers.1	Mon Dec 20 14:51:47 1999
+++ man1/rusers.1	Wed Jun 14 10:07:02 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rusers.1	6.7 (Berkeley) 4/23/91
-.\" %FreeBSD: src/usr.bin/rusers/rusers.1,v 1.6.2.1 1999/08/29 15:32:29 peter Exp %
+.\" %FreeBSD: src/usr.bin/rusers/rusers.1,v 1.6.2.2 2000/03/06 11:35:06 sheldonh Exp %
 .\"
 .Dd April 23, 1991
 .Dt RUSERS 1
@@ -48,9 +48,11 @@
 command produces output similar to
 .Xr who ,
 but for the list of hosts or all machines on the local
-network. For each host responding to the rusers query,
+network.
+For each host responding to the rusers query,
 the hostname with the names of the users currently logged
-on is printed on each line. The rusers command will wait for
+on is printed on each line.
+The rusers command will wait for
 one minute to catch late responders.
 .Pp
 The following options are available:
@@ -58,7 +60,8 @@
 .It Fl a
 Print all machines responding even if no one is currently logged in.
 .It Fl l
-Print a long format listing. This includes the user name, host name,
+Print a long format listing.
+This includes the user name, host name,
 tty that the user is logged in to, the date and time the user
 logged in, the amount of time since the user typed on the keyboard,
 and the remote host they logged in from (if applicable).
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/rwall.1 man1/rwall.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/rwall.1	Mon Dec 20 14:51:47 1999
+++ man1/rwall.1	Wed Jun 14 10:07:02 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rwall.1	6.7 (Berkeley) 4/23/91
-.\" %FreeBSD: src/usr.bin/rwall/rwall.1,v 1.5.2.1 1999/08/29 15:32:32 peter Exp %
+.\" %FreeBSD: src/usr.bin/rwall/rwall.1,v 1.5.2.2 2000/03/06 11:35:08 sheldonh Exp %
 .\"
 .Dd April 23, 1991
 .Dt RWALL 1
@@ -45,7 +45,8 @@
 .Sh DESCRIPTION
 The
 .Nm
-command sends a message to the users logged into the specified host. The
+command sends a message to the users logged into the specified host.
+The
 message to be sent can be typed in and terminated with EOF or it can
 be in a
 .Ar file .
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/sasc.1 man1/sasc.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/sasc.1	Mon Dec 20 14:52:18 1999
+++ man1/sasc.1	Wed Jun 14 10:07:29 2000
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.bin/sasc/sasc.1,v 1.7.2.1 1999/08/29 15:32:36 peter Exp %
+.\" %FreeBSD: src/usr.bin/sasc/sasc.1,v 1.7.2.2 2000/03/06 11:35:09 sheldonh Exp %
 .\"
 .Dd January 6, 1995
 .Dt SASC 1
@@ -49,10 +49,12 @@
 The
 .Nm
 utility provides shell level access to the ioctl
-requests served by the handy scanner device driver asc. Please see
+requests served by the handy scanner device driver asc.
+Please see
 .Xr asc 4
 for the exact meaning of the requests.  Generally they modify
-the output and behavior of the asc scanner device. When
+the output and behavior of the asc scanner device.
+When
 .Nm
 is called with no option only the current settings are reported.
 .Sh OPTIONS
@@ -65,9 +67,11 @@
 Normally the parameters are shown after the modifications have been
 performed.
 .It Fl f Ar file
-Operate on a different scanner device node given by filename. Note
+Operate on a different scanner device node given by filename.
+Note
 that even though there may exist more than one node of scanner device
-several of them will refer the same device unit. The modifications are
+several of them will refer the same device unit.
+The modifications are
 performed od the unit regardless of the device node by which it is
 accessed.
 .It Fl r Ar resolution Bq ASC_SRES
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/scon.1 man1/scon.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/scon.1	Mon Dec 20 14:53:31 1999
+++ man1/scon.1	Wed Jun 14 10:08:19 2000
@@ -29,6 +29,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)scon.1, 3.00, Last Edit-Date: [Mon Jan 10 21:30:48 1994]
+.\" %FreeBSD: src/usr.sbin/pcvt/scon/scon.1,v 1.5.2.1 2000/03/06 11:36:51 sheldonh Exp %
 .\"
 .Dd December 31, 1993
 .Dt SCON 1
@@ -88,12 +89,15 @@
 the command line should be applied to.
 .It Fl f
 Some programs which silently assume 24 lines when they run on a VT220 show
-incorrect behaviour when the terminal has really 25 lines. To support full
+incorrect behaviour when the terminal has really 25 lines.
+To support full
 VT220 behaviour, it is possible to force pcvt to select only 24 lines when
-it is running in 25-lines pure VT mode and/or in 28-lines HP-mode. The
+it is running in 25-lines pure VT mode and/or in 28-lines HP-mode.
+The
 .Fl f
 option requires one additional parameter, the string 'on' or 'off' to switch
-this mode for a virtual screen on or off respectively. This mode has no effect
+this mode for a virtual screen on or off respectively.
+This mode has no effect
 if any other vertical resolutions are selected than the two above mentioned.
 .It Fl h
 Prints a usage/help text.
@@ -111,14 +115,18 @@
 Switch the specified/current screen into a pure VT220 mode without recognizing
 any HP escape sequences and without displaying function key labels.
 .It Fl H
-Switch the specified/current screen into a mixed HP/VT220 mode. That is, that
+Switch the specified/current screen into a mixed HP/VT220 mode.
+That is, that
 in addition to the full VT220 emulation, the HP function key labels and the
 escape sequences for handling the labels are available to the user.
 .It Fl s
-Specify the number of character lines on the screen. Possible parameters are
-25, 28, 35, 40, 43 or 50. To use all this screen sizes, the fonts required
+Specify the number of character lines on the screen.
+Possible parameters are
+25, 28, 35, 40, 43 or 50.
+To use all this screen sizes, the fonts required
 for proper operation of a desired size have to be downloaded to the EGA/VGA
-font ram. This option is available only for EGA and VGA boards.
+font ram.
+This option is available only for EGA and VGA boards.
 .It Fl p
 Modify VGA palette
 .Pq DAC .
@@ -131,7 +139,8 @@
 .Fl V .
 Naturally, option
 .Fl p
-is available only for VGA boards. Three flavors are available.
+is available only for VGA boards.
+Three flavors are available.
 
 If used with argument
 .Dq Ar default ,
@@ -142,13 +151,17 @@
 
 If used with argument
 .Dq Ar list ,
-the current VGA DAC palette entries are listed. Each entry contains
+the current VGA DAC palette entries are listed.
+Each entry contains
 the table index, values for red, green, and blue, and if there's a
-known name for this entry, the color name. Trailing empty table
+known name for this entry, the color name.
+Trailing empty table
 slots (RGB values all zero) are omitted.
 
-Otherwise, four comma-separated arguments are expected. The first
-denotes the number of palette entry to be modified. This may be either
+Otherwise, four comma-separated arguments are expected.
+The first
+denotes the number of palette entry to be modified.
+This may be either
 a number between 0 and 255, or the usual name of an associated color
 .Pq case-insensitive .
 The following values for red, green and blue are restricted to 0 through 63
@@ -165,11 +178,13 @@
 .It Fl t
 Specifying
 .Fl t
-will activate the screen saver. The behaviour depends on
+will activate the screen saver.
+The behaviour depends on
 .Ar timeout :
 if
 .Ar timeout
-is given as 0, the screen saver is turned off. Otherwise,
+is given as 0, the screen saver is turned off.
+Otherwise,
 .Ar timeout
 is taken as a number of seconds to wait until activating the
 screen saver.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/script.1 man1/script.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/script.1	Mon Dec 20 14:51:48 1999
+++ man1/script.1	Wed Jun 14 10:07:03 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)script.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/script/script.1,v 1.6.2.2 1999/12/13 23:47:12 billf Exp %
+.\" %FreeBSD: src/usr.bin/script/script.1,v 1.6.2.3 2000/03/06 11:35:11 sheldonh Exp %
 .\"
 .Dd June 6, 1993
 .Dt SCRIPT 1
@@ -122,10 +122,12 @@
 .Ev SHELL
 exists, the shell forked by
 .Nm
-will be that shell. If
+will be that shell.
+If
 .Ev SHELL
 is not set, the Bourne shell
-is assumed. (Most shells set this variable automatically).
+is assumed.
+(Most shells set this variable automatically).
 .El
 .Sh SEE ALSO
 .Xr csh 1
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/sed.1 man1/sed.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/sed.1	Mon Dec 20 14:51:48 1999
+++ man1/sed.1	Wed Jun 14 10:07:03 2000
@@ -33,6 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sed.1	8.2 (Berkeley) 12/30/93
+.\" %FreeBSD: src/usr.bin/sed/sed.1,v 1.5.2.2 2000/02/15 03:17:11 unfurl Exp %
 .\"
 .Dd December 30, 1993
 .Dt SED 1
@@ -139,12 +140,16 @@
 A command line with one address selects all of the pattern spaces
 that match the address.
 .Pp
-A command line with two addresses selects the inclusive range from
-the first pattern space that matches the first address through the next
-pattern space that matches the second.
-(If the second address is a number less than or equal to the line number
-first selected, only that line is selected.)
-Starting at the first line following the selected range,
+A command line with two addresses selects an inclusive range.  This
+range starts with the first pattern space that matches the first
+address.  The end of the range is the next following pattern space
+that matches the second address.  If the second address is a number
+less than or equal to the line number first selected, only that
+line is selected.  In the case when the second address is a context
+address, sed does not re-match the second address against the
+pattern space that matched the first address.  Starting at the
+first line following the selected range, sed starts looking again
+for the first address.
 .Nm
 starts looking again for the first address.
 .Pp
@@ -431,7 +436,7 @@
 .sp
 .It [2addr]t [label]
 Branch to the
-.Dq :
+.Dq \&:
 function bearing the label if any substitutions have been made since the
 most recent reading of an input line or execution of a
 .Dq t
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/send-pr.1 man1/send-pr.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/send-pr.1	Mon Dec 20 14:46:44 1999
+++ man1/send-pr.1	Wed Jun 14 10:03:19 2000
@@ -21,6 +21,9 @@
 .\"    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 .\"
 .\" ---------------------------------------------------------------------------
+.\"
+.\" %FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.7.2.1 1999/12/29 23:16:08 steve Exp %
+.\"
 .nh
 .TH SEND-PR 1 3.2 "February 1993"
 .SH NAME
@@ -147,6 +150,41 @@
 .B send-pr
 itself will help ensure all necessary information will reach the
 support site.
+.SH FREEBSD CATEGORIES
+.TP
+.B advocacy
+This used to be for the advocacy WWW pages.  Not quite sure what is used
+for now.
+.TP
+.B alpha
+Alpha processor specific problems.
+.TP
+.B bin
+Corrections or enhancements to system executables.
+.TP
+.B conf
+Corrections or enhancements to the system configuration files.
+.TP
+.B docs
+Corrections or enhancements to the manpages or other documentation.
+.TP
+.B gnu
+Corrections or enhancements to the GNU contributed software.
+.TP
+.B i386
+Intel x86 processor specific problems.
+.TP
+.B kern
+Changes or enhancements to the architecture independent kernel sources.
+.TP
+.B misc
+Problems that don't fit into any of the other categories.
+.TP
+.B ports
+Corrections or enhancements (including new ports) to the ports collection.
+.TP
+.B sparc
+SPARC processor specific problems.
 .SH ENVIRONMENT
 The environment variable 
 .B EDITOR
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/sgsc.1 man1/sgsc.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/sgsc.1	Mon Dec 20 14:53:34 1999
+++ man1/sgsc.1	Wed Jun 14 10:08:22 2000
@@ -27,6 +27,9 @@
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" %FreeBSD: src/usr.sbin/sgsc/sgsc.1,v 1.4.2.1 2000/03/06 11:37:14 sheldonh Exp %
+.\"
 .Dd January 6, 1995
 .Dt SGSC 1
 .Os
@@ -46,10 +49,12 @@
 The
 .Nm
 utility provides shell level access to the ioctl
-requests served by the handy scanner device driver gsc. Please see
+requests served by the handy scanner device driver gsc.
+Please see
 .Xr gsc 4
 for the exact meaning of the requests.  Generally they modify
-the output and behaviour of the gsc scanner device. When
+the output and behaviour of the gsc scanner device.
+When
 .Nm
 is called with no option only the current settings are reported.
 .Sh OPTIONS
@@ -62,9 +67,11 @@
 Normally the parameters are shown after the modifications have been
 performed.
 .It Fl f Ar file
-Operate on a different scanner device node given by filename. Note
+Operate on a different scanner device node given by filename.
+Note
 that even though there may exist more than one node of scanner device
-several of them will refer the same device unit. The modifications are
+several of them will refer the same device unit.
+The modifications are
 performed od the unit regardless of the device node by which it is
 accessed.
 .It Fl r Ar resolution [GSC_SRES]
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/sh.1 man1/sh.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/sh.1	Mon Dec 20 14:44:53 1999
+++ man1/sh.1	Wed Jun 14 10:02:01 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" %FreeBSD: src/bin/sh/sh.1,v 1.23.2.8 1999/12/05 12:16:26 cracauer Exp %
+.\" %FreeBSD: src/bin/sh/sh.1,v 1.23.2.9 2000/03/20 10:51:04 cracauer Exp %
 .\"
 .Dd May 5, 1995
 .Dt SH 1
@@ -1746,7 +1746,7 @@
 the complete pathname of the command is printed.
 .It Xo
 .Ic ulimit
-.Op Fl HSacdflmnust
+.Op Fl HSabcdflmnust
 .Op Ar limit
 .Xc
 Set or display resource limits (see
@@ -1786,6 +1786,8 @@
 displayed or modified.
 They are mutually exclusive.
 .Bl -tag -width Ds
+.It Fl b Ar sbsize
+The maximum size of socket buffer usage, in bytes.
 .It Fl c Ar coredumpsize
 The maximal size of core dump files, in 512-byte blocks.
 .It Fl d Ar datasize
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/skey.1 man1/skey.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/skey.1	Mon Dec 20 14:43:42 1999
+++ man1/skey.1	Wed Jun 14 10:01:15 2000
@@ -1,6 +1,7 @@
 .ll 6i
 .pl 10.5i
 .\"	@(#)skey.1	1.1 	10/28/93
+.\" %FreeBSD: src/lib/libskey/skey.1,v 1.1.10.1 2000/03/03 14:59:41 sheldonh Exp %
 .\"
 .lt 6.0i
 .TH KEY 1 "28 October 1993"
@@ -10,8 +11,10 @@
 .SH DESCRIPTION
 .I S/key
 is a procedure for using one time password to authenticate access to
-computer systems. It uses 64 bits of information transformed by the
-MD4 algorithm. The user supplies the 64 bits in the form of 6 English
+computer systems.
+It uses 64 bits of information transformed by the
+MD4 algorithm.
+The user supplies the 64 bits in the form of 6 English
 words that are generated by a secure computer.
 Example use of the S/key program 
 .I key
@@ -27,7 +30,8 @@
  	>
 .sp
 The programs that are part of the S/Key system are keyinit, key, and
-keyinfo. Keyinit is used to get your ID set up, key is
+keyinfo.
+Keyinit is used to get your ID set up, key is
 used to get the one time password each time,
 keyinfo is used to extract information from the S/Key database.
 .sp
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/sleep.1 man1/sleep.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/sleep.1	Mon Dec 20 14:44:53 1999
+++ man1/sleep.1	Wed Jun 14 10:02:02 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sleep.1	8.3 (Berkeley) 4/18/94
-.\" %FreeBSD: src/bin/sleep/sleep.1,v 1.8.2.3 1999/10/28 18:02:43 ru Exp %
+.\" %FreeBSD: src/bin/sleep/sleep.1,v 1.8.2.4 2000/03/03 14:58:55 sheldonh Exp %
 .\"
 .Dd April 18, 1994
 .Dt SLEEP 1
@@ -89,7 +89,8 @@
 .Dl (sleep 1800; sh command_file >& errors)&
 .Pp
 This incantation would wait a half hour before
-running the script command_file. (See the
+running the script command_file.
+(See the
 .Xr at 1
 utility.)
 .Pp
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/sockstat.1 man1/sockstat.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/sockstat.1	Mon Dec 20 14:51:49 1999
+++ man1/sockstat.1	Wed Jun 14 10:07:03 2000
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.bin/sockstat/sockstat.1,v 1.1.2.3 1999/09/06 13:20:42 sheldonh Exp %
+.\" %FreeBSD: src/usr.bin/sockstat/sockstat.1,v 1.1.2.4 2000/03/06 11:35:15 sheldonh Exp %
 .\"
 .Dd April 13, 1999
 .Dt SOCKSTAT 1
@@ -37,7 +37,8 @@
 .Sh DESCRIPTION
 The
 .Nm
-command lists open Internet sockets. The information listed for each
+command lists open Internet sockets.
+The information listed for each
 socket is:
 .Bl -tag -width "FOREIGN ADDRESS"
 .It Li USER
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/startslip.1 man1/startslip.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/startslip.1	Mon Dec 20 14:49:28 1999
+++ man1/startslip.1	Wed Jun 14 10:05:16 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)startslip.1	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/sbin/startslip/startslip.1,v 1.14.2.1 1999/08/29 15:15:49 peter Exp %
+.\" %FreeBSD: src/sbin/startslip/startslip.1,v 1.14.2.2 2000/03/03 15:13:15 sheldonh Exp %
 .\"
 .Dd June 5, 1993
 .Dt STARTSLIP 1
@@ -170,21 +170,26 @@
 .Ev LINE
 environment variable.
 .It Fl K Ar keepalive
-Set SLIP "keep alive" timeout in seconds. If FRAME_END not received during this
-time period, a reconnect will occur. Active "out fill" timeout expected from other
+Set SLIP "keep alive" timeout in seconds.
+If FRAME_END not received during this
+time period, a reconnect will occur.
+Active "out fill" timeout expected from other
 side.
 Default value is no timeout.
 .It Fl O Ar outfill
-Set SLIP "out fill" timeout in seconds. It causes at least one FRAME_END
+Set SLIP "out fill" timeout in seconds.
+It causes at least one FRAME_END
 to be sent during this timeout.
 Needed for "keep alive" timeout on other side.
 Default value is no timeout.
 .It Fl S Ar unit
-Set SLIP unit number directly. Use with caution, no check for two
+Set SLIP unit number directly.
+Use with caution, no check for two
 interfaces with same number made.
 Default is dynamic assignment.
 .It Fl L
-Use uucp-style device locking. You need it unless you start
+Use uucp-style device locking.
+You need it unless you start
 .Nm
 from external program which already does uucp locking.
 Default case is no uucp locking to satisfy such programs.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/stty.1 man1/stty.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/stty.1	Mon Dec 20 14:44:54 1999
+++ man1/stty.1	Wed Jun 14 10:02:02 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stty.1	8.4 (Berkeley) 4/18/94
-.\" %FreeBSD: src/bin/stty/stty.1,v 1.10.2.2 1999/08/29 14:14:21 peter Exp %
+.\" %FreeBSD: src/bin/stty/stty.1,v 1.10.2.3 2000/03/03 14:58:57 sheldonh Exp %
 .\"
 .Dd April 18, 1994
 .Dt STTY 1
@@ -313,7 +313,8 @@
 is set, echo control characters as ^X.  Otherwise control characters
 echo as themselves.
 .It Cm echoprt Pq Fl echoprt
-For printing terminals. If set, echo erased characters backwards within ``\\''
+For printing terminals.
+If set, echo erased characters backwards within ``\\''
 and ``/''.  Otherwise, disable this feature.
 .It Cm noflsh Pq Fl noflsh
 Disable (enable) flush after
@@ -467,7 +468,8 @@
 to a pty.
 .It Cm raw Pq Fl raw
 If set, change the modes of the terminal so that no input or output processing
-is performed. If unset, change the modes of the terminal to some reasonable
+is performed.
+If unset, change the modes of the terminal to some reasonable
 state that performs input and output processing.  Note that since the
 terminal driver no longer has a single
 .Dv RAW
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/su.1 man1/su.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/su.1	Mon Dec 20 14:51:49 1999
+++ man1/su.1	Wed Jun 14 10:07:04 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)su.1	8.2 (Berkeley) 4/18/94
-.\" %FreeBSD: src/usr.bin/su/su.1,v 1.15.2.1 1999/08/29 15:32:57 peter Exp %
+.\" %FreeBSD: src/usr.bin/su/su.1,v 1.15.2.2 2000/03/06 11:35:17 sheldonh Exp %
 .\"
 .\" this is for hilit19's braindeadness: "
 .Dd April 18, 1994
@@ -131,7 +131,8 @@
 .Nm
 will fail.
 .It Fl c Ar class
-Use the settings of the specified login class. Only allowed for the super-user.
+Use the settings of the specified login class.
+Only allowed for the super-user.
 .El
 .Pp
 The
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/systat.1 man1/systat.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/systat.1	Mon Dec 20 14:51:51 1999
+++ man1/systat.1	Wed Jun 14 10:07:04 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/usr.bin/systat/systat.1,v 1.16.2.4 1999/09/07 08:39:34 des Exp %
+.\" %FreeBSD: src/usr.bin/systat/systat.1,v 1.16.2.5 2000/03/06 11:35:19 sheldonh Exp %
 .\"
 .Dd September 9, 1997
 .Dt SYSTAT 1
@@ -239,7 +239,8 @@
 .Tn I/O
 statistics in bar graph form (default).
 .It Cm kbpt
-Toggle the display of kilobytes per transaction. (the default is to
+Toggle the display of kilobytes per transaction.
+(the default is to
 not display kilobytes per transaction).
 .El
 .It Ic swap
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/talk.1 man1/talk.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/talk.1	Mon Dec 20 14:51:52 1999
+++ man1/talk.1	Wed Jun 14 10:07:05 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)talk.1	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.bin/talk/talk.1,v 1.3.2.1 2000/03/06 11:35:21 sheldonh Exp %
 .\"
 .Dd June 6, 1993
 .Dt TALK 1
@@ -79,7 +80,8 @@
 talk: respond with: talk your_name@your_machine
 .Ed
 .Pp
-to the user you wish to talk to. At this point, the recipient
+to the user you wish to talk to.
+At this point, the recipient
 of the message should reply by typing
 .Pp
 .Dl talk \ your_name@your_machine
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/tbl.1 man1/tbl.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/tbl.1	Mon Dec 20 14:46:29 1999
+++ man1/tbl.1	Wed Jun 14 10:03:09 2000
@@ -16,7 +16,7 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
-.TH TBL 1 "7 September 1996" "Groff Version 1.11"
+.TH TBL 1 "7 September 1996" "Groff Version 1.15"
 .SH NAME
 tbl \- format tables for troff
 .SH SYNOPSIS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/tcpslice.1 man1/tcpslice.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/tcpslice.1	Mon Dec 20 14:53:05 1999
+++ man1/tcpslice.1	Wed Jun 14 10:08:01 2000
@@ -17,7 +17,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.\" %FreeBSD: src/usr.sbin/tcpdump/tcpslice/tcpslice.1,v 1.6.2.1 1999/08/29 15:48:40 peter Exp %
+.\" %FreeBSD: src/usr.sbin/tcpdump/tcpslice/tcpslice.1,v 1.6.2.2 2000/05/09 14:27:13 sheldonh Exp %
 .\"
 .Dd October 14, 1991
 .Dt TCPSLICE 1
@@ -241,7 +241,8 @@
 .Nm Tcpslice
 refuses to write to its output if it is a terminal
 (as indicated by
-.Xr isatty 3 ). This is not a bug but a feature,
+.Xr isatty 3 ) .
+This is not a bug but a feature,
 to prevent it from spraying binary data to the user's terminal.
 Note that this means you must either redirect
 .Pa stdout
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/test.1 man1/test.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/test.1	Mon Dec 20 14:44:54 1999
+++ man1/test.1	Wed Jun 14 10:02:02 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)test.1	8.1 (Berkeley) 5/31/93
-.\" %FreeBSD: src/bin/test/test.1,v 1.8.2.2 1999/12/15 13:37:11 sheldonh Exp %
+.\" %FreeBSD: src/bin/test/test.1,v 1.8.2.3 2000/03/03 14:58:57 sheldonh Exp %
 .\"
 .Dd May 31, 1993
 .Dt TEST 1
@@ -94,7 +94,8 @@
 .Ar file
 exists and is a symbolic link.
 This operator is retained for compatibility with previous versions of
-this program. Do not rely on its existence; use
+this program.
+Do not rely on its existence; use
 .Fl L
 instead.
 .It Fl k Ar file
Only in man1: texindex.1
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/tfmtodit.1 man1/tfmtodit.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/tfmtodit.1	Mon Dec 20 14:46:30 1999
+++ man1/tfmtodit.1	Wed Jun 14 10:03:09 2000
@@ -24,7 +24,7 @@
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
-.TH TFMTODIT 1 "7 September 1996" "Groff Version 1.11"
+.TH TFMTODIT 1 "7 September 1996" "Groff Version 1.15"
 .SH NAME
 tfmtodit \- create font files for use with groff \-Tdvi
 .SH SYNOPSIS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/time.1 man1/time.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/time.1	Mon Dec 20 14:51:53 1999
+++ man1/time.1	Wed Jun 14 10:07:06 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)time.1	8.1 (Berkeley) 6/6/93
+.\"	%FreeBSD: src/usr.bin/time/time.1,v 1.8.2.2 2000/01/14 11:15:32 sheldonh Exp %
 .\"
 .Dd June 6, 1993
 .Dt TIME 1
@@ -70,7 +71,8 @@
 If the
 .Fl o
 flag is used, append to the specified file rather than overwriting
-it. Otherwise, this option has no effect.
+it.
+Otherwise, this option has no effect.
 .It Fl l
 The contents of the
 .Em rusage
@@ -89,18 +91,17 @@
 output POSIX.2 compliant (each time is printed on its own line).
 .El
 .Pp
-Most shells (including
-.Xr csh 1 )
-have their own and syntactically different builtin version of
-.Nm time .
-The command described here
-is available as
-.Pa /usr/bin/time
-to users of those shells.
+Some shells may provide a builtin
+.Nm
+command which is similar or identical to this utility.
+Consult the
+.Xr builtin 1
+manual page. 
 .Sh DIAGNOSTICS
 If
 .Ar command
-could be timed successfully, its exit status is returned. In case
+could be timed successfully, its exit status is returned.
+If
 .Ar command
 terminated abnormally, a warning message is output to stderr.
 If the 
@@ -114,6 +115,7 @@
 encounters any other error, the exit status is between 1 and 125
 included.
 .Sh SEE ALSO
+.Xr builtin 1 ,
 .Xr csh 1 ,
 .Xr getrusage 2 ,
 .Xr wait 2
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/tip.1 man1/tip.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/tip.1	Mon Dec 20 14:51:54 1999
+++ man1/tip.1	Wed Jun 14 10:07:06 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tip.1	8.4 (Berkeley) 4/18/94
+.\" %FreeBSD: src/usr.bin/tip/tip/tip.1,v 1.4.2.1 2000/03/06 11:35:22 sheldonh Exp %
 .\"
 .Dd April 18, 1994
 .Dt TIP 1
@@ -311,12 +312,14 @@
 .Ar ho  .
 .It Ar login
 (str) Pathname of a login shell script to run once connected; standard input
-and output are redirected to the remote host. Leading tildes in the pathname
+and output are redirected to the remote host.
+Leading tildes in the pathname
 are expanded expansion; abbreviated
 .Ar li  .
 .It Ar logout
 (str) Pathname of a shell script to run before disconnecting; standard input
-and output are redirected to the remote host. Leading tildes in the pathname
+and output are redirected to the remote host.
+Leading tildes in the pathname
 are expanded expansion; abbreviated
 .Ar lo  .
 .It Ar prompt
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/troff.1 man1/troff.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/troff.1	Mon Dec 20 14:46:31 1999
+++ man1/troff.1	Wed Jun 14 10:03:10 2000
@@ -1,5 +1,5 @@
 .ig \"-*- nroff -*-
-Copyright (C) 1989-1995 Free Software Foundation, Inc.
+Copyright (C) 1989-1999 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -15,6 +15,9 @@
 versions, except that this permission notice may be included in
 translations approved by the Free Software Foundation instead of in
 the original English.
+
+	%FreeBSD: src/contrib/groff/troff/troff.man,v 1.2.4.1 2000/03/09 20:13:17 asmodai Exp %
+
 ..
 .\" define a string tx for the TeX logo
 .ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
@@ -33,7 +36,7 @@
 .\" The BSD man macros can't handle " in arguments to font change macros,
 .\" so use \(ts instead of ".
 .tr \(ts"
-.TH TROFF 1 "8 September 1996" "Groff Version 1.11"
+.TH TROFF 1 "10 March 2000" "Groff Version 1.15"
 .SH NAME
 troff \- format documents
 .SH SYNOPSIS
@@ -47,7 +50,7 @@
 .ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
 .el .RB "[\ " "\\$1" "\ ]"
 ..
-.OP \-abivzCER
+.OP \-abivzCERU
 .OP \-w name
 .OP \-W name
 .OP \-d cs
@@ -80,7 +83,9 @@
 .B \-b
 Print a backtrace with each warning or error message.  This backtrace
 should help track down the cause of the error.  The line numbers given
-in the backtrace may not always correct: troff's idea of line numbers
+in the backtrace may not always be correct:
+.B troff 's
+idea of line numbers
 gets confused by
 .B as
 or 
@@ -140,6 +145,14 @@
 Read in the file
 .BI tmac. name\fR.
 Normally this will be searched for in /usr/share/tmac.
+By default is used the 
+.I safer
+macro (reverted using -U ).
+.TP
+.B \-U
+Unsafe option, avoids default use of 
+.I safer
+macro.
 .TP
 .B \-R
 Don't load
@@ -2046,6 +2059,7 @@
 .BR grops (1),
 .BR grodvi (1),
 .BR grotty (1),
+.BR grohtml (1),
 .BR groff_font (5),
 .BR groff_out (5),
 .BR groff_char (7)
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/uuencode.1 man1/uuencode.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/uuencode.1	Mon Dec 20 14:51:59 1999
+++ man1/uuencode.1	Wed Jun 14 10:07:16 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)uuencode.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/uuencode/uuencode.1,v 1.7.2.1 1999/08/29 15:34:24 peter Exp %
+.\" %FreeBSD: src/usr.bin/uuencode/uuencode.1,v 1.7.2.2 2000/03/06 11:35:24 sheldonh Exp %
 .\"
 .Dd June 6, 1993
 .Dt UUENCODE 1
@@ -93,7 +93,8 @@
 .Ar file
 and write output to standard output.
 .It Fl s
-Do not strip output pathname to base filename. By default 
+Do not strip output pathname to base filename.
+By default 
 .Nm uudecode 
 deletes any prefix ending with the last slash '/' for security
 purpose.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/vacation.1 man1/vacation.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/vacation.1	Mon Dec 20 14:52:00 1999
+++ man1/vacation.1	Wed Jun 14 10:07:16 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)vacation.1	8.1 (Berkeley) 6/16/93
-.\" %FreeBSD: src/usr.bin/vacation/vacation.1,v 1.6.2.2 1999/08/29 15:34:27 peter Exp %
+.\" %FreeBSD: src/usr.bin/vacation/vacation.1,v 1.6.2.3 2000/03/06 11:35:27 sheldonh Exp %
 .\"
 .Dd June 16, 1993
 .Dt VACATION 1
@@ -75,7 +75,8 @@
 in the same manner as those received for the user's
 login name.
 .It Fl d
-Enable debugging mode. See below.
+Enable debugging mode.
+See below.
 .It Fl i
 Initialize the vacation database files.  It should be used
 before you modify your
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/vidcontrol.1 man1/vidcontrol.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/vidcontrol.1	Mon Dec 20 14:53:07 1999
+++ man1/vidcontrol.1	Wed Jun 14 10:08:02 2000
@@ -12,7 +12,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"     @(#)vidcontrol.1
-.\" %FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.1,v 1.14.2.6 1999/10/30 14:31:56 phantom Exp %
+.\" %FreeBSD: src/usr.sbin/vidcontrol/vidcontrol.1,v 1.14.2.8 2000/03/06 11:37:24 sheldonh Exp %
 .\"
 .Dd June 30, 1999
 .Dt VIDCONTROL 1
@@ -29,6 +29,7 @@
 .Op Fl i Cm adapter | mode
 .Op Fl l Ar screen_map
 .Op Fl L
+.Op Fl M Ar char
 .Op Fl m Cm on | off
 .Op Fl r Ar foreground Ar background
 .Op Fl s Ar number
@@ -49,7 +50,8 @@
 The following command line options are supported:
 .Bl -tag -width indent
 .It Ar mode
-Select a new video mode. The modes currently recognized are:
+Select a new video mode.
+The modes currently recognized are:
 .Ar 80x25 ,
 .Ar 80x30 ,
 .Ar 80x43 ,
@@ -81,7 +83,8 @@
 .Sx Video Mode Support
 below.
 .It Ar foreground Op Ar background
-Change colors when displaying text. Specify the foreground color
+Change colors when displaying text.
+Specify the foreground color
 (e.g.
 .Dq vidcontrol white ) ,
 or both a foreground and background colors
@@ -102,7 +105,8 @@
 .Ar color .
 This option may not be always supported by the video driver.
 .It Fl c Cm normal | blink | destructive
-Change the cursor appearance. The cursor is either an inverting block 
+Change the cursor appearance.
+The cursor is either an inverting block 
 .Pq Cm normal
 that eventually can 
 .Cm blink .
@@ -122,6 +126,9 @@
 Shows info about the current video adapter.
 .It Fl i Cm mode
 Shows the possible video modes with the current video hardware.
+.It Fl M Ar char
+Sets the base character used to render the mouse pointer to
+.Ar char .
 .It Fl m Cm on | off
 Switch the mouse pointer
 .Cm on
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/vt220keys.1 man1/vt220keys.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/vt220keys.1	Mon Dec 20 14:53:31 1999
+++ man1/vt220keys.1	Wed Jun 14 10:08:19 2000
@@ -1,3 +1,4 @@
+.\" %FreeBSD: src/usr.sbin/pcvt/userkeys/vt220keys.1,v 1.5.2.1 2000/03/06 11:36:53 sheldonh Exp %
 .TH VT220KEYS 1 
 .UC 4
 .SH NAME
@@ -11,7 +12,8 @@
 .SH DESCRIPTION
 .I Vt220keys
 sets up a "vt220 terminal" in vt200 mode to allow user
-definition of the SHIFTED function keys. Each
+definition of the SHIFTED function keys.
+Each
 \f2keyname\f1 specified on the command line will be loaded with
 the corresponding \f2keystring\f1.  
 A \f2keyname\f1 is one of the  following "words":
@@ -112,7 +114,8 @@
 to press the SHIFT key and ESC to generate the escape sequence.
 .sp
 Some editors, allow other character(s) to be substituted for the 
-escape character. For example with 
+escape character.
+For example with 
 .B emacs
 include this line in your .emacs_pro:
 .br
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/which.1 man1/which.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/which.1	Mon Dec 20 14:52:04 1999
+++ man1/which.1	Wed Jun 14 10:07:19 2000
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 .\" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.bin/which/which.1,v 1.12.2.1 1999/08/29 15:34:46 peter Exp %
+.\" %FreeBSD: src/usr.bin/which/which.1,v 1.12.2.3 2000/01/14 11:20:04 sheldonh Exp %
 .Dd January 26, 1995
 .Dt WHICH 1
 .Os FreeBSD
@@ -52,12 +52,22 @@
 .It Fl s
 No output, just return 0 if any of the executables are found, or 1 if
 none are found.
+.El
+.Pp
+Some shells may provide a builtin
+.Nm
+command which is similar or identical to this utility.
+Consult the
+.Xr builtin 1
+manual page. 
 .Sh HISTORY
 The
 .Nm
 command first appeared in
 .Fx 2.1 .
 .Sh SEE ALSO
+.Xr builtin 1 ,
+.Xr csh 1 ,
 .Xr find 1 ,
 .Xr locate 1 ,
 .Xr perl 1 ,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man1/whois.1 man1/whois.1
--- /home/horikawa/man-jp/work/fbsd-340r/man/man1/whois.1	Mon Dec 20 14:52:05 1999
+++ man1/whois.1	Wed Jun 14 10:07:20 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)whois.1	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/whois/whois.1,v 1.4.2.3 1999/12/06 22:05:38 joe Exp %
+.\" %FreeBSD: src/usr.bin/whois/whois.1,v 1.4.2.5 2000/03/06 11:35:29 sheldonh Exp %
 .\"
 .Dd November 17, 1999
 .Dt WHOIS 1
@@ -89,7 +89,8 @@
 .Tn \&.ORG
 and
 .Tn \&.EDU
-domains. NOTE! The registration of these doamins is now done by a number of
+domains.
+NOTE! The registration of these domains is now done by a number of
 independent and competing registrars and this database holds no information
 on the domains registered by organizations other than Network Solutions, Inc. 
 Also, note that the InterNIC database
@@ -99,7 +100,8 @@
 .It Fl m
 Use the Route Arbiter Database
 .Pq Tn RADB
-database. It contains route policy specifications for a large
+database.
+It contains route policy specifications for a large
 number of operators' networks.
 .It Fl p
 Use the Asia/Pacific Network Information Center
@@ -109,7 +111,7 @@
 .It Fl Q
 Do a quick lookup.  This means that
 .Nm
-will not attempt to lookup the name in the authoratative whois
+will not attempt to lookup the name in the authoritative whois
 server (if one is listed) nor will it contact InterNic if a lookup
 fails.  This flag has no effect when combined with any other flag.
 .It Fl r

----Next_Part(Wed_Jun_14_23:40:58_2000_518)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: diff_3.4-20000614-JPSNAP_5
Content-Disposition: attachment; filename=diff_3.4-20000614-JPSNAP_5

diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/a.out.5 man5/a.out.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/a.out.5	Mon Dec 20 14:50:14 1999
+++ man5/a.out.5	Wed Jun 14 10:05:46 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)a.out.5	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/share/man/man5/a.out.5,v 1.7.2.1 1999/08/29 16:46:44 peter Exp %
+.\" %FreeBSD: src/share/man/man5/a.out.5,v 1.7.2.3 2000/03/06 11:33:38 sheldonh Exp %
 .\"
 .Dd June 5, 1993
 .Dt A.OUT 5
@@ -116,7 +116,8 @@
 .It Dv EX_DYNAMIC
 indicates that the executable requires the services of the run-time link editor.
 .It Dv EX_PIC
-indicates that the object contains position independent code. This flag is
+indicates that the object contains position independent code.
+This flag is
 set by
 .Xr as 1
 when given the
@@ -280,7 +281,8 @@
 field, is to be relocated to an offset into the Procedure Linkage Table.
 .It Fa r_relative
 If set, this relocation is relative to the (run-time) load address of the
-image this object file is going to be a part of. This type of relocation
+image this object file is going to be a part of.
+This type of relocation
 only occurs in shared objects.
 .It Fa r_copy
 If set, this relocation record identifies a symbol whose contents should
@@ -392,7 +394,8 @@
 This field provides information on the nature of the symbol independent of
 the symbol's location in terms of segments as determined by the
 .Fa n_type
-field. Currently, the lower 4 bits of the
+field.
+Currently, the lower 4 bits of the
 .Fa n_other
 field hold one of two values:
 .Dv AUX_FUNC
@@ -435,6 +438,7 @@
 .Xr execve 2 ,
 .Xr nlist 3 ,
 .Xr core 5 ,
+.Xr elf 5 ,
 .Xr link 5 ,
 .Xr stab 5
 .Sh HISTORY
@@ -457,7 +461,3 @@
 Nobody seems to agree on what
 .Em bss
 stands for.
-.Pp
-New binary file formats may be supported in the future,
-and they probably will not be compatible at any level
-with this ancient format.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/acct.5 man5/acct.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/acct.5	Mon Dec 20 14:50:14 1999
+++ man5/acct.5	Wed Jun 14 10:05:46 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)acct.5	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/share/man/man5/acct.5,v 1.5.2.1 1999/08/29 16:46:44 peter Exp %
+.\" %FreeBSD: src/share/man/man5/acct.5,v 1.5.2.2 2000/03/06 11:33:39 sheldonh Exp %
 .\"
 .Dd June 5, 1993
 .Dt ACCT 5
@@ -45,7 +45,8 @@
 The kernel maintains the following
 .Fa acct
 information structure for all
-processes. If a process terminates, and accounting is enabled,
+processes.
+If a process terminates, and accounting is enabled,
 the kernel calls the
 .Xr acct 2
 function call to prepare and append the record
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/amd.conf.5 man5/amd.conf.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/amd.conf.5	Mon Dec 20 14:52:27 1999
+++ man5/amd.conf.5	Wed Jun 14 10:07:34 2000
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" %Id: amd.conf.5,v 1.3 1999/03/30 17:23:08 ezk Exp %
-.\" %FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.6.2.3 1999/11/27 04:47:09 obrien Exp %
+.\" %FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.6.2.4 2000/05/09 14:27:15 sheldonh Exp %
 .\"
 .Dd April 7, 1997
 .Dt AMD.CONF 5
@@ -678,8 +678,8 @@
 .An Jan-Simon Pendry Aq jsp@doc.ic.ac.uk ,
 Department of Computing, Imperial College, London, UK.
 .Pp
-.An Other Authors and contributers to am-utils are listed in the 
-.Nm AUTHORS
+Other authors and contributers to am-utils are listed in the 
+.Pa AUTHORS
 file distributed with am-utils.
 .Sh HISTORY
 The
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/elf.5 man5/elf.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/elf.5	Mon Dec 20 14:50:14 1999
+++ man5/elf.5	Wed Jun 14 10:05:46 2000
@@ -22,7 +22,7 @@
 .\"OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\"SUCH DAMAGE.
 .\"
-.\"	%FreeBSD: src/share/man/man5/elf.5,v 1.1.2.3 1999/12/07 22:45:18 chris Exp %
+.\"	%FreeBSD: src/share/man/man5/elf.5,v 1.1.2.5 2000/03/13 13:44:03 asmodai Exp %
 .\"
 .Dd July 31, 1999
 .Dt ELF 5
@@ -35,21 +35,25 @@
 .Sh DESCRIPTION
 The header file
 .Aq Pa elf.h
-defines the format of ELF executable binary files. Amongst these files are
+defines the format of ELF executable binary files.
+Amongst these files are
 normal executable files, relocatable object files, core files and shared
 libraries.
 .Pp
 An executable file using the ELF file format consists of an ELF header,
 followed by a program header table or a section header table, or both.
-The ELF header is always at offset zero of the file. The program header
+The ELF header is always at offset zero of the file.
+The program header
 table and the section header table's offset in the file are defined in the
-ELF header. The two tables describe the rest of the particularities of
+ELF header.
+The two tables describe the rest of the particularities of
 the file.
 .Pp
 Applications which wish to process ELF binary files for their native
 architecture only should include
-.Pa sys/elf.h
-in their source code. These applications should need to refer to
+.Pa elf.h
+in their source code.
+These applications should need to refer to
 all the types and structures by their generic names
 .Dq Elf_xxx
 and to the macros by
@@ -63,7 +67,7 @@
 and
 .Pa sys/elf64.h
 instead of
-.Pa sys/elf.h .
+.Pa elf.h .
 Furthermore, all types and structures need to be identified by either
 .Dq Elf32_xxx
 or
@@ -105,7 +109,8 @@
 .Pp
 All data structures that the file format defines follow the
 .Dq natural
-size and alignment guidelines for the relevant class. If necessary,
+size and alignment guidelines for the relevant class.
+If necessary,
 data structures contain explicit padding to ensure 4-byte alignment
 for 4-byte objects, to force structure sizes to a multiple of 4, etc.
 .Pp
@@ -163,16 +168,20 @@
 .Pp
 .Bl -tag -width "EI_VERSION" -compact
 .It Dv EI_MAG0
-The first byte of the magic number. It must be filled with
+The first byte of the magic number.
+It must be filled with
 .Sy ELFMAG0 .
 .It Dv EI_MAG1
-The second byte of the magic number. It must be filled with
+The second byte of the magic number.
+It must be filled with
 .Sy ELFMAG1 .
 .It Dv EI_MAG2
-The third byte of the magic number. It must be filled with
+The third byte of the magic number.
+It must be filled with
 .Sy ELFMAG2 .
 .It Dv EI_MAG3
-The fourth byte of the magic number. It must be filled with
+The fourth byte of the magic number.
+It must be filled with
 .Sy ELFMAG3 .
 .It Dv EI_CLASS
 The fifth byte identifies the architecture for this binary:
@@ -181,14 +190,16 @@
 .It Dv ELFCLASSNONE
 This class is invalid.
 .It Dv ELFCLASS32
-This defines the 32-bit architecture. It supports machines with files
+This defines the 32-bit architecture.
+It supports machines with files
 and virtual address spaces up to 4 Gigabytes.
 .It Dv ELFCLASS64
 This defines the 64-bit architecture.
 .El
 .It Dv EI_DATA
 The sixth byte specifies the data encoding of the processor-specific
-data in the file. Currently these encodings are supported:
+data in the file.
+Currently these encodings are supported:
 .Pp
 .Bl -tag -width "ELFDATA2LSB" -compact
 .It Dv ELFDATANONE
@@ -208,8 +219,11 @@
 Current version.
 .El
 .It Dv EI_PAD
-Start of padding. These bytes are reserved and set to zero. Programs
-which read them should ignore them. The value for EI_PAD will change in
+Start of padding.
+These bytes are reserved and set to zero.
+Programs
+which read them should ignore them.
+The value for EI_PAD will change in
 the future if currently unused bytes are given meanings.
 .It Dv EI_BRAND
 Start of architecture identification.
@@ -278,16 +292,20 @@
 .El
 .It Dv e_entry
 This member gives the virtual address to which the system first transfers
-control, thus starting the process. If the file has no associated entry
+control, thus starting the process.
+If the file has no associated entry
 point, this member holds zero.
 .It Dv e_phoff
-This member holds the program header table's file offset in bytes. If
+This member holds the program header table's file offset in bytes.
+If
 the file has no program header table, this member holds zero.
 .It Dv e_shoff
-This member holds the section header table's file offset in bytes. If the
+This member holds the section header table's file offset in bytes.
+If the
 file has no section header table this member holds zero.
 .It Dv e_flags
-This member holds processor-specific flags associated with the file. Flag
+This member holds processor-specific flags associated with the file.
+Flag
 names take the form EF_`machine_flag'. Currently no flags have been defined.
 .It Dv e_ehsize
 This member holds the ELF header's size in bytes.
@@ -296,37 +314,44 @@
 table; all entries are the same size.
 .It Dv e_phnum
 This member holds the number of entries in the program header
-table. Thus the product of
+table.
+Thus the product of
 .Sy e_phentsize
 and
 .Sy e_phnum
 gives the table's size
-in bytes. If a file has no program header,
+in bytes.
+If a file has no program header,
 .Sy e_phnum
 holds the value zero.
 .It Dv e_shentsize
-This member holds a sections header's size in bytes. A section header is one
+This member holds a sections header's size in bytes.
+A section header is one
 entry in the section header table; all entries are the same size.
 .It Dv e_shnum
-This member holds the number of entries in the section header table. Thus
+This member holds the number of entries in the section header table.
+Thus
 the product of
 .Sy e_shentsize
 and
 .Sy e_shnum
-gives the section header table's size in bytes. If a file has no section
+gives the section header table's size in bytes.
+If a file has no section
 header table,
 .Sy e_shnum
 holds the value of zero.
 .It Dv e_shstrndx
 This member holds the section header table index of the entry associated
-with the section name string table. If the file has no section name string
+with the section name string table.
+If the file has no section name string
 table, this member holds the value
 .Sy SHN_UNDEF .
 .Pp
 .Bl -tag -width "SHN_LORESERVE" -compact
 .It Dv SHN_UNDEF
 This value marks an undefined, missing, irrelevant, or otherwise meaningless
-section reference. For example, a symbol
+section reference.
+For example, a symbol
 .Dq defined
 relative to section number
 .Sy SHN_UNDEF
@@ -342,7 +367,8 @@
 .Sy SHN_LOPROC
 are reserved for processor-specific semantics.
 .It Dv SHN_ABS
-This value specifies absolute values for the corresponding reference. For
+This value specifies absolute values for the corresponding reference.
+For
 example, symbols defined relative to section number
 .Sy SHN_ABS
 have absolute values and are not affected by relocation.
@@ -356,7 +382,8 @@
 and
 .Sy SHN_HIRESERVE ,
 inclusive; the values do
-not reference the section header table. That is, the section header table
+not reference the section header table.
+That is, the section header table
 does
 .Em not
 contain entries for the reserved indices.
@@ -365,7 +392,8 @@
 .Pp
 An executable or shared object file's program header table is an array of
 structures, each describing a segment or other information the system needs
-to prepare the program for execution. An object file
+to prepare the program for execution.
+An object file
 .Em segment
 contains one or more
 .Em sections .
@@ -374,7 +402,8 @@
 .Sy e_phentsize
 and
 .Sy e_phnum
-members. As with the Elf executable header, the program header
+members.
+As with the Elf executable header, the program header
 also has different versions depending on the architecture:
 .Pp
 .Bd -literal -offset indent
@@ -423,7 +452,8 @@
 and
 .Sy p_memsz .
 The bytes from the file are mapped to the beginning of the memory
-segment. If the segment's memory size (
+segment.
+If the segment's memory size (
 .Sy p_memsz
 ) is larger than the file
 size (
@@ -431,7 +461,8 @@
 ), the
 .Dq extra
 bytes are defined to hold the value 0 and to follow the segment's
-initialized area. The file size may not be larger than the memory size.
+initialized area.
+The file size may not be larger than the memory size.
 Loadable segment entries in the program header table appear in ascending
 order, sorted on the
 .Sy p_vaddr
@@ -440,21 +471,26 @@
 The array element specifies dynamic linking information.
 .It Dv PT_INTERP
 The array element specifies the location and size of a null-terminated
-path name to invoke as an interpreter. This segment type is meaningful
+path name to invoke as an interpreter.
+This segment type is meaningful
 only for executable files (though it may occur for shared objects). However
-it may not occur more than once in a file. If it is present it must precede
+it may not occur more than once in a file.
+If it is present it must precede
 any loadable segment entry.
 .It Dv PT_NOTE
 The array element specifies the location and size for auxiliary information.
 .It Dv PT_SHLIB
-This segment type is reserved but has unspecified semantics. Programs that
+This segment type is reserved but has unspecified semantics.
+Programs that
 contain an array element of this type do not conform to the ABI.
 .It Dv PT_PHDR
 The array element, if present, specifies the location and size of the program
 header table itself, both in the file and in the memory image of the program.
-This segment type may not occur more than once in a file. Moreover, it may
+This segment type may not occur more than once in a file.
+Moreover, it may
 only occur if the program header table is part of the memory image of the
-program. If it is present it must precede any loadable segment entry.
+program.
+If it is present it must precede any loadable segment entry.
 .It Dv PT_LOPROC
 This value up to and including
 .Sy PT_HIPROC
@@ -473,7 +509,8 @@
 segment resides in memory.
 .It Dv p_paddr
 On systems for which physical addressing is relevant, this member is
-reserved for the segment's physical address. Under BSD this member is
+reserved for the segment's physical address.
+Under BSD this member is
 not used and must be zero.
 .It Dv p_filesz
 This member holds the number of bytes in the file image of the segment.
@@ -504,11 +541,13 @@
 .Sy PF_R .
 .It Dv p_align
 This member holds the value to which the segments are aligned in memory
-and in the file. Loadable process segments must have congruent values for
+and in the file.
+Loadable process segments must have congruent values for
 .Sy p_vaddr
 and
 .Sy p_offset ,
-modulo the page size. Values of zero and one mean no alignment is required.
+modulo the page size.
+Values of zero and one mean no alignment is required.
 Otherwise,
 .Sy p_align
 should be a positive, integral power of two, and
@@ -519,8 +558,10 @@
 .Sy p_align .
 .El
 .Pp
-An file's section header table lets one locate all the file's sections. The
-section header table is an array of Elf32_Shdr or Elf64_Shdr structures. The
+An file's section header table lets one locate all the file's sections.
+The
+section header table is an array of Elf32_Shdr or Elf64_Shdr structures.
+The
 ELF header's
 .Sy e_shoff
 member gives the byte offset from the beginning of the file to the section
@@ -530,8 +571,10 @@
 .Sy e_shentsize
 holds the size in bytes of each entry.
 .Pp
-A section header table index is a subscript into this array. Some section
-header table indices are reserved. An object file does not have sections for
+A section header table index is a subscript into this array.
+Some section
+header table indices are reserved.
+An object file does not have sections for
 these special indices:
 .Pp
 .Bl -tag -width "SHN_LORESERVE" -compact
@@ -549,7 +592,8 @@
 .Sy SHN_LOPROC
 are reserved for processor-specific semantics.
 .It Dv SHN_ABS
-This value specifies absolute values for the corresponding reference. For
+This value specifies absolute values for the corresponding reference.
+For
 example, symbols defined relative to section number
 .Sy SHN_ABS
 have absolute values and are not affected by relocation.
@@ -557,12 +601,14 @@
 Symbols defined relative to this section are common symbols, such as FORTRAN
 COMMON or unallocated C external variables.
 .It Dv SHN_HIRESERVE
-This value specifies the upper bound of the range of reserved indices. The
+This value specifies the upper bound of the range of reserved indices.
+The
 system reserves indices between
 .Sy SHN_LORESERVE
 and
 .Sy SHN_HIRESERVE,
-inclusive. The section header table does not contain entries for the
+inclusive.
+The section header table does not contain entries for the
 reserved indices.
 .El
 .Pp
@@ -599,7 +645,8 @@
 .Pp
 .Bl -tag -width "sh_addralign" -compact
 .It Dv sh_name
-This member specifies the name of the section. Its value is an index
+This member specifies the name of the section.
+Its value is an index
 into the section header string table section, giving the location of
 a null-terminated string.
 .It Dv sh_type
@@ -607,36 +654,46 @@
 .Pp
 .Bl -tag -width "SHT_PROGBITS" -compact
 .It Dv SHT_NULL
-This value marks the section header as inactive. It does not
-have an associated section. Other members of the section header
+This value marks the section header as inactive.
+It does not
+have an associated section.
+Other members of the section header
 have undefined values.
 .It Dv SHT_PROGBITS
 The section holds information defined by the program, whose
 format and meaning are determined solely by the program.
 .It Dv SHT_SYMTAB
-This section holds a symbol table. Typically, 
+This section holds a symbol table.
+Typically, 
 .Sy SHT_SYMTAB
 provides symbols for link editing, though it may also be used
-for dynamic linking. As a complete symbol table, it may contain
-many symbols unnecessary for dynamic linking. An object file can
+for dynamic linking.
+As a complete symbol table, it may contain
+many symbols unnecessary for dynamic linking.
+An object file can
 also contain a
 .Sy SHN_DYNSYM
 section.
 .It Dv SHT_STRTAB
-This section holds a string table. An object file may have multiple
+This section holds a string table.
+An object file may have multiple
 string table sections.
 .It Dv SHT_RELA
 This section holds relocation entries with explicit addends, such
 as type
 .Sy Elf32_Rela
-for the 32-bit class of object files. An object may have multiple
+for the 32-bit class of object files.
+An object may have multiple
 relocation sections.
 .It Dv SHT_HASH
-This section holds a symbol hash table. All object participating in
-dynamic linking must contain a symbol hash table. An object file may
+This section holds a symbol hash table.
+All object participating in
+dynamic linking must contain a symbol hash table.
+An object file may
 have only one hash table.
 .It Dv SHT_DYNAMIC
-This section holds information for dynamic linking. An object file may
+This section holds information for dynamic linking.
+An object file may
 have only one dynamic section.
 .It Dv SHT_NOTE
 This section holds information that marks the file in some way.
@@ -651,12 +708,14 @@
 This section holds relocation offsets without explicit addends, such
 as type
 .Sy Elf32_Rel
-for the 32-bit class of object files. An object file may have multiple
+for the 32-bit class of object files.
+An object file may have multiple
 relocation sections.
 .It Dv SHT_SHLIB
 This section is reserved but has unspecified semantics.
 .It Dv SHT_DYNSYM
-This section holds a minimal set of dynamic linking symbols. An
+This section holds a minimal set of dynamic linking symbols.
+An
 object file can also contain a
 .Sy SHN_SYMTAB
 section.
@@ -673,7 +732,8 @@
 application programs.
 .It Dv SHT_HIUSER
 This value specifies the upper bound of the range of indices reserved for
-application programs. Section types between
+application programs.
+Section types between
 .Sy SHT_LOUSER
 and
 .Sy SHT_HIUSER
@@ -687,17 +747,21 @@
 .Sy sh_flags ,
 the attribute is
 .Dq on
-for the section. Otherwise, the attribute is
+for the section.
+Otherwise, the attribute is
 .Dq off
-or does not apply. Undefined attributes are set to zero.
+or does not apply.
+Undefined attributes are set to zero.
 .Pp
 .Bl -tag -width "SHF_EXECINSTR" -compact
 .It Dv SHF_WRITE
 This section contains data that should be writable during process
 execution.
 .It Dv SHF_ALLOC
-The section occupies memory during process execution. Some control
-sections do not reside in the memory image of an object file. This
+The section occupies memory during process execution.
+Some control
+sections do not reside in the memory image of an object file.
+This
 attribute is off for those sections.
 .It Dv SHF_EXECINSTR
 The section contains executable machine instructions.
@@ -712,18 +776,21 @@
 Otherwise, the member contains zero.
 .It Dv sh_offset
 This member's value holds the byte offset from the beginning of the file
-to the first byte in the section. One section type,
+to the first byte in the section.
+One section type,
 .Sy SHT_NOBITS ,
 occupies no space in the file, and its
 .Sy sh_offset
 member locates the conceptual placement in the file.
 .It Dv sh_size
-This member holds the section's size in bytes. Unless the section type
+This member holds the section's size in bytes.
+Unless the section type
 is
 .Sy SHT_NOBITS ,
 the section occupies
 .Sy sh_size
-bytes in the file. A section of type
+bytes in the file.
+A section of type
 .Sy SHT_NOBITS
 may have a non-zero size, but it occupies no space in the file.
 .It Dv sh_link
@@ -733,13 +800,16 @@
 This member holds extra information, whose interpretation depends on the
 section type.
 .It Dv sh_addralign
-Some sections have address alignment constraints. If a section holds a
+Some sections have address alignment constraints.
+If a section holds a
 doubleword, the system must ensure doubleword alignment for the entire
-section. That is, the value of
+section.
+That is, the value of
 .Sy sh_addr
 must be congruent to zero, modulo the value of
 .Sy sh_addralign .
-Only zero and positive integral powers of two are allowed. Values of zero
+Only zero and positive integral powers of two are allowed.
+Values of zero
 or one mean the section has no alignment constraints.
 .It Dv sh_entsize
 Some sections hold a table of fixed-sized entries, such as a symbol table.
@@ -752,20 +822,24 @@
 .Bl -tag -width ".shstrtab" -compact
 .It .bss
 This section holds uninitialized data that contributes to the program's
-memory image. By definition, the system initializes the data with zeros
-when the program begins to run. This section is of type
+memory image.
+By definition, the system initializes the data with zeros
+when the program begins to run.
+This section is of type
 .Sy SHT_NOBITS .
 The attributes types are
 .Sy SHF_ALLOC
 and
 .Sy SHF_WRITE .
 .It .comment
-This section holds version control information. This section is of type
+This section holds version control information.
+This section is of type
 .Sy SHT_PROGBITS .
 No attribute types are used.
 .It .data
 This section holds initialized data that contribute to the program's
-memory image. This section is of type
+memory image.
+This section is of type
 .Sy SHT_PROGBITS .
 The attribute types are
 .Sy SHF_ALLOC
@@ -773,24 +847,30 @@
 .Sy SHF_WRITE .
 .It .data1
 This section holds initialized data that contribute to the program's
-memory image. This section is of type
+memory image.
+This section is of type
 .Sy SHT_PROGBITS .
 The attribute types are
 .Sy SHF_ALLOC
 and
 .Sy SHF_WRITE .
 .It .debug
-This section holds information for symbolic debugging. The contents
-are unspecified. This section is of type
+This section holds information for symbolic debugging.
+The contents
+are unspecified.
+This section is of type
 .Sy SHT_PROGBITS .
 No attribute types are used.
 .It .dynamic
-This section holds dynamic linking information. The section's attributes
+This section holds dynamic linking information.
+The section's attributes
 will include the
 .Sy SHF_ALLOC
-bit. Whether the
+bit.
+Whether the
 .Sy SHF_WRITE
-bit is set is processor-specific. This section is of type
+bit is set is processor-specific.
+This section is of type
 .Sy SHT_DYNAMIC .
 See the attributes above.
 .It .dynstr
@@ -801,31 +881,37 @@
 The attribute type used is
 .Sy SHF_ALLOC .
 .It .dynsym
-This section holds the dynamic linking symbol table. This section is of type
+This section holds the dynamic linking symbol table.
+This section is of type
 .Sy SHT_DYNSYM .
 The attribute used is
 .Sy SHF_ALLOC .
 .It .fini
 This section holds executable instructions that contribute to the process
-termination code. When a program exits normally the system arranges to
-execute the code in this section. This section is of type
+termination code.
+When a program exits normally the system arranges to
+execute the code in this section.
+This section is of type
 .Sy SHT_PROGBITS .
 The attributes used are
 .Sy SHF_ALLOC
 and
 .Sy SHF_EXECINSTR .
 .It .got
-This section holds the global offset table. This section is of type
+This section holds the global offset table.
+This section is of type
 .Sy SHT_PROGBITS .
 The attributes are processor-specific.
 .It .hash
-This section holds a symbol hash table. This section is of type
+This section holds a symbol hash table.
+This section is of type
 .Sy SHT_HASH .
 The attribute used is
 .Sy SHF_ALLOC .
 .It .init
 This section holds executable instructions that contribute to the process
-initialization code. When a program starts to run the system arranges to
+initialization code.
+When a program starts to run the system arranges to
 execute the code in this section before calling the main program entry point.
 This section is of type
 .Sy SHT_PROGBITS .
@@ -834,36 +920,46 @@
 and
 .Sy SHF_EXECINSTR .
 .It .interp
-This section holds the pathname of a program interpreter. If the file has
+This section holds the pathname of a program interpreter.
+If the file has
 a loadable segment that includes the section, the section's attributes will
 include the
 .Sy SHF_ALLOC
-bit. Otherwise, that bit will be off. This section is of type
+bit.
+Otherwise, that bit will be off.
+This section is of type
 .Sy SHT_PROGBITS .
 .It .line
 This section holds line number information for symbolic debugging, which
 describes the correspondence between the program source and the machine code.
-The contents are unspecified. This section is of type
+The contents are unspecified.
+This section is of type
 .Sy SHT_PROGBITS .
 No attribute types are used.
 .It .note
 This section holds information in the
 .Dq Note Section
-format described below. This section is of type
+format described below.
+This section is of type
 .Sy SHT_NOTE .
 No attribute types are used.
 .It .plt
-This section holds the procedure linkage table. This section is of type
+This section holds the procedure linkage table.
+This section is of type
 .Sy SHT_PROGBITS .
 The attributes are processor-specific.
 .It .relNAME
-This section holds relocation information as described below. If the file
+This section holds relocation information as described below.
+If the file
 has a loadable segment that includes relocation, the section's attributes
 will include the
 .Sy SHF_ALLOC
-bit. Otherwise the bit will be off. By convention, 
+bit.
+Otherwise the bit will be off.
+By convention, 
 .Dq NAME
-is supplied by the section to which the relocations apply. Thus a relocation
+is supplied by the section to which the relocations apply.
+Thus a relocation
 section for
 .Sy .text
 normally would have the name
@@ -871,13 +967,17 @@
 This section is of type
 .Sy SHT_REL .
 .It .relaNAME
-This section holds relocation information as described below. If the file
+This section holds relocation information as described below.
+If the file
 has a loadable segment that includes relocation, the section's attributes
 will include the
 .Sy SHF_ALLOC
-bit. Otherwise the bit will be off. By convention,
+bit.
+Otherwise the bit will be off.
+By convention,
 .Dq NAME
-is supplied by the section to which the relocations apply. Thus a relocation
+is supplied by the section to which the relocations apply.
+Thus a relocation
 section for 
 .Sy .text
 normally would have the name
@@ -886,39 +986,49 @@
 .Sy SHT_RELA .
 .It .rodata
 This section holds read-only data that typically contributes to a
-non-writable segment in the process image. This section is of type
+non-writable segment in the process image.
+This section is of type
 .Sy SHT_PROGBITS .
 The attribute used is
 .Sy SHF_ALLOC .
 .It .rodata1
 This section hold read-only data that typically contributes to a 
-non-writable segment in the process image. This section is of type
+non-writable segment in the process image.
+This section is of type
 .Sy SHT_PROGBITS .
 The attribute used is
 .Sy SHF_ALLOC .
 .It .shstrtab
-This section holds section names. This section is of type
+This section holds section names.
+This section is of type
 .Sy SHT_STRTAB .
 No attribute types are used.
 .It .strtab
 This section holds strings, most commonly the strings that represent the
-names associated with symbol table entries. If the file has a loadable
+names associated with symbol table entries.
+If the file has a loadable
 segment that includes the symbol string table, the section's attributes
 will include the
 .Sy SHF_ALLOC
-bit. Otherwise the bit will be off. This section is of type
+bit.
+Otherwise the bit will be off.
+This section is of type
 .Sy SHT_STRTAB .
 .It .symtab
-This section holds a symbol table. If the file has a loadable segment
+This section holds a symbol table.
+If the file has a loadable segment
 that includes the symbol table, the section's attributes will include
 the
 .Sy SHF_ALLOC
-bit. Otherwise the bit will be off. This section is of type
+bit.
+Otherwise the bit will be off.
+This section is of type
 .Sy SHT_SYMTAB .
 .It .text
 This section holds the
 .Dq text ,
-or executable instructions, of a program. This section is of type
+or executable instructions, of a program.
+This section is of type
 .Sy SHT_PROGBITS .
 The attributes used are
 .Sy SHF_ALLOC
@@ -927,14 +1037,19 @@
 .El
 .Pp
 String table sections hold null-terminated character sequences, commonly
-called strings. The object file uses these strings to represent symbol
-and section names. One references a string as an index into the string
-table section. The first byte, which is index zero, is defined to hold
-a null character. Similarly, a string table's last byte is defined to
+called strings.
+The object file uses these strings to represent symbol
+and section names.
+One references a string as an index into the string
+table section.
+The first byte, which is index zero, is defined to hold
+a null character.
+Similarly, a string table's last byte is defined to
 hold a null character, ensuring null termination for all strings.
 .Pp
 An object file's symbol table holds information needed to locate and
-relocate a program's symbolic definitions and references. A symbol table
+relocate a program's symbolic definitions and references.
+A symbol table
 index is a subscript into this array.
 .Pp
 .Bd -literal -offset indent
@@ -962,13 +1077,16 @@
 .Bl -tag -width "st_value" -compact
 .It Dv st_name
 This member holds an index into the object file's symbol string table,
-which holds character representations of the symbol names. If the value
+which holds character representations of the symbol names.
+If the value
 is non-zero, it represents a string table index that gives the symbol
-name. Otherwise, the symbol table has no name.
+name.
+Otherwise, the symbol table has no name.
 .It Dv st_value
 This member gives the value of the associated symbol.
 .It Dv st_size
-Many symbols have associated sizes. This member holds zero if the symbol
+Many symbols have associated sizes.
+This member holds zero if the symbol
 has no size or an unknown size.
 .It Dv st_info
 This member specifies the symbol's type and binding attributes:
@@ -981,13 +1099,15 @@
 .It Dv STT_FUNC
 The symbol is associated with a function or other executable code.
 .It Dv STT_SECTION
-The symbol is associated with a section. Symbol table entries of
+The symbol is associated with a section.
+Symbol table entries of
 this type exist primarily for relocation and normally have
 .Sy STB_LOCAL
 bindings.
 .It Dv STT_FILE
 By convention the symbol's name gives the name of the source file
-associated with the object file. A file symbol has
+associated with the object file.
+A file symbol has
 .Sy STB_LOCAL
 bindings, its section index is
 .Sy SHN_ABS ,
@@ -1007,10 +1127,12 @@
 .Bl -tag -width "STB_GLOBAL" -compact
 .It Dv STB_LOCAL
 Local symbols are not visible outside the object file containing their
-definition. Local symbols of the same name may exist in multiple file
+definition.
+Local symbols of the same name may exist in multiple file
 without interfering with each other.
 .It Dv STB_GLOBAL
-Global symbols are visible to all object files being combined. One file's
+Global symbols are visible to all object files being combined.
+One file's
 definition of a global symbol will satisfy another file's undefined
 reference to the same symbol.
 .It Dv STB_WEAK
@@ -1047,15 +1169,18 @@
 .It Dv st_shndx
 Every symbol table entry is
 .Dq defined
-in relation to some action. This member holds the relevant section
+in relation to some action.
+This member holds the relevant section
 header table index.
 .El
 .Pp
 Relocation is the process of connecting symbolic references with
-symbolic definitions. Relocatable files must have information that 
+symbolic definitions.
+Relocatable files must have information that 
 describes how to modify their section contents, thus allowing executable
 and shared object files to hold the right information for a process'
-program image. Relocation entries are these data.
+program image.
+Relocation entries are these data.
 .Pp
 Relocation structures that do not need an addend:
 .Pp
@@ -1093,13 +1218,16 @@
 .It Dv r_offset
 This member gives the location at which to apply the relocation action.
 For a relocatable file, the value is the byte offset from the beginning
-of the section to the storage unit affected by the relocation. For an
+of the section to the storage unit affected by the relocation.
+For an
 executable file or shared object, the value is the virtual address of
 the storage unit affected by the relocation.
 .It Dv r_info
 This member gives both the symbol table index with respect to which the
-relocation must be made and the type of relocation to apply. Relocation
-types are processor-specific. When the text refers to a relocation
+relocation must be made and the type of relocation to apply.
+Relocation
+types are processor-specific.
+When the text refers to a relocation
 entry's relocation type or symbol table index, it means the result of
 applying
 .Sy ELF_[32|64]_R_TYPE
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/ethers.5 man5/ethers.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/ethers.5	Mon Dec 20 14:50:14 1999
+++ man5/ethers.5	Wed Jun 14 10:05:46 2000
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/share/man/man5/ethers.5,v 1.6.2.1 1999/08/29 16:46:45 peter Exp %
+.\" %FreeBSD: src/share/man/man5/ethers.5,v 1.6.2.2 2000/03/06 11:33:40 sheldonh Exp %
 .\"
 .Dd April 12, 1995
 .Dt ETHERS 5
@@ -40,7 +40,8 @@
 The
 .Nm ethers
 database contains information regarding known 48-bit ethernet addresses
-of hosts on an Internetwork. The data is stored in a file called
+of hosts on an Internetwork.
+The data is stored in a file called
 .Pa /etc/ethers
 in the following format:
 .Bd -unfilled -offset indent
@@ -48,8 +49,10 @@
 .Ed
 .Pp
 Items are separated by any number of blanks and/or
-tab characters. A ``#'' at the start of a line indicates the
-beginning of a comment that extends to the end of the line. A ``+'' at
+tab characters.
+A ``#'' at the start of a line indicates the
+beginning of a comment that extends to the end of the line.
+A ``+'' at
 the start of a line will cause the
 .Xr ethers 3
 library functions to use data stored in the
@@ -65,8 +68,10 @@
 .Tn ASCII
 form as "x:x:x:x:x:x" where
 .Ar x
-is a hexadecimal value between 0x00 and 0xFF. The address values
-should be in network order. Hostnames specified in the
+is a hexadecimal value between 0x00 and 0xFF.
+The address values
+should be in network order.
+Hostnames specified in the
 .Pa /etc/ethers
 database should correspond to entries in the
 .Xr hosts 5
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/exports.5 man5/exports.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/exports.5	Mon Dec 20 14:49:16 1999
+++ man5/exports.5	Wed Jun 14 10:05:10 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)exports.5	8.3 (Berkeley) 3/29/95
-.\" %FreeBSD: src/sbin/mountd/exports.5,v 1.7.2.1 1999/08/29 15:14:46 peter Exp %
+.\" %FreeBSD: src/sbin/mountd/exports.5,v 1.7.2.3 2000/06/08 06:54:23 kris Exp %
 .\"
 .Dd March 29, 1995
 .Dt EXPORTS 5
@@ -77,7 +77,8 @@
 this form allows the host(s) to mount at any point within the filesystem,
 including regular files if the
 .Fl r
-option is used on mountd.
+option is used on
+.Xr mountd 8 .
 The pathnames must not have any symbolic links in them and should not have
 any "." or ".." components.
 Mount points for a filesystem may appear on multiple lines each with
@@ -162,8 +163,10 @@
 exports strictly according to the spec (RFC 2054 and RFC 2055) can
 be done with the
 .Fl public
-flag. However, this flag in itself allows r/w access to all files in
-the filesystem, not requiring reserved ports and not remapping uids. It
+flag.
+However, this flag in itself allows r/w access to all files in
+the filesystem, not requiring reserved ports and not remapping uids.
+It
 is only provided to conform to the spec, and should normally not be used.
 For a
 .Tn WebNFS
@@ -185,7 +188,8 @@
 option can be used to specify a file whose handle will be returned if
 a directory is looked up using the public filehandle (
 .Tn WebNFS Ns ).
-This is to mimic the behavior of URLs. If no
+This is to mimic the behavior of URLs.
+If no
 .Fl index
 option is specified, a directory filehandle will be returned as usual.
 The
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/fbtab.5 man5/fbtab.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/fbtab.5	Mon Dec 20 14:50:14 1999
+++ man5/fbtab.5	Wed Jun 14 10:05:46 2000
@@ -1,5 +1,5 @@
 .\"
-.\" %FreeBSD: src/share/man/man5/fbtab.5,v 1.4.2.1 1999/08/29 16:46:46 peter Exp %
+.\" %FreeBSD: src/share/man/man5/fbtab.5,v 1.4.2.2 2000/03/06 11:33:41 sheldonh Exp %
 .\"
 .Dd August 22, 1994
 .Dt FBTAB 5
@@ -20,7 +20,8 @@
 whitespace: a login device (/dev/ttyv0), an octal
 permission number (0600), and a ":"-delimited list of
 devices (/dev/console). All device names are
-absolute paths. A path that ends in "/*" refers to all
+absolute paths.
+A path that ends in "/*" refers to all
 directory entries except "." and "..".
 .Pp
 If the tty argument (relative path) matches a login device
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/fs.5 man5/fs.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/fs.5	Mon Dec 20 14:50:14 1999
+++ man5/fs.5	Wed Jun 14 10:05:46 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fs.5	8.2 (Berkeley) 4/19/94
-.\" %FreeBSD: src/share/man/man5/fs.5,v 1.8.2.1 1999/08/29 16:46:46 peter Exp %
+.\" %FreeBSD: src/share/man/man5/fs.5,v 1.8.2.2 2000/03/06 11:33:42 sheldonh Exp %
 .\"
 .Dd April 19, 1994
 .Dt FS 5
@@ -236,7 +236,8 @@
 The
 .Fa fs_minfree
 element gives the minimum acceptable percentage of file system
-blocks that may be free. If the freelist drops below this level
+blocks that may be free.
+If the freelist drops below this level
 only the super-user may continue to allocate blocks.
 The
 .Fa fs_minfree
@@ -268,7 +269,8 @@
 .Em Cylinder group related limits :
 Each cylinder keeps track of the availability of blocks at different
 rotational positions, so that sequential blocks can be laid out
-with minimum rotational latency. With the default of 8 distinguished
+with minimum rotational latency.
+With the default of 8 distinguished
 rotational positions, the resolution of the
 summary information is 2ms for a typical 3600 rpm drive.
 .Pp
@@ -338,7 +340,8 @@
 The size of these tables is
 .Em inversely
 proportional to the block
-size of the file system. The size of the tables is
+size of the file system.
+The size of the tables is
 increased when sector sizes are not powers of two,
 as this increases the number of cylinders
 included before the rotational pattern repeats
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/groff_font.5 man5/groff_font.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/groff_font.5	Mon Dec 20 14:46:26 1999
+++ man5/groff_font.5	Wed Jun 14 10:03:06 2000
@@ -27,7 +27,7 @@
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
-.TH GROFF_FONT 5 "7 September 1996" "Groff Version 1.11"
+.TH GROFF_FONT 5 "7 September 1996" "Groff Version 1.15"
 .SH NAME
 groff_font \- format of groff device and font description files
 .SH DESCRIPTION
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/groff_out.5 man5/groff_out.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/groff_out.5	Mon Dec 20 14:46:26 1999
+++ man5/groff_out.5	Wed Jun 14 10:03:06 2000
@@ -1,6 +1,6 @@
 '\" e
 .ig \"-*- nroff -*-
-Copyright (C) 1989-1995 Free Software Foundation, Inc.
+Copyright (C) 1989-1999 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -16,11 +16,14 @@
 versions, except that this permission notice may be included in
 translations approved by the Free Software Foundation instead of in
 the original English.
+
+	%FreeBSD: src/contrib/groff/man/groff_out.man,v 1.2.2.1 2000/03/09 20:10:39 asmodai Exp %
+
 ..
 .\" This man page must be preprocessed with eqn.
 .ie \n(.g .ds ic \/
 .el .ds ic \^
-.TH GROFF_OUT 5 "11 May 1998" "Groff Version 1.11"
+.TH GROFF_OUT 5 "10 March 2000" "Groff Version 1.15"
 .SH NAME
 groff_out \- groff intermediate output format
 .SH DESCRIPTION
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/group.5 man5/group.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/group.5	Mon Dec 20 14:50:14 1999
+++ man5/group.5	Wed Jun 14 10:05:46 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)group.5	8.3 (Berkeley) 4/19/94
-.\" %FreeBSD: src/share/man/man5/group.5,v 1.13.2.1 1999/08/29 16:46:47 peter Exp %
+.\" %FreeBSD: src/share/man/man5/group.5,v 1.13.2.2 2000/03/06 11:33:43 sheldonh Exp %
 .\"
 .Dd September 29, 1994
 .Dt GROUP 5
@@ -45,7 +45,8 @@
 .Tn ASCII
 records, one per group, containing four colon
 .Ql \&:
-separated fields. These fields are as follows:
+separated fields.
+These fields are as follows:
 .Bl -tag -width password -offset indent -compact
 .It group
 Name of the group.
@@ -60,7 +61,8 @@
 .El
 .Pp
 Lines whose first non-whitespace character is a pound-sign (#)
-are comments, and are ignored. Blank lines that consist 
+are comments, and are ignored.
+Blank lines that consist 
 only of spaces, tabs or newlines are also ignored.
 .Pp
 The
@@ -133,9 +135,11 @@
 .Sx SEE ALSO .
 
 In older implementations, 
-a group cannot have more than 200 members. The maximum line length of
+a group cannot have more than 200 members.
+The maximum line length of
 .Pa /etc/group
-is 1024 characters. Longer lines will be skipped.
+is 1024 characters.
+Longer lines will be skipped.
 This limitation disappeared in
 .Fx 3.0 .
 Older binaries that are statically linked, depend on old
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/hosts.equiv.5 man5/hosts.equiv.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/hosts.equiv.5	Mon Dec 20 14:50:14 1999
+++ man5/hosts.equiv.5	Wed Jun 14 10:05:46 2000
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/share/man/man5/hosts.equiv.5,v 1.6.2.1 1999/08/29 16:46:47 peter Exp %
+.\" %FreeBSD: src/share/man/man5/hosts.equiv.5,v 1.6.2.3 2000/03/06 11:33:44 sheldonh Exp %
 .\"
 .Dd Feb 1996
 .Dt HOSTS.EQUIV 5
@@ -58,18 +58,29 @@
 [+-][hostname|@netgroup] [[+-][username|@netgroup]]
 .Ed
 .Pp
-A ``@'' indicates a host by netgroup or user by netgroup. A single
-``+'' matches all hosts or users.  A host name with a leading ``-'' will reject
-all matching hosts and all their users. A user name with leading ``-''
+A
+.Dq @
+indicates a host by netgroup or user by netgroup.
+A single
+.Dq +
+matches all hosts or users.  A host name with a leading
+.Dq -
+will reject
+all matching hosts and all their users.
+A user name with leading
+.Dq -
 will reject all matching users from matching hosts.
 .Pp
 Items are separated by any number of blanks and/or
-tab characters.  A ``#'' indicates the beginning of
+tab characters.  A
+.Dq #
+indicates the beginning of
 a comment; characters up to the end of the line are
 not interpreted by routines which search the file.
 .Pp
 Host names are specified in the conventional
-``.'' (dot) notation using the
+.Dq \&.
+(dot) notation using the
 .Xr inet_addr 3
 routine
 from the Internet address manipulation library,
@@ -87,16 +98,23 @@
 .Pp
 .Dl bar.com foo
 .Pp
-Trust user ``foo'' from host ``bar.com''.
+Trust user
+.Dq foo
+from host
+.Dq bar.com .
 .Pp
 .Dl +@allclient 
 .Pp
-Trust all hosts from netgroup ``allclient''.
+Trust all hosts from netgroup
+.Dq allclient .
 .Pp
 .Dl +@allclient -@dau
 .Pp
-Trust all hosts from netgroup ``allclient'' and their users 
-except users from netgroup ``dau''.
+Trust all hosts from netgroup
+.Dq allclient
+and their users 
+except users from netgroup
+.Dq dau .
 .Sh FILES
 .Bl -tag -width /etc/hosts.equivxxx -compact
 .It Pa /etc/hosts.equiv
@@ -121,5 +139,8 @@
 .Xr ifconfig 8 ,
 .Xr named 8
 .Sh BUGS
-This man page is incomplete. For more information read
-the source in lib/libc/net/rcmd.c or the sunos man page.
+This man page is incomplete.
+For more information read
+the source in
+.Pa src/lib/libc/net/rcmd.c
+or the SunOS man page.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/hosts_access.5 man5/hosts_access.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/hosts_access.5	Mon Dec 20 14:44:38 1999
+++ man5/hosts_access.5	Wed Jun 14 10:01:51 2000
@@ -89,6 +89,13 @@
 bitwise AND of the address and the `mask\'. For example, the net/mask
 pattern `131.155.72.0/255.255.254.0\' matches every address in the
 range `131.155.72.0\' through `131.155.73.255\'.
+.IP \(bu
+A string that begins with a `/\' character is treated as a file
+name. A host name or address is matched if it matches any host name
+or address pattern listed in the named file. The file format is
+zero or more lines with zero or more host name or address patterns
+separated by whitespace.  A file name pattern can be used anywhere
+a host name or address pattern can be used.
 .SH WILDCARDS
 The access control language supports explicit wildcards:
 .IP ALL
@@ -326,7 +333,7 @@
 	/usr/ucb/mail -s %d-%h root) &
 .fi
 .PP
-The safe_finger command comes with the tcpd wrapper and should be
+The safe_finger command is intended for use in back-fingering and should be
 installed in a suitable place. It limits possible damage from data sent
 by the remote finger server.  It gives better protection than the
 standard finger command.
@@ -350,6 +357,12 @@
 terminated by a newline character; when the result of %<letter>
 expansion would overflow an internal buffer; when a system call fails
 that shouldn\'t.  All problems are reported via the syslog daemon.
+.SH IMPLEMENTATION NOTES
+Some operating systems are distributed with TCP Wrappers as part of the
+base system. It is common for such systems to build wrapping functionality
+into networking utilities. Notably, some systems offer an \fIinetd\fR(8)
+which does not require the use of the \fItcpd\fR(8). Check your system's
+documentation for details.
 .SH FILES
 .na
 .nf
@@ -376,3 +389,4 @@
 Den Dolech 2, P.O. Box 513, 
 5600 MB Eindhoven, The Netherlands
 \" @(#) hosts_access.5 1.20 95/01/30 19:51:46
+\" %FreeBSD: src/contrib/tcp_wrappers/hosts_access.5,v 1.1.1.1.2.2 1999/12/23 18:47:06 sheldonh Exp %
Only in man5: info.5
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/isdnd.acct.5 man5/isdnd.acct.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/isdnd.acct.5	Mon Dec 20 14:53:23 1999
+++ man5/isdnd.acct.5	Wed Jun 14 10:08:14 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.acct.5,v 1.1.2.3 1999/11/15 22:40:55 joe Exp % 
+.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.acct.5,v 1.1.2.4 2000/03/06 11:35:54 sheldonh Exp % 
 .\"
 .\"	last edit-date: [Mon Feb 15 16:54:23 1999]
 .\"
@@ -62,7 +62,8 @@
 .Dl Day.Month.Year Hour:Minutes:seconds
 .Pp
 .Em UNTIL
-is the time the connection was closed. The format is the same as
+is the time the connection was closed.
+The format is the same as
 described for
 .Em FROM
 above.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/isdnd.rates.5 man5/isdnd.rates.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/isdnd.rates.5	Mon Dec 20 14:53:23 1999
+++ man5/isdnd.rates.5	Wed Jun 14 10:08:14 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rates.5,v 1.1.2.3 1999/11/15 22:40:56 joe Exp % 
+.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rates.5,v 1.1.2.4 2000/03/06 11:35:55 sheldonh Exp % 
 .\"
 .\"     last edit-date: [Sun Feb 14 10:11:05 1999]
 .\"
@@ -36,7 +36,8 @@
 The file
 .Pa isdnd.rates
 contains descriptions how long charging units last at a given time of day,
-day of week and the distance to the destination. If this file is available,
+day of week and the distance to the destination.
+If this file is available,
 this information may be used by the
 .Xr isdnd 8
 ISDN connection management daemon to calculate the short hold time for a 
@@ -69,9 +70,12 @@
 .Ed
 .Pp
 Start_hour and start_minutes define the begin of a time section and end_hour
-and end_minutes define the end. Charge_unit_length define the length of a
-charging unit in the previously defined time section. No spaces or tabs are
-allowed inside this field. The hour and minutes specifications MUST have
+and end_minutes define the end.
+Charge_unit_length define the length of a
+charging unit in the previously defined time section.
+No spaces or tabs are
+allowed inside this field.
+The hour and minutes specifications MUST have
 exactly 2 digits, in case just one digit is needed, a leading 0 must be used.
 .Pp
 For example,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/isdnd.rc.5 man5/isdnd.rc.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/isdnd.rc.5	Mon Dec 20 14:53:23 1999
+++ man5/isdnd.rc.5	Wed Jun 14 10:08:14 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rc.5,v 1.1.2.3 1999/11/15 22:40:56 joe Exp % 
+.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.rc.5,v 1.1.2.4 2000/03/06 11:35:56 sheldonh Exp % 
 .\"
 .\"     last edit-date: [Wed Jul 28 15:57:02 1999]
 .\"
@@ -76,8 +76,10 @@
 .Bl -tag -width system -compact
 
 .It Li system
-This keyword starts the system configuration section. It must not 
-have a parameter and may be used only once. The keyword is mandatory.
+This keyword starts the system configuration section.
+It must not 
+have a parameter and may be used only once.
+The keyword is mandatory.
 The following keywords are valid in the system configuration section:
 .Bl -tag -width useacctfile -compact
 
@@ -85,7 +87,8 @@
 If this parameter is set to
 .Em on ,
 accounting information is written even if the local site was not charged
-or no charging information is available or is not subscribed. (optional)
+or no charging information is available or is not subscribed.
+(optional)
 
 .It Li acctfile
 Specifies the name of the accounting file which is used when the keyword
@@ -94,14 +97,16 @@
 .Em on .
 See also system keyword
 .Em rotatesuffix .
-If this keyword is omitted the system default is used. (optional)
+If this keyword is omitted the system default is used.
+(optional)
 
 .It Li aliasing
 If this parameter is set to
 .Em on ,
 alias processing of telephone-number to name is enabled (see also the
 .Em aliasfile
-keyword below). The default is off. (optional)
+keyword below). The default is off.
+(optional)
 
 .It Li aliasfile
 Specifies the name of the telephone number-to-name alias database file shared
@@ -109,7 +114,8 @@
 .Xr isdntel 1
 utility when alias processing is enabled via the
 .Em aliasing
-keyword. (optional)
+keyword.
+(optional)
 
 .It Li beepconnect
 In fullscreen mode, if this parameter is set to
@@ -120,7 +126,9 @@
 If this parameter is set to
 .Em on ,
 date/time information from the exchange (if provided) is written to the
-logfile. The default is off. (optional)
+logfile.
+The default is off.
+(optional)
 
 .It Li monitor-allowed
 If this parameter is set to
@@ -138,7 +146,8 @@
 
 .It Li monitor
 This keyword specifies a local socket name or a host or network for remote
-monitoring. The 
+monitoring.
+The 
 .Em monitor 
 specification may either be:
 .Pp
@@ -158,7 +167,8 @@
 .It Li monitor-access
 This keyword specifies the access rights for a previously used 
 .Em monitor
-keyword. The supported access rights are:
+keyword.
+The supported access rights are:
 .Pp
 .Bl -tag -width Ds -compact -offset
 .It Ar fullcmd
@@ -170,11 +180,14 @@
 .El
 
 .It Li ratesfile
-Specifies the name of the ratesfile. If this keyword is omitted the system
-default is used. (optional)
+Specifies the name of the ratesfile.
+If this keyword is omitted the system
+default is used.
+(optional)
 
 .It Li regexpr
-This keyword is used to specify regular expressions. It can be specified
+This keyword is used to specify regular expressions.
+It can be specified
 more than once up to a compile time dependent value (currently set to 5 by
 the MAX_RE definition in the source).
 .Pp
@@ -207,18 +220,21 @@
 (optional)
 
 .It Li rotatesuffix
-Specifies a suffix for renaming the log- and the accountingfilename. In case
+Specifies a suffix for renaming the log- and the accountingfilename.
+In case
 rotatesuffix is used and a USR1 signal is sent to isdnd, the logfile and the
 accounting file is not only closed and reopened but the old logfile is also
 renamed to the former filename with the rotatesuffix string appended.
 If this keyword is omitted, the logfiles are just closed and reopened; this
-is also the default behaviour. (optional)
+is also the default behaviour.
+(optional)
 
 .It Li rtprio
 Specifies the realtime priority 
 .Nm isdnd
 runs at as an integer value in the range 0...31 with 0 being the highest
-priority. This keyword is optional; if not specified the process priority of 
+priority.
+This keyword is optional; if not specified the process priority of 
 .Nm isdnd
 is not touched in any way.
 ( See also
@@ -232,12 +248,14 @@
 If this parameter is set to
 .Em on
 charging (if available) and accounting information is written to the
-accounting file. (optional)
+accounting file.
+(optional)
 
 .El
 
 .It Li entry
-This keyword starts one configuration entry. It must not have a parameter.
+This keyword starts one configuration entry.
+It must not have a parameter.
 This keyword must be used at least once.
 The following keywords are valid in an entry section:
 .Bl -tag -width unitlengthsrc -compact
@@ -246,7 +264,8 @@
 This keyword is used to specify the name of a program which is run in
 case an incoming telephone connection specified
 .Em answer
-in its configuration entry. The default name is
+in its configuration entry.
+The default name is
 .Em answer .
 .Nm Isdnd
 expects to find this program beneath the path
@@ -255,15 +274,18 @@
 (optional)
 
 .It Li alert
-is used to specify a time in seconds to wait before accepting a call. This
+is used to specify a time in seconds to wait before accepting a call.
+This
 keyword is only usable for incoming telephone calls (dialin-reaction = answer).
 It is used to have a chance to accept an incoming call on the phone before
-the answering machine starts to run. The minimum value for the alert parameter
+the answering machine starts to run.
+The minimum value for the alert parameter
 is 5 seconds and the maximum parameter allowed is 180 seconds.
 (optional)
 
 .It Li b1protocol
-The B channel layer 1 protocol used for this connection. The keyword is mandatory.
+The B channel layer 1 protocol used for this connection.
+The keyword is mandatory.
 The currently configurable values are:
 .Pp
 .Bl -tag -width Ds -compact -offset
@@ -275,11 +297,13 @@
 
 .It Li callbackwait
 The time in seconds to wait between hanging up the call from a remote site
-and calling back the remote site. (optional)
+and calling back the remote site.
+(optional)
 
 .It Li calledbackwait
 The time in seconds to wait for a remote site calling back the local site
-after a call from the local site to the remote site has been made. (optional)
+after a call from the local site to the remote site has been made.
+(optional)
 
 .It Li dialin-reaction
 Used to specify what to do when an incoming connection request is received.
@@ -320,7 +344,8 @@
 each time it dials because the other side is also dialing.
 
 .It Li dialretries
-The number of dialing retries before giving up. (optional)
+The number of dialing retries before giving up.
+(optional)
 
 .It Li direction
 This keyword is used to configure if incoming and outgoing, incoming-only or
@@ -360,11 +385,13 @@
 
 .It Li earlyhangup
 A (safety) time in seconds which specifies the time to hangup before an
-expected next charging unit will occur. (optional)
+expected next charging unit will occur.
+(optional)
 
 .It Li idle-algorithm-outgoing
 The algorithm used to determine when to hang up an outgoing call when the
-line becomes idle. The current algorithms are:
+line becomes idle.
+The current algorithms are:
 
 .Pp
 .Bl -tag -width calledback -compact -offset
@@ -405,11 +432,15 @@
 kernel subroutine to delay the transmittion of the first packet after a
 successfull connection is made by this value for 
 .Em incoming
-ISDN connections. The specification unit is 1/100 second. A zero (0) disables
-this feature and is the default value. This feature is implemented (and makes 
+ISDN connections.
+The specification unit is 1/100 second.
+A zero (0) disables
+this feature and is the default value.
+This feature is implemented (and makes 
 sense only) for the
 .Xr i4bipr 4
-IP over raw HDLC ISDN driver. (optional)
+IP over raw HDLC ISDN driver.
+(optional)
 
 .It Li isdntxdel-outgoing
 A delay value suitable for the
@@ -417,14 +448,19 @@
 kernel subroutine to delay the transmittion of the first packet after a
 successfull connection is made by this value for 
 .Em outgoing
-ISDN connections. The specification unit is 1/100 second. A zero (0) disables   
-this feature and is the default value. This feature is implemented (and makes
+ISDN connections.
+The specification unit is 1/100 second.
+A zero (0) disables   
+this feature and is the default value.
+This feature is implemented (and makes
 sense only) for the
 .Xr i4bipr 4
-IP over raw HDLC ISDN driver. (optional)
+IP over raw HDLC ISDN driver.
+(optional)
 
 .It Li local-phone-dialout
-The local telephone number used when the local site dials out. When dialing
+The local telephone number used when the local site dials out.
+When dialing
 out to a remote site, the number specified here is put into the
 .Em "Calling Party Number Information Element" .
 .Pp
@@ -434,8 +470,10 @@
 
 .It Li local-phone-incoming
 The local telephone number used for verifying the destination of incoming
-calls. When a remote site dials in, this number is used to verify that it 
-is the local site which the remote site wants to connect to. It is compared
+calls.
+When a remote site dials in, this number is used to verify that it 
+is the local site which the remote site wants to connect to.
+It is compared
 with the
 .Em "Called Party Number Information Element"
 got from the telephone exchange.
@@ -443,19 +481,23 @@
 This keyword is mandatory for the ipr interfaces.
 
 .It Li name
-Defines a symbolic name for this configuration entry. It's purpose is to
+Defines a symbolic name for this configuration entry.
+It's purpose is to
 use this name in the full-screen display for easy identification of a link
-to a remote site and for accounting purposes. (mandatory)
+to a remote site and for accounting purposes.
+(mandatory)
 
 .It Li ratetype
-The rate entry used from the rates file. (optional)
+The rate entry used from the rates file.
+(optional)
 .br
 For example, ratetype=0 selects lines beginning "ra0" in /etc/isdn/isdnd.rates;
 (typically ra0 lines are a set of tables for local call rates on different
 days of the week & times per day).
 
 .It Li recoverytime
-The time in seconds to wait between dial retries. (optional)
+The time in seconds to wait between dial retries.
+(optional)
 
 .It Li remdial-handling
 is used to specify the dialout behavior in case more than one outgoing 
@@ -474,19 +516,23 @@
 .El
 
 .It Li remote-phone-dialout
-The remote telephone number used when the local site dials out. When dialing
+The remote telephone number used when the local site dials out.
+When dialing
 out to a remote site, the number specified here is put into the
 .Em "Called Party Number Information Element" .
 .Pp
 This keyword is mandatory for the
 .Em ipr
-interfaces. It may be specified more than once to try to dial to several
+interfaces.
+It may be specified more than once to try to dial to several
 numbers until one succeeds.
 
 .It Li remote-phone-incoming
-The remote telephone number used to verify an incoming call. When a remote site
+The remote telephone number used to verify an incoming call.
+When a remote site
 dials in, this number is used to verify that it is the correct remote site
-which is herewith authorized to connect into the local system. This parameter
+which is herewith authorized to connect into the local system.
+This parameter
 is compared against the 
 .Em "Calling Party Number Information Element"
 got from the telephone exchange.
@@ -496,13 +542,16 @@
 This keyword may have a wildcard parameter '*' to permit anyone dialing in.
 
 .It Li unitlength
-The length of a charging unit in seconds. This is used in conjunction with
-the idletime to decide when to hangup a connection. (optional)
+The length of a charging unit in seconds.
+This is used in conjunction with
+the idletime to decide when to hangup a connection.
+(optional)
 
 .It Li unitlengthsrc
 This keyword is used to specify from which source
 .Xr isdnd 8
-takes the unitlength for shorthold mode. The currently configurable values are:
+takes the unitlength for shorthold mode.
+The currently configurable values are:
 .Pp
 .Bl -tag -width Ds -compact -offset
 .It Ar none
@@ -518,14 +567,16 @@
 .Em ratetype .
 .It Ar aocd
 Use a dynamically calculated unitlength in case AOCD is subscribed on
-the ISDN line. (AOCD is an acronym for ``Advice Of Charge During the call''
+the ISDN line.
+(AOCD is an acronym for ``Advice Of Charge During the call''
 which is a service provided by the telecommunications (ie phone) provider,
 to indicate billable units).
 .El
 
 .It Li usrdevicename
 Specifies the userland interface which is used for interfacing ISDN B channel
-data to the userland. The keyword is mandatory.
+data to the userland.
+The keyword is mandatory.
 This keyword accepts the following parameters:
 .Pp
 .Bl -tag -width Ds -compact -offset
@@ -649,10 +700,13 @@
 .Ed
 
 During the unchecked window which is (unitlength - (idle-time+earlyhangup))
-in length, no idle check is done. After the unchecked window has ended,
-the line is checked for idle-time length if no traffic takes place. In case
+in length, no idle check is done.
+After the unchecked window has ended,
+the line is checked for idle-time length if no traffic takes place.
+In case
 there was traffic detected in the check-window, the same procedure is restarted
-at the beginning of the next unit. In case no traffic was detected during
+at the beginning of the next unit.
+In case no traffic was detected during
 the check-window, the line is closed at the end of the check window.
 .Pp
 Notice: 
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/keycap.5 man5/keycap.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/keycap.5	Mon Dec 20 14:53:29 1999
+++ man5/keycap.5	Wed Jun 14 10:08:17 2000
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" @(#)keycap.5, 3.00, Last Edit-Date: [Sun Jan  2 13:45:59 1994]
-.\" %FreeBSD: src/usr.sbin/pcvt/keycap/man5/keycap.5,v 1.7.2.1 1999/08/29 15:44:58 peter Exp %
+.\" %FreeBSD: src/usr.sbin/pcvt/keycap/man5/keycap.5,v 1.7.2.2 2000/03/06 11:36:46 sheldonh Exp %
 .\"
 .Dd January 3, 1993
 .Dt KEYCAP 5
@@ -102,7 +102,8 @@
 .Ed
 .Pp
 Entries may continue onto multiple lines by giving a \e as the last
-character of a line. Comments may be included on lines beginning with
+character of a line.
+Comments may be included on lines beginning with
 .Dq # .
 .Sh FILES
 .Bl -tag -width /usr/share/misc/keycap.pcvt -compact
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/link.5 man5/link.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/link.5	Mon Dec 20 14:50:14 1999
+++ man5/link.5	Wed Jun 14 10:05:46 2000
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/share/man/man5/link.5,v 1.12.2.1 1999/08/29 16:46:48 peter Exp %
+.\" %FreeBSD: src/share/man/man5/link.5,v 1.12.2.2 2000/03/06 11:33:44 sheldonh Exp %
 .\"
 .Dd October 23, 1993
 .Dt LINK 5
@@ -44,12 +44,15 @@
 declares several structures that are present in dynamically linked
 programs and libraries.
 The structures define the interface between several components of the
-link-editor and loader mechanism. The layout of a number of these
+link-editor and loader mechanism.
+The layout of a number of these
 structures within the binaries resembles the a.out format in many places
 as it serves such similar functions as symbol definitions (including the
 accompanying string table) and relocation records needed to resolve
-references to external entities. It also records a number of data structures
-unique to the dynamic loading and linking process. These include references
+references to external entities.
+It also records a number of data structures
+unique to the dynamic loading and linking process.
+These include references
 to other objects that are required to complete the link-editing process and
 indirection tables to facilitate
 .Em Position Independent Code
@@ -63,36 +66,45 @@
 .Pp
 Several utilities cooperate to ensure that the task of getting a program
 ready to run can complete successfully in a way that optimizes the use
-of system resources. The compiler emits PIC code from which shared libraries
+of system resources.
+The compiler emits PIC code from which shared libraries
 can be built by
 .Xr ld 1 .
 The compiler also includes size information of any initialized data items
-through the .size assembler directive. PIC code differs from conventional code
+through the .size assembler directive.
+PIC code differs from conventional code
 in that it accesses data variables through an indirection table, the
 Global Offset Table, by convention accessible by the reserved name
 .Em _GLOBAL_OFFSET_TABLE_.
 The exact mechanism used for this is machine dependent, usually a machine
-register is reserved for the purpose. The rational behind this construct
-is to generate code that is independent of the actual load address. Only
+register is reserved for the purpose.
+The rational behind this construct
+is to generate code that is independent of the actual load address.
+Only
 the values contained in the Global Offset Table may need updating at run-time
 depending on the load addresses of the various shared objects in the address
 space.
 .Pp
 Likewise, procedure calls to globally defined functions are redirected through
 the Procedure Linkage Table (PLT) residing in the data segment of the core
-image. Again, this is done to avoid run-time modifications to the text segment.
+image.
+Again, this is done to avoid run-time modifications to the text segment.
 .Pp
 The linker-editor allocates the Global Offset Table and Procedure Linkage Table
 when combining PIC object files into an image suitable for mapping into the
-process address space. It also collects all symbols that may be needed by the
+process address space.
+It also collects all symbols that may be needed by the
 run-time link-editor and stores these along with the image's text and data bits.
 Another reserved symbol,
 .Em _DYNAMIC
-is used to indicate the presence of the run-time linker structures. Whenever
+is used to indicate the presence of the run-time linker structures.
+Whenever
 _DYNAMIC is relocated to 0, there is no need to invoke the run-time
-link-editor. If this symbol is non-zero, it points at a data structure from
+link-editor.
+If this symbol is non-zero, it points at a data structure from
 which the location of the necessary relocation- and symbol information can
-be derived. This is most notably used by the start-up module,
+be derived.
+This is most notably used by the start-up module,
 .Em crt0.
 The _DYNAMIC structure is conventionally located at the start of the data
 segment of the image to which it pertains.
@@ -120,7 +132,8 @@
 .Bl -tag -width d_version
 .It Fa d_version
 This field provides for different versions of the dynamic linking
-implementation. The current version numbers understood by
+implementation.
+The current version numbers understood by
 .Xr ld 1
 and 
 .Xr ld.so 1
@@ -300,12 +313,15 @@
 Hook for attaching private data maintained by the run-time link-editor.
 .El
 .Pp
-Symbol description with size. This is simply an
+Symbol description with size.
+This is simply an
 .Fa nlist
 structure with one field
 .Pq Fa nz_size
-added. Used to convey size information on items in the data segment
-of shared objects. An array of these lives in the shared object's
+added.
+Used to convey size information on items in the data segment
+of shared objects.
+An array of these lives in the shared object's
 text segment and is addressed by the
 .Fa sdt_nzlist
 field of
@@ -356,12 +372,14 @@
 field).
 .It Fa rh_next
 In case of collisions, this field is the offset of the next entry in this
-hash table bucket. It is zero for the last bucket element.
+hash table bucket.
+It is zero for the last bucket element.
 .El
 The
 .Fa rt_symbol
 structure is used to keep track of run-time allocated commons
-and data items copied from shared objects. These items are kept on linked list
+and data items copied from shared objects.
+These items are kept on linked list
 and is exported through the
 .Fa dd_cc
 field in the
@@ -383,7 +401,8 @@
 .It Fa rt_next
 Virtual address of next rt_symbol.
 .It Fa rt_link
-Next in hash bucket. Used by internally by
+Next in hash bucket.
+Used by internally by
 .Nm ld.so .
 .It Fa rt_srcaddr
 Location of the source of initialized data within a shared object.
@@ -396,7 +415,8 @@
 .Fa so_debug
 structure is used by debuggers to gain knowledge of any shared objects
 that have been loaded in the process's address space as a result of run-time
-link-editing. Since the run-time link-editor runs as a part of process
+link-editing.
+Since the run-time link-editor runs as a part of process
 initialization, a debugger that wishes to access symbols from shared objects
 can only do so after the link-editor has been called from crt0.
 A dynamically linked binary contains a
@@ -426,7 +446,8 @@
 Set by the run-time linker whenever it adds symbols by loading shared objects.
 .It Fa dd_bpt_addr
 The address were a breakpoint will be set by the run-time linker to
-divert control to the debugger. This address is determined by the start-up
+divert control to the debugger.
+This address is determined by the start-up
 module,
 .Em crt0.o,
 to be some convenient place before the call to _main.
@@ -485,7 +506,8 @@
 .It Fa crt_dzfd
 On SunOS systems, this field contains an open file descriptor to
 .Dq Pa /dev/zero
-used to get demand paged zeroed pages. On
+used to get demand paged zeroed pages.
+On
 .Tn FreeBSD
 systems it contains -1.
 .It Fa crt_ldfd
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/login.access.5 man5/login.access.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/login.access.5	Mon Dec 20 15:01:41 1999
+++ man5/login.access.5	Wed Jun 14 10:13:18 2000
@@ -1,3 +1,4 @@
+.\" %FreeBSD: src/usr.bin/login/login.access.5,v 1.5.2.1 2000/03/06 11:34:40 sheldonh Exp %
 .\" this is comment
 .Dd April 30, 1994
 .Dt LOGIN.ACCESS 5
@@ -23,7 +24,8 @@
 ":" character:	  permission : users : origins
 .Pp
 The first field should be a "+" (access granted) or "-" (access denied)
-character. The second field should be a list of one or more login names,
+character.
+The second field should be a list of one or more login names,
 group names, or ALL (always matches).  The third field should be a list
 of one or more tty names (for non-networked logins), host names, domain
 names (begin with "."), host addresses, internet network numbers (end
@@ -34,7 +36,8 @@
 The EXCEPT operator makes it possible to write very compact rules.
 .Pp
 The group file is searched only when a name does not match that of the
-logged-in user. Only groups are matched in which users are explicitly
+logged-in user.
+Only groups are matched in which users are explicitly
 listed: the program does not look at a user's primary group id value.
 .Sh FILES
 .Bl -tag -width /etc/login.access -compact
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/login.conf.5 man5/login.conf.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/login.conf.5	Mon Dec 20 14:44:36 1999
+++ man5/login.conf.5	Wed Jun 14 10:01:50 2000
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\" %FreeBSD: src/lib/libutil/login.conf.5,v 1.15.2.4 1999/09/21 19:41:08 phantom Exp %
+.\" %FreeBSD: src/lib/libutil/login.conf.5,v 1.15.2.6 2000/03/03 14:59:44 sheldonh Exp %
 .\"
 .Dd November 22, 1996
 .Dt LOGIN.CONF 5
@@ -186,9 +186,10 @@
 .It setenv	list		A comma-separated list of environment variables and
 values to which they are to be set.
 .It shell	prog		Session shell to execute rather than the
-shell specified in the passwd file. The SHELL environment variable will
+shell specified in the passwd file.
+The SHELL environment variable will
 contain the shell specified in the password file.
-.It term	string	su	Default terminal type if not able to determine from
+.It term	string		Default terminal type if not able to determine from
 other means.
 .It timezone	string		Default value of $TZ environment variable.
 .It umask	number	022	Initial umask. Should always have a leading 0 to
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/magic.5 man5/magic.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/magic.5	Mon Dec 20 14:51:13 1999
+++ man5/magic.5	Wed Jun 14 10:06:38 2000
@@ -1,5 +1,5 @@
 .\"
-.\" @(#)%FreeBSD: src/usr.bin/file/magic.5,v 1.9.2.1 1999/08/29 15:27:43 peter Exp %
+.\" @(#)%FreeBSD: src/usr.bin/file/magic.5,v 1.9.2.2 2000/03/06 11:34:24 sheldonh Exp %
 .\"
 .\" install as magic.4 on USG, magic.5 on V7 or Berkeley systems.
 .\"
@@ -13,7 +13,8 @@
 This manual page documents the format of the magic file as
 used by the
 .Xr file 1
-command, version 3.22. The
+command, version 3.22.
+The
 .Nm file
 command identifies the type of a file using,
 among other tests,
@@ -96,7 +97,8 @@
 to specify that the value from the file must have clear any of the bits 
 that are set in the specified value, or
 .Em x ,
-to specify that any value will match. If the character is omitted,
+to specify that any value will match.
+If the character is omitted,
 it is assumed to be
 .Em = .
 .It ""
@@ -158,21 +160,27 @@
 .Em (
 then the string after the parenthesis is interpreted as an indirect offset.
 That means that the number after the parenthesis is used as an offset in
-the file. The value at that offset is read, and is used again as an offset
-in the file. Indirect offsets are of the form:
+the file.
+The value at that offset is read, and is used again as an offset
+in the file.
+Indirect offsets are of the form:
 .Em (x[.[bsl]][+-][y]) .
 The value of 
 .Em x
-is used as an offset in the file. A byte, short or long is read at that offset
+is used as an offset in the file.
+A byte, short or long is read at that offset
 depending on the 
 .Em [bsl]
-type specifier. To that number the value of
+type specifier.
+To that number the value of
 .Em y
-is added and the result is used as an offset in the file. The default type
+is added and the result is used as an offset in the file.
+The default type
 if one is not specified is long.
 .Pp
 Sometimes you do not know the exact offset as this depends on the length of
-preceding fields. You can specify an offset relative to the end of the
+preceding fields.
+You can specify an offset relative to the end of the
 last uplevel field (of course this may only be done for sublevel tests, i.e.
 test beginning with 
 .Em > Ns ).
Only in man5: named.conf.5
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/netgroup.5 man5/netgroup.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/netgroup.5	Mon Dec 20 14:49:16 1999
+++ man5/netgroup.5	Wed Jun 14 10:05:10 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)netgroup.5	8.2 (Berkeley) 12/11/93
+.\" %FreeBSD: src/sbin/mountd/netgroup.5,v 1.5.2.1 2000/03/03 15:13:07 sheldonh Exp %
 .\"
 .Dd December 11, 1993
 .Dt NETGROUP 5
@@ -66,7 +67,8 @@
 or may consist of the string ``-'' to specify ``no valid value''.
 The members of the list may be separated by whitespace and/or commas;
 the ``\e'' character may be used at the end of a line to specify
-line continuation. Lines are limited to 1024 characters.
+line continuation.
+Lines are limited to 1024 characters.
 The functions specified in
 .Xr getnetgrent 3
 should normally be used to access the
@@ -81,25 +83,29 @@
 .Tn NIS
 and local
 .Pa /etc/netgroup
-files are ignored. With
+files are ignored.
+With
 .Bx Free ,
 .Nm Ns s
 can be used with either
 .Tn NIS
 or local files, but there are certain
-caveats to consider. The existing
+caveats to consider.
+The existing
 .Nm
 system is extremely inefficient where
 .Fn innetgr 3
 lookups are concerned since
 .Nm
-memberships are computed on the fly. By contrast, the
+memberships are computed on the fly.
+By contrast, the
 .Tn NIS
 .Nm
 database consists of three separate maps (netgroup, netgroup.byuser
 and netgroup.byhost) that are keyed to allow
 .Fn innetgr 3
-lookups to be done quickly. The
+lookups to be done quickly.
+The
 .Bx Free
 .Nm
 system can interact with the
@@ -122,7 +128,8 @@
 with
 .Fn innetgr 3
 taking advantage of the netgroup.byuser and
-netgroup.byhost maps to speed up searches. (This
+netgroup.byhost maps to speed up searches.
+(This
 is more or less compatible with the behavior of SunOS and
 similar platforms.)
 .It
@@ -151,7 +158,8 @@
 netgroup
 map will be processed as a single combined
 .Nm
-database. While this configuration is the most flexible, it
+database.
+While this configuration is the most flexible, it
 is also the least efficient: in particular,
 .Fn innetgr 3
 lookups will be especially slow if the
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/passwd.5 man5/passwd.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/passwd.5	Mon Dec 20 14:50:14 1999
+++ man5/passwd.5	Wed Jun 14 10:05:46 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)passwd.5	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/share/man/man5/passwd.5,v 1.22.2.3 1999/08/29 16:46:48 peter Exp %
+.\" %FreeBSD: src/share/man/man5/passwd.5,v 1.22.2.4 2000/03/06 11:33:45 sheldonh Exp %
 .\"
 .Dd September 29, 1994
 .Dt PASSWD 5
@@ -190,7 +190,8 @@
 to use NIS/YP for
 its password information by adding special records to the
 .Pa /etc/master.passwd
-file. These entries should be added with
+file.
+These entries should be added with
 .Xr vipw 8
 so that the changes can be properly merged with the hashed
 password databases and the
@@ -220,10 +221,12 @@
 .Em wildcard
 entry, because it matches all users (the `+' without any other information
 matches everybody) and allows all NIS password data to be retrieved
-unaltered. However, by
+unaltered.
+However, by
 specifying a username or netgroup next to the `+' in the NIS
 entry, the administrator can affect what data are extracted from the
-NIS passwd maps and how it is interpreted. Here are a few example
+NIS passwd maps and how it is interpreted.
+Here are a few example
 records that illustrate this feature (note that you can have several
 NIS entries in a single
 .Pa master.passwd
@@ -240,8 +243,10 @@
 Specific usernames are listed explicitly while netgroups are signified
 by a preceding `@'. In the above example, users in the ``staff'' and
 ``permitted-users'' netgroups will have their password information
-read from NIS and used unaltered. In other words, they will be allowed
-normal access to the machine. Users ``ken'' and ``dennis,'' who have
+read from NIS and used unaltered.
+In other words, they will be allowed
+normal access to the machine.
+Users ``ken'' and ``dennis,'' who have
 been named explicitly rather than through a netgroup, will also have
 their password data read from NIS, _except_ that user ``ken'' will
 have his shell remapped to
@@ -250,7 +255,8 @@
 will be overridden by the value specified in the special NIS entry in
 the local
 .Pa master.passwd
-file. User ``ken'' may have been assigned the csh shell because his
+file.
+User ``ken'' may have been assigned the csh shell because his
 NIS password entry specified a different shell that may not be
 installed on the client machine for political or technical reasons.
 Meanwhile, users in the ``rejected-users'' netgroup are prevented
@@ -261,12 +267,14 @@
 specified with a `-' instead of a `+'. A minus entry can be used
 to block out certain NIS password entries completely; users who's
 password data has been excluded in this way are not recognized by
-the system at all. (Any overrides specified with minus entries are
+the system at all.
+(Any overrides specified with minus entries are
 also ignored since there is no point in processing override information
 for a user that the system isn't going to recognize in the first place.)
 In general, a minus entry is used to specifically exclude a user
 who might otherwise be granted access because he happens to be a
-member of an authorized netgroup. For example, if ``mitnick'' is
+member of an authorized netgroup.
+For example, if ``mitnick'' is
 a member of the ``permitted-users'' netgroup and must, for whatever
 the reason, be permitted to remain in that netgroup (possibly to
 retain access to other machines within the domain), the administrator
@@ -276,12 +284,14 @@
 users who are allowed access and omit the rest.
 .Pp
 Note that the plus and minus entries are evaluated in order from
-first to last with the first match taking precedence. This means
+first to last with the first match taking precedence.
+This means
 the system will only use the first entry that matches a particular user.
 If, for instance, we have a user ``foo'' who is a member of both the ``staff''
 netgroup and the ``rejected-users'' netgroup, he will be admitted to
 the system because the above example lists the entry for ``staff'' 
-before the entry for ``rejected-users.'' If we reversed the order,
+before the entry for ``rejected-users.''
+If we reversed the order,
 user ``foo'' would be flagged as a ``rejected-user'' instead and
 denied access.
 .Pp
@@ -294,11 +304,13 @@
 entry at the end of the list; therefore, the system will not recognize
 anyone except
 ``ken,'' ``dennis,'' the ``staff'' netgroup and the ``permitted-users''
-netgroup as authorized users. The ``rejected-users'' netgroup will
+netgroup as authorized users.
+The ``rejected-users'' netgroup will
 be recognized but all members will have their shells remapped and
 therefore be denied access.
 All other NIS password records
-will be ignored. The administrator may add a wildcard entry to the
+will be ignored.
+The administrator may add a wildcard entry to the
 end of the list such as:
 .Bd -literal -offset indent
 +:::::::::/usr/local/bin/go_away
@@ -309,7 +321,8 @@
 .Pa /usr/local/bin/go_away
 can be a short shell script or program
 that prints a message telling the user that he is not allowed access
-to the system. This technique is sometimes useful when it is
+to the system.
+This technique is sometimes useful when it is
 desirable to have the system be able to recognize all users in a
 particular NIS domain without necessarily granting them login access.
 See the above text on the shell field regarding security concerns when using
@@ -318,7 +331,8 @@
 The primary use of this
 .Pa override
 feature is to permit the administrator
-to enforce access restrictions on NIS client systems. Users can be
+to enforce access restrictions on NIS client systems.
+Users can be
 granted access to one group of machines and denied access to other
 machines simply by adding or removing them from a particular netgroup.
 Since the netgroup database can also be accessed via NIS, this allows
@@ -334,10 +348,12 @@
 .Pa /etc/master.passwd
 and
 .Pa /etc/spwd.db ,
-which are readable and writable only by the superuser. This is done
+which are readable and writable only by the superuser.
+This is done
 to prevent users from running the encrypted passwords through
 password-guessing programs and gaining unauthorized access to
-other users' accounts. NIS does not support a standard means of
+other users' accounts.
+NIS does not support a standard means of
 password shadowing, which implies that placing your password data
 into the NIS passwd maps totally defeats the security of
 .Tn FreeBSD Ns 's
@@ -345,11 +361,13 @@
 .Pp
 .Tn FreeBSD
 provides a few special features to help get around this
-problem. It is possible to implement password shadowing between
+problem.
+It is possible to implement password shadowing between
 .Tn FreeBSD
 NIS clients and
 .Tn FreeBSD
-NIS servers. The
+NIS servers.
+The
 .Xr getpwent 3
 routines will search for a
 .Pa master.passwd.byname
@@ -357,7 +375,8 @@
 .Pa master.passwd.byuid
 maps which should contain the same data found in the
 .Pa /etc/master.passwd
-file. If the maps exist,
+file.
+If the maps exist,
 .Tn FreeBSD
 will attempt to use them for user
 authentication instead of the standard
@@ -368,12 +387,14 @@
 .Tn FreeBSD Ns 's
 .Xr ypserv 8
 will also check client requests to make sure they originate on a
-privileged port. Since only the superuser is allowed to bind to
+privileged port.
+Since only the superuser is allowed to bind to
 a privileged port, the server can tell if the requesting user
 is the superuser; all requests from non-privileged users to access
 the
 .Pa master.passwd
-maps will be refused. Since all user authentication programs run
+maps will be refused.
+Since all user authentication programs run
 with superuser privilege, they should have the required access to
 users' encrypted password data while normal users will only
 be allowed access to the standard
@@ -382,7 +403,8 @@
 .Pp
 Note that this feature cannot be used in an environment with
 .No non- Ns Tn FreeBSD
-systems. Note also that a truly determined user with
+systems.
+Note also that a truly determined user with
 unrestricted access to your network could still compromise the
 .Pa master.passwd
 maps.
@@ -407,7 +429,8 @@
 have
 .Pa all
 of their password information overridden, including UIDs,
-GIDs and passwords. The result is that all `foo-users' will be
+GIDs and passwords.
+The result is that all `foo-users' will be
 locked out of the system, since their passwords will be remapped
 to invalid values.
 .Pp
@@ -451,21 +474,25 @@
 .Pa /etc/passwd
 file is in plain
 .Tn ASCII
-format. The
+format.
+The
 .Tn SunOS
 documentation claims that
 adding a '+' entry to the password file causes the contents of
 the NIS password database to be 'inserted' at the position in
-the file where the '+' entry appears. If, for example, the
+the file where the '+' entry appears.
+If, for example, the
 administrator places the +:::::: entry in the middle of
 .Pa /etc/passwd,
 then the entire contents of the NIS password map would appear
 as though it had been copied into the middle of the password
-file. If the administrator places the +:::::: entry at both the
+file.
+If the administrator places the +:::::: entry at both the
 middle and the end of
 .Pa /etc/passwd ,
 then the NIS password map would appear twice: once in the middle
-of the file and once at the end. (By using override entries
+of the file and once at the end.
+(By using override entries
 instead of simple wildcards, other combinations could be achieved.)
 .Pp
 By contrast,
@@ -473,7 +500,8 @@
 does not have a single
 .Tn ASCII
 password file: it
-has a hashed password database. This database does not have an
+has a hashed password database.
+This database does not have an
 easily-defined beginning, middle or end, which makes it very hard
 to design a scheme that is 100% compatible with
 .Tn SunOS .
@@ -485,8 +513,10 @@
 functions in
 .Tn FreeBSD
 are designed to do direct queries to the
-hash database rather than a linear search. This approach is faster
-on systems where the password database is large. However, when
+hash database rather than a linear search.
+This approach is faster
+on systems where the password database is large.
+However, when
 using direct database queries, the system does not know or care
 about the order of the original password file, and therefore
 it cannot easily apply the same override logic used by
@@ -495,7 +525,8 @@
 Instead,
 .Tn FreeBSD
 groups all the NIS override entries together
-and constructs a filter out of them. Each NIS password entry
+and constructs a filter out of them.
+Each NIS password entry
 is compared against the override filter exactly once and 
 treated accordingly: if the filter allows the entry through
 unaltered, it's treated unaltered; if the filter calls for remapping
@@ -536,13 +567,15 @@
 configurations, NIS client behavior will be
 indistinguishable from that of
 .Tn SunOS
-or other similar systems. Even
+or other similar systems.
+Even
 so, users should be aware of these architectural differences.
 .Pp
 .Ss Using groups instead of netgroups for NIS overrides
 .Tn FreeBSD
 offers the capability to do override matching based on
-user groups rather than netgroups. If, for example, an NIS entry
+user groups rather than netgroups.
+If, for example, an NIS entry
 is specified as:
 .Bd -literal -offset indent
 +@operator:::::::::
@@ -567,7 +600,8 @@
 .Fn getpwuid
 to return a login name that
 .Fn getpwnam
-would not recognize. This has been fixed: overrides specified
+would not recognize.
+This has been fixed: overrides specified
 in
 .Pa /etc/master.passwd
 now apply to all
@@ -580,7 +614,8 @@
 all, largely because
 .Tn FreeBSD
 did not have support for reading
-netgroups through NIS. Again, this has been fixed, and
+netgroups through NIS.
+Again, this has been fixed, and
 netgroups can be specified just as in
 .Tn SunOS
 and similar NIS-capable
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/pccard.conf.5 man5/pccard.conf.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/pccard.conf.5	Mon Dec 20 14:52:49 1999
+++ man5/pccard.conf.5	Wed Jun 14 10:07:50 2000
@@ -23,6 +23,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
+.\" %FreeBSD: src/usr.sbin/pccard/pccardd/pccard.conf.5,v 1.7.2.1 2000/03/06 11:36:37 sheldonh Exp %
+.\"
 .Dd November 2, 1994
 .Dt PCCARD.CONF 5
 .Os FreeBSD
@@ -56,9 +58,11 @@
 the manufacturer and card version; these are used
 to identify the card specification in the configuration
 file, and from this find a driver that can be used to
-interface to the particular card. There is a many-to-one mapping
+interface to the particular card.
+There is a many-to-one mapping
 between cards to drivers i.e a single driver may interface to
-multiple types of cards. To aid this, card parameters may be
+multiple types of cards.
+To aid this, card parameters may be
 specified separately from the driver to initialize the card or
 extract (in the case of a network card) an Ethernet address.
 .Pp
@@ -75,7 +79,8 @@
 .Em remove
 commands allow a shell command line to be executed.
 The command to be executed is the rest of the line after
-the keyword. The line can be continued using a backslash.
+the keyword.
+The line can be continued using a backslash.
 A simple
 macro substitution allows the current kernel device name
 .Em ( $device )
@@ -93,13 +98,15 @@
 .Em k
 or
 .Em K
-appended to it, the value is multiplied by 1024. Names may be
+appended to it, the value is multiplied by 1024.
+Names may be
 quoted using double quotes if spaces are required.
 A hash character comments out the rest of the line.
 .Ss "Resource pool"
 The (optional) section specifies a pool of system resources
 such as ISA bus memory address space, Input/Output ports and
-interrupt request numbers. This resource pool is used
+interrupt request numbers.
+This resource pool is used
 to allocate address space and interrupt numbers dynamically
 according to the requirements specified in each driver
 description.
@@ -128,26 +135,31 @@
 .Pp
 The first line is mandatory;
 the latter statements are optional and can appear in
-any order. There may be multiple
+any order.
+There may be multiple
 .Em config
 lines.
 The
 .Em card
 parameters are the Manufacturer name and card version that
-is used to match the values from the card's CIS memory. The
+is used to match the values from the card's CIS memory.
+The
 .Em config
 parameters select the particular card's configuration index
 from the range available in the card's CIS, the driver that
 is to be associated with this configuration, and the interrupt
-level (if any) to be assigned. An optional set of flags may
+level (if any) to be assigned.
+An optional set of flags may
 be assigned.
 .Pp
 The optional
 .Em ether
 keyword is used when network cards have their physical Ethernet address
-located within the attribute memory of the card. The parameter of this
+located within the attribute memory of the card.
+The parameter of this
 statement indicates the offset within the attribute memory of the
-Ethernet address. This value can be used within insert/remove
+Ethernet address.
+This value can be used within insert/remove
 commands using the
 .Em $ether
 macro.
@@ -157,7 +169,8 @@
 and
 .Em remove
 sections allow shell commands to be specified that are executed
-when the card is inserted or removed. Multiple
+when the card is inserted or removed.
+Multiple
 .Em insert
 and
 .Em remove
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/publickey.5 man5/publickey.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/publickey.5	Mon Dec 20 14:44:09 1999
+++ man5/publickey.5	Wed Jun 14 10:01:34 2000
@@ -1,4 +1,5 @@
 .\" @(#)publickey.5	2.1 88/08/07 4.0 RPCSRC; from 1.6 88/02/29 SMI;
+.\" %FreeBSD: src/lib/libc/rpc/publickey.5,v 1.2.2.1 2000/03/03 14:59:11 sheldonh Exp %
 .TH PUBLICKEY 5 "19 October 1987"
 .SH NAME
 publickey \- public key database
@@ -8,7 +9,8 @@
 .LP
 .B /etc/publickey
 is the public key database used for secure
-networking. Each entry in
+networking.
+Each entry in
 the database consists of a network user
 name (which may either refer to
 a user or a hostname), followed by the user's
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/pw.conf.5 man5/pw.conf.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/pw.conf.5	Mon Dec 20 14:52:57 1999
+++ man5/pw.conf.5	Wed Jun 14 10:07:55 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/pw/pw.conf.5,v 1.8.2.1 1999/08/29 15:47:26 peter Exp %
+.\" %FreeBSD: src/usr.sbin/pw/pw.conf.5,v 1.8.2.2 2000/03/06 11:37:04 sheldonh Exp %
 .\"
 .Dd December 9, 1996
 .Dt PW.CONF 5
@@ -284,7 +284,8 @@
 .Sh LIMITS
 The maximum line length of
 .Pa /etc/pw.conf
-is 1024 characters. Longer lines will be skipped and treated
+is 1024 characters.
+Longer lines will be skipped and treated
 as comments.
 .Sh FILES
 .Bl -tag -width /etc/master.passwd -compact
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/rc.conf.5 man5/rc.conf.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/rc.conf.5	Mon Dec 20 14:50:14 1999
+++ man5/rc.conf.5	Wed Jun 14 10:05:46 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/share/man/man5/rc.conf.5,v 1.27.2.22 1999/11/28 16:04:59 brian Exp %
+.\" %FreeBSD: src/share/man/man5/rc.conf.5,v 1.27.2.25 2000/03/27 10:13:52 sheldonh Exp %
 .\"
 .Dd April 26, 1997
 .Dt RC.CONF 5
@@ -53,14 +53,17 @@
 .Pa /etc/rc.conf
 file is included from the file
 .Pa /etc/defaults/rc.conf ,
-which specifies the default settings for all the available options. Options
+which specifies the default settings for all the available options.
+Options
 need only be specified in 
 .Pa /etc/rc.conf
-when the system administrator wishes to override these defaults. The file
+when the system administrator wishes to override these defaults.
+The file
 .Pa /etc/rc.conf.local
 is used to override settings in
 .Pa /etc/rc.conf
-for historical reasons. See the
+for historical reasons.
+See the
 .Dq rc_conf_files
 option below.
 .Pp
@@ -138,6 +141,8 @@
 is the default).
 .It Ar dhcp_flags
 (str) Additional flags to pass to the DHCP client program.
+For the ISC DHCP client, see the
+.Xr dhclient 8
 .It Ar firewall_enable
 (bool) Set to
 .Ar NO
@@ -199,7 +204,8 @@
 .It Ar tcp_extensions
 (bool) Set to
 .Ar NO
-by default. Setting this to YES enables certain TCP options as described by
+by default.
+Setting this to YES enables certain TCP options as described by
 .Rs
 .%T RFC 1323
 .Re
@@ -226,8 +232,10 @@
 .Ar NO
 by default.
 Setting to YES will cause the kernel to ignore TCP frames that have both
-the SYN and FIN flags set. This prevents OS fingerprinting, but may
-break some legitimate applications. This option is only available if the
+the SYN and FIN flags set.
+This prevents OS fingerprinting, but may
+break some legitimate applications.
+This option is only available if the
 kernel was built with the TCP_DROP_SYNFIN option.
 .It Ar tcp_restrict_rst
 (bool) Set to
@@ -246,7 +254,8 @@
 (bool) Set to
 .Ar NO
 by default.
-Setting to YES will cause the kernel to log ICMP REDIRECT packets. Not that
+Setting to YES will cause the kernel to log ICMP REDIRECT packets.
+Not that
 the log messages are not rate-limited, so this option should only be used
 for troubleshooting your own network.
 .It Ar network_interfaces
@@ -280,8 +289,20 @@
 ifconfig_ed0_alias4="inet 127.0.0.254 netmask 0xffffffff"
 
 .Ed
-Then note that alias4 would \fBnot\fR be added since the search would
+Then note that alias4 would
+.Em not
+be added since the search would
 stop with the missing alias3 entry.
+.Pp
+You can bring up an interface with DHCP by setting the
+.No ifconfig_ Ns Em interface
+variable to
+.Dq DHCP .
+For instance, to initialize your ed0 device via DHCP,
+you might have something like:
+.Bd -literal
+ifconfig_ed0="DHCP"
+.Ed
 .It Ar ppp_enable
 (bool) If set to
 .Ar YES ,
@@ -299,7 +320,8 @@
 .It Ar ppp_nat
 (bool) If set to
 .Ar YES ,
-enables packet aliasing. Used in conjunction with
+enables packet aliasing.
+Used in conjunction with
 .Ar gateway_enable
 allows hosts on private network addresses access to the Internet using
 this host as a network address translating router.
@@ -311,7 +333,8 @@
 the settings in
 .Pa /etc/defaults/rc.conf .
 The files will be read in the order in which they are specified and should
-include the full path to the file. By default, the files specified are
+include the full path to the file.
+By default, the files specified are
 .Pa /etc/rc.conf
 and
 .Pa /etc/rc.conf.local
@@ -403,8 +426,11 @@
 .Ar amd_enable
 is set to
 .Ar YES ,
-these are the flags to pass to it.  Use the \fBinfo amd\fR
-command for more information.
+these are the flags to pass to it.
+See the
+.Xr amd 8
+.Xr info 1
+page for more information.
 .It Ar update_motd
 (bool) If set to 
 .Ar YES ,
@@ -451,7 +477,7 @@
 .It Ar weak_mountd_authentication
 (bool) If set to
 .Ar YES ,
-allow services like \fBPCNFSD\fR to make non-privileged mount
+allow services like PCNFSD to make non-privileged mount
 requests.
 .It Ar nfs_reserved_port_only
 (bool) If set to
@@ -965,7 +991,8 @@
 
 .Ed
 Even if your mouse is not in the above list, it may be compatible
-with one in the list. Refer to the man page for
+with one in the list.
+Refer to the man page for
 .Xr moused 8
 for compatibility information.
 .Pp
@@ -978,7 +1005,8 @@
 using
 .Xr moused 8 .
 If the client program does not support the sysmouse type, 
-specify the mousesystems type. It is the second prefered type.
+specify the mousesystems type.
+It is the second prefered type.
 .It Ar moused_port
 (str) If
 .Ar moused_enable
@@ -998,6 +1026,18 @@
 is set, these are the additional flags to pass to the
 .Xr moused 8
 daemon.
+.It Ar allscreens_flags
+(str) If set,
+.Xr vidcontrol 1
+is run with these options for each of the virtual terminals
+.Pq Pa /dev/ttyv* .
+For example,
+.Ar -m on
+will enable the mouse pointer on all virtual terminals
+if
+.Ar moused_enable
+is set to
+.Ar YES .
 .It Ar cron_enable
 (bool) If set to
 .Ar YES
@@ -1129,6 +1169,7 @@
 .Xr apm 8 ,
 .Xr atm 8 ,
 .Xr cron 8 ,
+.Xr dhclient 8 ,
 .Xr gated 8 ,
 .Xr ifconfig 8 ,
 .Xr inetd 8 ,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/resolv.conf.5 man5/resolv.conf.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/resolv.conf.5	Mon Dec 20 14:50:14 1999
+++ man5/resolv.conf.5	Wed Jun 14 10:05:46 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)resolver.5	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/share/man/man5/resolver.5,v 1.5.2.1 1999/08/29 16:46:50 peter Exp %
+.\" %FreeBSD: src/share/man/man5/resolver.5,v 1.5.2.2 2000/03/06 11:33:46 sheldonh Exp %
 .\"
 .Dd November 11, 1993
 .Dt RESOLVER 5
@@ -106,9 +106,12 @@
 with a total of 256 characters.
 .It Sy sortlist
 Sortlist allows addresses returned by gethostbyname to be sorted.
-A sortlist is specified by IP address netmask pairs. The netmask is
-optional and defaults to the natural netmask of the net. The IP address
-and optional network pairs are separated by slashes. Up to 10 pairs may
+A sortlist is specified by IP address netmask pairs.
+The netmask is
+optional and defaults to the natural netmask of the net.
+The IP address
+and optional network pairs are separated by slashes.
+Up to 10 pairs may
 be specified.
 .Pp
 e.g. sortlist 130.155.160.0/255.255.240.0 130.155.0.0
@@ -134,7 +137,8 @@
 .Xr resolver 3 )
 before an
 .Em initial absolute query
-will be made. The default for
+will be made.
+The default for
 .Em n
 is
 .Dq 1 ,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/skey.access.5 man5/skey.access.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/skey.access.5	Mon Dec 20 14:43:42 1999
+++ man5/skey.access.5	Wed Jun 14 10:01:15 2000
@@ -1,3 +1,4 @@
+.\" %FreeBSD: src/lib/libskey/skey.access.5,v 1.3.2.1 2000/03/03 14:59:41 sheldonh Exp %
 .TH SKEY.ACCESS 5
 .SH NAME
 skey.access \- S/Key password control table
@@ -31,12 +32,15 @@
 .I permit
 and
 .I deny
-may be followed by zero or more conditions. Comments begin with a `#\'
+may be followed by zero or more conditions.
+Comments begin with a `#\'
 character, and extend through the end of the line.  Empty lines or
 lines with only comments are ignored.
 .PP
-A rule is matched when all conditions are satisfied. A rule without
-conditions is always satisfied. For example, the last entry could
+A rule is matched when all conditions are satisfied.
+A rule without
+conditions is always satisfied.
+For example, the last entry could
 be a line with just the word
 .I deny
 on it.
@@ -100,7 +104,8 @@
 a tcp wrapper).
 .PP
 Almost every network server must look up the client host name using the
-client network address. The next obvious attack therefore is:
+client network address.
+The next obvious attack therefore is:
 .IP "Host name spoofing (bad PTR record)"
 An intruder manipulates the name server system so that the client
 network address resolves to the name of a trusted host.  Given the
@@ -113,7 +118,8 @@
 network address (e.g. a tcp wrapper).
 .PP
 Some applications, such as the UNIX login program, must look up the
-client network address using the client host name. In addition to the
+client network address using the client host name.
+In addition to the
 previous two attacks, this opens up yet another possibility:
 .IP "Host address spoofing (extra A record)"
 An intruder manipulates the name server system so that the client host
@@ -123,7 +129,8 @@
 the skeyaccess() routines ignore network addresses that appear to
 belong to someone else.
 .SH DIAGNOSTICS
-Syntax errors are reported to the syslogd. When an error is found
+Syntax errors are reported to the syslogd.
+When an error is found
 the rule is skipped.
 .SH FILES
 /etc/skey.access, password control table
Only in man5: sysctl.conf.5
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/syslog.conf.5 man5/syslog.conf.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/syslog.conf.5	Mon Dec 20 14:53:02 1999
+++ man5/syslog.conf.5	Wed Jun 14 10:07:59 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syslog.conf.5	8.1 (Berkeley) 6/9/93
-.\" %FreeBSD: src/usr.sbin/syslogd/syslog.conf.5,v 1.12.2.1 1999/08/29 15:48:29 peter Exp %
+.\" %FreeBSD: src/usr.sbin/syslogd/syslog.conf.5,v 1.12.2.2 2000/03/06 11:37:22 sheldonh Exp %
 .\"
 .Dd June 9, 1993
 .Dt SYSLOG.CONF 5
@@ -71,7 +71,8 @@
 (e.g. it is possible to cut-and-paste into 
 .Em syslog.conf
 ), 
-and to avoid possible mistakes. This change however preserves 
+and to avoid possible mistakes.
+This change however preserves 
 backwards compatibility with the old style of the
 .Em syslog.conf
 (i.e. tab characters only).
@@ -135,7 +136,8 @@
 .Xr syslog
 library routine.
 .Pp
-Each block of lines is separated from the previous block by a tag. The tag
+Each block of lines is separated from the previous block by a tag.
+The tag
 is a line beginning with
 .Em #!prog
 or
@@ -143,7 +145,8 @@
 (the former is for compatibility with the previous syslogd, if one is sharing
 syslog.conf files, for example)
 and each block will be associated with calls to syslog from that specific
-program. A tag for ``foo'' will also match any message logged by the kernel
+program.
+A tag for ``foo'' will also match any message logged by the kernel
 with the prefix ``foo: ''.
 .Pp
 See
@@ -152,11 +155,13 @@
 .Em facility
 and
 .Em level
-keywords and their significance. It's preferred that selections be made on
+keywords and their significance.
+It's preferred that selections be made on
 .Em facility
 rather than
 .Em program ,
-since the latter can easily vary in a networked environment. In some cases,
+since the latter can easily vary in a networked environment.
+In some cases,
 though, an appropriate
 .Em facility
 simply doesn't exist.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/termcap.5 man5/termcap.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/termcap.5	Mon Dec 20 14:50:24 1999
+++ man5/termcap.5	Wed Jun 14 10:05:58 2000
@@ -51,7 +51,7 @@
 .\" *                                                                          *
 .\" ***************************************************************************/
 .\"
-.\" %FreeBSD: src/share/termcap/termcap.5,v 1.9.2.1 1999/08/29 16:48:03 peter Exp %
+.\" %FreeBSD: src/share/termcap/termcap.5,v 1.9.2.2 2000/03/06 11:34:06 sheldonh Exp %
 .\"
 .Dd April 16, 1994
 .Dt TERMCAP 5
@@ -121,7 +121,8 @@
 .Ed
 .Sh CAPABILITIES
 The description field attempts to convey the semantics of the
-capability. You may find some codes in the description field:
+capability.
+You may find some codes in the description field:
 .Pp
 .Bl -tag -width #[1-9]
 .It (P)
Only in man5: texinfo.5
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man5/uuencode.format.5 man5/uuencode.format.5
--- /home/horikawa/man-jp/work/fbsd-340r/man/man5/uuencode.format.5	Mon Dec 20 14:51:59 1999
+++ man5/uuencode.format.5	Wed Jun 14 10:07:16 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)uuencode.format.5	8.2 (Berkeley) 1/12/94
+.\" %FreeBSD: src/usr.bin/uuencode/uuencode.format.5,v 1.5.2.1 2000/03/06 11:35:25 sheldonh Exp %
 .\"
 .Dd January 12, 1994
 .Dt UUENCODE 5
@@ -76,7 +77,8 @@
 .Pp
 Groups of 3 bytes are stored in 4 characters, 6 bits per character.
 All characters are always in range from 1 to 64 and are offset by a 
-space (octal 40) to make the characters printing. Character 
+space (octal 40) to make the characters printing.
+Character 
 64 represents a count of zero.
 The last line may be shorter than the normal 45 bytes.
 If the size is not a multiple of 3, this fact can be determined

----Next_Part(Wed_Jun_14_23:40:58_2000_518)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: diff_3.4-20000614-JPSNAP_6
Content-Disposition: attachment; filename=diff_3.4-20000614-JPSNAP_6

diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man6/adventure.6 man6/adventure.6
--- /home/horikawa/man-jp/work/fbsd-340r/man/man6/adventure.6	Mon Dec 20 14:44:55 1999
+++ man6/adventure.6	Wed Jun 14 10:02:03 2000
@@ -35,6 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)adventure.6	8.1 (Berkeley) 5/31/93
+.\" %FreeBSD: src/games/adventure/adventure.6,v 1.1.1.1.10.1 2000/06/12 13:24:01 asmodai Exp %
 .\"
 .Dd May 31, 1993
 .Dt ADVENTURE 6
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man6/intro.6 man6/intro.6
--- /home/horikawa/man-jp/work/fbsd-340r/man/man6/intro.6	Mon Dec 20 14:50:15 1999
+++ man6/intro.6	Wed Jun 14 10:05:46 2000
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/share/man/man6/intro.6,v 1.2.4.1 1999/08/29 16:46:55 peter Exp %
+.\" %FreeBSD: src/share/man/man6/intro.6,v 1.2.4.2 2000/03/06 11:33:49 sheldonh Exp %
 .\"
 .Dd February 16, 1997
 .Dt INTRO 6
@@ -38,7 +38,8 @@
 .Nm intro
 .Nd "introduction to games"
 .Sh DESCRIPTION
-This section contains information about games. The games
+This section contains information about games.
+The games
 are located in 
 .Pa /usr/games
 if installed.
Only in man6: wargames.6

----Next_Part(Wed_Jun_14_23:40:58_2000_518)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Description: diff_3.4-20000614-JPSNAP_7
Content-Disposition: attachment; filename=diff_3.4-20000614-JPSNAP_7

diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man7/groff_char.7 man7/groff_char.7
--- /home/horikawa/man-jp/work/fbsd-340r/man/man7/groff_char.7	Mon Dec 20 14:46:26 1999
+++ man7/groff_char.7	Wed Jun 14 10:03:06 2000
@@ -37,7 +37,7 @@
 ..
 .Ac \(vc \(ah c
 .Ac \(vC \(ah C
-.TH GROFF_CHAR 7 "7 September 1996" "Groff Version 1.11"
+.TH GROFF_CHAR 7 "7 September 1996" "Groff Version 1.15"
 .SH NAME
 groff_char \- groff character names
 .SH DESCRIPTION
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man7/groff_me.7 man7/groff_me.7
--- /home/horikawa/man-jp/work/fbsd-340r/man/man7/groff_me.7	Mon Dec 20 14:46:30 1999
+++ man7/groff_me.7	Wed Jun 14 10:03:10 2000
@@ -17,7 +17,7 @@
 .\"
 .\" Modified for groff by jjc@jclark.com
 .hc %
-.TH GROFF_ME 7 "7 September 1996" "Groff Version 1.11"
+.TH GROFF_ME 7 "7 September 1996" "Groff Version 1.15"
 .UC 3
 .SH NAME
 groff_me \- troff macros for formatting papers
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man7/groff_mm.7 man7/groff_mm.7
--- /home/horikawa/man-jp/work/fbsd-340r/man/man7/groff_mm.7	Mon Dec 20 14:46:26 1999
+++ man7/groff_mm.7	Wed Jun 14 10:03:07 2000
@@ -1,22 +1,5 @@
-.ig \"-*- nroff -*-
-Copyright (C) 1991-1995 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this
-manual into another language, under the above conditions for modified
-versions, except that this permission notice may be included in
-translations approved by the Free Software Foundation instead of in
-the original English.
-..
-.\" %Id: groff_mm.man,v 1.27 1995/04/24 05:37:46 jh Exp %
+.\"
+.\" %Id: groff_mm.man,v 1.32 1999/09/03 05:33:12 jh Exp %
 .\"
 .de T2
 .ne 2v
@@ -30,12 +13,12 @@
 \fB\\$1\fP
 .br
 ..
-.TH GROFF_MM 7 "7 September 1996" "Groff Version 1.11"
+.TH GROFF_MM 7 "10 March 2000" "Groff Version 1.15"
 .SH NAME
 groff_mm \- groff mm macros
 .SH SYNOPSIS
 .B groff
-.B \-mmm
+.B \-m@TMAC_M@
 [
 .IR options .\|.\|.
 ]
@@ -55,16 +38,9 @@
 .B \(bu
 groff mm does not support cut marks
 .LP
-\fBmmm\fP is intended to be international. Therefore it is 
+\fBm@TMAC_M@\fP is intended to be international. Therefore it is 
 possible to write short national macrofiles which change all
-english text to the preferred language. Use \fBmmmse\fP as an example.
-.LP
-New macros: \fBAPP\fP, \fBAPPSK\fP, \fBB1\fP, \fBB2\fP, \fBBVL\fP,
-\fBCOVER\fP, \fBCOVEND\fP, \fBGETHN\fP, \fBGETPN\fP, \fBGETR\fP,
-\fBGETST\fP, \fBINITR\fP, \fBMC\fP, \fBMOVE\fP, \fBMULB\fP,
-\fBMULN\fP, \fBMULE\fP, \fBPGFORM\fP, \fBPGNH\fP, \fBSETR\fP,
-\fBTAB\fP, \fBVERBON\fP, \fBVERBOFF\fP.
-.LP
+english text to the preferred language. Use \fBm@TMAC_M@se\fP as an example.
 .\"########################################################################
 .LP
 A file called \fBlocale\fP or \fIlang\fP\fB_locale\fP is read
@@ -123,6 +99,12 @@
 .LP
 \fBMacros:\fP
 .TP
+.B ")E level text"
+Adds \fBtext\fP (heading-text) to the table of contents
+with \fBlevel\fP either 0
+or between 1-7. See also \fB.H\fP. This macro is used for customized
+table of contents.
+.TP
 .B "1C [1]"
 Begin one column processing. An \fB1\fP as argument disables the page-break.
 Use wide footnotes, small footnotes may be overprinted.
@@ -166,6 +148,7 @@
 The appendix always appear in the 'List of contents' with correct
 pagenumber. The name \fIAPPENDIX\fP can be changed by setting
 the string \fBApp\fP to the desired text.
+The string \fBApptxt\fP contains the current appendix text.
 .TP
 .B "APPSK name pages text"
 Same as \fB.APP\fP, but the pagenr is incremented with \fIpages\fP.
@@ -179,14 +162,14 @@
 .T2 Arg
 Placement
 .T2 0
-Abstract will be printed on page 1 and con the cover sheet if
+Abstract will be printed on page 1 and on the cover sheet if
 used in the released-paper style (\fBMT 4\fP), otherwise
 it will be printed on page 1 without a cover sheet.
 .T2 1
-Abstract will only be printed on page 1 (\fBMT 4\fP only).
+Abstract will only be printed on the cover sheet (\fBMT 4\fP only).
 .T2 2
-Abstract will be printed only on the cover sheet. The cover sheet
-is printed without need for \fBCS\fP.
+Abstract will be printed only on the cover sheet (other than \fBMT 4\fP only).
+The cover sheet is printed without need for \fBCS\fP.
 .in
 Abstract is not printed at all in external letters (\fBMT 5\fP).
 The \fIindent\fP controls the indentation of both margins, otherwise
@@ -200,7 +183,7 @@
 Authors title. \fBAT\fP must appear just after each \fBAU\fP.
 The title will show up after the name in the signature block.
 .TP
-.B "AU name [initials [loc [dept [ext [room [arg [arg [arg]]]]]]]]"
+.B "AU [name [initials [loc [dept [ext [room [arg [arg [arg]]]]]]]]]"
 Author information, specifies the author of the memo or paper, and
 will be printed on the cover sheet and on other similar places.
 \fBAU\fP must appear before \fBTL\fP. The author information
@@ -212,6 +195,9 @@
 signature and date. The string \fBAPPROVED:\fP can be changed
 with variable \fBLetapp\fP, and the string \fBDate\fP in \fBLetdate\fP.
 .TP
+.B "AVL [name]"
+Letter signature, generates a line with place for signature. 
+.TP
 .B "B [bold-text [prev-font-tex [bold...]]]"
 Begin boldface
 No limit on the number of arguments.
@@ -409,12 +395,19 @@
 It is possible to use \fB.af\fP to change the format of the number.
 If number register \fBOf\fP is 1, then the format of title
 will use a dash instead of a dot after the number.
+.br
 The string \fBLe\fP controls the title of the
 List of Equations, default is \fILIST OF EQUATIONS\fP.
+The List of Equations will only be printed if number register \fBLe\fP
+is 1, default 0.
 The string \fBLiec\fP contains the word \fIEquation\fP, wich
 is printed before the number.
-If \fIrefname\fP is used, then the equationnumber is saved with
+If \fIrefname\fP is used, then the equation number is saved with
 \&\fB.SETR\fP, and can be retrieved with \fB.GETST\fP \fIrefname\fP.
+.br
+Special handling of the title will occur if
+\fBEC\fP is used inside \fBDS\fP/\fBDE\fP, it will not be
+affected by the format of \fBDS\fP.
 .TP
 .B "EF [arg]"
 Even-page footer, printed just above the normal page footer
@@ -443,6 +436,14 @@
 Argument from \fBOF\fP.
 .in
 .TP
+.B "EPIC width height [name]"
+\fBEPIC\fP draws a box with the given \fIwidth\fP and \fIheight\fP, it will
+also print the text \fIname\fP or a default string if
+\fIname\fP is not specified..
+This is used to include external pictures, just give the size
+of the picture.
+See \fBPIC\fP
+.TP
 .B "EQ [label]"
 Equation start.
 \fBEQ\fP/\fBEN\fP are the delimiters for equations written for \fBeqn\fP.
@@ -453,14 +454,20 @@
 left margin.
 .TP
 .B "EX [title [override [flag [refname]]]]"
-Exhibit title, arguments are the same as for \fBEC\fP
+Exhibit title, arguments are the same as for \fBEC\fP.
 \fBEX\fP uses the number register \fBEx\fP as counter.
 The string \fBLx\fP controls the title of the
 List of Exhibits, default is \fILIST OF EXHIBITS\fP.
+The List of Exhibits will only be printed if number register \fBLx\fP
+is 1, default 1.
 The string \fBLiex\fP contains the word \fIExhibit\fP, wich
 is printed before the number.
-If \fIrefname\fP is used, then the exhibitnumber is saved with
+If \fIrefname\fP is used, then the exhibit number is saved with
 \&\fB.SETR\fP, and can be retrieved with \fB.GETST\fP \fIrefname\fP.
+.br
+Special handling of the title will occur if
+\fBEX\fP is used inside \fBDS\fP/\fBDE\fP, it will not be
+affected by the format of \fBDS\fP.
 .TP
 .B "FC [closing]"
 Prints \fIYours\ very\ truly,\fP as a formal closing of a letter or
@@ -493,15 +500,26 @@
 .fi
 .DT
 Argument greater than or equal to 11 is considered as arg 0.
-Default for mmmm is 10.
+Default for m@TMAC_M@m is 10.
 .TP
 .B FE
 Footnote end.
 .TP
 .B "FG [title [override [flag [refname]]]]"
-Figure title.
-If \fIrefname\fP is used, then the figurenumber is saved with
+Figure title, arguments are the same as for \fBEC\fP.
+\fBFG\fP uses the number register \fBFg\fP as counter.
+The string \fBLf\fP controls the title of the
+List of Figures, default is \fILIST OF FIGURES\fP.
+The List of Figures will only be printed if number register \fBLf\fP
+is 1, default 1.
+The string \fBLifg\fP contains the word \fIFigure\fP, wich
+is printed before the number.
+If \fIrefname\fP is used, then the figure number is saved with
 \&\fB.SETR\fP, and can be retrieved with \fB.GETST\fP \fIrefname\fP.
+.br
+Special handling of the title will occur if
+\fBFG\fP is used inside \fBDS\fP/\fBDE\fP, it will not be
+affected by the format of \fBDS\fP.
 .TP
 .B "FS [label]"
 Footnote start.
@@ -752,12 +770,59 @@
 .B IE
 Ends the address-specification after \fPIA\fP.
 .TP
+.B "INITI filename [type]"
+Initialize the new index system, sets the filename to collect
+index lines in with \fBIND\fP. Argument \fItype\fP selects
+teh type of index, page number, header marks or both.
+The default is \fIN\fP.
+.sp
+\fBtype\fP
+.in +.5i
+.T2 N
+Page numbers
+.T2 H
+Header marks
+.T2 B
+Both page numbers and header marks, tab separated
+.in
+.TP
+.B "IND arg1 [arg2 [...]]"
+\fBIND\fP writes a line in the index file selected by \fBINITI\fP
+with all arguments and the page number or header mark separated by tabs.
+.in +.5i
+\fBExamples\fP
+.br
+arg1\etpage number
+.br
+arg1\etarg2\etpage number
+.br
+arg1\etheader mark
+.br
+arg1\etpage number\etheader mark
+.in
+.TP
+.B "INDP"
+\fBINDP\fP prints the index by running the command specified
+by string variable \fBIndcmd\fP, normally \fIsort\ -t\et\fP.
+\fBINDP\fP reads the output from the command to form
+the index, normally in two columns (can be changed by defining \fBTYIND\fP).
+The index is printed with string variable \fBIndex\fP as header,
+default is \fBINDEX\fP. One-column processing is
+returned after the list. \fBINDP\fP will call the
+user-defined macros \fBTXIND\fP, \fBTYIND\fP and \fBTZIND\fP if defined.
+\fBTXIND\fP is called before printing \fBINDEX\fP, \fBTYIND\fP
+is called instead of printing \fBINDEX\fP. \fBTZIND\fP is called
+after the printing and should take care of restoring to normal
+operation again.
+
+.TP
 .B "INITR filename"
 Initialize the refencemacros. References will be written to
 \fIfilename.tmp\fP and \fIfilename.qrf\fP. Requires two passes with groff.
 The first looks for references and the second includes them.
 \fBINITR\fP can be used several times, but it is only the first
 occurrence of \fBINITR\fP that is active.
+Option \fB-U\fP might be needed if \fBunsafe\fP-errors occur.
 See also \fBSETR\fP, \fBGETPN\fP and \fBGETHN\fP.
 .TP
 .B "IR [italic-text [roman-text [italic-text [...]]]"
@@ -828,7 +893,12 @@
 will print the mark determined by the current list type. By giving
 \fBLI\fP one argument, it will use that as the mark instead.
 Two arguments to \fBLI\fP will make \fImark\fP a prefix to
-the current mark. A zero length \fImark\fP will make a hanging
+the current mark.
+There will be no separating space between the prefix
+and the mark if the second argument is \fB2\fP instead of \fB1\fP.
+This behaviour can also be achieved by setting number register
+\fBLimsp\fP to zero.
+A zero length \fImark\fP will make a hanging
 indent instead.
 .sp
 A blank line is normally printed before the list item. This behaviour
@@ -1060,6 +1130,9 @@
 A line-break is done unless the fourth argument is given. 
 This can be used to avoid the pagenumber on the first page while setting
 new width and length.
+(It seems as if this macro sometimes doesn't work too well.
+Use the command line arguments
+to change linelength, pagelength and pageoffset instead. Sorry.)
 .TP
 .B PGNH
 No header is printed on the next page. Used to get rid off
@@ -1067,9 +1140,16 @@
 This macro must be used before any text to inhibit the pageheader
 on the first page.
 .TP
+.B PIC [-L] [-C] [-R] [-I n] filename [width [height]]
+\fBPIC\fP includes a Postscript file in the document.
+The macro depends on \fBmgm_ref\fP and \fBINITR\fP.
+\fB-L\fP, \fB-C\fP, \fB-R\fP and \fB-I n\fP adjusts the picture
+or indents it. The optionally \fIwidth\fP and \fIheight\fP
+can also be given to resize the picture.
+.TP
 .B PE
 Picture end.
-Ends a picture for \fBpic\fP, see the manual for \fBpic\fP.
+Ends a picture for \fB@TMAC_M@pic\fP, see the manual for \fB@TMAC_M@pic\fP.
 .TP
 .B "PF [arg]"
 Page footer.
@@ -1216,9 +1296,18 @@
 reset tabs to every 5n. Normally used to reset any previous tabpositions.
 .TP
 .B "TB [title [override [flag [refname]]]]"
-Table title.
-If \fIrefname\fP is used, then the tablenumber is saved with
-\&\fB.SETR\fP, and can be retrieved with \fB.GETST\fP \fIrefname\fP.
+Table title, arguments are the same as for \fBEC\fP.
+\fBTB\fP uses the number register \fBTb\fP as counter.
+The string \fBLt\fP controls the title of the
+List of Tables, default is \fILIST OF TABLES\fP.
+The List of Tables will only be printed if number register \fBLt\fP
+is 1, default 1.
+The string \fBLitb\fP contains the word \fITABLE\fP, wich
+is printed before the number.
+.br
+Special handling of the title will occur if
+\fBTB\fP is used inside \fBDS\fP/\fBDE\fP, it will not be
+affected by the format of \fBDS\fP.
 .TP
 .B "TC [slevel [spacing [tlevel [tab [h1 [h2 [h3 [h4 [h5]]]]]]]]]"
 Table of contents.
@@ -1239,9 +1328,13 @@
 table of contents.
 .sp
 The user-defined macros \fBTX\fP and \fBTY\fP are used if \fBTC\fP is called
-with at most four arguments. \fBRX\fP is called before the printing
+with at most four arguments. \fBTX\fP is called before the printing
 of \fICONTENTS\fP, and \fBTY\fP is called instead of printing \fICONTENTS\fP.
 .sp
+Equivalent macros can be defined for list of figures, tables, equations
+and excibits by defining \fBTXxx\fP or \fBTYxx\fP, where \fBxx\fP
+is \fBFg\fP, \fBTB\fP, \fBEC\fP or \fBEX\fP.
+.sp
 String \fBCi\fP can be set to control the indentations for each heading-level.
 It must be scaled, like \fB.ds\ Ci\ .25i\ .5i\ .75i\ 1i\ 1i\fP.
 The indentation is normally controlled by the maxlength of headings
@@ -1372,14 +1465,21 @@
 .LP
 .\"########################################################################
 .LP
-.B "Strings used in mmm:"
+.B "Strings used in m@TMAC_M@:"
 .TP
 .B App
 A string containing the word "APPENDIX".
 .TP
+.B Apptxt
+.TP
+The current appendix text.
 .B "EM"
 Em dash string
 .TP
+.B H1txt
+Will be updated by \fB.H\fP and \fB.HU\fP to the current heading text.
+Also updated in table of contents & friends.
+.TP
 .B HF
 Fontlist for headings, normally "2 2 2 2 2 2 2".
 Nonnumeric fontnames may also be used.
@@ -1388,6 +1488,12 @@
 Pointsize list for headings. Normally "0 0 0 0 0 0 0" which is the same as
 "10 10 10 10 10 10 10".
 .TP
+.B Index
+.TP
+Contains \fIINDEX\fP.
+.B Indcmd
+.TP
+Contains the index command, \fIsort\ -t\et\fP.
 .B Lifg
 String containing \fIFigure\fP.
 .TP
@@ -1480,6 +1586,22 @@
 .B Rp
 Contains "REFERENCES".
 .TP
+.B Tcst
+Contains current status of table of contents and list of XXXX.
+Empty outside \fB.TC\fP.
+Useful in user-defined macros like \fB.TP\fP.
+.nf
+.ta 1.5i
+\fBValue	Meaning\fP
+co	Table of contents
+fg	List of figures
+tb	List of tables
+ec	List of equations
+ex	List of exhibits
+ap	Appendix
+.fi
+.ta
+.TP
 .B Tm
 Contains \e(tm, trade mark.
 .TP
@@ -1487,7 +1609,7 @@
 Argument to \fB.nm\fP in \fB.VERBON\fP, default: \fB1\fP.
 .\"-----------------------------------
 .LP
-.B "Number variables used in mmm:"
+.B "Number variables used in m@TMAC_M@:"
 .TP
 .B Aph
 Print an appendix-page for every new appendix 
@@ -1508,11 +1630,15 @@
 .B De
 Eject after floating display is output [0:1], default 0.
 .TP
+.B Dsp
+Controls the space output before and after static displays
+if defined. Otherwise is the value of Lsp used.
+.TP
 .B Df
 Floating keep output [0:5], default 5.
 .TP
 .B Ds
-space before and after display if == 1 [0:1], default 1.
+\fBLsp\fP space before and after display if == 1 [0:1], default 1.
 .TP
 .B Ej
 Eject page, default 0.
@@ -1526,6 +1652,13 @@
 .B "H1-H7"
 Heading counters
 .TP
+.B H1dot
+Append a dot after the level one heading number if > 0. Default is 1.
+.TP
+.B H1h
+.TP
+Copy of number register \fBH1\fP, but it is incremented
+just before the page break. Useful in user defined header macros.
 .B Hb
 Heading break level [0:7], default 2.
 .TP
@@ -1550,15 +1683,19 @@
 .TP
 .B Hps1
 This is the number of lines preceding \fB.H\fP when the heading-level
-is greater than \fBHps\fP. Value is in units, normally 0.5v.
+is greater than \fBHps\fP. Value is in units, normally 0.5.
 .TP
 .B Hps2
 This is the number of lines preceding \fB.H\fP when the heading-level
-is less than or equal to \fBHps\fP. Value is in units, normally 1v.
+is less than or equal to \fBHps\fP. Value is in units, normally 1.
 .TP
 .B Hs
 Heading space level [0:7], default 2.
 .TP
+.B Hss
+This is the number of lines that follows \fB.H\fP when the heading-level
+is less than or equal to \fBHs\fP. Value is in units, normally 1.
+.TP
 .B Ht
 Heading numbering type, default 0.
 0 -> multiple (1.1.1 ...)
@@ -1586,6 +1723,13 @@
 .B Li
 List indent, used by .AL, default 6.
 .TP
+.B Limsp
+Flag for space between prefix and mark in automatic lists (.AL).
+.br
+0\ ==\ no space
+.br
+1\ ==\ space
+.TP
 .B Ls
 List space, if current listlevel > Ls then no spacing will occur around lists.
 Default 99.
@@ -1714,7 +1858,7 @@
 Jgen H$BgH(Bg, Lund, Sweden <jh@axis.se>.
 .SH FILES
 .TP
-.B /usr/share/tmac/tmac.mm
+.B /usr/share/tmac/tmac.@TMAC_M@
 .TP
 .B /usr/share/tmac/mm/*.cov
 .TP
@@ -1729,4 +1873,4 @@
 .BR eqn (1)
 .br
 .BR mm (7)
-.BR mmmse (7)
+.BR m@TMAC_M@se (7)
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man7/groff_mmse.7 man7/groff_mmse.7
--- /home/horikawa/man-jp/work/fbsd-340r/man/man7/groff_mmse.7	Mon Dec 20 14:46:26 1999
+++ man7/groff_mmse.7	Wed Jun 14 10:03:07 2000
@@ -1,13 +1,13 @@
-.\" -*- nroff -*-
-.\" %Id: groff_mmse.man,v 1.27 1995/04/24 05:37:46 jh Exp %
+.\"
+.\" %Id: groff_mmse.man,v 1.32 1999/09/03 05:33:12 jh Exp %
 .\" Skrivet av Jgen H$BgH(Bg, Lund, Sverige
 .\"
-.TH GROFF_MMSE 7 "7 September 1996" "Groff Version 1.11"
+.TH GROFF_MMSE 7 "10 March 2000" "Groff Version 1.15"
 .SH NAMN
 groff_mmse \- svenska mm makro f groff
 .SH SYNTAX
 .B groff
-.B \-mmmse
+.B \-m@TMAC_M@se
 [
 .IR flaggor .\|.\|.
 ]
@@ -15,7 +15,7 @@
 .IR filer .\|.\|.
 ]
 .SH BESKRIVNING
-\fBmmmse\fP $BgS(B en svensk variant av \fBmmm\fP. Alla texter
+\fBm@TMAC_M@se\fP $BgS(B en svensk variant av \fBm@TMAC_M@\fP. Alla texter
 $BgS(B ersatta. En A4 sida f$BiS(B text som $BgS(B 13 cm bred, 3.5 cm indragning
 samt $BgS(B 28.5 cm h.
 Det finns st f brevuppst$BgM(Blning enligt svensk standard
@@ -68,9 +68,9 @@
 Om makrot \fB.TP\fP $BgS(B definierat anropas det efter utskrift av brevhuvudet.
 D$BgS(B l$BgH(Bger man l$BgN(Bpligen in postadress och annat som brevfot.
 .SH "SKRIVET AV"
-Jgen H$BgH(Bg, Lund, Sweden <jh@axis.se>
+Jgen H$BgH(Bg, Lund, Sweden <Jorgen.Hagg@axis.se>
 .SH FILER
-.B /usr/share/tmac/tmac.mmse
+.B /usr/share/tmac/tmac.@TMAC_M@se
 .B /usr/share/tmac/mm/se_*.cov
 .SH "SE OCKS$B%J(B"
 .BR groff (1),
@@ -79,4 +79,4 @@
 .BR pic (1),
 .BR eqn (1)
 .br
-.BR mmm (7)
+.BR m@TMAC_M@ (7)
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man7/groff_ms.7 man7/groff_ms.7
--- /home/horikawa/man-jp/work/fbsd-340r/man/man7/groff_ms.7	Mon Dec 20 14:46:30 1999
+++ man7/groff_ms.7	Wed Jun 14 10:03:10 2000
@@ -16,7 +16,7 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
-.TH GROFF_MS 7 "7 September 1996" "Groff Version 1.11"
+.TH GROFF_MS 7 "7 September 1996" "Groff Version 1.15"
 .SH NAME
 groff_ms \- groff ms macros
 .SH SYNOPSIS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man7/groff_msafer.7 man7/groff_msafer.7
--- /home/horikawa/man-jp/work/fbsd-340r/man/man7/groff_msafer.7	Mon Dec 20 14:46:30 1999
+++ man7/groff_msafer.7	Wed Jun 14 10:03:10 2000
@@ -16,7 +16,7 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
-.TH MSAFER 7 "7 September 1996" "Groff Version 1.11"
+.TH MSAFER 7 "7 September 1996" "Groff Version 1.15"
 .SH NAME
 msafer \- groff -msafer macros
 .SH SYNOPSIS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man7/hier.7 man7/hier.7
--- /home/horikawa/man-jp/work/fbsd-340r/man/man7/hier.7	Mon Dec 20 14:50:15 1999
+++ man7/hier.7	Wed Jun 14 10:05:47 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/share/man/man7/hier.7,v 1.16.2.6 1999/12/08 22:04:43 dcs Exp %
+.\" %FreeBSD: src/share/man/man7/hier.7,v 1.16.2.8 2000/06/13 08:32:59 ru Exp %
 .\"
 .Dd June 5, 1993
 .Dt HIER 7
@@ -256,6 +256,8 @@
 .It Li lib/
 archive libraries
 .Bl -tag -width Fl -compact
+.It Li aout/
+a.out archive libraries
 .It Li compat/
 shared libraries for compatibility
 .Bl -tag -width Fl -compact
@@ -322,10 +324,6 @@
 for /usr
 should be used.  Exceptions are the man directory is directly under local/
 rather than under local/share/.  Ports documentation is in share/doc/<port>/
-.It Li mdec/
-boot programs;
-see
-.Xr disklabel 8
 .It Li obj/
 architecture-specific target tree produced by building the /usr/src tree
 .It Li ports
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man7/man.7 man7/man.7
--- /home/horikawa/man-jp/work/fbsd-340r/man/man7/man.7	Mon Dec 20 14:50:15 1999
+++ man7/man.7	Wed Jun 14 10:05:47 2000
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/share/man/man7/man.7,v 1.1.4.2 1999/10/30 14:12:18 phantom Exp %
+.\" %FreeBSD: src/share/man/man7/man.7,v 1.1.4.3 2000/03/06 11:33:51 sheldonh Exp %
 .\"
 .Dd November 30, 1998
 .Os
@@ -164,7 +164,8 @@
 .It ".IR" Op Ar words
 join
 .Ar words
-alternating italic and roman faces. Does not cause a line break.  If no
+alternating italic and roman faces.
+Does not cause a line break.  If no
 arguments are given the next text line is processed.
 .It ".LP"
 begin a left-aligned paragraph.  The prevailing indent is set to the
@@ -291,7 +292,8 @@
 .Pp
 Literal text, filenames and references to items that appear elsewhere
 in the reference manuals should be presented using a constant width
-face. Arguments should be presented using an italic face.
+face.
+Arguments should be presented using an italic face.
 .It ".SH OPTIONS"
 The list of options together with a description of how each affects
 the commands operation.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man7/mdoc.7 man7/mdoc.7
--- /home/horikawa/man-jp/work/fbsd-340r/man/man7/mdoc.7	Mon Dec 20 14:50:15 1999
+++ man7/mdoc.7	Wed Jun 14 10:05:47 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mdoc.7	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/share/man/man7/mdoc.7,v 1.8.2.7 1999/12/12 17:35:57 mpp Exp %
+.\" %FreeBSD: src/share/man/man7/mdoc.7,v 1.8.2.10 2000/05/04 16:27:57 phantom Exp %
 .\"
 .Dd December 30, 1993
 .Os
@@ -93,6 +93,11 @@
 and the
 .Ql \&.Nd
 macros.
+.It Ar LIBRARY
+Library where that function is compiled in.
+Should include
+.Ql \&.Lb
+macro only.
 .It Ar SYNOPSIS
 Usage.
 .It Ar DESCRIPTION
@@ -193,7 +198,8 @@
 End-display (matches \&.Bd).
 .It Li \&.Bl
 Begin-list.
-Create lists or columns. Options:
+Create lists or columns.
+Options:
 .Bl -tag -width flag -compact
 .It Ar List-types
 .Bl -column xbullet -compact
@@ -209,7 +215,8 @@
 .It List-parameters
 .Bl -tag -width "xcompact " -compact
 .It Fl offset
-(All lists.) See
+(All lists.)
+See
 .Ql \&.Bd
 begin-display above.
 .It Fl width
@@ -299,6 +306,10 @@
 .It Li \&Fd Ta Yes Ta Yes Ta "Function declaration."
 .It Li \&Fn Ta Yes Ta Yes Ta "Function call (also .Fo and .Fc)."
 .It Li \&Ic Ta Yes Ta Yes Ta "Interactive command."
+.It Li \&Lb Ta \&No Ta \&No Ta "Library name; see"
+.Xr mdoc.samples 7 ,
+.Sx Standards
+section for complete list of known libraries.
 .It Li \&Li Ta Yes Ta Yes Ta "Literal text."
 .It Li \&Nm Ta Yes Ta Yes Ta "Command name."
 .It Li \&Op Ta Yes Ta Yes Ta "Option (also .Oo and .Oc)."
@@ -345,10 +356,10 @@
 .It Li \&Ef Ta \&No Ta \&No Ta "End font mode."
 .It Li \&Em Ta Yes Ta Yes Ta "Emphasis (traditional English)."
 .It Li \&Eo Ta Yes Ta Yes Ta "Enclose string open quote."
-.It Li \&Fx Ta \&No Ta \&No Ta Tn "FreeBSD operating system."
+.It Li \&Fx Ta Yes Ta Yes Ta Tn "FreeBSD operating system."
 .It Li \&No Ta Yes Ta Yes Ta "Normal text (no-op)."
 .It Li \&Ns Ta Yes Ta Yes Ta "No space."
-.It Li \&Nx Ta \&No Ta \&No Ta Tn "NetBSD operating system."
+.It Li \&Nx Ta Yes Ta Yes Ta Tn "NetBSD operating system."
 .It Li \&Pc Ta Yes Ta Yes Ta "Parenthesis close quote."
 .It Li \&Pf Ta Yes Ta \&No Ta "Prefix string."
 .It Li \&Po Ta Yes Ta Yes Ta "Parenthesis open quote."
@@ -357,7 +368,7 @@
 .It Li \&Ql Ta Yes Ta Yes Ta "Quoted literal."
 .It Li \&Qo Ta Yes Ta Yes Ta "Straight Double open quote."
 .It Li \&Qq Ta Yes Ta Yes Ta "Straight Double quote."
-.It Li \&Ox Ta \&No Ta \&No Ta Tn "OpenBSD operating system."
+.It Li \&Ox Ta Yes Ta Yes Ta Tn "OpenBSD operating system."
 .It Li \&Re Ta \&No Ta \&No Ta "Reference end."
 .It Li \&Rs Ta \&No Ta \&No Ta "Reference start."
 .It Li \&Rv Ta \&No Ta \&No Ta "Return values (sections two and three only)."
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man7/mdoc.samples.7 man7/mdoc.samples.7
--- /home/horikawa/man-jp/work/fbsd-340r/man/man7/mdoc.samples.7	Mon Dec 20 14:50:15 1999
+++ man7/mdoc.samples.7	Wed Jun 14 10:05:47 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mdoc.samples.7	8.2 (Berkeley) 12/30/93
-.\" %FreeBSD: src/share/man/man7/mdoc.samples.7,v 1.17.2.7 1999/12/12 17:35:57 mpp Exp %
+.\" %FreeBSD: src/share/man/man7/mdoc.samples.7,v 1.17.2.12 2000/05/04 16:27:58 phantom Exp %
 .\"
 .\" This tutorial sampler invokes every macro in the package several
 .\" times and is guaranteed to give a worst case performance
@@ -71,7 +71,7 @@
 make up the
 .Em "page structure domain"
 which consists of macros for titles, section headers, displays
-and lists. Essentially items which affect the physical position
+and lists.  Essentially items which affect the physical position
 of text on a formatted page.
 In addition to the page structure domain, there are two more domains,
 the manual domain and the general text domain.
@@ -144,6 +144,7 @@
 .It "Functions (library routines)" .
 .It "Function Types" .
 .\" .It "Header File (including source code)" .
+.It "Library name" .
 .It "Interactive Commands" .
 .It "Names" .
 .It "Options" .
@@ -790,7 +791,7 @@
 .Dl Li sptr, ptr),
 .Pp
 The punctuation is not recognized and all is output in the
-literal font. If the punctuation is separated by a leading
+literal font.  If the punctuation is separated by a leading
 white space:
 .Pp
 .Dl \&.Li "sptr , ptr ) ,"
@@ -1133,7 +1134,7 @@
 may be used with
 .Ql \&.Fa
 (function argument)
-to get around the limitation. For example:
+to get around the limitation.  For example:
 .Bd -literal -offset indent
 \&.Fo "int res_mkquery"
 \&.Fa "int op"
@@ -1226,6 +1227,56 @@
 The
 .Ql \&.Ic
 macro is parsed and is callable.
+.Ss Library Name
+The
+.Ql \&.Lb
+macro is used to specify library where that function is compiled in.
+It does not accept any parameters.
+.Pp
+.Dl Usage: .Lb argument ... \*(Pu
+.Pp
+Available arguments to
+.Ql \&.Lb 
+macro and its results are:
+.Pp
+.Bl -tag -width "libnetgraph" -compact -offset indent
+.It Li "libc"
+.Lb libc
+.It Li "libc_r"
+.Lb libc_r
+.It Li "libcalendar"
+.Lb libcalendar
+.It Li "libcam"
+.Lb libcam
+.It Li "libcrypt"
+.Lb libcrypt
+.It Li "libdevstat"
+.Lb libdevstat
+.It Li "libdisk"
+.Lb libdisk
+.It Li "libedit"
+.Lb libedit
+.It Li "libfetch"
+.Lb libfetch
+.It Li "libipx"
+.Lb libipx
+.It Li "libkvm"
+.Lb libkvm
+.It Li "libm"
+.Lb libm
+.It Li "libmd"
+.Lb libmd
+.It Li "libnetgraph"
+.Lb libnetgraph
+.It Li "libposix1e"
+.Lb libposix1e
+.It Li "libskey"
+.Lb libskey
+.It Li "libutil"
+.Lb libutil
+.It Li "libvgl"
+.Lb libvgl
+.El
 .Ss Name Macro
 The
 .Ql \&.Nm
@@ -1282,7 +1333,7 @@
 The
 .Ql \&.Op
 macro
-places option brackets around the any remaining arguments on the command
+places option brackets around any remaining arguments on the command
 line, and places any
 trailing punctuation outside the brackets.
 The macros
@@ -1470,7 +1521,7 @@
 .Em not
 parsed and
 .Em not
-callable. It accepts at most two arguments.
+callable.  It accepts at most two arguments.
 .Ss BSD Macro
 .Dl Usage: .Bx [Version/release] ... \*(Pu
 .Bl -tag -width ".Bx 4.3 ) ," -compact -offset 14n
@@ -1512,11 +1563,8 @@
 .Ql \&.Fx ,
 .Ql \&.Nx ,
 .Ql \&.Ox
-macros are
-.Em not
-parsed and
-.Em not
-callable. They accept at most two arguments.
+macros are parsed and are callable.
+They accept at most two arguments.
 .Ss UNIX Macro
 .Dl Usage: .Ux ... \*(Pu
 .Bl -tag -width ".Ux 4.3 ) ," -compact -offset 14n
@@ -1571,7 +1619,7 @@
 is presented one character at a time and separated by spaces.
 The quoting macros examine opening and closing punctuation
 to determine whether it comes before or after the
-enclosing string. This makes some nesting possible.
+enclosing string.  This makes some nesting possible.
 .Bl -tag -width xxx,xxxx
 .It Li \&.Ec , \&.Eo
 These macros expect the first argument to be the
@@ -1583,7 +1631,8 @@
 .Xr nroff .
 If formatted with
 .Xr nroff ,
-a quoted literal is always quoted. If formatted with
+a quoted literal is always quoted.
+If formatted with
 troff, an item is only quoted if the width
 of the item is less than three constant width characters.
 This is to make short strings more visible where the font change
@@ -2293,7 +2342,7 @@
 the indent (display) of one line of text.
 Its default font is set to
 constant width (literal) however
-it is parsed and will recognized other macros.
+it is parsed and will recognize other macros.
 It is not callable however.
 .Pp
 .Dl % ls -ldg /usr/local/bin
@@ -2719,7 +2768,7 @@
 if another item in the list is given with a different callable
 macro name, a new and nested list is assumed.
 .Sh PREDEFINED STRINGS
-The following strings are predefined as may be used by
+The following strings are predefined and may be used by
 preceding with the troff string interpreting sequence
 .Ql \&\e*(xx
 where
@@ -2729,7 +2778,7 @@
 where
 .Em x
 is the name of the string.
-The interpreting sequence may be used any where in the text.
+The interpreting sequence may be used anywhere in the text.
 .Pp
 .Bl -column "String " "Nroff " "Troff " -offset indent
 .It Sy "String	Nroff	Troff"
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man7/ports.7 man7/ports.7
--- /home/horikawa/man-jp/work/fbsd-340r/man/man7/ports.7	Mon Dec 20 14:50:15 1999
+++ man7/ports.7	Wed Jun 14 10:05:47 2000
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/share/man/man7/ports.7,v 1.9.2.7 1999/08/29 16:47:00 peter Exp %
+.\" %FreeBSD: src/share/man/man7/ports.7,v 1.9.2.8 2000/01/02 17:56:51 hoek Exp %
 .\"
 .Dd January 25, 1998
 .Dt PORTS 7
@@ -269,6 +269,7 @@
 .Xr pkg_create 1 ,
 .Xr pkg_delete 1 ,
 .Xr pkg_info 1 ,
+.Xr pkg_version 1
 .Pp
 The following are part of the ports collection:
 .Pp
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man7/symlink.7 man7/symlink.7
--- /home/horikawa/man-jp/work/fbsd-340r/man/man7/symlink.7	Mon Dec 20 14:44:47 1999
+++ man7/symlink.7	Wed Jun 14 10:01:57 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)symlink.7	8.3 (Berkeley) 3/31/94
-.\" %FreeBSD: src/bin/ln/symlink.7,v 1.8.2.2 1999/08/29 14:12:43 peter Exp %
+.\" %FreeBSD: src/bin/ln/symlink.7,v 1.8.2.4 2000/03/03 14:58:52 sheldonh Exp %
 .\"
 .Dd March 31, 1994
 .Dt SYMLINK 7
@@ -132,7 +132,8 @@
 .Bx 4.4
 system differs from historical 4BSD systems in that the system call
 .Xr chown 2
-has been changed to follow symbolic links. The
+has been changed to follow symbolic links.
+The
 .Xr lchown 2
 system call was added later when the limitations of the new
 .Xr chown 2

----Next_Part(Wed_Jun_14_23:40:58_2000_518)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: diff_3.4-20000614-JPSNAP_8
Content-Disposition: attachment; filename=diff_3.4-20000614-JPSNAP_8

riff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/IPXrouted.8 man8/IPXrouted.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/IPXrouted.8	Mon Dec 20 14:52:19 1999
+++ man8/IPXrouted.8	Wed Jun 14 10:07:30 2000
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/IPXrouted/IPXrouted.8,v 1.3.4.2 1999/12/11 14:34:45 jhay Exp %
+.\" %FreeBSD: src/usr.sbin/IPXrouted/IPXrouted.8,v 1.3.4.3 2000/03/06 11:35:36 sheldonh Exp %
 .\"
 .Dd Oct 11, 1995
 .Dt IPXROUTED 8
@@ -70,7 +70,8 @@
 .It Fl S
 Do not supply Service Advertizing Protocol 
 .Nm (SAP)
-information. The default is to supply 
+information.
+The default is to supply 
 .Nm SAP 
 information.
 .It Fl t
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/adduser.8 man8/adduser.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/adduser.8	Mon Dec 20 14:52:20 1999
+++ man8/adduser.8	Wed Jun 14 10:07:31 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/adduser/adduser.8,v 1.26.2.1 1999/08/29 15:39:01 peter Exp %
+.\" %FreeBSD: src/usr.sbin/adduser/adduser.8,v 1.26.2.2 2000/03/06 11:35:37 sheldonh Exp %
 .\"
 .Dd January 9, 1995
 .Dt ADDUSER 8
@@ -59,14 +59,18 @@
 .Op Fl v | verbose
 .Sh DESCRIPTION
 .Nm Adduser 
-is a simple program for adding new users. Adduser checks
-the passwd, group and shell databases. It creates passwd/group entries,
+is a simple program for adding new users.
+Adduser checks
+the passwd, group and shell databases.
+It creates passwd/group entries,
 .Ev HOME
 directory, dotfiles and sends the new user a welcome message.
 .Sh RESTRICTIONS
 .Bl -tag -width Ds -compact
 .It Sy username
-Login name. May contain only  lowercase characters or digits. Maximum length
+Login name.
+May contain only  lowercase characters or digits.
+Maximum length
 is 16 characters (see 
 .Xr setlogin 2
 BUGS section). 
@@ -81,7 +85,8 @@
 and recompile the
 world; people have done this and it works, but you will have problems
 with any precompiled programs, or source that assumes the 8-character
-name limit and NIS. The NIS protocol mandates an 8-character username.
+name limit and NIS.
+The NIS protocol mandates an 8-character username.
 If you need a longer login name for e-mail addresses,
 you can define an alias in
 .Pa /etc/aliases .
@@ -186,7 +191,8 @@
 .Ar uid
 on up.
 .It Sy -verbose,-v
-Many warnings, questions. Recommended for novice users.
+Many warnings, questions.
+Recommended for novice users.
 .Sh FORMATS
 .Bl -tag -width Ds -compact
 .Ql Pa #
@@ -198,7 +204,8 @@
 .Pa /etc/adduser.conf
 for more details.
 .It Sy message file
-Eval variables in this file. See
+Eval variables in this file.
+See
 .Pa /etc/adduser.message
 for more
 details.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/adjkerntz.8 man8/adjkerntz.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/adjkerntz.8	Mon Dec 20 14:48:50 1999
+++ man8/adjkerntz.8	Wed Jun 14 10:04:49 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/adjkerntz/adjkerntz.8,v 1.16.2.1 1999/08/29 15:12:13 peter Exp %
+.\" %FreeBSD: src/sbin/adjkerntz/adjkerntz.8,v 1.16.2.2 2000/03/03 14:59:49 sheldonh Exp %
 .\"
 .Dd April 4, 1996
 .Dt ADJKERNTZ 8
@@ -43,7 +43,8 @@
 .Nm Adjkerntz
 also informs the kernel about machine timezone shifts to
 maintain proper timestamps for local time file systems such as the MS-DOS
-file system. The main purpose of this thing is not general fixing of
+file system.
+The main purpose of this thing is not general fixing of
 initially broken MS-DOS file timestamp idea but keeping
 the same timestamps between
 .Bx Free
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/amd.8 man8/amd.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/amd.8	Mon Dec 20 14:52:23 1999
+++ man8/amd.8	Wed Jun 14 10:07:32 2000
@@ -39,7 +39,7 @@
 .\"	%W% (Berkeley) %G%
 .\"
 .\" %Id: amd.8,v 1.3 1999/09/30 21:01:29 ezk Exp %
-.\" %FreeBSD: src/contrib/amd/amd/amd.8,v 1.3.2.1 1999/11/27 04:46:21 obrien Exp %
+.\" %FreeBSD: src/contrib/amd/amd/amd.8,v 1.3.2.2 2000/05/09 14:27:15 sheldonh Exp %
 .\"
 .Dd April 19, 1994
 .Dt AMD 8
@@ -335,8 +335,8 @@
 Department of Computer Science, Columbia University,
 New York, USA.
 .Pp
-.An Other authors and contributors to am-utils are listed in the
-.Nm AUTHORS 
+Other authors and contributors to am-utils are listed in the
+.Pa AUTHORS 
 file distributed with am-utils.
 .Sh HISTORY
 The
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/apm.8 man8/apm.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/apm.8	Mon Dec 20 14:53:20 1999
+++ man8/apm.8	Wed Jun 14 10:08:12 2000
@@ -8,6 +8,9 @@
 .\" responsible for the proper functioning of this software, nor does 
 .\" the author assume any responsibility for damages incurred with its 
 .\" use.
+.\" 
+.\" %FreeBSD: src/usr.sbin/apm/apm.8,v 1.10.2.1 2000/03/06 11:35:39 sheldonh Exp %
+.\" 
 .Dd November 1, 1994
 .Dt APM 8
 .Os
@@ -90,7 +93,8 @@
 resuming from this state on timer or Ring Indicator events.  The
 output of apm tells what your laptop claims to support.
 .It Fl z
-Suspend the system. It is equivalent to
+Suspend the system.
+It is equivalent to
 .Nm zzz .
 .El
 .Sh BUGS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/badsect.8 man8/badsect.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/badsect.8	Mon Dec 20 14:48:52 1999
+++ man8/badsect.8	Wed Jun 14 10:04:51 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)badsect.8	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/sbin/badsect/badsect.8,v 1.7.2.1 1999/08/29 15:12:32 peter Exp %
+.\" %FreeBSD: src/sbin/badsect/badsect.8,v 1.7.2.2 2000/03/03 15:12:54 sheldonh Exp %
 .\"
 .Dd June 5, 1993
 .Dt BADSECT 8
@@ -74,7 +74,8 @@
 First mount the file system, and change to its root directory.
 Make a directory
 .Li BAD
-there. Run
+there.
+Run
 .Nm
 giving as argument the
 .Ar BAD
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/bootparamd.8 man8/bootparamd.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/bootparamd.8	Mon Dec 20 14:52:29 1999
+++ man8/bootparamd.8	Wed Jun 14 10:07:36 2000
@@ -1,4 +1,5 @@
 .\" @(#)bootparamd.8
+.\" %FreeBSD: src/usr.sbin/bootparamd/bootparamd/bootparamd.8,v 1.6.2.1 2000/03/06 11:35:41 sheldonh Exp %
 .Dd November 8, 1989
 .Dt BOOTPARAMD 8
 .Os
@@ -13,16 +14,19 @@
 .Sh DESCRIPTION
 .Nm Bootparamd
 is a server process that provides information to diskless clients
-necessary for booting. It consults the
+necessary for booting.
+It consults the
 .Pa /etc/bootparams
 file. 
 .Pp
 This version will allow the use of aliases on the hostname in the
 .Pa /etc/bootparams
-file. The returned hostname to the whoami request done by the booting client
+file.
+The returned hostname to the whoami request done by the booting client
 will be the name that appears in 
 .Pa /etc/bootparams
-and not the canonical name. In this way you can keep the answer short enough
+and not the canonical name.
+In this way you can keep the answer short enough
 so that machines that can not handle long hostnames won't fail during boot.
 .Sh OPTIONS
 .Bl -tag -width Fl
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/camcontrol.8 man8/camcontrol.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/camcontrol.8	Mon Dec 20 14:48:53 1999
+++ man8/camcontrol.8	Wed Jun 14 10:04:51 2000
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.9.2.9 1999/12/17 02:29:05 ken Exp %
+.\" %FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.9.2.10 2000/03/03 15:12:55 sheldonh Exp %
 .\"
 .Dd September 14, 1998
 .Dt CAMCONTROL 8
@@ -257,7 +257,8 @@
 Tell the kernel to reset the given bus (XPT_RESET_BUS) by issuing a SCSI bus
 reset for that bus, or to reset the given bus:target:lun
 (XPT_RESET_DEV), typically by issuing a BUS DEVICE RESET message after
-connecting to that device. Note that this can have a destructive impact
+connecting to that device.
+Note that this can have a destructive impact
 on the system.
 .It defects
 Send the SCSI READ DEFECT DATA (10) command (0x37) to the given device, and
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/chat.8 man8/chat.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/chat.8	Mon Dec 20 14:51:01 1999
+++ man8/chat.8	Wed Jun 14 10:06:27 2000
@@ -1,6 +1,6 @@
 .\" -*- nroff -*-
 .\" manual page [] for chat 1.8
-.\" %FreeBSD: src/usr.bin/chat/chat.8,v 1.12.2.1 1999/08/29 15:26:06 peter Exp %
+.\" %FreeBSD: src/usr.bin/chat/chat.8,v 1.12.2.2 2000/03/06 11:34:11 sheldonh Exp %
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
@@ -18,39 +18,52 @@
 .SH DESCRIPTION
 .LP
 The \fIchat\fR program defines a conversational exchange between the
-computer and the modem. Its primary purpose is to establish the
+computer and the modem.
+Its primary purpose is to establish the
 connection between the Point-to-Point Protocol Daemon (\fIpppd\fR) and
 the remote's \fIpppd\fR process.
 .SH OPTIONS
 .TP
 .B -f \fI<chat file>
-Read the chat script from the chat \fIfile\fR. The use of this option
-is mutually exclusive with the chat script parameters. The user must
-have read access to the file. Multiple lines are permitted in the
-file. Space or horizontal tab characters should be used to separate
+Read the chat script from the chat \fIfile\fR.
+The use of this option
+is mutually exclusive with the chat script parameters.
+The user must
+have read access to the file.
+Multiple lines are permitted in the
+file.
+Space or horizontal tab characters should be used to separate
 the strings.
 .TP
 .B -t \fI<timeout>
-Set the timeout for the expected string to be received. If the string
+Set the timeout for the expected string to be received.
+If the string
 is not received within the time limit then the reply string is not
-sent. An alternate reply may be sent or the script will fail if there
-is no alternate reply string. A failed script will cause the
+sent.
+An alternate reply may be sent or the script will fail if there
+is no alternate reply string.
+A failed script will cause the
 \fIchat\fR program to terminate with a non-zero error code.
 .TP
 .B -r \fI<report file>
-Set the file for output of the report strings. If you use the keyword
-\fIREPORT\fR, the resulting strings are written to this file. If this
+Set the file for output of the report strings.
+If you use the keyword
+\fIREPORT\fR, the resulting strings are written to this file.
+If this
 option is not used and you still use \fIREPORT\fR keywords, the
 \fIstderr\fR file is used for the report strings.
 .TP
 .B -e
-Start with the echo option turned on. Echoing may also be turned on
+Start with the echo option turned on.
+Echoing may also be turned on
 or off at specific points in the chat script by using the \fIECHO\fR
-keyword. When echoing is enabled, all output from the modem is echoed
+keyword.
+When echoing is enabled, all output from the modem is echoed
 to \fIstderr\fR.
 .TP
 .B -v
-Request that the \fIchat\fR script be executed in a verbose mode. The
+Request that the \fIchat\fR script be executed in a verbose mode.
+The
 \fIchat\fR program will then log the execution state of the chat
 script as well as all text received from the modem and the output
 strings sent to the modem.  The default is to log through
@@ -62,8 +75,10 @@
 .TP
 .B -V
 Request that the \fIchat\fR script be executed in a stderr verbose
-mode. The \fIchat\fR program will then log all text received from the
-modem and the output strings sent to the modem to the stderr device. This
+mode.
+The \fIchat\fR program will then log all text received from the
+modem and the output strings sent to the modem to the stderr device.
+This
 device is usually the local console at the station running the chat or
 pppd program.
 .TP
@@ -113,20 +128,24 @@
 string ppp and then expect the prompt "ssword:". When it receives the
 prompt for the password, it will send the password hello2u2.
 .LP
-A carriage return is normally sent following the reply string. It is not
+A carriage return is normally sent following the reply string.
+It is not
 expected in the "expect" string unless it is specifically requested by using
 the \\r character sequence.
 .LP
 The expect sequence should contain only what is needed to identify the
-string. Since it is normally stored on a disk file, it should not contain
-variable information. It is generally not acceptable to look for time
+string.
+Since it is normally stored on a disk file, it should not contain
+variable information.
+It is generally not acceptable to look for time
 strings, network identification strings, or other variable pieces of data as
 an expect string.
 .LP
 To help correct for characters which may be corrupted during the initial
 sequence, look for the string "ogin:" rather than "login:". It is possible
 that the leading "l" character may be received in error and you may never
-find the string even though it was sent by the system. For this reason,
+find the string even though it was sent by the system.
+For this reason,
 scripts look for "ogin:" rather than "login:" and "ssword:" rather than
 "password:".
 .LP
@@ -136,21 +155,27 @@
 .LP
 In other words, expect ....ogin:, send ppp, expect ...ssword:, send hello2u2.
 .LP
-In actual practice, simple scripts are rare. At the vary least, you
+In actual practice, simple scripts are rare.
+At the vary least, you
 should include sub-expect sequences should the original string not be
-received. For example, consider the following script:
+received.
+For example, consider the following script:
 .IP
 ogin:--ogin: ppp ssword: hello2u2
 .LP
-This would be a better script than the simple one used earlier. This would look
+This would be a better script than the simple one used earlier.
+This would look
 for the same login: prompt, however, if one was not received, a single
-return sequence is sent and then it will look for login: again. Should line
+return sequence is sent and then it will look for login: again.
+Should line
 noise obscure the first login prompt then sending the empty line will
 usually generate a login prompt again.
 .SH COMMENTS
-Comments can be embedded in the chat script. A comment is a line which
+Comments can be embedded in the chat script.
+A comment is a line which
 starts with the \fB#\fR (hash) character in column 1. Such comment
-lines are just ignored by the chat program. If a '#' character is to
+lines are just ignored by the chat program.
+If a '#' character is to
 be expected as the first character of the expect sequence, you should
 quote the expect string.
 If you want to wait for a prompt that starts with a # (hash)
@@ -162,27 +187,42 @@
 .LP
 
 .SH ABORT STRINGS
-Many modems will report the status of the call as a string. These
-strings may be \fBCONNECTED\fR or \fBNO CARRIER\fR or \fBBUSY\fR. It
+Many modems will report the status of the call as a string.
+These
+strings may be \fBCONNECTED\fR or \fBNO CARRIER\fR or \fBBUSY\fR.
+It
 is often desirable to terminate the script should the modem fail to
-connect to the remote. The difficulty is that a script would not know
-exactly which modem string it may receive. On one attempt, it may
+connect to the remote.
+The difficulty is that a script would not know
+exactly which modem string it may receive.
+On one attempt, it may
 receive \fBBUSY\fR while the next time it may receive \fBNO CARRIER\fR.
 .LP
 These "abort" strings may be specified in the script using the \fIABORT\fR
-sequence. It is written in the script as in the following example:
+sequence.
+It is written in the script as in the following example:
 .IP
 ABORT BUSY ABORT 'NO CARRIER' '' ATZ OK ATDT5551212 CONNECT
 .LP
-This sequence will expect nothing; and then send the string ATZ. The
-expected response to this is the string \fIOK\fR. When it receives \fIOK\fR,
-the string ATDT5551212 to dial the telephone. The expected string is
-\fICONNECT\fR. If the string \fICONNECT\fR is received the remainder of the
-script is executed. However, should the modem find a busy telephone, it will
-send the string \fIBUSY\fR. This will cause the string to match the abort
-character sequence. The script will then fail because it found a match to
-the abort string. If it received the string \fINO CARRIER\fR, it will abort
-for the same reason. Either string may be received. Either string will
+This sequence will expect nothing; and then send the string ATZ.
+The
+expected response to this is the string \fIOK\fR.
+When it receives \fIOK\fR,
+the string ATDT5551212 to dial the telephone.
+The expected string is
+\fICONNECT\fR.
+If the string \fICONNECT\fR is received the remainder of the
+script is executed.
+However, should the modem find a busy telephone, it will
+send the string \fIBUSY\fR.
+This will cause the string to match the abort
+character sequence.
+The script will then fail because it found a match to
+the abort string.
+If it received the string \fINO CARRIER\fR, it will abort
+for the same reason.
+Either string may be received.
+Either string will
 terminate the \fIchat\fR script.
 .SH CLR_ABORT STRINGS
 This sequence allows for clearing previously set \fBABORT\fR strings.
@@ -196,7 +236,8 @@
 terminal), standard error will normally be redirected to the file
 /etc/ppp/connect-errors.
 .LP
-\fBSAY\fR strings must be enclosed in single or double quotes. If
+\fBSAY\fR strings must be enclosed in single or double quotes.
+If
 carriage return and line feed are needed in the string to be output,
 you must explicitly add them to your string.
 .LP
@@ -229,7 +270,8 @@
 \fIetc ...\fR
 .LP
 This sequence will only present the SAY strings to the user and all
-the details of the script will remain hidden. For example, if the
+the details of the script will remain hidden.
+For example, if the
 above script works, the user will see:
 .IP
 Dialling your ISP...
@@ -240,28 +282,35 @@
 .LP
 
 .SH REPORT STRINGS
-A \fBreport\fR string is similar to the ABORT string. The difference
+A \fBreport\fR string is similar to the ABORT string.
+The difference
 is that the strings, and all characters to the next control character
 such as a carriage return, are written to the report file.
 .LP
 The report strings may be used to isolate the transmission rate of the
-modem's connect string and return the value to the chat user. The
+modem's connect string and return the value to the chat user.
+The
 analysis of the report string logic occurs in conjunction with the
-other string processing such as looking for the expect string. The use
+other string processing such as looking for the expect string.
+The use
 of the same string for a report and abort sequence is probably not
 very useful, however, it is possible.
 .LP
 The report strings to no change the completion code of the program.
 .LP
 These "report" strings may be specified in the script using the \fIREPORT\fR
-sequence. It is written in the script as in the following example:
+sequence.
+It is written in the script as in the following example:
 .IP
 REPORT CONNECT ABORT BUSY '' ATDT5551212 CONNECT '' ogin: account
 .LP
 This sequence will expect nothing; and then send the string
-ATDT5551212 to dial the telephone. The expected string is
-\fICONNECT\fR. If the string \fICONNECT\fR is received the remainder
-of the script is executed. In addition the program will write to the
+ATDT5551212 to dial the telephone.
+The expected string is
+\fICONNECT\fR.
+If the string \fICONNECT\fR is received the remainder
+of the script is executed.
+In addition the program will write to the
 expect-file the string "CONNECT" plus any characters which follow it
 such as the connection rate.
 .SH CLR_REPORT STRINGS
@@ -271,11 +320,15 @@
 entries so that new strings can use that space.
 .SH ECHO
 The echo options controls whether the output from the modem is echoed
-to \fIstderr\fR. This option may be set with the \fI-e\fR option, but
-it can also be controlled by the \fIECHO\fR keyword. The "expect-send"
+to \fIstderr\fR.
+This option may be set with the \fI-e\fR option, but
+it can also be controlled by the \fIECHO\fR keyword.
+The "expect-send"
 pair \fIECHO\fR \fION\fR enables echoing, and \fIECHO\fR \fIOFF\fR
-disables it. With this keyword you can select which parts of the
-conversation should be visible. For instance, with the following
+disables it.
+With this keyword you can select which parts of the
+conversation should be visible.
+For instance, with the following
 script:
 .IP
 ABORT   'BUSY'
@@ -341,7 +394,8 @@
 \fIetc ...\fR
 .LP
 .SH TIMEOUT
-The initial timeout value is 45 seconds. This may be changed using the \fB-t\fR
+The initial timeout value is 45 seconds.
+This may be changed using the \fB-t\fR
 parameter.
 .LP
 To change the timeout value for the next expect string, the following
@@ -350,21 +404,26 @@
 ATZ OK ATDT5551212 CONNECT TIMEOUT 10 ogin:--ogin: TIMEOUT 5 assword: hello2u2
 .LP
 This will change the timeout to 10 seconds when it expects the login:
-prompt. The timeout is then changed to 5 seconds when it looks for the
+prompt.
+The timeout is then changed to 5 seconds when it looks for the
 password prompt.
 .LP
 The timeout, once changed, remains in effect until it is changed again.
 .SH SENDING EOT
 The special reply string of \fIEOT\fR indicates that the chat program
-should send an EOT character to the remote. This is normally the
-End-of-file character sequence. A return character is not sent
+should send an EOT character to the remote.
+This is normally the
+End-of-file character sequence.
+A return character is not sent
 following the EOT.
 .PR
 The EOT sequence may be embedded into the send string using the
 sequence \fI^D\fR.
 .SH GENERATING BREAK
 The special reply string of \fIBREAK\fR will cause a break condition
-to be sent. The break is a special signal on the transmitter. The
+to be sent.
+The break is a special signal on the transmitter.
+The
 normal processing on the receiver is to change the transmission rate.
 It may be used to cycle through the available transmission rates on
 the remote until you are able to receive a valid login prompt.
@@ -372,27 +431,35 @@
 The break sequence may be embedded into the send string using the
 \fI\\K\fR sequence.
 .SH ESCAPE SEQUENCES
-The expect and reply strings may contain escape sequences. All of the
-sequences are legal in the reply string. Many are legal in the expect.
+The expect and reply strings may contain escape sequences.
+All of the
+sequences are legal in the reply string.
+Many are legal in the expect.
 Those which are not valid in the expect sequence are so indicated.
 .TP
 .B ''
-Expects or sends a null string. If you send a null string then it will still
-send the return character. This sequence may either be a pair of apostrophe
+Expects or sends a null string.
+If you send a null string then it will still
+send the return character.
+This sequence may either be a pair of apostrophe
 or quote characters.
 .TP
 .B \\\\b
 represents a backspace character.
 .TP
 .B \\\\c
-Suppresses the newline at the end of the reply string. This is the only
-method to send a string without a trailing return character. It must
-be at the end of the send string. For example,
+Suppresses the newline at the end of the reply string.
+This is the only
+method to send a string without a trailing return character.
+It must
+be at the end of the send string.
+For example,
 the sequence hello\\c will simply send the characters h, e, l, l, o.
 .I (not valid in expect.)
 .TP
 .B \\\\d
-Delay for one second. The program uses sleep(1) which will delay to a
+Delay for one second.
+The program uses sleep(1) which will delay to a
 maximum of one second.
 .I (not valid in expect.)
 .TP
@@ -404,11 +471,13 @@
 Send a newline or linefeed character.
 .TP
 .B \\\\N
-Send a null character. The same sequence may be represented by \\0.
+Send a null character.
+The same sequence may be represented by \\0.
 .I (not valid in expect.)
 .TP
 .B \\\\p
-Pause for a fraction of a second. The delay is 1/10th of a second.
+Pause for a fraction of a second.
+The delay is 1/10th of a second.
 .I (not valid in expect.)
 .TP
 .B \\\\q
@@ -422,8 +491,10 @@
 Send or expect a carriage return.
 .TP
 .B \\\\s
-Represents a space character in the string. This may be used when it
-is not desirable to quote the strings which contains spaces. The
+Represents a space character in the string.
+This may be used when it
+is not desirable to quote the strings which contains spaces.
+The
 sequence 'HI TIM' and HI\\sTIM are the same.
 .TP
 .B \\\\t
@@ -446,22 +517,26 @@
 codes.
 .TP
 .B 0
-The normal termination of the program. This indicates that the script
+The normal termination of the program.
+This indicates that the script
 was executed without error to the normal conclusion.
 .TP
 .B 1
 One or more of the parameters are invalid or an expect string was too
-large for the internal buffers. This indicates that the program as not
+large for the internal buffers.
+This indicates that the program as not
 properly executed.
 .TP
 .B 2
-An error occurred during the execution of the program. This may be due
+An error occurred during the execution of the program.
+This may be due
 to a read or write operation failing for some reason or chat receiving
 a signal such as SIGINT.
 .TP
 .B 3
 A timeout event occurred when there was an \fIexpect\fR string without
-having a "-subsend" string. This may mean that you did not program the
+having a "-subsend" string.
+This may mean that you did not program the
 script correctly for the condition or that some unexpected event has
 occurred and the expected string could not be found.
 .TP
@@ -482,16 +557,20 @@
 condition.
 .LP
 Using the termination code, it is possible to determine which event
-terminated the script. It is possible to decide if the string "BUSY"
+terminated the script.
+It is possible to decide if the string "BUSY"
 was received from the modem as opposed to "NO DIAL TONE". While the
 first event may be retried, the second will probably have little
 chance of succeeding during a retry.
 .SH SEE ALSO
 Additional information about \fIchat\fR scripts may be found with UUCP
-documentation. The \fIchat\fR script was taken from the ideas proposed
+documentation.
+The \fIchat\fR script was taken from the ideas proposed
 by the scripts used by the \fIuucico\fR program.
 .LP
 uucico(1), uucp(1), syslog(3), syslogd(8).
 .SH COPYRIGHT
-The \fIchat\fR program is in public domain. This is not the GNU public
-license. If it breaks then you get to keep both pieces.
+The \fIchat\fR program is in public domain.
+This is not the GNU public
+license.
+If it breaks then you get to keep both pieces.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/chkgrp.8 man8/chkgrp.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/chkgrp.8	Mon Dec 20 14:52:29 1999
+++ man8/chkgrp.8	Wed Jun 14 10:07:36 2000
@@ -24,27 +24,32 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/chkgrp/chkgrp.8,v 1.4.2.1 1999/08/29 15:40:17 peter Exp %
+.\" %FreeBSD: src/usr.sbin/chkgrp/chkgrp.8,v 1.4.2.3 2000/06/13 09:14:54 ru Exp %
 .\"
 .Dd May 5, 1998
 .Dt CHKGRP 8
-.Os
+.Os FreeBSD
 .Sh NAME
 .Nm chkgrp
 .Nd check the syntax of the group file
 .Sh SYNOPSIS
-.Nm chkgrp
+.Nm
 .Op Ar groupfile
 .Sh DESCRIPTION
-.Nm Chkgrp
+The
+.Nm
+utility
 scans the given file or, failing that, the system-wide group file for
-errors. Specifically, it checks that every non-blank, non-comment
+errors.
+Specifically, it checks that every non-blank, non-comment
 entry is composed of four colon-separated fields, that none of them
 contains whitespace, and that the third field (the group ID) is
 numeric.
 .Sh FILES
-.Bl -tag -width /dev/null -compact
+.Bl -tag -width /etc/group -compact
 .It Pa /etc/group
+group database file
+.El
 .Sh SEE ALSO
 .Xr getgrent 3 ,
 .Xr group 5
@@ -52,21 +57,28 @@
 For each error found,
 .Nm
 will print an error message containing the name of the file being
-scanned and the line number on which the error was found. Otherwise no
+scanned and the line number on which the error was found.
+Otherwise no
 output is produced.
 .Pp
-.Nm Chkgrp
-returns EX_DATAERR if errors were found in the group file, and EX_OK
+The
+.Nm
+utility returns
+.Dv EX_DATAERR
+if errors were found in the group file,
+and
+.Dv EX_OK
 otherwise.
 .Sh HISTORY
 The
 .Nm
-command appeared in
-.Fx 3.0
+utility appeared in
+.Fx 3.0 .
 .Sh AUTHORS
-.Nm Chkgrp
-and this manual page were written by
+The
+.Nm
+utility and this manual page were written by
 .An Dag-Erling Coodan Smgav Aq des@FreeBSD.org .
 .Sh BUGS
-Should check fields more thoroughly for allowed / disallowed
+Should check fields more thoroughly for allowed/disallowed
 characters, and the range of the group ID.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/chown.8 man8/chown.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/chown.8	Mon Dec 20 14:52:29 1999
+++ man8/chown.8	Wed Jun 14 10:07:36 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chown.8	8.3 (Berkeley) 3/31/94
-.\" %FreeBSD: src/usr.sbin/chown/chown.8,v 1.6.2.1 1999/08/29 15:40:19 peter Exp %
+.\" %FreeBSD: src/usr.sbin/chown/chown.8,v 1.6.2.2 1999/12/29 19:55:08 obrien Exp %
 .\"
 .Dd March 31, 1994
 .Dt CHOWN 8
@@ -46,7 +46,8 @@
 .Oc
 .Op Fl f
 .Op Fl h
-.Ar owner Op Ar :group
+.Op Fl v
+.Ar owner Ns Op Ar :group
 .Ar file ...
 .Nm chown
 .Oo
@@ -55,6 +56,7 @@
 .Oc
 .Op Fl f
 .Op Fl h
+.Op Fl v
 .Ar :group
 .Ar
 .Sh DESCRIPTION
@@ -85,6 +87,10 @@
 .It Fl h
 If the file is a symbolic link, change the user ID and/or the group ID
 of the link itself rather than the file that the link points to.
+.It Fl v
+Cause
+.Nm
+to be verbose, showing files as the owner is modified.
 .El
 .Pp
 The
@@ -133,6 +139,10 @@
 .Pp
 On previous versions of this system, symbolic links did not have
 owners.
+.Pp
+The
+.Fl v
+option is non-standard and its use in scripts is not recommended.
 .Sh SEE ALSO
 .Xr chgrp 1 ,
 .Xr find 1 ,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/comcontrol.8 man8/comcontrol.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/comcontrol.8	Mon Dec 20 14:49:33 1999
+++ man8/comcontrol.8	Wed Jun 14 10:05:18 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/sbin/i386/comcontrol/comcontrol.8,v 1.14.2.1 1999/08/29 15:13:22 peter Exp %
+.\" %FreeBSD: src/sbin/i386/comcontrol/comcontrol.8,v 1.14.2.2 2000/05/04 16:56:01 phantom Exp %
 .Dd May 15, 1994
 .Dt COMCONTROL 8
 .Os FreeBSD
@@ -52,10 +52,6 @@
 dialout devices
 .Sh AUTHORS
 .An Christopher G. Demetriou
-.Sh BUGS
-.Nm Comcontrol
-should be named
-.Nm siocontrol .
 .Sh HISTORY
 Originally part of cgd's com package patches, version 0.2.1, to 386BSD 0.1.
 Once controlled bidirectional capabilities.  Little is left to control now
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/dhclient-script.8 man8/dhclient-script.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/dhclient-script.8	Mon Dec 20 14:48:54 1999
+++ man8/dhclient-script.8	Wed Jun 14 10:04:53 2000
@@ -35,6 +35,9 @@
 .\" Enterprises.  To learn more about the Internet Software Consortium,
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
+.\"
+.\" %FreeBSD: src/contrib/isc-dhcp/client/dhclient-script.8,v 1.2.2.4 2000/01/13 17:20:53 asmodai Exp %
+.\"
 .TH dhclient-script 8
 .SH NAME
 dhclient-script - DHCP client network configuration script
@@ -86,7 +89,7 @@
 After all processing has completed,
 .B /sbin/dhclient-script
 checks for the presence of an executable
-.B /sbin/dhclient-exit-hooks
+.B /etc/dhclient-exit-hooks
 script, which if present is invoked using the '.' command.   The exit status
 is passed in the exit_status shell variable, and will always be zero if the
 script succeeded at the task for which it was invoked.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/dump.8 man8/dump.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/dump.8	Mon Dec 20 14:48:56 1999
+++ man8/dump.8	Wed Jun 14 10:04:54 2000
@@ -31,13 +31,14 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dump.8	8.3 (Berkeley) 5/1/95
-.\" %FreeBSD: src/sbin/dump/dump.8,v 1.22.2.1 1999/08/29 15:12:51 peter Exp %
+.\" %FreeBSD: src/sbin/dump/dump.8,v 1.22.2.3 2000/03/03 15:12:56 sheldonh Exp %
 .\"
 .Dd May 1, 1995
 .Dt DUMP 8
 .Os BSD 4
 .Sh NAME
-.Nm dump
+.Nm dump ,
+.Nm rdump
 .Nd filesystem backup
 .Sh SYNOPSIS
 .Nm dump
@@ -63,7 +64,8 @@
 examines files
 on a filesystem
 and determines which files
-need to be backed up. These files
+need to be backed up.
+These files
 are copied to the given disk, tape or other
 storage medium for safe keeping (see the
 .Fl f
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/fdcontrol.8 man8/fdcontrol.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/fdcontrol.8	Mon Dec 20 14:53:22 1999
+++ man8/fdcontrol.8	Wed Jun 14 10:08:13 2000
@@ -24,6 +24,8 @@
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\" 
+.\" %FreeBSD: src/usr.sbin/fdcontrol/fdcontrol.8,v 1.5.2.1 2000/03/06 11:35:47 sheldonh Exp %
+.\" 
 .Dd May 22, 1994
 .Os
 .Dt FDCONTROL 8
@@ -75,13 +77,15 @@
 .Sh BUGS
 The
 .Nm
-command is currently under development. It's user interface is rather
+command is currently under development.
+It's user interface is rather
 silly and likely to change in future, options should be provided to
 allow anything being modified from the command line.
 .Pp
 The driver does actually support only two debug levels
 .Pq 0 and 1 ,
-where debug level 1 will generate huge amounts of output. It is likely
+where debug level 1 will generate huge amounts of output.
+It is likely
 to overflow the syslog if not used with extreme care.
 .Sh SEE ALSO
 .Xr ioctl 2 ,
@@ -89,7 +93,8 @@
 .Xr fdc 4
 .Sh HISTORY
 .Nm Fdcontrol
-is currently under development. It's user interface and overall
+is currently under development.
+It's user interface and overall
 functionality are subjects to future improvements and changes.
 .Sh AUTHORS
 The program has been contributed by
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/fore_dnld.8 man8/fore_dnld.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/fore_dnld.8	Mon Dec 20 14:48:52 1999
+++ man8/fore_dnld.8	Wed Jun 14 10:04:50 2000
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) %FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.8,v 1.1.2.1 1999/08/29 15:12:27 peter Exp %
+.\" @(#) %FreeBSD: src/sbin/atm/fore_dnld/fore_dnld.8,v 1.1.2.2 2000/03/03 14:59:51 sheldonh Exp %
 .\"
 .\"
 .de EX		\"Begin example
@@ -63,7 +63,8 @@
 Default is to use current directory.
 .TP
 .B -f objfile
-Specify the microcode binary file. Defaults are:
+Specify the microcode binary file.
+Defaults are:
 "sba200.obj" for SBA-200 adapters,
 "sba200e.obj" for SBA-200E adapters, and
 "pca200e.bin" for PCA-200E adapters. 
@@ -71,9 +72,11 @@
 .SH NOTES
 .PP
 Microcode as distributed by FORE Systems is not ready for downloading
-directly into SBA host ATM adapters. Instead, the supplied microcode needs
+directly into SBA host ATM adapters.
+Instead, the supplied microcode needs
 to be processed with the "objcopy" command to create an image suitable
-for downloading. Arguments to "objcopy" are "-S -l -Fcoff". Microcode as
+for downloading.
+Arguments to "objcopy" are "-S -l -Fcoff". Microcode as
 distibuted by FORE Systems for the PCA host ATM adapter does not need
 to be processed.
 .SH "SEE ALSO"
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/ifconfig.8 man8/ifconfig.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/ifconfig.8	Mon Dec 20 14:49:01 1999
+++ man8/ifconfig.8	Wed Jun 14 10:04:56 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
-.\" %FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.18.2.2 1999/12/13 02:02:20 jkh Exp %
+.\" %FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.18.2.3 2000/03/03 15:12:58 sheldonh Exp %
 .\"
 .Dd February 13, 1996
 .Dt IFCONFIG 8
@@ -205,7 +205,8 @@
 to
 .Ar vlan_tag .
 This value is a 16-bit number which is used to create an 802.1Q
-vlan header for packets sent from the vlan interface. Note that
+vlan header for packets sent from the vlan interface.
+Note that
 .Cm vlan
 and
 .Cm vlandev
@@ -213,19 +214,24 @@
 .It Cm vlandev Ar iface
 If the interface is a vlan pseudo device, associate physical interface
 .Ar iface
-with it. Packets transmitted through the vlan interface will be
+with it.
+Packets transmitted through the vlan interface will be
 diverted to the specified physical interface
 .Ar iface
-with 802.1Q vlan encapsulation. Packets with 802.1Q encapsulation received
+with 802.1Q vlan encapsulation.
+Packets with 802.1Q encapsulation received
 by the parent interface with the correct vlan tag will be diverted to
-the associated vlan pseudo-interface. The vlan interface is assigned a
+the associated vlan pseudo-interface.
+The vlan interface is assigned a
 copy of the parent interface's flags and the parent's ethernet address.
 The
 .Cm vlandev
 and
 .Cm vlan
-must both be set at the same time. If the vlan interface already has
-a physical interface associated with it, this command will fail. To
+must both be set at the same time.
+If the vlan interface already has
+a physical interface associated with it, this command will fail.
+To
 change the association to another physical interface, the existing
 association must be cleared first.
 .Pp
@@ -241,7 +247,8 @@
 .It Fl vlandev Ar iface
 If the driver is a vlan pseudo device, disassociate the physical interface
 .Ar iface
-from it. This breaks the link between the vlan interface and its parent,
+from it.
+This breaks the link between the vlan interface and its parent,
 clears its vlan tag, flags and its link address and shuts the interface down.
 .It Cm metric Ar n
 Set the routing metric of the interface to
@@ -307,17 +314,20 @@
 .It Cm range
 Under appletalk, set the interface to respond to a 
 .Em netrange.
-of the form startnet-endnet. Appletalk uses this scheme instead of 
+of the form startnet-endnet.
+Appletalk uses this scheme instead of 
 netmasks though
 .Bx Free
 implements it internally as a set of netmasks.
 .It Cm phase
 The argument following this specifies the version (phase) of the 
-Appletalk network attached to the interface. Values of 1 or 2 are permitted.
+Appletalk network attached to the interface.
+Values of 1 or 2 are permitted.
 .It Cm link[0-2]
 Enable special processing of the link level of the interface.
 These three options are interface specific in actual effect, however,
-they are in general used to select special modes of operation. An example
+they are in general used to select special modes of operation.
+An example
 of this is to enable SLIP compression, or to select the connector type
 for some Ethernet cards.  Refer to the man page for the specific driver
 for more information.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/ilmid.8 man8/ilmid.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/ilmid.8	Mon Dec 20 14:48:52 1999
+++ man8/ilmid.8	Wed Jun 14 10:04:50 2000
@@ -22,7 +22,7 @@
 .\" Copies of this Software may be made, however, the above copyright
 .\" notice must be reproduced on all copies.
 .\"
-.\" @(#) %FreeBSD: src/sbin/atm/ilmid/ilmid.8,v 1.1.2.1 1999/08/29 15:12:30 peter Exp %
+.\" @(#) %FreeBSD: src/sbin/atm/ilmid/ilmid.8,v 1.1.2.2 2000/03/03 15:12:53 sheldonh Exp %
 .\"
 .\"
 .de EX		\"Begin example
@@ -68,7 +68,8 @@
 .SH OPTIONS
 .TP
 .B \-d level
-Specify the debug level for optional protocol tracing. Messages are
+Specify the debug level for optional protocol tracing.
+Messages are
 written to /var/log/ilmid.
 .TP
 .B \-f
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/inetd.8 man8/inetd.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/inetd.8	Mon Dec 20 14:52:34 1999
+++ man8/inetd.8	Wed Jun 14 10:07:40 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)inetd.8	8.3 (Berkeley) 4/13/94
-.\" %FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.22.2.5 1999/11/18 09:33:47 des Exp %
+.\" %FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.22.2.7 2000/03/04 08:14:16 sheldonh Exp %
 .\"
 .Dd February 7, 1996
 .Dt INETD 8
@@ -79,9 +79,10 @@
 .It Fl d
 Turn on debugging.
 .It Fl l
-Turn on logging.
+Turn on logging of successful connections.
 .It Fl w
-Turn on TCP Wrapping for external services. See the
+Turn on TCP Wrapping for external services.
+See the
 .Sx "IMPLEMENTATION NOTES"
 section for more information on TCP Wrappers support.
 .It Fl W
@@ -181,7 +182,8 @@
 .Pa /etc/rpc . 
 The part on the right of the 
 .Dq /
-is the RPC version number. This
+is the RPC version number.
+This
 can simply be a single numeric argument or a range of versions.
 A range is bounded by the low version to the high version - 
 .Dq rusers/1-3 .
@@ -298,10 +300,13 @@
 .Dq /
 followed by the number to the
 .Dq nowait
-keyword. Normally
-(or if a value of zero is specified) there is no maximum. Otherwise,
+keyword.
+Normally
+(or if a value of zero is specified) there is no maximum.
+Otherwise,
 once the maximum is reached, further connection attempts will be
-queued up until an existing child process exits. This also works
+queued up until an existing child process exits.
+This also works
 in the case of
 .Dq wait
 mode, although a value other than one (the
@@ -311,7 +316,8 @@
 a
 .Dq /
 followed by the number to the maximum number of
-outstanding child processes. Once the maximum is reached, further
+outstanding child processes.
+Once the maximum is reached, further
 connections from this IP address will be dropped until the end of the
 minute.
 .Pp
@@ -365,7 +371,8 @@
 .It Fl r
 Offer a real
 .Dq auth
-service, as per RFC 1413. All the following flags apply only in this case.
+service, as per RFC 1413.
+All the following flags apply only in this case.
 .It Fl f
 If the file
 .Pa .fakeid
@@ -384,7 +391,8 @@
 returned by
 .Xr uname 3 .
 .It Fl t Ar sec[.usec]
-Specify a timeout for the service. The default timeout is 10.0 seconds.
+Specify a timeout for the service.
+The default timeout is 10.0 seconds.
 .El
 .Pp
 The
@@ -426,6 +434,16 @@
 .Nm
 will log an entry to syslog each time a connection is accepted, noting the
 service selected and the IP-number of the remote requestor if available.
+Unless otherwise specified in the configuration file,
+and in the absence of the
+.Fl W
+and
+.Fl w
+options,
+.Nm
+will log to the
+.Dq daemon
+facility.
 .Pp
 The
 .Nm
@@ -450,24 +468,31 @@
 .Dq dgram
 except for 
 .Dq internal
-services. If the
+services.
+If the
 .Fl W
 option is given, such
 .Dq internal
-services will be wrapped. If both options are given, wrapping for both
+services will be wrapped.
+If both options are given, wrapping for both
 internal and external services will be enabled.
-.Pp
-If the
+Either wrapping option
+will cause failed connections to be logged to the
+.Dq auth
+syslog facility.
+Adding the
 .Fl l
-option is specified, all connection attempts are logged, whether they are
-allowed, denied or not wrapped at all. Otherwise, only denied requests will
-be logged.
+flag to the wrapping options will include successful connections in the
+logging to the
+.Dq auth
+facility.
 .Pp
 Note that
 .Nm
 only wraps requests for a
 .Dq wait
-service while no servers are available to service requests. Once a
+service while no servers are available to service requests.
+Once a
 connection to such a service has been allowed, inetd has no control
 over subsequent connections to the service until no more servers
 are left listening for connection requests.
@@ -480,14 +505,14 @@
 ).
 When reading that document, keep in mind that
 .Dq internal
-services have no associated daemon name. Therefore, the service name
+services have no associated daemon name.
+Therefore, the service name
 as specified in
 .Pa inetd.conf
 should be used as the daemon name for
 .Dq internal
 services.
-.Sh TCPMUX
-.Pp
+.Sx TCPMUX
 .Tn RFC 1078 
 describes the TCPMUX protocol:
 ``A TCP client connects to a foreign host on TCP port 1.  It sends the
@@ -548,7 +573,8 @@
 .No " server failing (looping), service terminated."
 .Xc
 The number of requests for the specified service in the past minute
-exceeded the limit. The limit exists to prevent a broken program
+exceeded the limit.
+The limit exists to prevent a broken program
 or a malicious user from swamping the system.
 This message may occur for several reasons:
 .Bl -enum -offset indent
@@ -587,10 +613,12 @@
 .Ar user
 exists in the 
 .Xr passwd 5
-database. The first message
+database.
+The first message
 occurs when
 .Nm
-(re)reads the configuration file. The second message occurs when the
+(re)reads the configuration file.
+The second message occurs when the
 service is invoked.
 .Pp
 .It Xo
@@ -647,6 +675,6 @@
 .Tn SunOS
 4.1.
 The
-.Tn FreeBSD
+.Fx
 TCP Wrappers support first appeared in 
 .Fx 3.2 .
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/init.8 man8/init.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/init.8	Mon Dec 20 16:00:05 1999
+++ man8/init.8	Wed Jun 14 10:23:30 2000
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)init.8	8.3 (Berkeley) 4/18/94
-.\" %FreeBSD: src/sbin/init/init.8,v 1.13.2.6 1999/12/07 07:57:57 sheldonh Exp %
+.\" %FreeBSD: src/sbin/init/init.8,v 1.13.2.7 2000/03/03 15:12:59 sheldonh Exp %
 .\"
 .Dd April 18, 1994
 .Dt INIT 8
@@ -285,7 +285,8 @@
 .Nm
 will try to run the
 .Pa /etc/rc.shutdown
-script. This script can be used to cleanly terminate specific programs such
+script.
+This script can be used to cleanly terminate specific programs such
 as
 .Nm innd
 (the InterNetNews server).
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/ipfw.8 man8/ipfw.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/ipfw.8	Mon Dec 20 14:49:04 1999
+++ man8/ipfw.8	Wed Jun 14 10:04:59 2000
@@ -1,92 +1,229 @@
 .\"
-.\" %FreeBSD: src/sbin/ipfw/ipfw.8,v 1.47.2.9 1999/10/20 13:07:36 ru Exp %
+.\" %FreeBSD: src/sbin/ipfw/ipfw.8,v 1.47.2.12 2000/03/03 11:06:44 ru Exp %
 .\"
-.Dd July 20, 1996
+.Dd February 16, 2000
 .Dt IPFW 8
 .Os FreeBSD
 .Sh NAME
 .Nm ipfw
-.Nd controlling utility for IP firewall
+.Nd controlling utility for IP firewall and traffic shaper
 .Sh SYNOPSIS
 .Nm ipfw
 .Op Fl q
 .Oo
 .Fl p Ar preproc
-.Op Fl D Ar macro Ns Op Ns =value
+.Oo Fl D
+.Sm off
+.Ar macro
+.Op = Ar value
+.Sm on
+.Oc
 .Op Fl U Ar macro
 .Oc
 .Ar file
 .Nm ipfw
-.Oo
-.Fl f
-|
-.Fl q
-.Oc
-flush
+.Op Fl f | q
+.Cm flush
 .Nm ipfw
-.Oo
-.Fl q
-.Oc
-zero
+.Op Fl q
+.Es \&{ \&}
+.En Cm zero | resetlog | delete
 .Op Ar number ...
 .Nm ipfw
-.Oo
-.Fl q
-.Oc
-resetlog
+.Op Fl s Op Ar field
+.Op Fl aftN
+.Es \&{ \&}
+.En Cm list | show
 .Op Ar number ...
 .Nm ipfw
-delete
-.Ar number ...
+.Op Fl q
+.Cm add
+.Op Ar number
+.Ar rule-body
 .Nm ipfw
-.Op Fl aftN
-list
-.Op Ar number ...
+.Cm pipe
+.Ar number
+.Cm config
+.Ar pipe-config-options
 .Nm ipfw
-.Oo
-.Fl ftN
-.Oc
-show
+.Cm pipe
+.Es \&{ \&}
+.En Cm delete | list | show
 .Op Ar number ...
-.Nm ipfw
-.Oo
-.Fl q
-.Oc
-add
-.Op Ar number
-.Op prob match_probability
-.Ar action 
-.Op log Op Ar logamount Ar number
-.Ar proto
-from
-.Ar src
-to
-.Ar dst
-.Op via Ar name | ipno
-.Op Ar options
 .Sh DESCRIPTION
-If used as shown in the first synopsis line, the
-.Ar file
-will be read line by line and applied as arguments to the 
 .Nm
+is the user interface for controlling the
+.Xr ipfirewall 4
+and the
+.Xr dummynet 4
+traffic shaper in
+.Fx .
+.Pp
+Each incoming or outgoing packet is passed through the
+.Nm
+rules.
+If host is acting as a gateway, packets forwarded by
+the gateway are processed by
+.Nm
+twice.
+In case a host is acting as a bridge, packets forwarded by
+the bridge are processed by
+.Nm
+once.
+.Pp
+A firewall configuration is made of a list of numbered rules,
+which is scanned for each packet until a match is found and
+the relevant action is performed.
+Depending on the action and certain system settings, packets
+can be reinjected into the firewall at the rule after the
+matching one for further processing.
+All rules apply to all interfaces, so it is responsibility
+of the system administrator to write the ruleset in such a
+way as to minimize the number of checks.
+.Pp
+A configuration always includes a
+.Em DEFAULT
+rule (numbered 65535) which cannot be modified by the programmer
+and always matches packets.
+The action associated with the default rule can be either
+.Cm deny
+or
+.Cm allow
+depending on how the kernel is configured.
+.Pp
+If the ruleset includes one or more rules with the
+.Cm keep-state
+option, then
+.Nm
+assumes a
+.Em stateful
+behaviour, i.e. upon a match will create dynamic rules matching
+the exact parameters (addresses and ports) of the matching packet.
+.Pp
+These dynamic rules, which have a limited lifetime, are checked
+at the first occurrence of a
+.Cm check-state
+or
+.Cm keep-state
+rule, and are typically used to open the firewall on-demand to
+legitimate traffic only.
+See the
+.Sx RULE FORMAT
+and
+.Sx EXAMPLES
+sections below for more information on the stateful behaviour of
+.Nm ipfw .
+.Pp
+All rules (including dynamic ones) have a few associated counters:
+a packet count, a byte count, a log count and a timestamp
+indicating the time of the last match.
+Counters can be displayed or reset with
+.Nm
+commands.
+.Pp
+Rules can be added with the
+.Cm add
+command; deleted individually with the
+.Cm delete
+command, and globally with the
+.Cm flush
+command; displayed, optionally with the content of the
+counters, using the
+.Cm show
+and
+.Cm list
+commands.
+Finally, counters can be reset with the
+.Cm zero
+and
+.Cm resetlog
+commands.
+.Pp
+The following options are available:
+.Bl -tag -width indent
+.It Fl a
+While listing, show counter values.
+See also the
+.Cm show
 command.
+.It Fl f
+Don't ask for confirmation for commands that can cause problems
+if misused,
+.No i.e. Cm flush .
+.Em Note ,
+if there is no tty associated with the process, this is implied.
+.It Fl q
+While
+.Cm add Ns ing ,
+.Cm zero Ns ing ,
+.Cm resetlog Ns ging
+or
+.Cm flush Ns ing ,
+be quiet about actions
+.Po
+implies
+.Fl f
+.Pc .
+This is useful for adjusting rules by executing multiple
+.Nm
+commands in a script
+.Po
+e.g.,
+.Ql sh\ /etc/rc.firewall
+.Pc ,
+or by processing a file of many
+.Nm
+rules,
+across a remote login session.
+If a
+.Cm flush
+is performed in normal (verbose) mode (with the default kernel
+configuration), it prints a message.
+Because all rules are flushed, the message cannot be delivered
+to the login session.
+This causes the remote login session to be closed and the
+remainder of the ruleset is not processed.
+Access to the console is required to recover.
+.It Fl t
+While listing, show last match timestamp.
+.It Fl N
+Try to resolve addresses and service names in output.
+.It Fl s Op Ar field
+While listing pipes, sort according to one of the four
+counters (total and current packets or bytes).
+.El
+.Pp
+To ease configuration, rules can be put into a file which is
+processed using
+.Nm
+as shown in the first synopsis line.
+The
+.Ar file
+will be read line by line and applied as arguments to the
+.Nm
+utility.
 .Pp
 Optionally, a preprocessor can be specified using
 .Fl p Ar preproc
 where
 .Ar file
-is to be piped through.  Useful preprocessors include
+is to be piped through.
+Useful preprocessors include
 .Xr cpp 1
 and
 .Xr m4 1 .
 If
 .Ar preproc
-doesn't start with a slash as its first character, the usual
+doesn't start with a slash
+.Pq Ql /
+as its first character, the usual
 .Ev PATH
-name search is performed.  Care should be taken with this in environments
-where not all filesystems are mounted (yet) by the time
+name search is performed.
+Care should be taken with this in environments where not all
+filesystems are mounted (yet) by the time
 .Nm
-is being run (e. g. since they are mounted over NFS).  Once
+is being run (e.g. when they are mounted over NFS).
+Once
 .Fl p
 has been specified, optional
 .Fl D
@@ -97,354 +234,192 @@
 them on the local hostname) and the use of macros to centralize
 frequently required arguments like IP addresses.
 .Pp
-Each packet that has been received or is about to be sent goes through
-the
+The
 .Nm
-rules. In the case of a host acting as a gateway, packets that are
-forwarded by the host are processed by
+.Cm pipe
+commands are used to configure the traffic shaper, as shown in the
+.Sx TRAFFIC SHAPER CONFIGURATION
+section below.
+.Sh RULE FORMAT
+The
 .Nm
-twice
-.Po
-once when entering, and once when leaving
-.Pc .
+rule format is the following:
+.Bd -ragged
+.Op Cm prob Ar match_probability
+.Ar action
+.Op Cm log Op Cm logamount Ar number
+.Ar proto
+.Cm from Ar src
+.Cm to Ar dst
+.Op Ar interface-spec
+.Op Ar options
+.Ed
+.Pp
 Each packet can be filtered based on the following information that is
 associated with it:
 .Pp
-.Bl -tag -offset indent -compact -width xxxx
-.It Receive Interface Pq Ar recv
-Interface over which the packet was received
-.It Transmit Interface Pq Ar xmit
-Interface over which the packet would be transmitted
-.It Incoming Pq Ar in
-Packet was just received
-.It Outgoing Pq Ar out
-Packet would be transmitted
-.It Source IP Address
-Sender's IP Address
-.It Destination IP Address
-Target's IP Address
+.Bl -tag -width "Source and destination IP address" -offset indent -compact
+.It Transmit and receive interface
+(by name or address)
+.It Direction
+(incoming or outgoing)
+.It Source and destination IP address
+(possibly masked)
 .It Protocol
-IP protocol, including but not limited to IP
-.Pq Ar ip ,
-UDP
-.Pq Ar udp ,
-TCP
-.Pq Ar tcp ,
-or
-ICMP
-.Pq Ar icmp
-.It Source Port
-Sender's UDP or TCP port
-.It Destination Port
-Target's UDP or TCP port
-.It Connection Setup Flag Pq Ar setup
-This packet is a request to setup a TCP connection
-.It Connection Established Flag Pq Ar established
-This packet is part of an established TCP connection
-.It All TCP Flags Pq Ar tcpflags
-One or more of the TCP flags: close connection
-.Pq Ar fin ,
-open connection
-.Pq Ar syn ,
-reset connection
-.Pq Ar rst ,
-push
-.Pq Ar psh ,
-acknowledgment
-.Pq Ar ack ,
-and
-urgent
-.Pq Ar urg
-.It Fragment Flag Pq Ar frag
-This packet is a fragment of an IP packet
-.It IP Options Pq Ar ipoptions
-One or more of the IP options: strict source route
-.Pq Ar ssrr ,
-loose source route
-.Pq Ar lsrr ,
-record route
-.Pq Ar rr ,
-and timestamp
-.Pq Ar ts
-.It ICMP Types Pq Ar icmptypes
-One or more of the ICMP types: echo reply
-.Pq Ar 0 ,
-destination unreachable
-.Pq Ar 3 ,
-source quench
-.Pq Ar 4 ,
-redirect
-.Pq Ar 5 ,
-echo request
-.Pq Ar 8 ,
-router advertisement
-.Pq Ar 9 ,
-router solicitation
-.Pq Ar 10 ,
-time-to-live exceeded
-.Pq Ar 11 ,
-IP header bad
-.Pq Ar 12 ,
-timestamp request
-.Pq Ar 13 ,
-timestamp reply
-.Pq Ar 14 ,
-information request
-.Pq Ar 15 ,
-information reply
-.Pq Ar 16 ,
-address mask request
-.Pq Ar 17 ,
-and address mask reply
-.Pq Ar 18
+(TCP, UDP, ICMP, etc.)
+.It Source and destination port
+(lists, ranges or masks)
+.It TCP flags
+.It IP fragment flag
+.It IP options
+.It ICMP types
+.It User/group ID of the socket associated with the packet
 .El
 .Pp
-Note that may be dangerous to filter on the source IP address or
-source TCP/UDP port because either or both could easily be spoofed.
-.Pp
-The
-.Nm
-code works by going through the rule-list for each packet
-until a match is found.
-All rules have two associated counters, a packet count and
-a byte count.
-These counters are updated when a packet matches the rule.
-.Pp
-If a rule has the optional
-.Dq prob match_probability
-specifier, where the match_probability is a floating point number
-between 0 and 1, a match is only declared with the specified
-probability. This can be useful for a number of applications
-such as random packet drop or (in conjunction with
+Note that it may be dangerous to filter on the source IP
+address or source TCP/UDP port because either or both could
+easily be spoofed.
+.Bl -tag -width indent
+.It Cm prob Ar match_probability
+A match is only declared with the specified probability
+(floating point number between 0 and 1).
+This can be useful for a number of applications such as
+random packet drop or
+.Po
+in conjunction with
 .Xr dummynet 4
-) to simulate the effect of multiple paths leading to out-of-order
+.Pc
+to simulate the effect of multiple paths leading to out-of-order
 packet delivery.
-.Pp
-The rules are ordered by a 
-.Dq line-number
-from 1 to 65534 that is used
-to order and delete rules. Rules are tried in increasing order, and the
-first rule that matches a packet applies.
-Multiple rules may share the same number and apply in
-the order in which they were added.
-.Pp
-If a rule is added without a number, it is numbered 100 higher than the highest
-defined rule number, unless the highest defined rule number is 65435 or
-greater, in which case new rules are given that same number.
-.Pp
-The delete operation deletes the first rule with number
-.Ar number ,
-if any.
-.Pp
-The list command prints out the current rule set.
-.Pp
-The show command is equivalent to 
-.Sq ipfw -a list .
-.Pp
-The zero operation zeroes the counters associated with rule number
-.Ar number .
-.Pp
-The resetlog operation resets the logging counters associated with
-rule number
-.Ar number .
-.Pp
-The flush operation removes all rules.
-.Pp
-Any command beginning with a 
-.Sq # ,
-or being all blank, is ignored.
-.Pp
-One rule is always present:
-.Bd -literal -offset center
-65535 deny all from any to any
-.Ed
-.Pp
-This rule is the default policy, i.e., don't allow anything at all.
-Your job in setting up rules is to modify this policy to match your
-needs.
-.Pp
-However, if the kernel option
-.Dq IPFIREWALL_DEFAULT_TO_ACCEPT
-is active, the rule is instead:
-.Bd -literal -offset center
-65535 allow all from any to any
-.Ed
-.Pp
-This variation lets everything pass through.  This option should only be
-activated in particular circumstances, such as if you use the firewall
-system as an on-demand denial-of-service filter that is normally wide open.
-.Pp
-The following options are available:
+.It Ar action :
 .Bl -tag -width indent
-.It Fl a
-While listing, show counter values.  See also 
-.Dq show
-command.
-.It Fl f
-Don't ask for confirmation for commands that can cause problems if misused
-(i.e. flush).
-.Ar Note ,
-if there is no tty associated with the process, this is implied.
-.It Fl q
-While adding, zeroing, resetlogging or flushing, be quiet about actions (implies
-.Fl f Ns ).
-This is useful for adjusting rules by executing multiple
-.Nm
-commands in a script
-.Po
-e.g.,
-.Sq sh /etc/rc.firewall
-.Pc ,
-or by processing a file of many
-.Nm 
-rules,
-across a remote login session.  If a flush is performed in normal
-(verbose) mode (with the default kernel configuration), it prints a message.
-Because all rules are flushed, the
-message cannot be delivered to the login session.  This causes the
-remote login session to be closed and the remainder of the ruleset is
-not processed.  Access to the console is required to recover.
-.It Fl t
-While listing, show last match timestamp.
-.It Fl N
-Try to resolve addresses and service names in output.
-.El
-.Pp
-.Ar action :
-.Bl -hang -offset flag -width 1234567890123456
-.It Ar allow
+.It Cm allow
 Allow packets that match rule.
-The search terminates. Aliases are
-.Ar pass ,
-.Ar permit ,
+The search terminates.
+Aliases are
+.Cm pass ,
+.Cm permit
 and
-.Ar accept .
-.It Ar deny
+.Cm accept .
+.It Cm deny
 Discard packets that match this rule.
 The search terminates.
-.Ar Drop
+.Cm drop
 is an alias for
-.Ar deny .
-.It Ar reject
-(Deprecated.) Discard packets that match this rule, and try to send an ICMP
+.Cm deny .
+.It Cm reject
+.Pq Deprecated .
+Discard packets that match this rule, and try to send an ICMP
 host unreachable notice.
 The search terminates.
-.It Ar unreach code
+.It Cm unreach Ar code
 Discard packets that match this rule, and try to send an ICMP
 unreachable notice with code
 .Ar code ,
 where
 .Ar code
-is a number from zero to 255, or one of these aliases:
-.Ar net ,
-.Ar host ,
-.Ar protocol ,
-.Ar port ,
-.Ar needfrag ,
-.Ar srcfail ,
-.Ar net-unknown ,
-.Ar host-unknown ,
-.Ar isolated ,
-.Ar net-prohib ,
-.Ar host-prohib ,
-.Ar tosnet ,
-.Ar toshost ,
-.Ar filter-prohib ,
-.Ar host-precedence ,
+is a number from 0 to 255, or one of these aliases:
+.Cm net , host , protocol , port ,
+.Cm needfrag , srcfail , net-unknown , host-unknown ,
+.Cm isolated , net-prohib , host-prohib , tosnet ,
+.Cm toshost , filter-prohib , host-precedence
 or
-.Ar precedence-cutoff .
+.Cm precedence-cutoff .
 The search terminates.
-.It Ar reset
-TCP packets only. Discard packets that match this rule,
-and try to send a TCP reset
-.Pq RST
-notice.
+.It Cm reset
+TCP packets only.
+Discard packets that match this rule, and try to send a TCP
+reset (RST) notice.
 The search terminates.
-.It Ar count
+.It Cm count
 Update counters for all packets that match rule.
 The search continues with the next rule.
-.It Ar divert port
+.It Cm check-state
+Checks the packet against the dynamic ruleset.
+If a match is found then the search terminates, otherwise
+we move to the next rule.
+If no
+.Cm check-state
+rule is found, the dynamic ruleset is checked at the first
+.Cm keep-state
+rule.
+.It Cm divert Ar port
 Divert packets that match this rule to the
 .Xr divert 4
 socket bound to port
 .Ar port .
 The search terminates.
-.It Ar tee port
+.It Cm tee Ar port
 Send a copy of packets matching this rule to the
 .Xr divert 4
 socket bound to port
 .Ar port .
-The search continues with the next rule. This feature is not yet implemented.
-.It Ar fwd ipaddr Op ,port
+This feature is not yet implemented.
+.It Cm fwd Ar ipaddr Ns Xo
+.Op , Ns Ar port
+.Xc
 Change the next-hop on matching packets to
 .Ar ipaddr ,
 which can be an IP address in dotted quad or a host name.
 If
 .Ar ipaddr
-is not a directly-reachable address, the route 
-as found in the local routing table for that IP is used
-instead.
+is not a directly-reachable address, the route as found in
+the local routing table for that IP is used instead.
 If
 .Ar ipaddr
-is a local address, then on a packet entering the system from a remote
-host it will be diverted to
+is a local address, then on a packet entering the system
+from a remote host it will be diverted to
 .Ar port
-on the local machine, keeping the local address of the socket set
-to the original IP address the packet was destined for. This is intended
-for use with transparent proxy servers. If the IP is not
-a local address then the port number (if specified) is ignored and
-the rule only applies to packets leaving the system. This will
-also map addresses to local ports when packets are generated locally.
-The search terminates if this rule matches. If the port number is not 
-given then the port number in the packet is used, so that a packet for
-an external machine port Y would be forwarded to local port Y. The kernel
-must have been compiled with options IPFIREWALL_FORWARD.
-.It Ar pipe pipe_nr
+on the local machine, keeping the local address of the socket
+set to the original IP address the packet was destined for.
+This is intended for use with transparent proxy servers.
+If the IP is not a local address then the port number
+(if specified) is ignored and the rule only applies to packets
+leaving the system.
+This will also map addresses to local ports when packets are
+generated locally.
+The search terminates if this rule matches.
+If the port number is not given then the port number in the
+packet is used, so that a packet for an external machine port
+Y would be forwarded to local port Y.
+The kernel must have been compiled with the
+.Dv IPFIREWALL_FORWARD
+option.
+.It Cm pipe Ar pipe_nr
 Pass packet to a
 .Xr dummynet 4
-``pipe'' (for bandwidth limitation, delay etc.). See the
+.Dq pipe
+(for bandwidth limitation, delay, etc.).
+See the
 .Xr dummynet 4
-manpage for further information. The search terminates; however,
-on exit from the pipe and if the sysctl variable
-net.inet.ip.fw.one_pass is not set, the packet is passed again to
-the firewall code starting from the next rule.
-.It Ar skipto number
+manpage for further information.
+The search terminates; however, on exit from the pipe and if
+the
+.Xr sysctl 8
+variable
+.Em net.inet.ip.fw.one_pass
+is not set, the packet is passed again to the firewall code
+starting from the next rule.
+.It Cm skipto Ar number
 Skip all subsequent rules numbered less than
 .Ar number .
 The search continues with the first rule numbered
 .Ar number
 or higher.
-.It Ar uid user
-Match all TCP or UDP packets sent by or received for a
-.Ar user .
-A
-.Ar user
-may be matched by name or identification number.
-.It Ar gid group
-Match all TCP or UDP packets sent by or received for a
-.Ar group .
-A
-.Ar group
-may be matched by name or identification number.
 .El
-.Pp
-If a packet matches more than one
-.Ar divert
-and/or
-.Ar tee
-rule, all but the last are ignored.
-.Pp
+.It Cm log Op Cm logamount Ar number
 If the kernel was compiled with
 .Dv IPFIREWALL_VERBOSE ,
 then when a packet matches a rule with the
-.Ar log
+.Cm log
 keyword a message will be printed on the console.
 If the kernel was compiled with the
 .Dv IPFIREWALL_VERBOSE_LIMIT
 option, then by default logging will cease after the number
 of packets specified by the option are received for that
-particular chain entry. However, if
-.Ar logamount Ar number
+particular chain entry.
+However, if
+.Cm logamount Ar number
 is used, that
 .Ar number
 will be the default logging limit rather than
@@ -456,219 +431,395 @@
 through the
 .Xr sysctl 8
 interface in the MIB base of
-.Dv net.inet.ip.fw .
-.Pp
-.Ar proto :
-.Bl -hang -offset flag -width 1234567890123456
-.It Ar ip
-All packets match. The alias
-.Ar all
-has the same effect.
-.It Ar tcp
-Only TCP packets match.
-.It Ar udp
-Only UDP packets match.
-.It Ar icmp
-Only ICMP packets match.
-.It Ar <number|name>
-Only packets for the specified protocol matches (see
-.Pa /etc/protocols
-for a complete list).
-.El
-.Pp
-.Ar src 
-and
-.Ar dst :
-.Bl -hang -offset flag
-.It Ar <address/mask>
+.Em net.inet.ip.fw .
+.It Ar proto
+An IP protocol specified by number or name (for a complete
+list see
+.Pa /etc/protocols ) .
+The
+.Cm ip
+or
+.Cm all
+keywords mean any protocol will match.
+.It Ar src No and Ar dst :
+.Aq Ar address Ns / Ns Ar mask
 .Op Ar ports
-.El
 .Pp
 The
-.Em <address/mask>
+.Aq Ar address Ns / Ns Ar mask
 may be specified as:
-.Bl -hang -offset flag -width 1234567890123456
+.Bl -tag -width indent
 .It Ar ipno
-An ipnumber of the form 1.2.3.4.
-Only this exact ip number match the rule.
-.It Ar ipno/bits
-An ipnumber with a mask width of the form 1.2.3.4/24.
-In this case all ip numbers from 1.2.3.0 to 1.2.3.255 will match.
-.It Ar ipno:mask
-An ipnumber with a mask width of the form 1.2.3.4:255.255.240.0.
-In this case all ip numbers from 1.2.0.0 to 1.2.15.255 will match.
+An IP number of the form 1.2.3.4.
+Only this exact IP number will match the rule.
+.It Ar ipno Ns / Ns Ar bits
+An IP number with a mask width of the form 1.2.3.4/24.
+In this case all IP numbers from 1.2.3.0 to 1.2.3.255 will match.
+.It Ar ipno Ns : Ns Ar mask
+An IP number with a mask of the form 1.2.3.4:255.255.240.0.
+In this case all IP numbers from 1.2.0.0 to 1.2.15.255 will match.
 .El
 .Pp
 The sense of the match can be inverted by preceding an address with the
-.Dq not
-modifier, causing all other addresses to be matched instead. This
-does not affect the selection of port numbers.
+.Cm not
+modifier, causing all other addresses to be matched instead.
+This does not affect the selection of port numbers.
 .Pp
 With the TCP and UDP protocols, optional
 .Em ports
 may be specified as:
+.Bd -ragged -offset indent
+.Sm off
+.Eo \&{
+.Ar port |
+.Ar port No \&- Ar port |
+.Ar port : mask
+.Ec \&} Op , Ar port Op , Ar ...
+.Sm on
+.Ed
 .Pp
-.Bl -hang -offset flag
-.It Ns {port|port-port} Ns Op ,port Ns Op ,...
-.El
+The
+.Ql \&-
+notation specifies a range of ports (including boundaries).
+.Pp
+The
+.Ql \&:
+notation specifies a port and a mask, a match is declared if
+the port number in the packet matches the one in the rule,
+limited to the bits which are set in the mask.
 .Pp
-Service names (from 
+Service names (from
 .Pa /etc/services )
 may be used instead of numeric port values.
-A range may only be specified as the first value,
-and the length of the port list is limited to
+A range may only be specified as the first value, and the
+length of the port list is limited to
 .Dv IP_FW_MAX_PORTS
-(as defined in 
-.Pa /usr/src/sys/netinet/ip_fw.h )
-ports.
-A
-.Ql \e
-can be used to escape the
-.Ql -
+ports (as defined in
+.Pa /usr/src/sys/netinet/ip_fw.h ) .
+A backslash
+.Pq Ql \e
+can be used to escape the dash
+.Pq Ql -
 character in a service name:
 .Pp
-.Dl ipfw add count tcp from any ftp\e\e-data-ftp to any
+.Dl "ipfw add count tcp from any ftp\e\e-data-ftp to any"
 .Pp
 Fragmented packets which have a non-zero offset (i.e. not the first
 fragment) will never match a rule which has one or more port
-specifications.  See the
-.Ar frag
+specifications.
+See the
+.Cm frag
 option for details on matching fragmented packets.
-.Pp
-Rules can apply to packets when they are incoming, or outgoing, or both.
-The
-.Ar in
-keyword indicates the rule should only match incoming packets.
-The
-.Ar out
-keyword indicates the rule should only match outgoing packets.
-.Pp
-To match packets going through a certain interface, specify
-the interface using
-.Ar via :
-.Bl -hang -offset flag -width 1234567890123456
-.It Ar via ifX
+.It Ar interface-spec
+Some combinations of the following specifiers are allowed:
+.Bl -tag -width "via ipno"
+.It Cm in
+Only match incoming packets.
+.It Cm out
+Only match outgoing packets.
+.It Cm via Ar ifX
 Packet must be going through interface
-.Ar ifX.
-.It Ar via if*
+.Ar ifX .
+.It Cm via Ar if Ns Cm *
 Packet must be going through interface
 .Ar ifX ,
-where X is any unit number.
-.It Ar via any
+where
+.Ar X
+is any unit number.
+.It Cm via any
 Packet must be going through
 .Em some
 interface.
-.It Ar via ipno
+.It Cm via Ar ipno
 Packet must be going through the interface having IP address
 .Ar ipno .
 .El
 .Pp
 The
-.Ar via
+.Cm via
 keyword causes the interface to always be checked.
 If
-.Ar recv
+.Cm recv
 or
-.Ar xmit
+.Cm xmit
 is used instead of
-.Ar via ,
-then the only receive or transmit interface (respectively) is checked.
-By specifying both, it is possible to match packets based on both receive
-and transmit interface, e.g.:
+.Cm via ,
+then the only receive or transmit interface (respectively)
+is checked.
+By specifying both, it is possible to match packets based on
+both receive and transmit interface, e.g.:
 .Pp
 .Dl "ipfw add 100 deny ip from any to any out recv ed0 xmit ed1"
 .Pp
 The
-.Ar recv
-interface can be tested on either incoming or outgoing packets, while the
-.Ar xmit
-interface can only be tested on outgoing packets. So
-.Ar out
+.Cm recv
+interface can be tested on either incoming or outgoing packets,
+while the
+.Cm xmit
+interface can only be tested on outgoing packets.
+So
+.Cm out
 is required (and
-.Ar in
-invalid) whenever
-.Ar xmit
-is used. Specifying
-.Ar via
+.Cm in
+is invalid) whenever
+.Cm xmit
+is used.
+Specifying
+.Cm via
 together with
-.Ar xmit
+.Cm xmit
 or
-.Ar recv
+.Cm recv
 is invalid.
 .Pp
-A packet may not have a receive or transmit interface: packets originating
-from the local host have no receive interface. while packets destined for
-the local host have no transmit interface.
-.Pp
-Additional
-.Ar options :
-.Bl -hang -offset flag -width 1234567890123456
-.It frag
-Match if the packet is a fragment and this is not the first fragment
-of the datagram.
-.Ar frag
+A packet may not have a receive or transmit interface: packets
+originating from the local host have no receive interface,
+while packets destined for the local host have no transmit
+interface.
+.It Ar options :
+.Bl -tag -width indent
+.It Cm keep-state Op Ar method
+Upon a match, the firewall will create a dynamic rule, whose
+default behaviour is to matching bidirectional traffic between
+source and destination IP/port using the same protocol.
+The rule has a limited lifetime (controlled by a set of
+.Xr sysctl 8
+variables), and the lifetime is refreshed every time a matching
+packet is found.
+.Pp
+The actual behaviour can be modified by specifying a different
+.Ar method ,
+although at the moment only the default one is specified.
+.It Cm bridged
+Matches only bridged packets.
+This can be useful for multicast or broadcast traffic, which
+would otherwise pass through the firewall twice: once during
+bridging, and a second time when the packet is delivered to
+the local stack.
+.Pp
+Apart from a small performance penalty, this would be a problem
+when using
+.Em pipes
+because the same packet would be accounted for twice in terms
+of bandwidth, queue occupation, and also counters.
+.It Cm frag
+Match if the packet is a fragment and this is not the first
+fragment of the datagram.
+.Cm frag
 may not be used in conjunction with either
-.Ar tcpflags
+.Cm tcpflags
 or TCP/UDP port specifications.
-.It in
-Match if this packet was on the way in.
-.It out
-Match if this packet was on the way out.
-.It ipoptions Ar spec
-Match if the IP header contains the comma separated list of 
+.It Cm ipoptions Ar spec
+Match if the IP header contains the comma separated list of
 options specified in
 .Ar spec .
 The supported IP options are:
-.Ar ssrr 
+.Pp
+.Cm ssrr
 (strict source route),
-.Ar lsrr 
+.Cm lsrr
 (loose source route),
-.Ar rr 
-(record packet route), and
-.Ar ts 
+.Cm rr
+(record packet route) and
+.Cm ts
 (timestamp).
 The absence of a particular option may be denoted
 with a
-.Dq ! .
-.It established
+.Ql ! .
+.It Cm established
+TCP packets only.
 Match packets that have the RST or ACK bits set.
+.It Cm setup
 TCP packets only.
-.It setup
 Match packets that have the SYN bit set but no ACK bit.
+.It Cm tcpflags Ar spec
 TCP packets only.
-.It tcpflags Ar spec
 Match if the TCP header contains the comma separated list of
 flags specified in
 .Ar spec .
 The supported TCP flags are:
-.Ar fin ,
-.Ar syn ,
-.Ar rst ,
-.Ar psh ,
-.Ar ack ,
+.Pp
+.Cm fin ,
+.Cm syn ,
+.Cm rst ,
+.Cm psh ,
+.Cm ack
 and
-.Ar urg .
+.Cm urg .
 The absence of a particular flag may be denoted
 with a
-.Dq ! .
+.Ql ! .
 A rule which contains a
-.Ar tcpflags
+.Cm tcpflags
 specification can never match a fragmented packet which has
-a non-zero offset.  See the
-.Ar frag
+a non-zero offset.
+See the
+.Cm frag
 option for details on matching fragmented packets.
-.It icmptypes Ar types
+.It Cm icmptypes Ar types
+ICMP packets only.
 Match if the ICMP type is in the list
 .Ar types .
-The list may be specified as any combination of ranges
-or individual types separated by commas.
+The list may be specified as any combination of ranges or
+individual types separated by commas.
+The supported ICMP types are:
+.Pp
+echo reply
+.Pq Cm 0 ,
+destination unreachable
+.Pq Cm 3 ,
+source quench
+.Pq Cm 4 ,
+redirect
+.Pq Cm 5 ,
+echo request
+.Pq Cm 8 ,
+router advertisement
+.Pq Cm 9 ,
+router solicitation
+.Pq Cm 10 ,
+time-to-live exceeded
+.Pq Cm 11 ,
+IP header bad
+.Pq Cm 12 ,
+timestamp request
+.Pq Cm 13 ,
+timestamp reply
+.Pq Cm 14 ,
+information request
+.Pq Cm 15 ,
+information reply
+.Pq Cm 16 ,
+address mask request
+.Pq Cm 17
+and address mask reply
+.Pq Cm 18 .
+.It Cm uid Ar user
+Match all TCP or UDP packets sent by or received for a
+.Ar user .
+A
+.Ar user
+may be matched by name or identification number.
+.It Cm gid Ar group
+Match all TCP or UDP packets sent by or received for a
+.Ar group .
+A
+.Ar group
+may be matched by name or identification number.
+.El
+.El
+.Sh TRAFFIC SHAPER CONFIGURATION
+The
+.Nm
+utility is also the user interface for the
+.Xr dummynet 4
+traffic shaper.
+The shaper operates by passing packets to objects called
+.Em pipes ,
+which emulate a link with given bandwidth, propagation delay,
+queue size and packet loss rate.
+The
+.Nm
+pipe configuration format is the following:
+.Bd -ragged
+.Cm pipe Ar number Cm config
+.Op Cm bw Ar bandwidth
+.Oo
+.Cm queue
+.Es \&{ \&}
+.En Ar slots | size
+.Oc
+.Op Cm delay Ar ms-delay
+.Op Cm plr Ar loss-probability
+.Op Cm mask Ar mask-specifier
+.Op Cm buckets Ar hash-table-size
+.Ed
+.Pp
+The following parameters can be configured for a pipe:
+.Bl -tag -width indent
+.It Cm bw Ar bandwidth
+Bandwidth, measured in
+.Sm off
+.Oo
+.Cm K | M
+.Oc Eo \&{
+.Cm bit/s | Byte/s
+.Ec \&} .
+.Sm on
+.Pp
+A value of 0 (default) means unlimited bandwidth.
+The unit must follow immediately the number, as in
+.Dl "ipfw pipe 1 config bw 300Kbit/s queue 50KBytes"
+.It Cm delay Ar ms-delay
+Propagation delay, measured in milliseconds.
+The value is rounded to the next multiple of the clock tick
+(typically 10ms, but it is a good practice to run kernels
+with
+.Dq "options HZ=1000"
+to reduce
+the granularity to 1ms or less).
+Default value is 0, meaning no delay.
+.It Cm queue Xo
+.Es \&{ \&}
+.En Ar slots | size Ns Cm Kbytes
+.Xc
+Queue size, in
+.Ar slots
+or
+.Cm KBytes .
+Default value is 50 slots, which
+is the typical queue size for Ethernet devices.
+Note that for slow speed links you should keep the queue
+size short or your traffic might be affected by a significant
+queueing delay.
+E.g., 50 max-sized ethernet packets (1500 bytes) mean 600Kbit
+or 20s of queue on a 30Kbit/s pipe.
+Even worse effect can result if you get packets from an
+interface with a much larger MTU, e.g. the loopback interface
+with its 16KB packets.
+.It Cm plr Ar packet-loss-rate
+Packet loss rate.
+Argument
+.Ar packet-loss-rate
+is a floating-point number between 0 and 1, with 0 meaning no
+loss, 1 meaning 100% loss.
+The loss rate is internally represented on 31 bits.
+.It Cm mask Ar mask-specifier
+The
+.Xr dummynet 4
+allows you to generate per-flow queues using a single pipe
+specification.
+A flow identifier is constructed by masking the IP addresses,
+ports and protocol types as specified in the pipe configuration.
+Packets with the same identifier after masking fall into the
+same queue.
+Available mask specifiers are a combination of the following:
+.Cm dst-ip Ar mask ,
+.Cm src-ip Ar mask ,
+.Cm dst-port Ar mask ,
+.Cm src-port Ar mask ,
+.Cm proto Ar mask
+or
+.Cm all ,
+where the latter means all bits in all fields are significant.
+.It Cm buckets Ar hash-table-size
+Specifies the size of the hash table used for storing the
+various queues.
+Default value is 64 controlled by the
+.Xr sysctl 8
+variable
+.Em net.inet.ip.dummynet.hash_size ,
+allowed range is 16 to 1024.
 .El
 .Sh CHECKLIST
 Here are some important points to consider when designing your
 rules:
-.Bl -bullet -hang -offset flag 
-.It 
-Remember that you filter both packets going in and out.
+.Bl -bullet
+.It
+Remember that you filter both packets going
+.Cm in
+and
+.Cm out .
 Most connections need packets going in both directions.
 .It
 Remember to test very carefully.
@@ -677,28 +828,33 @@
 Don't forget the loopback interface.
 .El
 .Sh FINE POINTS
-There is one kind of packet that the firewall will always discard,
-that is an IP fragment with a fragment offset of one.
-This is a valid packet, but it only has one use, to try to circumvent
-firewalls.
-.Pp
-If you are logged in over a network, loading the KLD version of
+There is one kind of packet that the firewall will always
+discard, that is an IP fragment with a fragment offset of
+one.
+This is a valid packet, but it only has one use, to try
+to circumvent firewalls.
+.Pp
+If you are logged in over a network, loading the
+.Xr kld 4
+version of
 .Nm
 is probably not as straightforward as you would think.
-I recommend this command line:
-.Bd -literal -offset center
+I recommend the following command line:
+.Bd -literal -offset indent
 kldload /modules/ipfw.ko && \e
-ipfw add 32000 allow all from any to any
+ipfw add 32000 allow ip from any to any
 .Ed
 .Pp
 Along the same lines, doing an
-.Bd -literal -offset center
+.Bd -literal -offset indent
 ipfw flush
 .Ed
 .Pp
 in similar surroundings is also a bad idea.
 .Pp
-The IP filter list may not be modified if the system security level
+The
+.Nm
+filter list may not be modified if the system security level
 is set to 3 or higher
 .Po
 see
@@ -706,11 +862,62 @@
 for information on system security levels
 .Pc .
 .Sh PACKET DIVERSION
-A divert socket bound to the specified port will receive all packets diverted
-to that port; see
-.Xr divert 4 .
+A
+.Xr divert 4
+socket bound to the specified port will receive all packets
+diverted to that port.
 If no socket is bound to the destination port, or if the kernel
-wasn't compiled with divert socket support, diverted packets are dropped.
+wasn't compiled with divert socket support, the packets are
+dropped.
+.Sh SYSCTL VARIABLES
+A set of
+.Xr sysctl 8
+variables controls the behaviour of the firewall.
+These are shown below together with their default value and
+meaning:
+.Bl -tag -width indent
+.It Em net.inet.ip.fw.debug : No 1
+Controls debugging messages produced by
+.Nm ipfw .
+.It Em net.inet.ip.fw.one_pass : No 1
+When set, permits only one pass through the firewall.
+Otherwise, after a pipe or divert action, the packet is
+reinjected in the firewall starting from the next rule.
+.It Em net.inet.ip.fw.verbose : No 1
+Enables verbose messages.
+.It Em net.inet.ip.fw.enable : No 1
+Enables the firewall.
+Setting this variable to 0 lets you run your machine without
+firewall even if compiled in.
+.It Em net.inet.ip.fw.verbose_limit : No 0
+Limits the number of messages produced by a verbose firewall.
+.It Em net.inet.ip.fw.dyn_buckets : No 256
+.It Em net.inet.ip.fw.curr_dyn_buckets : No 256
+The configured and current size of the hash table used to
+hold dynamic rules.
+This must be a power of 2.
+The table can only be resized when empty, so in order to
+resize it on the fly you will probably have to
+.Cm flush
+and reload the ruleset.
+.It Em net.inet.ip.fw.dyn_count : No 3
+Current number of dynamic rules
+.Pq read-only .
+.It Em net.inet.ip.fw.dyn_max : No 1000
+Maximum number of dynamic rules.
+When you hit this limit, no more dynamic rules can be
+installed until old ones expire.
+.It Em net.inet.ip.fw.dyn_ack_lifetime : No 300
+.It Em net.inet.ip.fw.dyn_syn_lifetime : No 20
+.It Em net.inet.ip.fw.dyn_fin_lifetime : No 20
+.It Em net.inet.ip.fw.dyn_rst_lifetime : No 5
+.It Em net.inet.ip.fw.dyn_short_lifetime : No 30
+These variables control the lifetime, in seconds, of dynamic
+rules.
+Upon the initial SYN exchange the lifetime is kept short,
+then increased after both SYN have been seen, then decreased
+again during the final FIN exchange or when a RST
+.El
 .Sh EXAMPLES
 This command adds an entry which denies all tcp packets from
 .Em cracker.evil.org
@@ -718,30 +925,164 @@
 .Em wolf.tambov.su
 from being forwarded by the host:
 .Pp
-.Dl ipfw add deny tcp from cracker.evil.org to wolf.tambov.su 23
-.Pp 
-This one disallows any connection from the entire crackers network to
-my host:
+.Dl "ipfw add deny tcp from cracker.evil.org to wolf.tambov.su telnet"
+.Pp
+This one disallows any connection from the entire crackers
+network to my host:
 .Pp
-.Dl ipfw add deny all from 123.45.67.0/24 to my.host.org
+.Dl "ipfw add deny ip from 123.45.67.0/24 to my.host.org"
+.Pp
+A first and efficient way to limit access (not using dynamic rules)
+is the use of the following rules:
+.Pp
+.Dl "ipfw add allow tcp from any to any established"
+.Dl "ipfw add allow tcp from net1 portlist1 to net2 portlist2 setup"
+.Dl "ipfw add allow tcp from net3 portlist3 to net3 portlist3 setup"
+.Dl "..."
+.Dl "ipfw add deny tcp from any to any"
+.Pp
+The first rule will be a quick match for normal TCP packets,
+but it will not match the initial SYN packet, which will be
+matched by the
+.Cm setup
+rules only for selected source/destination pairs.
+All other SYN packets will be rejected by the final
+.Cm deny
+rule.
+.Pp
+In order to protect a site from flood attacks involving fake
+TCP packets, it is safer to use dynamic rules:
+.Pp
+.Dl "ipfw add check-state"
+.Dl "ipfw add deny tcp from any to any established"
+.Dl "ipfw add allow tcp from my-net to any setup keep-state"
+.Pp
+This will let the firewall install dynamic rules only for
+those connection which start with a regular SYN packet coming
+from the inside of our network.
+Dynamic rules are checked when encountering the first
+.Cm check-state
+or
+.Cm keep-state
+rule.
+A
+.Cm check-state
+rule should be usually placed near the beginning of the
+ruleset to minimize the amount of work scanning the ruleset.
+Your mileage may vary.
+.Pp
+.Em BEWARE :
+stateful rules can be subject to denial-of-service attacks
+by a SYN-flood which opens a huge number of dynamic rules.
+The effects of such attacks can be partially limited by
+acting on a set of
+.Xr sysctl 8
+variables which control the operation of the firewall.
 .Pp
 Here is a good usage of the
-.Ar list
-command to see accounting records
-and timestamp information:
+.Cm list
+command to see accounting records and timestamp information:
 .Pp
-.Dl ipfw -at l
+.Dl ipfw -at list
 .Pp
 or in short form without timestamps:
 .Pp
-.Dl ipfw -a l
+.Dl ipfw -a list
+.Pp
+Next rule diverts all incoming packets from 192.168.2.0/24
+to divert port 5000:
+.Pp
+.Dl ipfw divert 5000 ip from 192.168.2.0/24 to any in
+.Pp
+The following rules show some of the applications of
+.Nm
+and
+.Xr dummynet 4
+for simulations and the like.
+.Pp
+This rule drops random incoming packets with a probability
+of 5%:
+.Pp
+.Dl "ipfw add prob 0.05 deny ip from any to any in"
+.Pp
+A similar effect can be achieved making use of dummynet pipes:
+.Pp
+.Dl "ipfw add pipe 10 ip from any to any"
+.Dl "ipfw pipe 10 config plr 0.05"
+.Pp
+We can use pipes to artificially limit bandwidth, e.g. on a
+machine acting as a router, if we want to limit traffic from
+local clients on 192.168.2.0/24 we do:
+.Pp
+.Dl "ipfw add pipe 1 ip from 192.168.2.0/24 to any out"
+.Dl "ipfw pipe 1 config bw 300Kbit/s queue 50KBytes"
+.Pp
+note that we use the
+.Cm out
+modifier so that the rule is not used twice.
+Remember in fact that
+.Nm
+rules are checked both on incoming and outgoing packets.
 .Pp
-This rule diverts all incoming packets from 192.168.2.0/24 to divert port 5000:
+Should we like to simulate a bidirectional link with bandwidth
+limitations, the correct way is the following:
 .Pp
-.Dl ipfw divert 5000 all from 192.168.2.0/24 to any in
+.Dl "ipfw add pipe 1 ip from any to any out"
+.Dl "ipfw add pipe 2 ip from any to any in"
+.Dl "ipfw pipe 1 config bw 64Kbit/s queue 10Kbytes"
+.Dl "ipfw pipe 2 config bw 64Kbit/s queue 10Kbytes"
+.Pp
+The above can be very useful, e.g. if you want to see how
+your fancy Web page will look for a residential user which
+is connected only through a slow link.
+You should not use only one pipe for both directions, unless
+you want to simulate a half-duplex medium (e.g. AppleTalk,
+Ethernet, IRDA).
+It is not necessary that both pipes have the same configuration,
+so we can also simulate asymmetric links.
+.Pp
+Another typical application of the traffic shaper is to
+introduce some delay in the communication.
+This can affect a lot applications which do a lot of Remote
+Procedure Calls, and where the round-trip-time of the
+connection often becomes a limiting factor much more than
+bandwidth:
+.Pp
+.Dl "ipfw add pipe 1 ip from any to any out"
+.Dl "ipfw add pipe 2 ip from any to any in"
+.Dl "ipfw pipe 1 config delay 250ms bw 1Mbit/s"
+.Dl "ipfw pipe 2 config delay 250ms bw 1Mbit/s"
+.Pp
+Per-flow queueing can be useful for a variety of purposes.
+A very simple one is counting traffic:
+.Pp
+.Dl "ipfw add pipe 1 tcp from any to any"
+.Dl "ipfw add pipe 1 udp from any to any"
+.Dl "ipfw add pipe 1 ip from any to any"
+.Dl "ipfw pipe 1 config mask all"
+.Pp
+The above set of rules will create queues (and collect
+statistics) for all traffic.
+Because the pipes have no limitations, the only effect is
+collecting statistics.
+Note that we need 3 rules, not just the last one, because
+when
+.Nm
+tries to match IP packets it will not consider ports, so we
+would not see connections on separate ports as different
+ones.
+.Pp
+A more sophisticated example is limiting the outbound traffic
+on a net with per-host limits, rather than per-network limits:
+.Pp
+.Dl "ipfw add pipe 1 ip from 192.168.2.0/24 to any out"
+.Dl "ipfw add pipe 2 ip from any to 192.168.2.0/24 in"
+.Dl "ipfw pipe 1 config mask src-ip 0x000000ff bw 200Kbit/s queue 20Kbytes"
+.Dl "ipfw pipe 2 config mask dst-ip 0x000000ff bw 200Kbit/s queue 20Kbytes"
 .Sh SEE ALSO
 .Xr cpp 1 ,
 .Xr m4 1 ,
+.Xr bridge 4 ,
 .Xr divert 4 ,
 .Xr dummynet 4 ,
 .Xr ip 4 ,
@@ -755,35 +1096,48 @@
 .Xr syslogd 8 .
 .Sh BUGS
 .Pp
+The syntax has grown over the years and it is not very clean.
+.Pp
 .Em WARNING!!WARNING!!WARNING!!WARNING!!WARNING!!WARNING!!WARNING!!
 .Pp
-This program can put your computer in rather unusable state. When
-using it for the first time, work on the console of the computer, and
-do
+This program can put your computer in rather unusable state.
+When using it for the first time, work on the console of the
+computer, and do
 .Em NOT
 do anything you don't understand.
 .Pp
-When manipulating/adding chain entries, service and protocol names are
-not accepted.
+When manipulating/adding chain entries, service and protocol names
+are not accepted.
 .Pp
 Incoming packet fragments diverted by
-.Ar divert
-are reassembled before delivery to the socket, whereas fragments diverted via
-.Ar tee
-are not.
+.Cm divert
+are reassembled before delivery to the socket.
 .Pp
 The
-.Dq tee
-action is unimplemented.
+.Cm tee
+action is not implemented in this version of
+.Fx .
 .Sh AUTHORS
 .An Ugen J. S. Antsilevich ,
 .An Poul-Henning Kamp ,
 .An Alex Nash ,
-.An Archie Cobbs .
+.An Archie Cobbs ,
+.An Luigi Rizzo .
+.Pp
 API based upon code written by
-.An Daniel Boulet
+Daniel Boulet
 for BSDI.
+.Pp
+Work on
+.Xr dummynet 4
+traffic shaper supported by Akamba Corp.
 .Sh HISTORY
-.Nm Ipfw
-first appeared in
+The
+.Nm
+utility first appeared in
 .Fx 2.0 .
+.Xr dummynet 4
+was introduced in
+.Fx 2.2.8 .
+Stateful extensions were introduced in
+.Fx 4.0 .
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/isdnd.8 man8/isdnd.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/isdnd.8	Mon Dec 20 14:53:23 1999
+++ man8/isdnd.8	Wed Jun 14 10:08:14 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.1.2.3 1999/11/15 22:40:55 joe Exp % 
+.\" %FreeBSD: src/usr.sbin/i4b/isdnd/isdnd.8,v 1.1.2.4 2000/03/06 11:35:53 sheldonh Exp % 
 .\"
 .\"	last edit-date: [Thu May 20 14:37:42 1999]
 .\"
@@ -64,7 +64,8 @@
 If debugging support is compiled into
 .Nm isdnd
 this option is used to specify the debugging level, or better which kind 
-of debugging messages are displayed. The debugging level is the sum of the
+of debugging messages are displayed.
+The debugging level is the sum of the
 following values:
 .Pp
 .Bl -tag -width Ds -compact -offset indent
@@ -100,14 +101,16 @@
 .It Fl f
 Specifying this option causes
 .Nm isdnd
-to enter the full-screen mode of operation. When operating in this mode,
+to enter the full-screen mode of operation.
+When operating in this mode,
 entering the control character
 .Em Control-L
 causes the display to be refreshed and entering
 .Em Carriage-Return
 or
 .Em Enter
-will pop-up a command window. Because the
+will pop-up a command window.
+Because the
 .Nm
 daemon will not listen to messages while the command window is active,
 this command window will disappear automatically after 5 seconds without
@@ -117,7 +120,8 @@
 .Em Tab
 or
 .Em Space
-advances to the next menu item. To execute a command, press
+advances to the next menu item.
+To execute a command, press
 .Em Return
 or
 .Em Enter
@@ -131,13 +135,16 @@
 .It Fl L
 Specifies the name of the logfile which is used when the option
 .Em -l
-is set. See also the keyword
+is set.
+See also the keyword
 .Em rotatesuffix
 in the system section of
 .Xr isdnd.rc 5 .
 .It Fl P
 This option prints out the parsed and verified isdnd configuration in the same
-format as the isdnd.rc file. This output can be used as an isdnd.rc file. This 
+format as the isdnd.rc file.
+This output can be used as an isdnd.rc file.
+This 
 feature is especially useful when debugging an isdnd.rc file to see, what the
 default settings of options are when they are not set in the isdnd.rc input
 file.
@@ -161,7 +168,8 @@
 This option may be used to specify the logging facility in case
 .Xr syslog 3
 logging is configured and another facility than the default LOCAL0
-facility shall be used. The facility is to be specified as an integer in
+facility shall be used.
+The facility is to be specified as an integer in
 the range 0-11 or 16-23 (see the file /usr/include/syslog.h). 
 .It Fl t
 In conjunction with the 
@@ -173,7 +181,8 @@
 specifies a terminal type or termcap entry name (such as vt220) for the device
 used for
 .Nm isdnd
-full-screen output. This is useful if an unused (no getty running) tty line is
+full-screen output.
+This is useful if an unused (no getty running) tty line is
 used for full-screen output for which no 
 .Li TERM
 environment variable exists.
@@ -185,7 +194,8 @@
 .Em cmdl .
 .It Fl m
 If the isdn daemon is compiled with local or remote monitoring support,
-this option disables all monitoring access. It overrides the config
+this option disables all monitoring access.
+It overrides the config
 file option
 .Em monitor-allowed .
 .El
@@ -272,7 +282,8 @@
 in its entry section of the configuration corresponding to that connection 
 and issues a
 .Em I4B_CONNECT_REQ
-ioctl message to the kernel. The kernel now dials the remote side and
+ioctl message to the kernel.
+The kernel now dials the remote side and
 if the remote side accepts the call, the kernel sends a
 .Em MSG_CONNECT_ACTIVE_IND
 to the daemon.
@@ -321,7 +332,8 @@
 Sending a HUP signal to 
 .Nm
 causes all open connections to be terminated and the configuration file is
-reread. In case aliasfile handling was enabled, the aliasfile is also
+reread.
+In case aliasfile handling was enabled, the aliasfile is also
 reread.
 
 Sending a USR1 signal to 
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/isdndebug.8 man8/isdndebug.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/isdndebug.8	Mon Dec 20 14:53:23 1999
+++ man8/isdndebug.8	Wed Jun 14 10:08:14 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdndebug/isdndebug.8,v 1.1.2.3 1999/11/15 22:41:02 joe Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdndebug/isdndebug.8,v 1.1.2.4 2000/03/06 11:35:57 sheldonh Exp %
 .\"
 .\"	last edit-date: [Sat May 29 11:03:15 1999]
 .\"
@@ -70,7 +70,8 @@
 .It Fl h
 Display the HSCX error counters.
 .It Fl l
-Specify the layer for which a command applies. Default is all layers.
+Specify the layer for which a command applies.
+Default is all layers.
 .It Fl m
 Set debugging mask for the selected layer(s) to display all possible
 debugging messages (maximum output).
@@ -80,7 +81,8 @@
 Set debugging mask for the selected layer(s) to the compiled in default
 (reset).
 .It Fl s
-Set debugging mask for the selected layer(s) to value. Value can be
+Set debugging mask for the selected layer(s) to value.
+Value can be
 specified in any number base supported by
 .Xr sscanf 3 .
 .It Fl u
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/isdndecode.8 man8/isdndecode.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/isdndecode.8	Mon Dec 20 14:53:27 1999
+++ man8/isdndecode.8	Wed Jun 14 10:08:16 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdndecode/isdndecode.8,v 1.1.2.3 1999/11/15 22:41:05 joe Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdndecode/isdndecode.8,v 1.1.2.4 2000/03/06 11:35:59 sheldonh Exp %
 .\"
 .\"	last edit-date: [Sun Feb 14 10:16:25 1999]
 .\"
@@ -73,9 +73,11 @@
 in analyzer mode by using two passive cards and a custom cable which can
 be build as described in the file
 .Em cable.txt
-in the isdn4bsd source distribution. One card acts as a receiver for the
+in the isdn4bsd source distribution.
+One card acts as a receiver for the
 transmitting direction on the S0 bus while the other card acts as a receiver
-for the receiving direction on the S0 bus. Complete traffic monitoring is
+for the receiving direction on the S0 bus.
+Complete traffic monitoring is
 possible using this setup.
 
 .It Fl b
@@ -137,7 +139,8 @@
 process, the currently used logfiles are reopened, so that logfile
 rotation becomes possible.
 .Pp
-The decode output should be obvious. It is very handy to have the following
+The decode output should be obvious.
+It is very handy to have the following
 standard texts available when tracing ISDN protocols:
 .Pp
 .Bl -tag -width Ds -compact -offset indent
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/isdnmonitor.8 man8/isdnmonitor.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/isdnmonitor.8	Mon Dec 20 14:53:25 1999
+++ man8/isdnmonitor.8	Wed Jun 14 10:08:16 2000
@@ -20,7 +20,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdnmonitor/isdnmonitor.8,v 1.1.2.2 1999/08/29 15:42:02 peter Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdnmonitor/isdnmonitor.8,v 1.1.2.3 2000/03/06 11:36:00 sheldonh Exp %
 .\"
 .\"	last edit-date: [Fri Jan 30 22:49:48 1998]
 .\"
@@ -36,6 +36,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-is not intended for real world use. It will be replaced
+is not intended for real world use.
+It will be replaced
 by something with a better user interface as soon as the monitoring
 subsystem is functional.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/isdntel.8 man8/isdntel.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/isdntel.8	Mon Dec 20 14:53:25 1999
+++ man8/isdntel.8	Wed Jun 14 10:08:15 2000
@@ -24,7 +24,7 @@
 .\"
 .\"	last edit-date: [Sun Feb 14 10:19:44 1999]
 .\"	
-.\" %FreeBSD: src/usr.sbin/i4b/isdntel/isdntel.8,v 1.1.2.3 1999/11/15 22:41:11 joe Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdntel/isdntel.8,v 1.1.2.4 2000/03/06 11:36:02 sheldonh Exp %
 .\"
 .Dd July 11, 1998
 .Dt ISDNTEL 8
@@ -48,11 +48,14 @@
 .It Fl a
 Use 
 .Ar aliasfile
-as the pathname for an aliasfile containing aliases for phone numbers. The
+as the pathname for an aliasfile containing aliases for phone numbers.
+The
 default path is
 .Em /etc/isdn/isdntel.alias .
 The format of an alias entry is the number string followed by one or more
-spaces or tabs. The rest of the line is taken as the alias string. Comments
+spaces or tabs.
+The rest of the line is taken as the alias string.
+Comments
 are introduced by a leading blank, tab or "#" character.
 .It Fl d
 Use
@@ -69,9 +72,11 @@
 Use
 .Ar playcommand
 as the command string to execute for playing a voice message to some audio
-output facility. The characters
+output facility.
+The characters
 .Em %s
-are replaced by the currently selected filename. The default string is
+are replaced by the currently selected filename.
+The default string is
 .Em cat %s | alaw2ulaw >/dev/audio
 .It Fl t
 The value for
@@ -80,7 +85,8 @@
 when there is no keyboard activity.
 .El
 .Pp
-The screen output should be obvious. If in doubt, consult the source.
+The screen output should be obvious.
+If in doubt, consult the source.
 .Sh SEE ALSO
 .Xr i4btel 4 ,
 .Xr isdnd.rc 5 ,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/isdntelctl.8 man8/isdntelctl.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/isdntelctl.8	Mon Dec 20 14:53:25 1999
+++ man8/isdntelctl.8	Wed Jun 14 10:08:15 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdntelctl/isdntelctl.8,v 1.1.2.2 1999/11/15 22:41:12 joe Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdntelctl/isdntelctl.8,v 1.1.2.3 2000/03/06 11:36:04 sheldonh Exp %
 .\"
 .\"	last edit-date: [Wed Apr 21 11:27:34 1999]
 .\"
@@ -52,7 +52,8 @@
 .It Fl g
 Get the sound format currently in use.
 .It Fl u
-Set the /dev/i4btel unit number. The default value is zero to access
+Set the /dev/i4btel unit number.
+The default value is zero to access
 device /dev/i4btel0.
 .It Fl A
 Do A-law (ISDN line) -> u-law (userland) conversion.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/isdntrace.8 man8/isdntrace.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/isdntrace.8	Mon Dec 20 14:53:23 1999
+++ man8/isdntrace.8	Wed Jun 14 10:08:14 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/i4b/isdntrace/isdntrace.8,v 1.1.2.3 1999/11/15 22:41:15 joe Exp %
+.\" %FreeBSD: src/usr.sbin/i4b/isdntrace/isdntrace.8,v 1.1.2.4 2000/03/06 11:36:06 sheldonh Exp %
 .\"
 .\"	last edit-date: [Sun Feb 14 10:22:24 1999]
 .\"
@@ -73,9 +73,11 @@
 in analyzer mode by using two passive cards and a custom cable which can
 be build as described in the file
 .Em cable.txt
-in the isdn4bsd source distribution. One card acts as a receiver for the
+in the isdn4bsd source distribution.
+One card acts as a receiver for the
 transmitting direction on the S0 bus while the other card acts as a receiver
-for the receiving direction on the S0 bus. Complete traffic monitoring is
+for the receiving direction on the S0 bus.
+Complete traffic monitoring is
 possible using this setup.
 .It Fl b
 switch B channel tracing on (default off).
@@ -94,7 +96,8 @@
 switch displaying of Layer 2 (Q.921) frames off (default on).
 .It Fl n
 This option takes a numeric argument specifying the minimum 
-frame size in octetts a frame must have to be displayed. (default 0)
+frame size in octetts a frame must have to be displayed.
+(default 0)
 .It Fl o
 switch off writing trace output to a file (default on).
 .It Fl p
@@ -114,7 +117,8 @@
 analyzing (default off).
 .It Fl F
 This option can only be used when option -P (playback from binary data file)
-is used. The -F option causes playback not to stop at end of file but rather
+is used.
+The -F option causes playback not to stop at end of file but rather
 to wait for additional data to be available from the input file.
 .Pp
 This option is useful when trace data is accumulated in binary format (to
@@ -137,7 +141,8 @@
 process, the currently used logfiles are reopened, so that logfile
 rotation becomes possible.
 .Pp
-The trace output should be obvious. It is very handy to have the following
+The trace output should be obvious.
+It is very handy to have the following
 standard texts available when tracing ISDN protocols:
 .Pp
 .Bl -tag -width Ds -compact -offset indent
@@ -148,7 +153,8 @@
 .It Ar Q.931
 ISDN D-channel layer 3 protocol description.
 .It Ar 1TR6
-German-specific ISDN layer 3 protocol description. (NOTICE: decoding
+German-specific ISDN layer 3 protocol description.
+(NOTICE: decoding
 of the 1TR6 protocol is included but not supported since i dont have
 any longer access to a 1TR6 based ISDN installation.)
 .El
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/ispcvt.8 man8/ispcvt.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/ispcvt.8	Mon Dec 20 14:53:32 1999
+++ man8/ispcvt.8	Wed Jun 14 10:08:19 2000
@@ -28,6 +28,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" @(#)ispcvt.1, 3.20, Last Edit-Date: [Tue Apr  4 12:35:54 1995]
+.\" %FreeBSD: src/usr.sbin/pcvt/ispcvt/ispcvt.8,v 1.6.2.1 2000/03/06 11:36:42 sheldonh Exp %
 .\"
 .Dd April 4, 1995
 .Dt ISPCVT 8
@@ -43,7 +44,8 @@
 The
 .Nm ispcvt
 utility allows the user to check whether the current video driver compiled
-into the kernel is a pcvt driver. The major and minor release numbers of
+into the kernel is a pcvt driver.
+The major and minor release numbers of
 the driver are also checked.
 Furthermore
 .Nm ispcvt
@@ -57,13 +59,15 @@
 .It Fl d
 Specifies a device for which the check is done.
 .It Fl v
-Specifies being verbose. On success the name and revision is reported, on
+Specifies being verbose.
+On success the name and revision is reported, on
 failure which comparison failed.
 .It Fl c
 This options prints out the values of all
 .Dq Ar PCVT_XXXXXX
 #defines which were given to the compiler at the time the currently running
-kernel was compiled. Specifying
+kernel was compiled.
+Specifying
 .Fl v
 with the
 .Fl c
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/ldconfig.8 man8/ldconfig.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/ldconfig.8	Mon Dec 20 14:49:05 1999
+++ man8/ldconfig.8	Wed Jun 14 10:05:01 2000
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/ldconfig/ldconfig.8,v 1.16.2.1 1999/08/29 15:14:02 peter Exp %
+.\" %FreeBSD: src/sbin/ldconfig/ldconfig.8,v 1.16.2.2 2000/03/03 15:13:00 sheldonh Exp %
 .\"
 .Dd October 3, 1993
 .Dt LDCONFIG 8
@@ -62,7 +62,8 @@
 are ignored.
 .Pp
 The shared libraries so found will be automatically available for loading
-if needed by the program being prepared for execution. This obviates the need
+if needed by the program being prepared for execution.
+This obviates the need
 for storing search paths within the executable.
 .Pp
 The
@@ -75,7 +76,8 @@
 .Sq \:
 separated list of directory paths which are searched by
 the dynamic linker
-when it needs to load a shared library. It can be viewed as the run-time
+when it needs to load a shared library.
+It can be viewed as the run-time
 equivalent of the
 .Fl L
 switch of
@@ -108,7 +110,8 @@
 are also rescanned for new shared libraries.
 .It Fl r
 List the current contents of the hints file
-on the standard output. The hints file is not modified.  The list of
+on the standard output.
+The hints file is not modified.  The list of
 directories stored in the hints file is included.
 .It Fl s
 Do not scan the built-in system directory
@@ -120,15 +123,20 @@
 Special care must be taken when loading shared libraries into the address
 space of
 .Ev set-user-Id
-programs. Whenever such a program is run,
+programs.
+Whenever such a program is run,
 the dynamic linker
 will only load shared libraries from the hints
-file. In particular, the
+file.
+In particular, the
 .Ev LD_LIBRARY_PATH
-is not used to search for libraries. Thus, the role of ldconfig is dual. In
+is not used to search for libraries.
+Thus, the role of ldconfig is dual.
+In
 addition to building a set of hints for quick lookup, it also serves to
 specify the trusted collection of directories from which shared objects can
-be safely loaded. It is presumed that the set of directories specified to
+be safely loaded.
+It is presumed that the set of directories specified to
 .Nm ldconfig
 are under control of the system's administrator.
 .Sh ENVIRONMENT
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/lpc.8 man8/lpc.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/lpc.8	Mon Dec 20 14:52:41 1999
+++ man8/lpc.8	Wed Jun 14 10:07:43 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lpc.8	8.5 (Berkeley) 4/28/95
+.\" %FreeBSD: src/usr.sbin/lpr/lpc/lpc.8,v 1.5.2.1 2000/03/06 11:36:15 sheldonh Exp %
 .\"
 .Dd April 28, 1995
 .Dt LPC 8
@@ -101,7 +102,8 @@
 .It Ic down No {\ all\ |\ printer\ } message ...
 Turn the specified printer queue off, disable printing and put
 .Em message
-in the printer status file. The message doesn't need to be quoted, the
+in the printer status file.
+The message doesn't need to be quoted, the
 remaining arguments are treated like
 .Xr echo 1 .
 This is normally used to take a printer down and let others know why
@@ -142,7 +144,8 @@
 Place the jobs in the order listed at the top of the printer queue.
 .Pp
 .It Ic up  No {\ all\ |\ printer\ }
-Enable everything and start a new printer daemon. Undoes the effects of
+Enable everything and start a new printer daemon.
+Undoes the effects of
 .Ic down .
 .Sh FILES
 .Bl -tag -width /var/spool/*/lockx -compact
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/lpd.8 man8/lpd.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/lpd.8	Mon Dec 20 14:52:41 1999
+++ man8/lpd.8	Wed Jun 14 10:07:44 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lpd.8	8.3 (Berkeley) 4/19/94
-.\"	%FreeBSD: src/usr.sbin/lpr/lpd/lpd.8,v 1.9.2.1 1999/09/20 09:49:58 phantom Exp %
+.\"	%FreeBSD: src/usr.sbin/lpr/lpd/lpd.8,v 1.9.2.2 2000/03/06 11:36:17 sheldonh Exp %
 .\"
 .Dd April 19, 1994
 .Dt LPD 8
@@ -50,7 +50,8 @@
 file.  It makes a single pass through the
 .Xr printcap 5
 file to find out about the existing printers and
-prints any files left after a crash. It then uses the system calls
+prints any files left after a crash.
+It then uses the system calls
 .Xr listen 2
 and
 .Xr accept 2
@@ -71,7 +72,8 @@
 .Fl l
 flag causes
 .Nm
-to log valid requests received from the network. This can be useful
+to log valid requests received from the network.
+This can be useful
 for debugging purposes.
 .It Ar "port#"
 The Internet port number used to rendezvous
@@ -82,7 +84,8 @@
 argument.
 .El
 .Pp
-Access control is provided by two means. First, all requests must come from
+Access control is provided by two means.
+First, all requests must come from
 one of the machines listed in the file
 .Pa /etc/hosts.equiv
 or
@@ -162,7 +165,8 @@
 Graph File.  The file contains data produced by
 .Xr plot 3 .
 .It c
-Cifplot File. The file contains data produced by
+Cifplot File.
+The file contains data produced by
 .Em cifplot .
 .It v
 The file contains a raster image.
@@ -178,7 +182,8 @@
 .It \&4
 Troff Font S. Name of the font file to use instead of the default.
 .It W
-Width. Changes the page width (in characters) used by
+Width.
+Changes the page width (in characters) used by
 .Xr pr 1
 and the text filters.
 .It I
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/lptcontrol.8 man8/lptcontrol.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/lptcontrol.8	Mon Dec 20 14:53:28 1999
+++ man8/lptcontrol.8	Wed Jun 14 10:08:17 2000
@@ -11,7 +11,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"
-.\" %FreeBSD: src/usr.sbin/lptcontrol/lptcontrol.8,v 1.7.2.3 1999/08/29 15:43:37 peter Exp %
+.\" %FreeBSD: src/usr.sbin/lptcontrol/lptcontrol.8,v 1.7.2.4 2000/03/06 11:36:21 sheldonh Exp %
 .Dd September 3, 1994
 .Dt LPTCONTROL 8
 .Os FreeBSD 2
@@ -38,7 +38,8 @@
 a mode to another, this change will only take effect
 the next time the device is opened.
 .Pp
-Extended mode is anything the parallel port interface can support. For an
+Extended mode is anything the parallel port interface can support.
+For an
 ECP/ISA parallel port, it may be FIFO+DMA or ECP.
 .Sh OPTIONS
 .TP
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/map-mbone.8 man8/map-mbone.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/map-mbone.8	Mon Dec 20 14:52:45 1999
+++ man8/map-mbone.8	Wed Jun 14 10:07:47 2000
@@ -1,3 +1,4 @@
+.\" %FreeBSD: src/usr.sbin/mrouted/map-mbone.8,v 1.5.2.1 2000/03/06 11:36:30 sheldonh Exp %
 .Dd May 8, 1995
 .Dt MAP-MBONE 8
 .UC 5
@@ -23,24 +24,30 @@
 .Pp
 .Nm Map-mbone
 traverses neighboring multicast routers by sending the ASK_NEIGHBORS IGMP
-message to the multicast starting_router. If this multicast router responds,
+message to the multicast starting_router.
+If this multicast router responds,
 the version number and a list of their neighboring multicast router addresses is
-part of that response. If the responding router has recent multicast version
+part of that response.
+If the responding router has recent multicast version
 number, then 
 .Nm
 requests additional information such as metrics, thresholds, and flags from the
-multicast router. For each new occurrence of neighboring multicast router in 
+multicast router.
+For each new occurrence of neighboring multicast router in 
 the reply and provided the flooding option has been selected, then 
 .Nm
-asks each of this multicast router for a list of neighbors. This search
+asks each of this multicast router for a list of neighbors.
+This search
 for unique routers will continue until no new neighboring multicast routers
 are reported.
 .Pp
 The following options are available:
 .Bl -tag -width indent
 .It Fl d
-Set the debug level. When the debug level is greater than the
-default value of 0, addition debugging messages are printed. Regardless of
+Set the debug level.
+When the debug level is greater than the
+default value of 0, addition debugging messages are printed.
+Regardless of
 the debug level, an error condition, will always write an error message and will
 cause 
 .Nm
@@ -56,7 +63,8 @@
 timeouts are printed to stderr.
 .El
 .It Fl f
-Set flooding option. Flooding allows the recursive search
+Set flooding option.
+Flooding allows the recursive search
 of neighboring multicast routers and is enable by default when starting_router
 is not used.
 .It Fl g
@@ -64,10 +72,12 @@
 .It Fl n
 Disable the DNS lookup for the multicast routers names.
 .It Fl r Ar retry_count
-Set the neighbor query retry limit. Default is 1 retry.
+Set the neighbor query retry limit.
+Default is 1 retry.
 .It Fl t Ar timeout_count
 Set the number of seconds to wait for a neighbor query
-reply before retrying. Default timeout is 2 seconds.
+reply before retrying.
+Default timeout is 2 seconds.
 .El
 .Sh IMPORTANT NOTE
 .Nm Map-mbone
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/memcontrol.8 man8/memcontrol.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/memcontrol.8	Mon Dec 20 14:52:43 1999
+++ man8/memcontrol.8	Wed Jun 14 10:07:45 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\" 
-.\" %FreeBSD: src/usr.sbin/memcontrol/memcontrol.8,v 1.2.2.1 1999/11/03 05:47:13 chris Exp %
+.\" %FreeBSD: src/usr.sbin/memcontrol/memcontrol.8,v 1.2.2.2 2000/03/06 11:36:23 sheldonh Exp %
 .\" 
 .Dd September 28, 1999
 .Dt MEMCONTROL 8
@@ -89,7 +89,8 @@
 .Ar write-protect
 .El
 .It Ar clear
-Clear memory range attributes. Ranges may be cleared by owner or by
+Clear memory range attributes.
+Ranges may be cleared by owner or by
 base/length combination.
 .Pp
 To clear based on ownership:
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/mergemaster.8 man8/mergemaster.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/mergemaster.8	Mon Dec 20 14:52:44 1999
+++ man8/mergemaster.8	Wed Jun 14 10:07:45 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.4.2.1 1999/11/03 20:58:47 billf Exp %
+.\" %FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.4.2.2 2000/03/06 11:36:25 sheldonh Exp %
 .\"
 .Dd September 10, 1999
 .Dt MERGEMASTER 8
@@ -54,15 +54,18 @@
 to build a temporary root environment from
 .Pa /
 down, populating that environment with the various
-files. You can specify a different source directory
+files.
+You can specify a different source directory
 with the
 .Op Fl m
 command line option.
 It then compares each file in that environment
-to its installed counterpart. When the script finds a
+to its installed counterpart.
+When the script finds a
 change in the new file, or there is no installed
 version of the new file it gives you four options to
-deal with it. You can install the new file as is,
+deal with it.
+You can install the new file as is,
 delete the new file, merge the old and new
 files (as appropriate) using
 .Xr sdiff 1
@@ -74,23 +77,29 @@
 and compares the
 .Xr cvs 1
 version $Id/$FreeBSD strings for files that have them, deleting
-the temporary file if the strings match. If there is
+the temporary file if the strings match.
+If there is
 no $Id string, or if the strings are different it
-compares the files themselves. You can
+compares the files themselves.
+You can
 also specify that the script ignore the $Id strings and
 compare every file.
 .Pp
 .Nm
 checks your umask and issues a warning for anything
-other than 022. While it is not mandatory to grant
+other than 022.
+While it is not mandatory to grant
 world read permissions for most configuration files, you
-may run into problems without them. If you choose a
+may run into problems without them.
+If you choose a
 umask other than 022 and experience trouble later this
 could be the cause.
 .Pa /etc/master.passwd
-is treated as a special case. If you choose to install
+is treated as a special case.
+If you choose to install
 this file or a merged version of it the file permissions
-are always 600 (rw-------) for security reasons. After
+are always 600 (rw-------) for security reasons.
+After
 installing an updated version of this file you should
 probably run
 .Xr pwd_mkdb 8
@@ -115,23 +124,29 @@
 Re-run
 .Nm
 on a previously cleaned directory, skipping the creation of
-the temporary root environment. This option is compatible
+the temporary root environment.
+This option is compatible
 with all other options.
 .It Fl v
-Be more verbose about the process. You should probably use
+Be more verbose about the process.
+You should probably use
 this option the first time you run
 .Nm mergemaster .
 This option also gives you a list of files that exist
 only in the installed version of
 .Pa /etc .
 .It Fl a
-Run automatically. This option will leave all the files that
+Run automatically.
+This option will leave all the files that
 differ from the installed versions in the temporary directory
-to be dealt with by hand. If the
+to be dealt with by hand.
+If the
 .Pa temproot
 directory exists, it creates a new one in a previously
-non-existent directory. This option unsets the verbose flag,
-but is compatible with all other options. Setting -a makes
+non-existent directory.
+This option unsets the verbose flag,
+but is compatible with all other options.
+Setting -a makes
 -w superfluous.
 .It Fl h
 Display usage and help information.
@@ -147,21 +162,25 @@
 .Pa /var/tmp/temproot .
 .It Fl d
 Add the date and time to the name of the temporary
-root directory. If -t is specified, this option must
+root directory.
+If -t is specified, this option must
 follow it if you want the date added too.
 .It Fl u Ar N
-Specify a numeric umask. The default is 022.
+Specify a numeric umask.
+The default is 022.
 .It Fl w Ar N
 Supply an alternate screen width to the
 .Xr sdiff 1
-command in numbers of columns. The default is 80.
+command in numbers of columns.
+The default is 80.
 .El
 .Sh ENVIRONMENT
 The
 .Nm
 script uses the
 .Ev PAGER
-environment variable if set. Otherwise it uses
+environment variable if set.
+Otherwise it uses
 .Xr more 1 .
 If
 .Ev PAGER
@@ -200,8 +219,10 @@
 .Pa $HOME/.mergemasterrc
 .Pp
 .Nm
-will . (source) this file if it exists. Command line options
-will override rc file options. Here is an example
+will . (source) this file if it exists.
+Command line options
+will override rc file options.
+Here is an example
 with all values commented out:
 .Pp
 .Bd -literal
@@ -265,7 +286,8 @@
 script was first publicly available on one of my
 web pages in a much simpler form under the name
 .Pa comproot
-on 13 March 1998. The idea for creating the
+on 13 March 1998.
+The idea for creating the
 temporary root environment comes from Nik Clayton's
 make world tutorial which is referenced above.
 .Pp
@@ -273,7 +295,10 @@
 This manual page and the script itself were written by
 .An Douglas Barton Aq Doug@gorean.org .
 .Sh BUGS
-There are no known bugs. Please report any problems,
-comments or suggestions to the author. Several of the
+There are no known bugs.
+Please report any problems,
+comments or suggestions to the author.
+Several of the
 improvements to this program have come from user
-suggestions. Thank you.
+suggestions.
+Thank you.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/mixer.8 man8/mixer.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/mixer.8	Mon Dec 20 14:53:28 1999
+++ man8/mixer.8	Wed Jun 14 10:08:17 2000
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/mixer/mixer.8,v 1.4.2.1 1999/10/30 19:38:52 mpp Exp %
+.\" %FreeBSD: src/usr.sbin/mixer/mixer.8,v 1.4.2.2 2000/03/06 11:36:26 sheldonh Exp %
 .Dd January 9, 1997
 .Dt MIXER 8
 .Os
@@ -46,7 +46,8 @@
 .Sh DESCRIPTION
 The
 .Nm
-command is used to set and display soundcard mixer device levels. It may
+command is used to set and display soundcard mixer device levels.
+It may
 also be used to start and stop recording from the soundcard.  The list
 of mixer devices that may be modified are:  
 .Pp
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/mknod.8 man8/mknod.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/mknod.8	Mon Dec 20 14:49:06 1999
+++ man8/mknod.8	Wed Jun 14 10:05:02 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mknod.8	8.2 (Berkeley) 12/11/93
-.\" %FreeBSD: src/sbin/mknod/mknod.8,v 1.7.2.1 1999/08/29 15:14:06 peter Exp %
+.\" %FreeBSD: src/sbin/mknod/mknod.8,v 1.7.2.2 2000/03/03 15:13:01 sheldonh Exp %
 .\"
 .Dd December 11, 1993
 .Dt MKNOD 8
@@ -64,7 +64,8 @@
 .Dq pty
 for pseudo-devices.
 .It Cm b | Cm c
-Type of device. If the
+Type of device.
+If the
 device is a block type device such as a tape or disk drive which needs
 both cooked and raw special files,
 the type is
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/modload.8 man8/modload.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/modload.8	Mon Dec 20 14:49:06 1999
+++ man8/modload.8	Wed Jun 14 10:05:03 2000
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/modload/modload.8,v 1.11.2.1 1999/08/29 15:14:09 peter Exp %
+.\" %FreeBSD: src/sbin/modload/modload.8,v 1.11.2.2 2000/03/03 11:43:13 sheldonh Exp %
 .\"
 .Dd September 22, 1994
 .Dt MODLOAD 8
@@ -77,7 +77,8 @@
 The default module entry point name is the module name with `_mod' appended.
 .It Fl p Ar postinstall
 Specify the name of a shell script or program that will
-be executed if the module is successfully loaded. It
+be executed if the module is successfully loaded.
+It
 is always passed the module id (in decimal) and module
 type (in hexadecimal) as the first two arguments.
 For loadable drivers, the third argument is
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/mount.8 man8/mount.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/mount.8	Mon Dec 20 14:49:08 1999
+++ man8/mount.8	Wed Jun 14 10:05:04 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
-.\" %FreeBSD: src/sbin/mount/mount.8,v 1.24.2.3 1999/08/29 15:14:18 peter Exp %
+.\" %FreeBSD: src/sbin/mount/mount.8,v 1.24.2.4 2000/03/03 15:13:02 sheldonh Exp %
 .\"
 .Dd June 16, 1994
 .Dt MOUNT 8
@@ -94,7 +94,8 @@
 command is trying to do.
 .It Fl f
 Forces the revocation of write access when trying to downgrade
-a filesystem mount status from read-write to read-only. Also
+a filesystem mount status from read-write to read-only.
+Also
 forces the R/W mount of an unclean filesystem (dangerous; use with
 caution).
 .It Fl o
@@ -123,7 +124,8 @@
 The same as
 .Fl f ;
 forces the revocation of write access when trying to downgrade
-a filesystem mount status from read-write to read-only. Also
+a filesystem mount status from read-write to read-only.
+Also
 forces the R/W mount of an unclean filesystem (dangerous; use with caution).
 .It fstab
 When used with the
@@ -132,7 +134,8 @@
 .Xr fstab 5
 file for the filesystem.
 .It noatime
-Do not update the file access time when reading from a file. This option
+Do not update the file access time when reading from a file.
+This option
 is useful on filesystems where there are large numbers of files and
 performance is more critical than updating the file access time (which is
 rarely ever important). This option is currently only supported on local
@@ -179,10 +182,12 @@
 the file, and it will not be given to root.
 .Pp
 This feature is designed for use on fileservers serving PC users via
-ftp, SAMBA, or netatalk. It provides security holes for shell users and as
+ftp, SAMBA, or netatalk.
+It provides security holes for shell users and as
 such should not be used on shell machines, especially on home directories.
 This option requires the SUIDDIR
-option in the kernel to work. Only UFS filesystems support this option.
+option in the kernel to work.
+Only UFS filesystems support this option.
 See
 .Xr chmod 2
 for more information.
@@ -221,7 +226,8 @@
 /sbin/mount_mfs -o nosuid -N -s 4000 /dev/dk0b /tmp
 .Ed
 .It Fl p
-Print mount information in fstab format. Implies also the
+Print mount information in fstab format.
+Implies also the
 .Fl v
 option.
 .It Fl r
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/mount_cd9660.8 man8/mount_cd9660.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/mount_cd9660.8	Mon Dec 20 14:49:08 1999
+++ man8/mount_cd9660.8	Wed Jun 14 10:05:04 2000
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_cd9660.8	8.3 (Berkeley) 3/27/94
-.\" %FreeBSD: src/sbin/mount_cd9660/mount_cd9660.8,v 1.6.2.4 1999/08/29 15:14:21 peter Exp %
+.\" %FreeBSD: src/sbin/mount_cd9660/mount_cd9660.8,v 1.6.2.5 2000/06/08 07:01:04 kris Exp %
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_CD9660 8
@@ -133,5 +133,5 @@
 .Sh HISTORY
 The
 .Nm
-utility first appeared
+utility first appeared in
 .Bx 4.4 .
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/mount_mfs.8 man8/mount_mfs.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/mount_mfs.8	Mon Dec 20 14:49:17 1999
+++ man8/mount_mfs.8	Wed Jun 14 10:05:11 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)newfs.8	8.6 (Berkeley) 5/3/95
-.\" %FreeBSD: src/sbin/newfs/newfs.8,v 1.20.2.2 1999/08/29 15:14:53 peter Exp %
+.\" %FreeBSD: src/sbin/newfs/newfs.8,v 1.20.2.4 2000/06/08 07:00:10 kris Exp %
 .\"
 .Dd May 3, 1995
 .Dt NEWFS 8
@@ -344,20 +344,21 @@
 options nosuid and nodev.
 .Sh BUGS
 The boot code of
-.Bx Free
+.Fx
 assumes that the file system that carries the
-kernel has blocks of 8 kilobytes and fragments of 1 kilobyte. You will
+kernel has blocks of 8 kilobytes and fragments of 1 kilobyte.
+You will
 not be able to boot from a file system that uses another size.
 .Sh SEE ALSO
 .Xr fdformat 1 ,
 .Xr disktab 5 ,
 .Xr fs 5 ,
+.Xr camcontrol 8 ,
 .Xr disklabel 8 ,
 .Xr diskpart 8 ,
 .Xr dumpfs 8 ,
 .Xr fsck 8 ,
 .Xr mount 8 ,
-.Xr scsiformat 8 ,
 .Xr tunefs 8 ,
 .Xr vinum 8
 .Rs
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/mount_msdos.8 man8/mount_msdos.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/mount_msdos.8	Mon Dec 20 14:49:34 1999
+++ man8/mount_msdos.8	Wed Jun 14 10:05:19 2000
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/i386/mount_msdos/mount_msdos.8,v 1.15.2.2 1999/09/03 08:53:58 jkh Exp %
+.\" %FreeBSD: src/sbin/i386/mount_msdos/mount_msdos.8,v 1.15.2.3 2000/03/03 11:43:15 sheldonh Exp %
 .\"
 .Dd April 7, 1994
 .Dt MOUNT_MSDOS 8
@@ -128,12 +128,14 @@
 be mounted for any existing Win'95 long filenames.
 If no such entries are found, but short DOS filenames are found,
 .Fl s
-is the default. Otherwise
+is the default.
+Otherwise
 .Fl l
 is assumed.
 .It Fl 9
 Ignore the special Win'95 directory entries even
-if deleting or renaming a file. This forces
+if deleting or renaming a file.
+This forces
 .Fl s .
 .\".It Fl G
 .\"This option causes the filesystem to be interpreted as an Atari-Gemdos
@@ -154,10 +156,12 @@
 0x003F code ('?') as replacement.
 .It
 DOS to local character set conversion table (upper half) for DOS names,
-128 character codes. Code 0x3F ('?') used for impossible translations.
+128 character codes.
+Code 0x3F ('?') used for impossible translations.
 .It
 Local character set to DOS conversion table (upper half) for DOS names,
-128 character codes. Some codes have special meaning:
+128 character codes.
+Some codes have special meaning:
 .Bl -hang
 .It 0x00
 character disallowed in DOS file name;
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/mount_nfs.8 man8/mount_nfs.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/mount_nfs.8	Mon Dec 20 14:49:10 1999
+++ man8/mount_nfs.8	Wed Jun 14 10:05:06 2000
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)mount_nfs.8	8.3 (Berkeley) 3/29/95
 .\"
-.\" %FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.14.2.1 1999/08/29 15:14:25 peter Exp %
+.\" %FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.14.2.2 2000/03/03 15:13:03 sheldonh Exp %
 .\""
 .Dd March 29, 1995
 .Dt MOUNT_NFS 8
@@ -92,7 +92,8 @@
 This option is not generally recommended and is really an experimental
 feature.
 .It Fl I
-Set the readdir read size to the specified value. The value should normally
+Set the readdir read size to the specified value.
+The value should normally
 be a multiple of DIRBLKSIZ that is <= the read size for the mount.
 .It Fl K
 Pass Kerberos authenticators to the server for client-to-server
@@ -115,7 +116,8 @@
 Reserved port numbers are used by default now.
 This is useful for mounting servers that require clients to use a
 reserved port number on the mistaken belief that this makes NFS
-more secure. (For the rare case where the client has a trusted root account
+more secure.
+(For the rare case where the client has a trusted root account
 but untrustworthy users and the network cables are in secure areas this does
 help, but for normal desktop clients this does not apply.)
 .It Fl R
@@ -167,7 +169,8 @@
 This option reduces RPC traffic for cases such as
 .Dq "ls -l" ,
 but tends to flood the attribute and name caches with prefetched entries.
-Try this option and see whether performance improves or degrades. Probably
+Try this option and see whether performance improves or degrades.
+Probably
 most useful for client to server network interconnects with a large bandwidth
 times delay product.
 .It Fl m
@@ -255,7 +258,8 @@
 This protocol Version 2, referred to as Not Quite Nfs (NQNFS),
 is only supported by this updated release of NFS code.
 (It is not backwards compatible with the release of NQNFS that went out on
-4.4BSD-Lite. To interoperate with a 4.4BSD-Lite NFS system you will have to
+4.4BSD-Lite.
+To interoperate with a 4.4BSD-Lite NFS system you will have to
 avoid this option until you have had an opportunity to upgrade the NFS code
 on all your 4.4BSD-Lite based systems.)
 .It Fl r
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/mount_ntfs.8 man8/mount_ntfs.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/mount_ntfs.8	Mon Dec 20 14:49:11 1999
+++ man8/mount_ntfs.8	Wed Jun 14 10:05:07 2000
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/mount_ntfs/mount_ntfs.8,v 1.2.2.4 1999/08/29 15:14:28 peter Exp %
+.\" %FreeBSD: src/sbin/mount_ntfs/mount_ntfs.8,v 1.2.2.5 2000/03/03 15:13:05 sheldonh Exp %
 .\"
 .Dd Jan 3, 1999
 .Dt MOUNT_NTFS 8
@@ -89,9 +89,11 @@
 .Pp
 .Sq ATTRTYPE
 is one of identifier listed in $AttrDef file of
-volume. Default is $DATA.
+volume.
+Default is $DATA.
 .Sq ATTRNAME
-is an attribute name. Default is none.
+is an attribute name.
+Default is none.
 .Sh EXAMPLES
 To mount an ntfs volume located in 
 .Pa /dev/wd1s1 :
@@ -110,7 +112,8 @@
 .Ed
 .Pp
 .Sh WRITING
-There is limited writing ability. Limitations: file must be nonresident
+There is limited writing ability.
+Limitations: file must be nonresident
 and must not contain any sparces (uninitialized areas), compressed
 files are not supported either.
 .Sh SEE ALSO
@@ -119,7 +122,8 @@
 .Xr fstab 5 ,
 .Xr mount 8
 .Sh CAVEATS
-This utility gives almost only read-only access to NTFS volume. See
+This utility gives almost only read-only access to NTFS volume.
+See
 .Sx WRITING
 section.
 .Sh HISTORY
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/mount_portal.8 man8/mount_portal.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/mount_portal.8	Mon Dec 20 14:49:12 1999
+++ man8/mount_portal.8	Wed Jun 14 10:05:08 2000
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_portal.8	8.3 (Berkeley) 3/27/94
-.\" %FreeBSD: src/sbin/mount_portal/mount_portal.8,v 1.4.2.3 1999/08/29 15:14:33 peter Exp %
+.\" %FreeBSD: src/sbin/mount_portal/mount_portal.8,v 1.4.2.4 2000/03/03 15:13:06 sheldonh Exp %
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_PORTAL 8
@@ -97,12 +97,15 @@
 The
 .Pa tcplisten
 namespace takes a slash separated hostname and port and creates a TCP/IP
-socket bound to the given hostname-port pair. The hostname may be
-specified as "ANY" to allow any other host to connect to the socket. A
+socket bound to the given hostname-port pair.
+The hostname may be
+specified as "ANY" to allow any other host to connect to the socket.
+A
 port number of 0 will dynamically allocate a port, this can be
 discovered by calling
 .Xr getsockname 2
-with the returned file descriptor. Privileged ports can only be bound to
+with the returned file descriptor.
+Privileged ports can only be bound to
 by the super-user.
 The
 .Pa tcp
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/moused.8 man8/moused.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/moused.8	Mon Dec 20 14:52:44 1999
+++ man8/moused.8	Wed Jun 14 10:07:46 2000
@@ -28,9 +28,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/moused/moused.8,v 1.18.2.7 1999/12/17 09:59:07 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/moused/moused.8,v 1.18.2.10 2000/04/21 14:21:39 yokota Exp %
 .\"
-.Dd December 3, 1997
+.Dd April 1, 2000
 .Dt MOUSED 8
 .Os FreeBSD
 .Sh NAME
@@ -38,7 +38,7 @@
 .Nd pass mouse data to the console driver
 .Sh SYNOPSIS
 .Nm
-.Op Fl 3DPRcdfs
+.Op Fl DPRcdfs
 .Op Fl I Ar file
 .Op Fl F Ar rate
 .Op Fl r Ar resolution
@@ -48,6 +48,7 @@
 .Op Fl w Ar N
 .Op Fl z Ar target
 .Op Fl t Ar mousetype
+.Op Fl 3 Op Fl E Ar timeout
 .Fl p Ar port
 .Pp
 .Nm
@@ -81,22 +82,25 @@
 .Pp
 If the mouse daemon receives the signal 
 .Dv SIGHUP ,
-it will reopen the mouse port and reinitializes itself. Useful if
+it will reopen the mouse port and reinitializes itself.
+Useful if
 the mouse is attached/detached while the system is suspended.
 .Pp
 The following options are available:
 .Bl -tag -width indent
 .It Fl 3
-Emulate the third (middle) button for 2-button mice. It is emulated
+Emulate the third (middle) button for 2-button mice.
+It is emulated
 by pressing the left and right physical buttons simultaneously.
 .It Fl C Ar threshold
 Set double click speed as the maximum interval in msec between button clicks.
 Without this option, the default value of 500 msec will be assumed.
 This option will have effect only on the cut and paste operations 
-in the text mode console. The user program which is reading mouse data
+in the text mode console.
+The user program which is reading mouse data
 via 
 .Xr sysmouse 4
-won't be affected.
+will not be affected.
 .It Fl D
 Lower DTR on the serial port. 
 This option is valid only if 
@@ -106,6 +110,16 @@
 to operate in the
 .Ar mousesystems
 mode.
+.It Fl E Ar timeout
+When the third button emulation is enabled
+.Pq see above ,
+the
+.Nm
+daemon waits
+.Ar timeout
+msec at most before deciding whether two buttons are being pressed
+simultaneously.
+The default timeout is 100 msec.
 .It Fl F Ar rate
 Set the report rate (reports/sec) of the device if supported.
 .It Fl I Ar file
@@ -121,16 +135,18 @@
 .Fl i
 option, the
 .Nm
-command won't be able to print useful information for the serial mouse.
+command will not be able to print useful information for the serial mouse.
 .It Fl R
 Lower RTS on the serial port.
 This option is valid only if 
 .Ar mousesystems
 is selected as the protocol type by the
 .Fl t
-option below. It is often used with the 
+option below.
+It is often used with the 
 .Fl D
-option above. Both RTS and DTR lines may need to be dropped for 
+option above.
+Both RTS and DTR lines may need to be dropped for 
 a 3-button mouse to operate in the
 .Ar mousesystems
 mode.
@@ -139,7 +155,8 @@
 Not all serial mice support this option.
 .It Fl c
 Some mice report middle button down events
-as if the left and right buttons are pressed. This option handles this.
+as if the left and right buttons are being pressed.
+This option handles this.
 .It Fl d
 Enable debugging messages.
 .It Fl f
@@ -159,7 +176,8 @@
 .It Ar if
 Interface type: serial, bus, inport or ps/2.
 .It Ar type
-Protocol type. It is one of the types listed under the 
+Protocol type.
+It is one of the types listed under the 
 .Fl t
 option below or 
 .Ar sysmouse
@@ -186,7 +204,8 @@
 .Ar N.
 You may specify as many instances of this option as you like.
 More than one physical button may be assigned to a logical button at the
-same time. In this case the logical button will be down, 
+same time.
+In this case the logical button will be down, 
 if either of the assigned physical buttons is held down.
 Do not put space around `='.
 .It Fl p Ar port
@@ -238,6 +257,10 @@
 .Ar busmouse .
 Serial mouse protocols will not work with these mice.
 .Pp
+For the USB mouse, the protocol must be
+.Ar auto .
+No other protocol will work with the USB mouse.
+.Pp
 Valid types for this option are
 listed below.
 .Pp
@@ -292,6 +315,11 @@
 This is the only protocol type available for the PS/2 mouse
 and should be specified for any PS/2 mice, regardless of the brand.
 .El
+.Pp
+For the USB mouse,
+.Ar auto
+is the only protocol type available for the USB mouse
+and should be specified for any USB mice, regardless of the brand.
 .It Fl w Ar N
 Make the physical button
 .Ar N
@@ -311,17 +339,51 @@
 .It Ar y
 X or Y axis movement will be reported when the Z axis movement is detected.
 .It Ar N
-Report the virtual buttons
+Report down events for the virtual buttons
 .Ar N 
 and 
 .Ar N+1 
-down events respectively when negative and positive Z axis movement 
-is detected. There doesn't need to be physical buttons 
+respectively when negative and positive Z axis movement 
+is detected.
+There do not need to be physical buttons 
 .Ar N
 and 
 .Ar N+1 .
 Note that mapping to logical buttons is carried out after mapping
 from the Z axis movement to the virtual buttons is done.
+.It Ar N1 N2
+Report down events for the virtual buttons
+.Ar N1
+and 
+.Ar N2
+respectively when negative and positive Z axis movement 
+is detected.
+.It Ar N1 N2 N3 N4
+This is useful for the mouse with two wheels of which
+the second wheel is used to generate horizontal scroll action,
+and for the mouse which has a knob or a stick which can detect
+the horizontal force applied by the user.
+.Pp
+The motion of the second wheel will be mapped to the buttons
+.Ar N3 ,
+for the negative direction, and
+.Ar N4 ,
+for the positive direction.
+If the buttons
+.Ar N3
+and
+.Ar N4
+actually exist in this mouse, their actions will not be detected.
+.Pp
+Note that horizontal movement or second roller/wheel movement may not
+always be detected,
+because there appears to be no accepted standard as to how it is encoded.
+.Pp
+Note also that some mice think left is the negative horizontal direction, 
+others may think otherwise.  
+Moreover, there are some mice whose two wheels are both mounted vertically,
+and the direction of the second vertical wheel does not match the
+first one's.
 .El
 .El
 .Ss Configuring Mouse Daemon
@@ -336,6 +398,7 @@
 be converted to another.  If you are to use such an adapter,
 remember the connector at the very end of the mouse/adapter pair is 
 what matters.
+The USB mouse has a flat rectangular connector.
 .Pp
 The next thing to decide is a port to use for the given interface.
 For the bus, InPort and PS/2 mice, there is little choice: 
@@ -348,6 +411,11 @@
 serial port
 .Pa /dev/cuaa0
 to the mouse.
+You can attach multiple USB mice to your system or to your USB hub.
+They are accessible as 
+.Pa /dev/ums0, /dev/ums1, 
+and so on.
+.Pa
 You may want to create a symbolic link
 .Pa /dev/mouse
 pointing to the real port to which the mouse is connected, so that you
@@ -386,7 +454,8 @@
 .Nm
 command by the
 .Fl t
-option. You have to make a guess and try.
+option.
+You have to make a guess and try.
 There is rule of thumb:
 .Pp
 .Bl -tag -compact -width 1.X
@@ -400,20 +469,25 @@
 protocol should always be specified for the PS/2 mouse
 regardless of the brand of the mouse.
 .It 3.
+You must specify the
+.Ar auto
+protocol for the USB mouse.
+.It 4.
 Most 2-button serial mice support the
 .Ar microsoft
 protocol.
-.It 4.
+.It 5.
 3-button serial mice may work with the
 .Ar mousesystems
-protocol. If it doesn't, it may work with the 
+protocol.
+If it does not, it may work with the 
 .Ar microsoft
 protocol although 
-the third (middle) button won't function.
+the third (middle) button will not function.
 3-button serial mice may also work with the
 .Ar mouseman
 protocol under which the third button may function as expected.
-.It 5.
+.It 6.
 3-button serial mice may have a small switch to choose between ``MS''
 and ``PC'', or ``2'' and ``3''.
 ``MS'' or ``2'' usually mean the 
@@ -422,7 +496,7 @@
 ``PC'' or ``3'' will choose the 
 .Ar mousesystems
 protocol.
-.It 6.
+.It 7.
 If the mouse has a roller or a wheel, it may be compatible with the
 .Ar intellimouse
 protocol.
@@ -438,8 +512,10 @@
 .Dl moused -f -p Ar _selected_port_ -t Ar _selected_protocol_
 .Pp
 and see if the mouse pointer travels correctly
-according to the mouse movement. Then try cut & paste features by
-clicking the left, right and middle buttons. Type ^C to stop
+according to the mouse movement.
+Then try cut & paste features by
+clicking the left, right and middle buttons.
+Type ^C to stop
 the command.
 .Ss Multiple Mice
 As many instances of the mouse daemon as the number of mice attached to
@@ -454,9 +530,10 @@
 .Xr sysmouse ,
 then the application program will always see mouse data from either mice. 
 When the serial mouse is not attached, the corresponding mouse daemon
-won't detect any movement or button state change and the application
+will not detect any movement or button state change and the application
 program will only see mouse data coming from the daemon for the
-PS/2 mouse. In contrast when both mice are attached and both of them
+PS/2 mouse.
+In contrast when both mice are attached and both of them
 are moved at the same time in this configuration,
 the mouse pointer will travel across the screen just as if movement of 
 the mice is combined all together.
@@ -472,6 +549,8 @@
 virtualized mouse driver
 .It Pa /dev/ttyv%d
 virtual consoles
+.It Pa /dev/ums%d
+USB mouse driver
 .It Pa /var/run/moused.pid
 process id of the currently running
 .Nm
@@ -532,7 +611,8 @@
 the user `taps' the surface of the pad.
 In contrast, some ALPS GlidePoint and Interlink VersaPad models 
 treat the tapping action 
-as fourth button events. Use the option ``-m 1=4'' for these models
+as fourth button events.
+Use the option ``-m 1=4'' for these models
 to obtain the same effect as the other pad devices.
 .Pp
 Cut and paste functions in the virtual console assume that there
@@ -558,7 +638,8 @@
 .Xr pcvt 4 ,
 .Xr psm 4 ,
 .Xr screen 4 ,
-.Xr sysmouse 4
+.Xr sysmouse 4 ,
+.Xr ums 4
 .Sh STANDARD
 The
 .Nm
@@ -567,7 +648,8 @@
 in order to support PnP serial mice.
 However, due to various degrees of conformance to the specification by 
 existing serial mice, it does not strictly follow the version 1.0 of the
-standard. Even with this less strict approach, 
+standard.
+Even with this less strict approach, 
 it may not always determine an appropriate protocol type 
 for the given serial mouse.
 .Sh AUTHORS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/mrinfo.8 man8/mrinfo.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/mrinfo.8	Mon Dec 20 14:52:45 1999
+++ man8/mrinfo.8	Wed Jun 14 10:07:47 2000
@@ -1,3 +1,4 @@
+.\" %FreeBSD: src/usr.sbin/mrouted/mrinfo.8,v 1.7.2.1 2000/03/06 11:36:30 sheldonh Exp %
 .Dd May 8, 1995
 .Dt MRINFO 8
 .UC 5
@@ -16,20 +17,25 @@
 .Ar multicast_router .
 .Pp
 .Nm Mrinfo
-uses the ASK_NEIGHBORS IGMP message to the specified multicast router. If this
+uses the ASK_NEIGHBORS IGMP message to the specified multicast router.
+If this
 multicast router responds, the version number and a list of their neighboring
-multicast router addresses is part of that response. If the responding router
+multicast router addresses is part of that response.
+If the responding router
 has a recent multicast version number, then 
 .Nm
 requests additional information such as metrics, thresholds, and flags from the
-multicast router. Once the specified multicast router responds, the
+multicast router.
+Once the specified multicast router responds, the
 configuration is displayed to the standard output.
 .Pp
 The following options are available:
 .Bl -tag -width indent
 .It Fl d Ar debug_level
-Set the debug level. When the debug level is greater than the
-default value of 0, addition debugging messages are printed. Regardless of
+Set the debug level.
+When the debug level is greater than the
+default value of 0, addition debugging messages are printed.
+Regardless of
 the debug level, an error condition, will always write an error message and will
 cause 
 .Nm
@@ -45,10 +51,12 @@
 timeouts are printed to stderr.
 .El
 .It Fl r Ar retry_count
-Set the neighbor query retry limit. Default is 3 retries.
+Set the neighbor query retry limit.
+Default is 3 retries.
 .It Fl t Ar timeout_count
 Set the number of seconds to wait for a neighbor query
-reply. Default timeout is 4 seconds.
+reply.
+Default timeout is 4 seconds.
 .El
 .Sh SAMPLE OUTPUT
 .nf
@@ -61,8 +69,10 @@
 .fi
 .Pp
 For each neighbor of the queried multicast router, the IP of the queried router
-is displayed, followed by the IP and name of the neighbor. In square brackets
-the metric (cost of connection), the treashold (multicast ttl) is displayed. If
+is displayed, followed by the IP and name of the neighbor.
+In square brackets
+the metric (cost of connection), the treashold (multicast ttl) is displayed.
+If
 the queried multicast router has a newer version number, the type (tunnel,
 srcrt) and status (disabled, down) of the connection is displayed.
 .Sh IMPORTANT NOTE
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/mrouted.8 man8/mrouted.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/mrouted.8	Mon Dec 20 14:52:45 1999
+++ man8/mrouted.8	Wed Jun 14 10:07:46 2000
@@ -1,5 +1,5 @@
 .\"COPYRIGHT 1989 by The Board of Trustees of Leland Stanford Junior University.
-.\"%FreeBSD: src/usr.sbin/mrouted/mrouted.8,v 1.12.2.2 1999/08/29 15:43:56 peter Exp %
+.\"%FreeBSD: src/usr.sbin/mrouted/mrouted.8,v 1.12.2.3 2000/03/06 11:36:31 sheldonh Exp %
 .Dd May 8, 1995
 .Dt MROUTED 8
 .UC 5
@@ -21,12 +21,15 @@
 .Pp
 .Nm Mrouted 
 forwards a multicast datagram along a shortest (reverse) path tree
-rooted at the subnet on which the datagram originates. The multicast
+rooted at the subnet on which the datagram originates.
+The multicast
 delivery tree may be thought of as a broadcast delivery tree that has
 been pruned back so that it does not extend beyond those subnetworks
-that have members of the destination group. Hence, datagrams
+that have members of the destination group.
+Hence, datagrams
 are not forwarded along those branches which have no listeners of the
-multicast group. The IP time-to-live of a multicast datagram can be
+multicast group.
+The IP time-to-live of a multicast datagram can be
 used to limit the range of multicast datagrams.
 .Pp
 In order to support multicasting among subnets that are separated by (unicast)
@@ -72,7 +75,8 @@
 The following options are available:
 .Bl -tag -width indent
 .It Fl c Ar config_file
-Specify an alternative file for configuration commands. Default is
+Specify an alternative file for configuration commands.
+Default is
 .Pa /etc/mrouted.conf .
 .It Fl d Op Ar debug_level
 If no
@@ -289,7 +293,8 @@
 .It boundary Ar "boundary-name|scoped-addr/mask-len"
 The boundary option allows an interface
 to be configured as an administrative boundary for the specified
-scoped address. Packets belonging to this address will not
+scoped address.
+Packets belonging to this address will not
 be forwarded on a scoped interface.  The boundary option accepts either
 a name or a boundary spec.  This command may be specified several times
 on an interface in order to describe multiple boundaries.
@@ -491,8 +496,10 @@
 .Nm
 is the one responsible for sending periodic group
 membership queries on the vif 0 and vif 1 subnets, as indicated by the
-"querier" flags. The list of boundaries indicate the scoped addresses on that
-interface. A count of the no. of incoming and outgoing packets is also
+"querier" flags.
+The list of boundaries indicate the scoped addresses on that
+interface.
+A count of the no. of incoming and outgoing packets is also
 shown at each interface.
 .Pp
 Associated with each subnet from which a multicast datagram can originate
@@ -505,7 +512,8 @@
 outgoing vif only if there are members of the destination group on that leaf.
 .Pp
 .Nm Mrouted 
-also maintains a copy of the kernel forwarding cache table. Entries
+also maintains a copy of the kernel forwarding cache table.
+Entries
 are created and deleted by 
 .Nm mrouted .
 .Pp
@@ -543,16 +551,21 @@
 The 'Ivif' field indicates the
 incoming vif for multicast packets from that origin.  Each router also
 maintains a record of the number of prunes received from neighboring
-routers for a particular source and group. If there are no members of
+routers for a particular source and group.
+If there are no members of
 a multicast group on any downward link of the multicast tree for a
-subnet, a prune message is sent to the upstream router. They are
+subnet, a prune message is sent to the upstream router.
+They are
 indicated by a "P" after the vif number.
 .Pp
 The Forwvifs field shows the
 interfaces along which datagrams belonging to the source-group are
-forwarded. A "p" indicates that no datagrams are being forwarded along
-that interface. An unlisted interface is a leaf subnet with no
-members of the particular group on that subnet. A "b" on an interface
+forwarded.
+A "p" indicates that no datagrams are being forwarded along
+that interface.
+An unlisted interface is a leaf subnet with no
+members of the particular group on that subnet.
+A "b" on an interface
 indicates that it is a boundary interface, i.e. traffic will not be
 forwarded on the scoped address on that interface.
 .Pp
Only in man8: named-bootconf.8
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/natd.8 man8/natd.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/natd.8	Mon Dec 20 14:49:17 1999
+++ man8/natd.8	Wed Jun 14 10:05:10 2000
@@ -1,5 +1,5 @@
 .\" manual page [] for natd 1.4
-.\" %FreeBSD: src/sbin/natd/natd.8,v 1.16.2.6 1999/10/28 18:55:35 ru Exp %
+.\" %FreeBSD: src/sbin/natd/natd.8,v 1.16.2.8 2000/03/03 15:13:08 sheldonh Exp %
 .Dd 15 April 1997
 .Os FreeBSD
 .Dt NATD 8
@@ -142,7 +142,8 @@
 
 .It Fl redirect_address Ar localIP publicIP
 Redirect traffic for public IP address to a machine on the local
-network. This function is known as "static NAT". Normally static NAT
+network.
+This function is known as "static NAT". Normally static NAT
 is useful if your ISP has allocated a small block of IP addresses to you,
 but it can even be used in the case of single address:
 
@@ -274,35 +275,44 @@
 Trailing spaces and empty lines are ignored.
 A
 .Ql \&#
-sign will mark the remaining of the line as a comment.
+sign will mark the rest of the line as a comment.
 
 .It Fl reverse
-Reverse operation of natd. This can be useful in some 
+Reverse operation of natd.
+This can be useful in some 
 transparent proxying situations when outgoing traffic
 is redirected to the local machine and natd is running on the
 incoming interface (it usually runs on the outgoing interface).
 
 .It Fl proxy_only
 Force natd to perform transparent proxying
-only. Normal address translation is not performed.
+only.
+Normal address translation is not performed.
 
 .It Fl proxy_rule Ar [type encode_ip_hdr|encode_tcp_stream] port xxxx server a.b.c.d:yyyy
-Enable transparent proxying. Packets with the given port going through this
+Enable transparent proxying.
+Packets with the given port going through this
 host to any other host are redirected to the given server and port.
-Optionally, the original target address can be encoded into the packet. Use 
+Optionally, the original target address can be encoded into the packet.
+Use 
 .Dq encode_ip_hdr
 to put this information into the IP option field or
 .Dq encode_tcp_stream
 to inject the data into the beginning of the TCP stream.
 
 .It Fl pptpalias Ar localIP
-Allow PPTP packets to go to the defined localIP address. PPTP is a VPN or secure
-IP tunneling technology being developed primarily by Microsoft. For its encrypted traffic,
+Allow PPTP packets to go to the defined localIP address.
+PPTP is a VPN or secure
+IP tunneling technology being developed primarily by Microsoft.
+For its encrypted traffic,
 it uses an old IP encapsulation protocol called GRE (47). This
 natd option will translate any traffic of this protocol to a
-single, specified IP address. This would allow either one client or one server 
-to be serviced with natd. If you are setting up a server, don't forget to allow the TCP traffic
-for the PPTP setup. For a client or server, you must allow GRE (protocol 47) if you have firewall lists active.
+single, specified IP address.
+This would allow either one client or one server 
+to be serviced with natd.
+If you are setting up a server, don't forget to allow the TCP traffic
+for the PPTP setup.
+For a client or server, you must allow GRE (protocol 47) if you have firewall lists active.
 
 .El
 
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/newfs.8 man8/newfs.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/newfs.8	Mon Dec 20 14:49:17 1999
+++ man8/newfs.8	Wed Jun 14 10:05:11 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)newfs.8	8.6 (Berkeley) 5/3/95
-.\" %FreeBSD: src/sbin/newfs/newfs.8,v 1.20.2.2 1999/08/29 15:14:53 peter Exp %
+.\" %FreeBSD: src/sbin/newfs/newfs.8,v 1.20.2.4 2000/06/08 07:00:10 kris Exp %
 .\"
 .Dd May 3, 1995
 .Dt NEWFS 8
@@ -344,20 +344,21 @@
 options nosuid and nodev.
 .Sh BUGS
 The boot code of
-.Bx Free
+.Fx
 assumes that the file system that carries the
-kernel has blocks of 8 kilobytes and fragments of 1 kilobyte. You will
+kernel has blocks of 8 kilobytes and fragments of 1 kilobyte.
+You will
 not be able to boot from a file system that uses another size.
 .Sh SEE ALSO
 .Xr fdformat 1 ,
 .Xr disktab 5 ,
 .Xr fs 5 ,
+.Xr camcontrol 8 ,
 .Xr disklabel 8 ,
 .Xr diskpart 8 ,
 .Xr dumpfs 8 ,
 .Xr fsck 8 ,
 .Xr mount 8 ,
-.Xr scsiformat 8 ,
 .Xr tunefs 8 ,
 .Xr vinum 8
 .Rs
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/newfs_msdos.8 man8/newfs_msdos.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/newfs_msdos.8	Mon Dec 20 14:49:18 1999
+++ man8/newfs_msdos.8	Wed Jun 14 10:05:11 2000
@@ -23,7 +23,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/newfs_msdos/newfs_msdos.8,v 1.5.2.1 1999/08/29 15:14:54 peter Exp %
+.\" %FreeBSD: src/sbin/newfs_msdos/newfs_msdos.8,v 1.5.2.2 2000/03/03 15:13:10 sheldonh Exp %
 .\"
 .Dd July 6, 1998
 .Dt NEWFS_MSDOS 8
@@ -111,7 +111,8 @@
 .It Fl m Ar media
 Media descriptor (acceptable range 0xf0 to 0xff).
 .It Fl n Ar FATs
-Number of FATs.  Acceptable values are 1 to 16 inclusive. The default
+Number of FATs.  Acceptable values are 1 to 16 inclusive.
+The default
 is 2.
 .It Fl o Ar hidden
 Number of hidden sectors.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/newsyslog.8 man8/newsyslog.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/newsyslog.8	Mon Dec 20 14:52:46 1999
+++ man8/newsyslog.8	Wed Jun 14 10:07:48 2000
@@ -1,7 +1,7 @@
 .\" This file contains changes from the Open Software Foundation.
 .\"
 .\"	from: @(#)newsyslog.8
-.\" %FreeBSD: src/usr.sbin/newsyslog/newsyslog.8,v 1.14.2.3 1999/08/29 15:44:31 peter Exp %
+.\" %FreeBSD: src/usr.sbin/newsyslog/newsyslog.8,v 1.14.2.4 2000/03/06 11:36:33 sheldonh Exp %
 .\"
 .\" Copyright 1988, 1989 by the Massachusetts Institute of Technology
 .\" 
@@ -224,7 +224,8 @@
 properly.
 .It Ar signal_number
 This optional field specifies
-the signal number will be sent to the daemon process. By default
+the signal number will be sent to the daemon process.
+By default
 a SIGHUP will be sent.
 .El
 .Sh OPTIONS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/nextboot.8 man8/nextboot.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/nextboot.8	Mon Dec 20 14:49:34 1999
+++ man8/nextboot.8	Wed Jun 14 10:05:20 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/sbin/i386/nextboot/nextboot.8,v 1.8.2.2 1999/08/29 15:13:36 peter Exp %
+.\" %FreeBSD: src/sbin/i386/nextboot/nextboot.8,v 1.8.2.3 2000/03/03 15:12:57 sheldonh Exp %
 .Dd July 9, 1996
 .Dt NEXTBOOT 8
 .\".Os BSD 4
@@ -21,9 +21,11 @@
 controls the actions of the boot blocks at the time of the next boot.
 If compiled with the correct option,
 the boot blocks will check the nameblock for a magic number and a 
-default name to use for booting. If compiled to do so they will also 
+default name to use for booting.
+If compiled to do so they will also 
 delete the name from the block, ensuring that if the boot should fail,
-then it will not be tried again. It is the job of
+then it will not be tried again.
+It is the job of
 .Pa /etc/rc
 to use 
 .Nm
@@ -36,7 +38,8 @@
 The following options are available:
 .Bl -tag -width indent
 .It Fl b
-Is used for bootstrapping (initially configuring) the nameblock. Without
+Is used for bootstrapping (initially configuring) the nameblock.
+Without
 this, 
 .Nm
 will refuse to write to a block that does not already contain the magic
@@ -57,15 +60,19 @@
 .Sh DESCRIPTION
 .Nm Nextboot
 first checks that the disk has an fdisk table and checks that none of the 
-partitions defined in that table include the nameblock. If the name block is 
+partitions defined in that table include the nameblock.
+If the name block is 
 shown to be unused, it will install the bootstrings given as arguments,
 one after the other, each preceded by a small magic number, and NULL
-terminated. The end of the list of strings is delimited by a sequence of 
-0xff bytes. If the boot blocks are compiled to write back the nameblock
+terminated.
+The end of the list of strings is delimited by a sequence of 
+0xff bytes.
+If the boot blocks are compiled to write back the nameblock
 after each boot, it will zero out the supplied names as it uses them,
 one per boot,
 until it reaches the 0xff, at which time it will revert to the compiled in
-boot string. At this time the nameblock will contain only zeroed out names.
+boot string.
+At this time the nameblock will contain only zeroed out names.
 .Pp
 An example of usage might be:
 .Bd -literal
@@ -78,12 +85,15 @@
 boot the kernel
 .Pa /kernel.old
 off the IDE drive.  (Assuming the write-back option were enabled) If this
-in turn failed. The compiled in default would be used.
+in turn failed.
+The compiled in default would be used.
 .Pp
 If the write-back feature is disabled, the nextboot program is a convenient way
-to change the default boot string. Note, that should the file specified in
+to change the default boot string.
+Note, that should the file specified in
 the nameblock be non-existent, then the name compiled into the boot blocks
-will be used for the boot rather than the next name in the nameblock. The 
+will be used for the boot rather than the next name in the nameblock.
+The 
 nameblock is only consulted
 .Em once
 per boot.
@@ -96,7 +106,8 @@
 .Pp
 The entire program should be made more user-friendly.
 The option of whether to write back or not should be stored on the
-disk and not a compile time option. I want to rethink this at some 
+disk and not a compile time option.
+I want to rethink this at some 
 later stage to make it co-exist with disks that do not have
 a fdisk partitioning table (i.e. purely disklabel'd systems).
 .Pp
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man8: ng_UI.8
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man8: ng_async.8
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man8: ng_bpf.8
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man8: ng_cisco.8
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man8: ng_echo.8
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man8: ng_frame_relay.8
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man8: ng_hole.8
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man8: ng_iface.8
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man8: ng_ksocket.8
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man8: ng_lmi.8
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man8: ng_ppp.8
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man8: ng_pppoe.8
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man8: ng_pptpgre.8
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man8: ng_rfc1490.8
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man8: ng_socket.8
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man8: ng_tee.8
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man8: ng_tty.8
Only in /home/horikawa/man-jp/work/fbsd-340r/man/man8: ng_vjc.8
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/ngctl.8 man8/ngctl.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/ngctl.8	Mon Dec 20 14:52:47 1999
+++ man8/ngctl.8	Wed Jun 14 10:07:48 2000
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/ngctl/ngctl.8,v 1.2.2.2 1999/12/01 19:41:41 julian Exp %
+.\" %FreeBSD: src/usr.sbin/ngctl/ngctl.8,v 1.2.2.4 2000/03/06 11:36:35 sheldonh Exp %
 .\" $Whistle: ngctl.8,v 1.6 1999/01/20 03:19:44 archie Exp %
 .\"
 .Dd January 19, 1999
@@ -40,7 +40,7 @@
 .Nm ngctl
 .Nd netgraph control utility
 .Sh SYNOPSIS
-.Nm ngctl
+.Nm
 .Op Fl d
 .Op Fl f Ar filename
 .Op Fl n Ar nodename
@@ -55,19 +55,22 @@
 .Fl f
 flag is given, no
 command is supplied on the command line, and standard input is a tty,
-.Nm ngctl
-will enter interactive mode. Otherwise
-.Nm ngctl
+.Nm
+will enter interactive mode.
+Otherwise
+.Nm
 will execute the supplied command(s) and exit immediately.
 .Pp
 Nodes can be created, removed, joined together, etc.
-ASCII formatted control messages can be sent to any node if that node
+.Tn ASCII
+formatted control messages can be sent to any node if that node
 supports binary/ASCII control message conversion.
 .Pp
 In interactive mode,
 .Nm
 will display any control messages and data packets received by the socket node.
-In the case of control messages, the message arguments are displayed in ASCII
+In the case of control messages, the message arguments are displayed in
+.Tn ASCII
 form if the originating node supports conversion.
 .Pp
 The options are as follows:
@@ -75,11 +78,14 @@
 .It Fl f Ar nodeinfo
 Read commands from the named file.
 A single dash represents the standard input.
-Blank lines and lines starting with a ``#'' are ignored.
+Blank lines and lines starting with a
+.Dq #
+are ignored.
 .It Fl n Ar nodename
 Assign
 .Em nodename
-to the newly created netgraph node. The default name is
+to the newly created netgraph node.
+The default name is
 .Em ngctlXXX
 where XXX is the process ID number.
 .It Fl d
@@ -87,7 +93,7 @@
 .El
 .Sh COMMANDS
 The currently supported commands in
-.Nm ngctl
+.Nm
 are:
 .Pp
 .Bd -literal -offset indent -compact
@@ -107,8 +113,13 @@
 quit       Exit program
 .Ed
 .Pp
-Some commands have aliases, e.g., ``ls'' is the same as ``list''.
-The ``help'' command displays the available
+Some commands have aliases, e.g.,
+.Dq ls
+is the same as
+.Dq list .
+The
+.Dq help
+command displays the available
 commands, their usage and aliases, and a brief description.
 .Sh EXIT VALUE
 The
@@ -116,12 +127,14 @@
 utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
 .Xr netgraph 3 ,
-.Xr netgraph 4 .
+.Xr netgraph 4 ,
 .Xr nghook 8 .
-.Sh AUTHOR
-Archie Cobbs <archie@whistle.com>
 .Sh HISTORY
 The
-.Em netgraph
+.Nm netgraph
 system was designed and first implemented at Whistle Communications, Inc. in
-a version FreeBSD 2.2 customized for the Whistle InterJet.
+a version
+.Fx 2.2
+customized for the Whistle InterJet.
+.Sh AUTHORS
+.An Archie Cobbs Aq archie@whistle.com
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/nghook.8 man8/nghook.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/nghook.8	Mon Dec 20 14:52:47 1999
+++ man8/nghook.8	Wed Jun 14 10:07:48 2000
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\"
-.\"  %FreeBSD: src/usr.sbin/nghook/nghook.8,v 1.1.2.1 1999/11/17 07:06:04 julian Exp %
+.\"  %FreeBSD: src/usr.sbin/nghook/nghook.8,v 1.1.2.3 1999/12/22 01:26:19 archie Exp %
 .\" $Whistle: nghook.8,v 1.4 1999/01/20 03:19:45 archie Exp %
 .\"
 .Dd January 19, 1999
@@ -39,7 +39,7 @@
 .Sh NAME
 .Nm nghook
 .Nd connect to a
-.Xr netgraph 8
+.Xr netgraph 4
 node
 .Sh SYNOPSIS
 .Nm
@@ -50,14 +50,16 @@
 .Sh DESCRIPTION
 .Nm
 creates a
-.Xr netgraph 8
+.Xr ng_socket 8
 socket type node and connects it to hook
 .Ar hookname
 of the node found at
 .Ar path .
 If
 .Ar hookname
-is omitted, ``debug'' is assumed.
+is omitted,
+.Dq debug
+is assumed.
 .Pp
 At this point all data written to standard input is sent
 to the node and all data received from the node is relayed
@@ -67,7 +69,8 @@
 .Pp
 .Bl -tag -width indent
 .It Fl a
-Output each read packet in ASCII.
+Output each read packet in
+.Tn ASCII .
 .It Fl d
 Increase the debugging verbosity level.
 .El
@@ -78,10 +81,12 @@
 .Xr netgraph 4 ,
 .Xr netgraph 3 ,
 .Xr ngctl 8 .
-.Sh AUTHOR
-Archie Cobbs <archie@whistle.com>
 .Sh HISTORY
 The
 .Em netgraph
 system was designed and first implemented at Whistle Communications, Inc.
-in a version FreeBSD 2.2 customized for the Whistle InterJet.
+in a version of
+.Fx 2.2
+customized for the Whistle InterJet.
+.Sh AUTHOR
+.An Archie Cobbs Aq archie@whistle.com
Only in man8: nsupdate.8
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/ntpq.8 man8/ntpq.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/ntpq.8	Mon Dec 20 14:53:12 1999
+++ man8/ntpq.8	Wed Jun 14 10:08:04 2000
@@ -1,5 +1,5 @@
 .\"
-.\" %FreeBSD: src/usr.sbin/xntpd/doc/ntpq.8,v 1.5.2.3 1999/09/20 09:50:01 phantom Exp %
+.\" %FreeBSD: src/usr.sbin/xntpd/doc/ntpq.8,v 1.5.2.4 2000/03/03 11:29:21 sheldonh Exp %
 .\"
 .Dd December 21, 1993
 .Dt NTPQ 8
@@ -16,8 +16,10 @@
 .Nm Ntpq
 is used to query NTP servers which implement the recommended NTP mode 6
 control message format about current state and to request changes in
-that state. The program may be run either in interactive mode or
-controlled using command line arguments. Requests to read and write
+that state.
+The program may be run either in interactive mode or
+controlled using command line arguments.
+Requests to read and write
 arbitrary variables can be assembled, with raw and pretty\-printed
 output options being available.
 .Nm Ntpq
@@ -29,7 +31,8 @@
 is executed, each of the requests will be sent to the NTP servers
 running on each of the hosts given as command line arguments, or on
 .Ar localhost
-by default. If no request options are given,
+by default.
+If no request options are given,
 .Nm
 will attempt to read commands from the standard input and execute these
 on the NTP server running on the first host given on the command line,
@@ -43,20 +46,23 @@
 .Nm Ntpq
 uses NTP mode 6 packets to communicate with the NTP server, and hence
 can be used to query any compatable server on the network which permits
-it. Note that since NTP is a UDP protocol this communication will be
+it.
+Note that since NTP is a UDP protocol this communication will be
 somewhat unreliable, especially over large distances in terms of network
 topology.
 .Nm Ntpq
 makes one attempt to retransmit requests, and will time requests out if
 the remote host is not heard from within a suitable time out time.
 .Pp
-Command line options are described following. Specifying a command line
+Command line options are described following.
+Specifying a command line
 option other than
 .Fl i
 or
 .Fl n
 will cause the specified query (queries) to be sent to the indicated
-host(s) immediately. Otherwise,
+host(s) immediately.
+Otherwise,
 .Nm
 will attempt to read interactive format commands from the standard
 input.
@@ -72,22 +78,26 @@
 .It Fl i
 Force
 .Nm
-to operate in interactive mode. Prompts will be written to the standard
+to operate in interactive mode.
+Prompts will be written to the standard
 output and commands read from the standard input.
 .It Fl n
 Output all host addresses in dotted\-quad numeric format rather than
 converting to the canonical host names.
 .It Fl p
 Print a list of the peers known to the server as well as a summary of
-their state. This is equivalent to the
+their state.
+This is equivalent to the
 .Em peers
 interactive command.
 .El
 .Sh INTERNAL COMMANDS
 .Pp
 Interactive format commands consist of a keyword followed by zero to
-four arguments. Only enough characters of the full keyword to uniquely
-identify the command need be typed. The output of a command is normally
+four arguments.
+Only enough characters of the full keyword to uniquely
+identify the command need be typed.
+The output of a command is normally
 sent to the standard output, but optionally the output of individual
 commands may be sent to a file by appending a
 .Qq > ,
@@ -96,7 +106,8 @@
 A number of interactive format commands are executed entirely within the
 .Nm
 program itself and do not result in NTP mode 6 requests being sent to a
-server. These are described following.
+server.
+These are described following.
 .Pp
 .Bl -tag -width indent
 .It ? Op Ar command_keyword
@@ -108,21 +119,26 @@
 A
 .Qq ?
 followed by a command keyword will print function and
-usage information about the command. This command is probably a better
+usage information about the command.
+This command is probably a better
 source of information about
 .Nm
 than this manual page.
 .It timeout Ar milliseconds
-Specify a time out period for responses to server queries. The default
-is about 5000 milliseconds. Note that since
+Specify a time out period for responses to server queries.
+The default
+is about 5000 milliseconds.
+Note that since
 .Nm
 retries each query once after a time out the total waiting time for a
 time out will be twice the time out value set.
 .It delay Ar milliseconds
 Specify a time interval to be added to timestamps included in requests
-which require authentication. This is used to enable (unreliable) server
+which require authentication.
+This is used to enable (unreliable) server
 reconfiguration over long delay network paths or between machines whose
-clocks are unsynchronized. Actually the server does not now require time
+clocks are unsynchronized.
+Actually the server does not now require time
 stamps in authenticated requests, so this command may be obsolete.
 .It host Ar hostname
 Set the host to which future queries will be sent.
@@ -133,34 +149,41 @@
 .Op Ar #
 .Op Ar verbose
 .Xc
-Poll the current server in client mode. The first argument is the number
+Poll the current server in client mode.
+The first argument is the number
 of times to poll (default is 1) while the second argument may be given
-to obtain a more detailed output of the results. This command is
+to obtain a more detailed output of the results.
+This command is
 currently just wishful thinking.
 .It keyid Ar #
 This command allows the specification of a key number to be used to
-authenticate configuration requests. This must correspond to a key
+authenticate configuration requests.
+This must correspond to a key
 number the server has been configured to use for this purpose.
 .It passwd
 This command prompts you to type in a password (which will not be
-echoed) which will be used to authenticate configuration requests. The
+echoed) which will be used to authenticate configuration requests.
+The
 password must correspond to the key configured for use by the NTP server
 for this purpose if such requests are to be successful.
 .It hostnames Ar yes | Ar no
 If
 .Ar yes
 is specified, host names are printed in information
-displays. If
+displays.
+If
 .Ar no
 is given, numeric addresses are printed
-instead. The default is
+instead.
+The default is
 .Ar yes
 unless modified using the command line
 .Fl n
 switch.
 .It raw
 Cause all output from query commands is printed as received from the
-remote server. The only formating/intepretation done on the data is to
+remote server.
+The only formating/intepretation done on the data is to
 transform non-ASCII data into a printable (but barely understandable)
 form.
 .It cooked
@@ -168,7 +191,8 @@
 .Qq cooked Ns .
 Variables
 which are recognized by the server will have their values reformatted
-for human consumption. Variables which
+for human consumption.
+Variables which
 .Nm
 thinks should have a decodeable value but didn't are marked with a
 trailing
@@ -176,18 +200,21 @@
 .It ntpversion Ar 1 | Ar 2 | Ar 3
 Set the NTP version number which
 .Nm
-claims in packets. Defaults to 3, Note that mode 6 control messages (and
+claims in packets.
+Defaults to 3, Note that mode 6 control messages (and
 modes, for that matter) didn't exist in NTP version 1. There appear to
 be no servers left which demand version 1.
 .It authenticate Ar yes | Ar no
 Normally
 .Nm
-does not authenticate requests unless they are write requests. The
+does not authenticate requests unless they are write requests.
+The
 command
 .Em authenticate yes
 causes
 .Nm
-to send authentication with all requests it makes. Authenticated
+to send authentication with all requests it makes.
+Authenticated
 requests causes some servers to handle requests slightly differently,
 and can occasionally melt the CPU in fuzzballs if you turn
 authentication on before doing a peer display.
@@ -216,11 +243,14 @@
 .Em readlist
 and
 .Em writelist
-commands described below. The
+commands described below.
+The
 .Em addvars
 command allows variables and their optional values to be added to the
-list. If more than one variable is to be added, the list should be
-comma\-separated and not contain white space. The
+list.
+If more than one variable is to be added, the list should be
+comma\-separated and not contain white space.
+The
 .Em rmvars
 command can be used to remove individual variables from the list, while
 the
@@ -235,15 +265,19 @@
 .Sh CONTROL MESSAGE COMMANDS
 Each peer known to an NTP server has a 16 bit integer
 .Em association identifier
-assigned to it. NTP control messages which carry peer variables must
+assigned to it.
+NTP control messages which carry peer variables must
 identify the peer the values correspond to by including its association
-ID. An association ID of 0 is special, and indicates the variables are
+ID.
+An association ID of 0 is special, and indicates the variables are
 system variables, whose names are drawn from a separate name space.
 .Pp
 Control message commands result in one or more NTP mode 6 messages being
 sent to the server, and cause the data returned to be printed in some
-format. Most commands currently implemented send a single message and
-expect a single response. The current exceptions are the
+format.
+Most commands currently implemented send a single message and
+expect a single response.
+The current exceptions are the
 .Em peers
 command, which will send a preprogrammed series of messages to obtain
 the data it needs, and the
@@ -254,12 +288,16 @@
 .Bl -tag -width indent
 .It associations
 Obtain and print a list of association identifiers and peer statuses
-for in\-spec peers of the server being queried. The list is printed in
-columns. The first of these is an index numbering the associations from
+for in\-spec peers of the server being queried.
+The list is printed in
+columns.
+The first of these is an index numbering the associations from
 1 for internal use, the second the actual association identifier
-returned by the server and the third the status word for the peer. This
+returned by the server and the third the status word for the peer.
+This
 is followed by a number of columns containing data decoded from the
-status word. Note that the data returned by the \*(L"associations\*(R"
+status word.
+Note that the data returned by the \*(L"associations\*(R"
 command is cached internally in
 .Nm Ns .
 The index is then of use when dealing with stupid servers which use
@@ -270,7 +308,8 @@
 may be used as an alternative.
 .It lassocations
 Obtain and print a list of association identifiers and peer statuses
-for all associations for which the server is maintaining state. This
+for all associations for which the server is maintaining state.
+This
 command differs from the
 .Em associations
 command only for servers
@@ -283,19 +322,23 @@
 .Em lassociations Ns .
 .It passociations
 Print association data concerning in\-spec peers from the internally
-cached list of associations. This command performs identically to the
+cached list of associations.
+This command performs identically to the
 .Em associations
 except that it displays the internally stored
 data rather than making a new query.
 .It lpassociations
 Print data for all associations, including out\-of\-spec client
-associations, from the internally cached list of associations. This
+associations, from the internally cached list of associations.
+This
 command differs from
 .Em passociations
 only when dealing with fuzzballs.
 .It pstatus Ar assocID
-Send a read status request to the server for the given association. The
-names and values of the peer variables returned will be printed. Note
+Send a read status request to the server for the given association.
+The
+names and values of the peer variables returned will be printed.
+Note
 that the status word from the header is displayed preceding the
 variables, both in hexadecimal and in pidgin English.
 .It Xo readvar
@@ -305,10 +348,12 @@
 .Op ,...]
 .Xc
 Request that the values of the specified variables be returned by the
-server by sending a read variables request. If the association ID is
+server by sending a read variables request.
+If the association ID is
 omitted or is given as zero the variables are system variables,
 otherwise they are peer variables and the values returned will be those
-of the corresponding peer. Omitting the variable list will send a
+of the corresponding peer.
+Omitting the variable list will send a
 request with no data which should induce the server to return a default
 display.
 .It Xo rv
@@ -331,9 +376,12 @@
 request, except the specified variables are written instead of read.
 .It readlist Op Ar assocID
 Request that the values of the variables in the internal variable list
-be returned by the server. If the association ID is omitted or is 0 the
-variables are assumed to be system variables. Otherwise they are treated
-as peer variables. If the internal variable list is empty a request is
+be returned by the server.
+If the association ID is omitted or is 0 the
+variables are assumed to be system variables.
+Otherwise they are treated
+as peer variables.
+If the internal variable list is empty a request is
 sent without data, which should induce the remote server to return a
 default display.
 .It rl Op Ar assocID
@@ -353,7 +401,8 @@
 Like the
 .Em readvar
 command except the query is done for each of a range of (nonzero)
-association IDs. This range is determined from the association list
+association IDs.
+This range is determined from the association list
 cached by the most recent
 .Em associations
 command.
@@ -370,7 +419,8 @@
 Like the
 .Em readlist
 command except the query is done for each of a range of (nonzero)
-association IDs. This range is determined from the association list
+association IDs.
+This range is determined from the association list
 cached by the most recent
 .Em associations
 command.
@@ -384,16 +434,20 @@
 .Op = Ns Aq value Ns
 .Op ,...]
 .Xc
-Request that a list of the server's clock variables be sent. Servers
+Request that a list of the server's clock variables be sent.
+Servers
 which have a radio clock or other external synchronization will respond
-positively to this. If the association identifier is omitted or zero the
+positively to this.
+If the association identifier is omitted or zero the
 request is for the variables of the
 .Qq system clock
 and will
-generally get a positive response from all servers with a clock. If the
+generally get a positive response from all servers with a clock.
+If the
 server treats clocks as pseudo\-peers, and hence can possibly have more
 than one clock connected at once, referencing the appropriate peer
-association ID will show the variables of a particular clock. Omitting
+association ID will show the variables of a particular clock.
+Omitting
 the variable list will cause the server to return a default variable
 display.
 .It Xo cv
@@ -407,7 +461,8 @@
 command.
 .It peers
 Obtain a list of in\-spec peers of the server, along with a summary of
-each peer's state. Summary information includes the address of the
+each peer's state.
+Summary information includes the address of the
 remote peer, the reference ID (0.0.0.0 if the refID is unknown), the
 stratum of the remote peer, the type of the peer (local, unicast,
 multicast or broadcast), when the last packet was received, the polling
@@ -416,7 +471,8 @@
 seconds.
 .Pp
 The character in the left margin indicates the fate of this peer in the
-clock selection process. The codes mean: <sp> discarded due to high
+clock selection process.
+The codes mean: <sp> discarded due to high
 stratum and/or failed sanity checks;
 .Qq x
 designated falsticker
@@ -444,7 +500,8 @@
 gets it may fail to work from time to time with servers which poorly
 control the data formats.
 .Pp
-The contents of the host field may be one of four forms. It may be a
+The contents of the host field may be one of four forms.
+It may be a
 host name, an IP address, a reference clock implementation name with its
 parameter or
 .Qq REFCLK(<implementation number>, <parameter>) .
@@ -455,7 +512,8 @@
 Like
 .Em peers ,
 except a summary of all associations for which the server is maintaining
-state is printed. This can produce a much longer list of peers from
+state is printed.
+This can produce a much longer list of peers from
 fuzzball servers.
 .It opeers
 An old form of the
@@ -475,6 +533,7 @@
 command.
 .Pp
 The timeout time is a fixed constant, which means you wait a long time
-for time outs since it assumes sort of a worst case. The program should
+for time outs since it assumes sort of a worst case.
+The program should
 improve the time out estimate as it sends queries to a particular host,
 but doesn't.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/pam_radius.8 man8/pam_radius.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/pam_radius.8	Mon Dec 20 14:44:31 1999
+++ man8/pam_radius.8	Wed Jun 14 10:01:47 2000
@@ -36,7 +36,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.8,v 1.1.2.2 1999/08/29 14:57:23 peter Exp %
+.\" %FreeBSD: src/lib/libpam/modules/pam_radius/pam_radius.8,v 1.1.2.3 2000/03/03 14:59:40 sheldonh Exp %
 .\"
 .Dd August 2, 1999
 .Dt pam_radius 8
@@ -85,7 +85,8 @@
 specifies a user whose
 .Xr passwd 5
 entry will be used as a template to create the session environment
-if the supplied username doesn't exist in local password database. The user
+if the supplied username doesn't exist in local password database.
+The user
 will be authenticated with the supplied username and password, but his
 credentials to the system will be presented as the ones for
 .Ar username ,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/pccardd.8 man8/pccardd.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/pccardd.8	Mon Dec 20 14:52:49 1999
+++ man8/pccardd.8	Wed Jun 14 10:07:50 2000
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/pccard/pccardd/pccardd.8,v 1.10.2.4 1999/08/29 15:44:45 peter Exp %
+.\" %FreeBSD: src/usr.sbin/pccard/pccardd/pccardd.8,v 1.10.2.5 2000/03/06 11:36:37 sheldonh Exp %
 .\"
 .Dd November 1, 1994
 .Dt PCCARDD 8
@@ -82,7 +82,8 @@
 If the attach succeeds, then specific shell commands
 may be executed to configure the device, such as
 .Xr ifconfig 8
-to set up a network interface. Separate commands may be specified
+to set up a network interface.
+Separate commands may be specified
 for each card, driver or device, and are executed in that order.
 .El
 .Pp
@@ -91,7 +92,8 @@
 detects that a card has been removed, the following sequence occurs:
 .Bl -enum
 .It
-The shell commands associated with card removal are executed. These
+The shell commands associated with card removal are executed.
+These
 are intended to reset any device associated with the removed card.
 Separate commands may exist for card, driver and device instances.
 .It
@@ -100,15 +102,18 @@
 .Pp
 Once a card/driver instance is configured, the resources
 bound to that instance are remembered, and if the card is removed
-and reinserted, the same driver is allocated. The primary reason
+and reinserted, the same driver is allocated.
+The primary reason
 is that once a driver is associated with a card, the
 driver's
 .Fn probe
 routine has been called, and this usually causes driver specific
 data areas to be initialized with the I/O ports or memory resources
-allocated to the card. Most drivers are not designed to be
+allocated to the card.
+Most drivers are not designed to be
 disassociated from the hardware and then reassociated with different
-parameters. This will change significantly when loadable kernel
+parameters.
+This will change significantly when loadable kernel
 modules are supported.
 .Pp
 The start options understood by
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/pciconf.8 man8/pciconf.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/pciconf.8	Mon Dec 20 14:52:49 1999
+++ man8/pciconf.8	Wed Jun 14 10:07:50 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.sbin/pciconf/pciconf.8,v 1.4.2.2 1999/08/29 15:44:50 peter Exp %
+.\" %FreeBSD: src/usr.sbin/pciconf/pciconf.8,v 1.4.2.3 2000/03/06 11:36:39 sheldonh Exp %
 .\" Copyright (c) 1997
 .\"	Stefan Esser <se@freebsd.org>. All rights reserved.
 .\"
@@ -71,16 +71,19 @@
 The third column gives the contents of the subvendorid register, introduced 
 in revision 2.1 of the 
 .Tn PCI
-standard. It is 0 for most current (2.0)
+standard.
+It is 0 for most current (2.0)
 .Tn PCI
 cards, but is supposed to be loaded with a unique card identification code
 in newly developed 
 .Tn PCI 
-cards. The field consists of the card ID in the upper
+cards.
+The field consists of the card ID in the upper
 half and the card vendor ID in the lower half of the value.
 .Pp
 The fourth column contains the chip device ID, which identifies the chip 
-this card is based on. It consists of two fields, identifying the chip and 
+this card is based on.
+It consists of two fields, identifying the chip and 
 its vendor, as above.
 The fifth column prints the chip's revision.
 The sixth column describes the header type. 
@@ -88,7 +91,8 @@
 .Tn PCI
 to
 .Tn PCI
-bridges, and 1 for such bridge chips. If the most significant bit
+bridges, and 1 for such bridge chips.
+If the most significant bit
 of the header type register is set for 
 function 0 of a 
 .Tn PCI 
@@ -185,7 +189,8 @@
 .Fl a
 and
 .Fl r
-options. But only root will be able to execute a 
+options.
+But only root will be able to execute a 
 .Nm kldload
 to provide the device with a driver KLD, and reading of configuration space
 registers may cause a failure in badly designed 
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/ping.8 man8/ping.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/ping.8	Mon Dec 20 14:49:20 1999
+++ man8/ping.8	Wed Jun 14 10:05:12 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ping.8	8.2 (Berkeley) 12/11/93
-.\" %FreeBSD: src/sbin/ping/ping.8,v 1.19.2.2 1999/08/29 15:15:07 peter Exp %
+.\" %FreeBSD: src/sbin/ping/ping.8,v 1.19.2.3 2000/03/03 15:13:10 sheldonh Exp %
 .\"
 .Dd March 1, 1997
 .Dt PING 8
@@ -77,9 +77,11 @@
 bytes used to fill out the packet.  The options are as follows:
 .Bl -tag -width indent
 .It Fl a
-Audible. Include a bell
+Audible.
+Include a bell
 .Pq ASCII 0x07
-character in the output when any packet is received. This option is ignored
+character in the output when any packet is received.
+This option is ignored
 if other format options are present.
 .It Fl c Ar count
 Stop after sending
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/portmap.8 man8/portmap.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/portmap.8	Mon Dec 20 14:52:51 1999
+++ man8/portmap.8	Wed Jun 14 10:07:53 2000
@@ -31,6 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)portmap.8	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.sbin/portmap/portmap.8,v 1.4.2.1 2000/03/03 00:16:14 cwt Exp %
 .\"
 .Dd June 6, 1993
 .Dt PORTMAP 8
@@ -80,6 +81,12 @@
 .Tn RPC
 servers are invoked.
 .Pp
+.Nm Portmap
+uses
+.Xr hosts_access 5 
+access control by default.  
+Access control patterns may only reference IP addresses.
+.Pp
 Normally
 .Nm
 forks and dissociates itself from the terminal
@@ -97,9 +104,10 @@
 and causes errors and debugging information
 to be printed to the standard error output.
 .It Fl v
-Enable verbose logging access control checks.
+Enable verbose logging of access control checks.
 .El
 .Sh SEE ALSO
+.Xr hosts_access 5 ,
 .Xr inetd.conf 5 ,
 .Xr inetd 8 ,
 .Xr rpcinfo 8
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/ppp.8 man8/ppp.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/ppp.8	Mon Dec 20 16:00:39 1999
+++ man8/ppp.8	Wed Jun 14 10:23:49 2000
@@ -1,11 +1,11 @@
-.\" %FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.142.2.16 1999/11/19 23:48:01 brian Exp %
+.\" %FreeBSD: src/usr.sbin/ppp/ppp.8,v 1.142.2.21 2000/06/12 09:07:40 brian Exp %
 .Dd 20 September 1995
 .nr XX \w'\fC00'
 .Os FreeBSD
 .Dt PPP 8
 .Sh NAME
 .Nm ppp
-.Nd Point to Point Protocol (a.k.a. user-ppp) 
+.Nd Point to Point Protocol (a.k.a. user-ppp)
 .Sh SYNOPSIS
 .Nm
 .Op Fl Va mode
@@ -17,7 +17,8 @@
 .Sh DESCRIPTION
 This is a user process
 .Em PPP
-software package.  Normally,
+software package.
+Normally,
 .Em PPP
 is implemented as a part of the kernel (e.g. as managed by
 .Xr pppd 8 )
@@ -34,11 +35,13 @@
 flag for backwards compatability) does the equivalent of a
 .Dq nat enable yes ,
 enabling
-.Nm ppp Ns No s
-network address translation features.  This allows
-.Nm ppp
-to act as a NAT or masquerading engine for all machines on an internal 
-LAN.  Refer to
+.Nm Ns No 's
+network address translation features.
+This allows
+.Nm
+to act as a NAT or masquerading engine for all machines on an internal
+LAN.
+Refer to
 .Xr libalias 3
 for details.
 .Pp
@@ -61,7 +64,8 @@
 .Ar N ,
 and keep trying to open a tunnel device by incrementing the value of
 .Ar N
-by one each time until it succeeds.  If it fails three times in a row
+by one each time until it succeeds.
+If it fails three times in a row
 because the device file is missing, it gives up.
 .Pp
 The following
@@ -75,11 +79,12 @@
 The link isn't brought up until outgoing data is detected on the tun
 interface at which point
 .Nm
-attempts to bring up the link.  Packets received (including the first one)
-while
+attempts to bring up the link.
+Packets received (including the first one) while
 .Nm
 is trying to bring the link up will remain queued for a default of
-2 minutes.  See the
+2 minutes.
+See the
 .Dq set choked
 command below.
 .Pp
@@ -90,9 +95,11 @@
 must be given on the command line (see below) and a
 .Dq set ifaddr
 must be done in the system profile that specifies a peer IP address to
-use when configuring the interface.  Something like
+use when configuring the interface.
+Something like
 .Dq 10.0.0.1/0
-is usually appropriate.  See the
+is usually appropriate.
+See the
 .Dq pmdemand
 system in
 .Pa /usr/share/examples/ppp/ppp.conf.sample
@@ -100,20 +107,22 @@
 .It Fl background
 Here,
 .Nm
-attempts to establish a connection with the peer immediately.  If it
-succeeds,
+attempts to establish a connection with the peer immediately.
+If it succeeds,
 .Nm
 goes into the background and the parent process returns an exit code
-of 0.  If it fails,
+of 0.
+If it fails,
 .Nm
 exits with a non-zero result.
 .It Fl foreground
 In foreground mode,
 .Nm
 attempts to establish a connection with the peer immediately, but never
-becomes a daemon.  The link is created in background mode.  This is useful
-if you wish to control
-.Nm ppp Ns No s
+becomes a daemon.
+The link is created in background mode.
+This is useful if you wish to control
+.Nm Ns No 's
 invocation from another process.
 .It Fl direct
 This is used for receiving incoming connections.
@@ -161,16 +170,17 @@
 .It Provides an interactive user interface.
 Using its command mode, the user can
 easily enter commands to establish the connection with the remote end, check
-the status of connection and close the connection.  All functions can
-also be optionally password protected for security.
+the status of connection and close the connection.
+All functions can also be optionally password protected for security.
 .It Supports both manual and automatic dialing.
 Interactive mode has a
 .Dq term
-command which enables you to talk to the device directly.  When you
-are connected to the remote peer and it starts to talk
+command which enables you to talk to the device directly.
+When you are connected to the remote peer and it starts to talk
 .Em PPP ,
 .Nm
-detects it and switches to packet mode automatically.  Once you have
+detects it and switches to packet mode automatically.
+Once you have
 determined the proper sequence for connecting with the remote host, you
 can write a chat script to define the necessary dialing and login
 procedure for later convenience.
@@ -181,23 +191,27 @@
 .Nm
 will act as a daemon and wait for a packet to be sent over the
 .Em PPP
-link.  When this happens, the daemon automatically dials and establishes the
+link.
+When this happens, the daemon automatically dials and establishes the
 connection.
 In almost the same manner
 .Fl ddial
 mode (direct-dial mode) also automatically dials and establishes the
-connection.  However, it differs in that it will dial the remote site
+connection.
+However, it differs in that it will dial the remote site
 any time it detects the link is down, even if there are no packets to be
-sent.  This mode is useful for full-time connections where we worry less
+sent.
+This mode is useful for full-time connections where we worry less
 about line charges and more about being connected full time.
 A third
 .Fl dedicated
-mode is also available.  This mode is targeted at a dedicated link
-between two machines.
+mode is also available.
+This mode is targeted at a dedicated link between two machines.
 .Nm
 will never voluntarily quit from dedicated mode - you must send it the
 .Dq quit all
-command via its diagnostic socket.  A
+command via its diagnostic socket.
+A
 .Dv SIGHUP
 will force an LCP renegotiation, and a
 .Dv SIGTERM
@@ -208,16 +222,19 @@
 CallBack Control Protocol (ftp://ftp.microsoft.com/developr/rfc/cbcp.txt).
 .It Supports NAT or packet aliasing.
 Packet aliasing (a.k.a. IP masquerading) allows computers on a
-private, unregistered network to access the Internet.  The
+private, unregistered network to access the Internet.
+The
 .Em PPP
-host acts as a masquerading gateway.  IP addresses as well as TCP and
+host acts as a masquerading gateway.
+IP addresses as well as TCP and
 UDP port numbers are aliased for outgoing packets and de-aliased for
 returning packets.
 .It Supports background PPP connections.
 In background mode, if
 .Nm
 successfully establishes the connection, it will become a daemon.
-Otherwise, it will exit with an error.  This allows the setup of
+Otherwise, it will exit with an error.
+This allows the setup of
 scripts that wish to execute certain commands only if the connection
 is successfully established.
 .It Supports server-side PPP connections.
@@ -231,8 +248,8 @@
 .Xr login 1
 procedure, and use the
 .Em PPP
-protocol for authentication instead.  If the peer requests Microsoft
-CHAP authentication and
+protocol for authentication instead.
+If the peer requests Microsoft CHAP authentication and
 .Nm
 is compiled with DES support, an appropriate MD4/DES response will be
 made.
@@ -246,7 +263,8 @@
 .Em \&S Ns No ervice
 allows authentication information to be stored in a central or
 distributed database along with various per-user framed connection
-characteristics.  If
+characteristics.
+If
 .Pa libradius
 is available at compile time,
 .Nm
@@ -256,7 +274,8 @@
 .It Supports Proxy Arp.
 .Nm
 can be configured to make one or more proxy arp entries on behalf of
-the peer.  This allows routing from the peer to the LAN without
+the peer.
+This allows routing from the peer to the LAN without
 configuring each machine on that LAN.
 .It Supports packet filtering.
 User can define four kinds of filters: the
@@ -282,7 +301,8 @@
 .Xc
 .Nm
 will open a TCP or UDP connection for transporting data rather than using a
-conventional serial device.  UDP connections force
+conventional serial device.
+UDP connections force
 .Nm
 into synchronous mode.
 .It Supports PPP over ISDN.
@@ -318,8 +338,8 @@
 While this is generally a good thing in most other situations, this
 higher speed data imposes a penalty on the system by increasing the
 number of serial interrupts the system has to process in talking to the
-modem and also increases latency.  Unlike VJ-compression, Predictor-1 and
-DEFLATE compression pre-compresses
+modem and also increases latency.
+Unlike VJ-compression, Predictor-1 and DEFLATE compression pre-compresses
 .Em all
 network traffic flowing through the link, thus reducing overheads to a
 minimum.
@@ -327,7 +347,7 @@
 Name Server Addresses and NetBIOS Name Server Addresses can be negotiated
 with clients using the Microsoft
 .Em PPP
-stack (ie. Win95, WinNT)
+stack (i.e., Win95, WinNT)
 .It Supports Multi-link PPP (rfc 1990)
 It is possible to configure
 .Nm
@@ -342,18 +362,18 @@
 .Dv network ,
 with permissions
 .Dv 04554 .
-By default, 
+By default,
 .Nm
-will not run if the invoking user id is not zero.  This may be overridden
-by using the
+will not run if the invoking user id is not zero.
+This may be overridden by using the
 .Dq allow users
 command in
 .Pa /etc/ppp/ppp.conf .
 When running as a normal user,
 .Nm
 switches to user id 0 in order to alter the system routing table, set up
-system lock files and read the ppp configuration files.  All
-external commands (executed via the "shell" or "!bg" commands) are executed
+system lock files and read the ppp configuration files.
+All external commands (executed via the "shell" or "!bg" commands) are executed
 as the user id that invoked
 .Nm ppp .
 Refer to the
@@ -367,7 +387,8 @@
 .Bl -bullet
 .It
 Your kernel must include a tunnel device (the GENERIC kernel includes
-one by default).  If it doesn't, or if you require more than one tun
+one by default).
+If it doesn't, or if you require more than one tun
 interface, you'll need to rebuild your kernel with the following line in
 your kernel configuration file:
 .Pp
@@ -394,21 +415,22 @@
 .Dq network
 in the
 .Pa /etc/group
-file and that that group contains the names of all users expected to use
+file and that the group contains the names of all users expected to use
 .Nm ppp .
 Refer to the
 .Xr group 5
-manual page for details.  Each of these users must also be given access
-using the
+manual page for details.
+Each of these users must also be given access using the
 .Dq allow users
 command in
 .Pa /etc/ppp/ppp.conf .
 .It
 Create a log file.
 .Nm
-uses 
+uses
 .Xr syslog 3
-to log information.  A common log file name is
+to log information.
+A common log file name is
 .Pa /var/log/ppp.log .
 To make output go to this file, put the following lines in the
 .Pa /etc/syslog.conf
@@ -443,7 +465,7 @@
 .Pa /etc/syslog.conf .
 .It
 Although not strictly relevant to
-.Nm ppp Ns No s
+.Nm Ns No 's
 operation, you should configure your resolver so that it works correctly.
 This can be done by configuring a local DNS
 .Pq using Xr named 8
@@ -460,9 +482,12 @@
 can be configured to ask the peer for the nameserver address(es) and to
 update
 .Pa /etc/resolv.conf
-automatically.  Refer to the
+automatically.
+Refer to the
 .Dq enable dns
-command below for details.
+and
+.Dq resolv
+commands below for details.
 .El
 .Sh MANUAL DIALING
 In the following examples, we assume that your machine name is
@@ -478,10 +503,11 @@
 .Pp
 The
 .Sq ON
-part of your prompt should always be in upper case.  If it is in lower
-case, it means that you must supply a password using the
+part of your prompt should always be in upper case.
+If it is in lower case, it means that you must supply a password using the
 .Dq passwd
-command.  This only ever happens if you connect to a running version of
+command.
+This only ever happens if you connect to a running version of
 .Nm
 and have not authenticated yourself using the correct password.
 .Pp
@@ -491,13 +517,15 @@
 ppp ON awfulhak> set speed 38400
 .Ed
 .Pp
-Normally, hardware flow control (CTS/RTS) is used.  However, under
+Normally, hardware flow control (CTS/RTS) is used.
+However, under
 certain circumstances (as may happen when you are connected directly
 to certain PPP-capable terminal servers), this may result in
 .Nm
 hanging as soon as it tries to write data to your communications link
 as it is waiting for the CTS (clear to send) signal - which will never
-come.  Thus, if you have a direct line and can't seem to make a
+come.
+Thus, if you have a direct line and can't seem to make a
 connection, try turning CTS/RTS off with
 .Dq set ctsrts off .
 If you need to do this, check the
@@ -508,22 +536,25 @@
 Usually, parity is set to
 .Dq none ,
 and this is
-.Nm ppp Ns No s
-default.  Parity is a rather archaic error checking mechanism that is no
+.Nm Ns No 's
+default.
+Parity is a rather archaic error checking mechanism that is no
 longer used because modern modems do their own error checking, and most
 link-layer protocols (that's what
 .Nm
-is) use much more reliable checking mechanisms.  Parity has a relatively
+is) use much more reliable checking mechanisms.
+Parity has a relatively
 huge overhead (a 12.5% increase in traffic) and as a result, it is always
 disabled
 .Pq set to Dq none
 when
 .Dv PPP
-is opened.  However, some ISPs (Internet Service Providers) may use
+is opened.
+However, some ISPs (Internet Service Providers) may use
 specific parity settings at connection time (before
 .Dv PPP
-is opened).  Notably, Compuserve insist
-on even parity when logging in:
+is opened).
+Notably, Compuserve insist on even parity when logging in:
 .Bd -literal -offset indent
 ppp ON awfulhak> set parity even
 .Ed
@@ -546,7 +577,7 @@
 Connect time: 0 secs
 0 octets in, 0 octets out
 Overall 0 bytes/sec
-ppp ON awfulhak> 
+ppp ON awfulhak>
 .Ed
 .Pp
 The term command can now be used to talk directly to the device:
@@ -573,7 +604,8 @@
 .Ed
 .Pp
 If it does not, it's probable that the peer is waiting for your end to
-start negotiating.  To force
+start negotiating.
+To force
 .Nm
 to start sending
 .Em PPP
@@ -583,7 +615,8 @@
 .Pp
 If you never even receive a login prompt, it is quite likely that the
 peer wants to use PAP or CHAP authentication instead of using Unix-style
-login/password authentication.  To set things up properly, drop back to
+login/password authentication.
+To set things up properly, drop back to
 the prompt and set your authentication name and key, then reconnect:
 .Bd -literal -offset indent
 ~.
@@ -605,23 +638,28 @@
 PPP ON awfulhak>               # We've agreed IP numbers
 .Ed
 .Pp
-You are now connected!  Note that
+You are now connected!
+Note that
 .Sq PPP
 in the prompt has changed to capital letters to indicate that you have
-a peer connection.  If only some of the three Ps go uppercase, wait until
-either everything is uppercase or lowercase.  If they revert to lowercase,
-it means that
+a peer connection.
+If only some of the three Ps go uppercase, wait until
+either everything is uppercase or lowercase.
+If they revert to lowercase, it means that
 .Nm
-couldn't successfully negotiate with the peer.  A good first step
-for troubleshooting at this point would be to
+couldn't successfully negotiate with the peer.
+A good first step for troubleshooting at this point would be to
 .Bd -literal -offset indent
 ppp ON awfulhak> set log local phase lcp ipcp
 .Ed
 .Pp
-and try again.  Refer to the
+and try again.
+Refer to the
 .Dq set log
-command description below for further details.  If things fail at this point,
-it is quite important that you turn logging on and try again.  It is also
+command description below for further details.
+If things fail at this point,
+it is quite important that you turn logging on and try again.
+It is also
 important that you note any prompt changes and report them to anyone trying
 to help you.
 .Pp
@@ -642,9 +680,11 @@
 * Logical (high level) connection related information is shown here *
 .Ed
 .Pp
-At this point, your machine has a host route to the peer.  This means
+At this point, your machine has a host route to the peer.
+This means
 that you can only make a connection with the host on the other side
-of the link.  If you want to add a default route entry (telling your
+of the link.
+If you want to add a default route entry (telling your
 machine to send all packets without another routing entry to the other
 side of the
 .Em PPP
@@ -670,8 +710,8 @@
 will update your default route accordingly.
 .Pp
 You can now use your network applications (ping, telnet, ftp etc.)
-in other windows or terminals on your machine.  If you wish to reuse
-the current terminal, you can put
+in other windows or terminals on your machine.
+If you wish to reuse the current terminal, you can put
 .Nm
 into the background using your standard shell suspend and background
 commands (usually
@@ -694,12 +734,13 @@
 .It
 A line starting with a
 .Pq Dq #
-character is treated as a comment line.  Leading whitespace are ignored
-when identifying comment lines.
+character is treated as a comment line.
+Leading whitespace are ignored when identifying comment lines.
 .It
 An inclusion is a line beginning with the word
 .Sq !include .
-It must have one argument - the file to include.  You may wish to
+It must have one argument - the file to include.
+You may wish to
 .Dq !include ~/.ppp.conf
 for compatibility with older versions of
 .Nm ppp .
@@ -715,7 +756,9 @@
 .Pa /etc/ppp/ppp.conf
 file should consist of at least a
 .Dq default
-section.  This section is always executed.  It should also contain
+section.
+This section is always executed.
+It should also contain
 one or more sections, named according to their purpose, for example,
 .Dq MyISP
 would represent your ISP, and
@@ -728,12 +771,13 @@
 Commands associated with the
 .Dq default
 label are executed, followed by those associated with the destination
-label provided.  When
+label provided.
+When
 .Nm
 is started with no arguments, the
 .Dq default
-section is still executed.  The load command can be used to manually
-load a section from the
+section is still executed.
+The load command can be used to manually load a section from the
 .Pa /etc/ppp/ppp.conf
 file:
 .Bd -literal -offset indent
@@ -745,8 +789,10 @@
 after a section is loaded, whether it's the result of passing a label on
 the command line or using the
 .Dq load
-command.  Only the commands specified for that label in the configuration
-file are executed.  However, when invoking
+command.
+Only the commands specified for that label in the configuration
+file are executed.
+However, when invoking
 .Nm
 with the
 .Fl background ,
@@ -755,7 +801,8 @@
 .Fl dedicated
 switches, the link mode tells
 .Nm
-to establish a connection.  Refer to the
+to establish a connection.
+Refer to the
 .Dq set mode
 command below for further details.
 .Pp
@@ -774,9 +821,11 @@
 .Pp
 The Ppp prompt indicates that
 .Nm
-has entered the authentication phase.  The PPp prompt indicates that
+has entered the authentication phase.
+The PPp prompt indicates that
 .Nm
-has entered the network phase.  The PPP prompt indicates that
+has entered the network phase.
+The PPP prompt indicates that
 .Nm
 has successfully negotiated a network layer protocol and is in
 a usable state.
@@ -786,7 +835,8 @@
 file is available, its contents are executed
 when the
 .Em PPP
-connection is established.  See the provided
+connection is established.
+See the provided
 .Dq pmdemand
 example in
 .Pa /usr/share/examples/ppp/ppp.conf.sample
@@ -795,10 +845,11 @@
 .Dq shell
 and
 .Dq bg
-commands below for a description of possible substitution strings).  Similarly,
-when a connection is closed, the contents of the
+commands below for a description of possible substitution strings).
+Similarly, when a connection is closed, the contents of the
 .Pa /etc/ppp/ppp.linkdown
-file are executed.  Both of these files have the same format as
+file are executed.
+Both of these files have the same format as
 .Pa /etc/ppp/ppp.conf .
 .Pp
 In previous versions of
@@ -832,9 +883,10 @@
 .Fl background
 is specified,
 .Nm
-attempts to establish the connection immediately.  If multiple phone
-numbers are specified, each phone number will be tried once.  If the
-attempt fails,
+attempts to establish the connection immediately.
+If multiple phone
+numbers are specified, each phone number will be tried once.
+If the attempt fails,
 .Nm
 exits immediately with a non-zero exit code.
 If it succeeds, then
@@ -849,11 +901,14 @@
 .Fl auto
 or
 .Fl ddial
-options.  You must also specify the destination label in
+options.
+You must also specify the destination label in
 .Pa /etc/ppp/ppp.conf
-to use.  It must contain the
+to use.
+It must contain the
 .Dq set ifaddr
-command to define the remote peers IP address. (refer to
+command to define the remote peers IP address.
+(refer to
 .Pa /usr/share/examples/ppp/ppp.conf.sample )
 .Bd -literal -offset indent
 # ppp -auto pmdemand
@@ -883,7 +938,8 @@
 .Dq show who
 command lists users that are currently connected to
 .Nm
-itself.  If the diagnostic socket is closed or changed to a different
+itself.
+If the diagnostic socket is closed or changed to a different
 socket, all connections are immediately dropped.
 .Pp
 In
@@ -891,7 +947,8 @@
 mode, when an outgoing packet is detected,
 .Nm
 will perform the dialing action (chat script) and try to connect
-with the peer.  In
+with the peer.
+In
 .Fl ddial
 mode, the dialing action is performed any time the line is found
 to be down.
@@ -911,16 +968,18 @@
 .Bl -tag -width attempts -compact
 .It Ar secs
 is the number of seconds to wait before attempting
-to connect again. If the argument is the literal string
+to connect again.
+If the argument is the literal string
 .Sq Li random ,
 the delay period is a random value between 1 and 30 seconds inclusive.
 .It Ar inc
 is the number of seconds that
 .Ar secs
-should be incremented each time a new dial attempt is made.  The timeout
-reverts to
+should be incremented each time a new dial attempt is made.
+The timeout reverts to
 .Ar secs
-only after a successful connection is established.  The default value for
+only after a successful connection is established.
+The default value for
 .Ar inc
 is zero.
 .It Ar max
@@ -935,14 +994,16 @@
 is the number of seconds to wait before attempting
 to dial the next number in a list of numbers (see the
 .Dq set phone
-command).  The default is 3 seconds.  Again, if the argument is the literal
-string
+command).
+The default is 3 seconds.
+Again, if the argument is the literal string
 .Sq Li random ,
 the delay period is a random value between 1 and 30 seconds.
 .It Ar attempts
 is the maximum number of times to try to connect for each outgoing packet
-that triggers a dial.  The previous value is unchanged if this parameter
-is omitted.  If a value of zero is specified for
+that triggers a dial.
+The previous value is unchanged if this parameter is omitted.
+If a value of zero is specified for
 .Ar attempts ,
 .Nm
 will keep trying until a connection is made.
@@ -955,7 +1016,8 @@
 .Pp
 will attempt to connect 4 times for each outgoing packet that causes
 a dial attempt with a 3 second delay between each number and a 10 second
-delay after all numbers have been tried.  If multiple phone numbers
+delay after all numbers have been tried.
+If multiple phone numbers
 are specified, the total number of attempts is still 4 (it does not
 attempt each number 4 times).
 .Pp
@@ -967,11 +1029,14 @@
 .Pp
 tells
 .Nm
-to attempt to connect 20 times.  After the first attempt,
+to attempt to connect 20 times.
+After the first attempt,
 .Nm
-pauses for 10 seconds.  After the next attempt it pauses for 20 seconds
-and so on until after the sixth attempt it pauses for 1 minute.  The next
-14 pauses will also have a duration of one minute.  If
+pauses for 10 seconds.
+After the next attempt it pauses for 20 seconds
+and so on until after the sixth attempt it pauses for 1 minute.
+The next 14 pauses will also have a duration of one minute.
+If
 .Nm
 connects, disconnects and fails to connect again, the timeout starts again
 at 10 seconds.
@@ -980,11 +1045,13 @@
 .Nm
 in
 .Fl auto
-mode on both ends of the link. If each end has the same timeout,
+mode on both ends of the link.
+If each end has the same timeout,
 both ends wind up calling each other at the same time if the link
 drops and both ends have packets queued.
 At some locations, the serial link may not be reliable, and carrier
-may be lost at inappropriate times.  It is possible to have
+may be lost at inappropriate times.
+It is possible to have
 .Nm
 redial should carrier be unexpectedly lost during a session.
 .Bd -literal -offset indent
@@ -997,7 +1064,8 @@
 .Ar ntries
 times on loss of carrier with a pause of
 .Ar timeout
-seconds before each try.  For example,
+seconds before each try.
+For example,
 .Bd -literal -offset indent
 set reconnect 3 5
 .Ed
@@ -1006,24 +1074,28 @@
 .Nm
 that on an unexpected loss of carrier, it should wait
 .Ar 3
-seconds before attempting to reconnect.  This may happen up to
+seconds before attempting to reconnect.
+This may happen up to
 .Ar 5
 times before
 .Nm
-gives up.  The default value of ntries is zero (no reconnect).  Care
-should be taken with this option.  If the local timeout is slightly
+gives up.
+The default value of ntries is zero (no reconnect).
+Care should be taken with this option.
+If the local timeout is slightly
 longer than the remote timeout, the reconnect feature will always be
 triggered (up to the given number of times) after the remote side
 times out and hangs up.
-NOTE:  In this context, losing too many LQRs constitutes a loss of
+NOTE: In this context, losing too many LQRs constitutes a loss of
 carrier and will trigger a reconnect.
 If the
 .Fl background
 flag is specified, all phone numbers are dialed at most once until
-a connection is made.  The next number redial period specified with
-the
+a connection is made.
+The next number redial period specified with the
 .Dq set redial
-command is honoured, as is the reconnect tries value.  If your redial
+command is honoured, as is the reconnect tries value.
+If your redial
 value is less than the number of phone numbers specified, not all
 the specified numbers will be tried.
 To terminate the program, type
@@ -1070,7 +1142,7 @@
 on the port where the modem is attached.
 For example:
 .Pp
-.Dl ttyd1  "/usr/libexec/getty std.38400" dialup on secure
+.Dl ttyd1 "/usr/libexec/getty std.38400" dialup on secure
 .Pp
 Don't forget to send a
 .Dv HUP
@@ -1093,7 +1165,8 @@
 .Pq Fl direct
 lets
 .Nm
-work with stdin and stdout.  You can also use
+work with stdin and stdout.
+You can also use
 .Xr pppctl 8
 to connect to a configured diagnostic port, in the same manner as with
 client-side
@@ -1126,12 +1199,13 @@
 .Dq accept dns
 and
 .Dq set nbns
-commands.  Refer to their descriptions below.
+commands.
+Refer to their descriptions below.
 .El
 .Pp
 .Sh RECEIVING INCOMING PPP CONNECTIONS (Method 2)
 This method differs in that we use
-.Nm ppp
+.Nm
 to authenticate the connection rather than
 .Xr login 1 :
 .Bl -enum
@@ -1182,17 +1256,19 @@
 .Pp
 It is
 .Em VITAL
-that either PAP or CHAP are enabled as above.  If they are not, you are
+that either PAP or CHAP are enabled as above.
+If they are not, you are
 allowing anybody to establish ppp session with your machine
 .Em without
 a password, opening yourself up to all sorts of potential attacks.
 .Sh AUTHENTICATING INCOMING CONNECTIONS
 Normally, the receiver of a connection requires that the peer
-authenticates itself.  This may be done using
+authenticates itself.
+This may be done using
 .Xr login 1 ,
-but alternatively, you can use PAP or CHAP.  CHAP is the more secure
-of the two, but some clients may not support it.  Once you decide which
-you wish to use, add the command
+but alternatively, you can use PAP or CHAP.
+CHAP is the more secure of the two, but some clients may not support it.
+Once you decide which you wish to use, add the command
 .Sq enable chap
 or
 .Sq enable pap
@@ -1201,7 +1277,8 @@
 .Pp
 You must then configure the
 .Pa /etc/ppp/ppp.secret
-file.  This file contains one line per possible client, each line
+file.
+This file contains one line per possible client, each line
 containing up to five fields:
 .Pp
 .Ar name Ar key Oo
@@ -1212,7 +1289,8 @@
 .Ar name
 and
 .Ar key
-specify the client username and password.  If
+specify the client username and password.
+If
 .Ar key
 is
 .Dq \&*
@@ -1220,8 +1298,8 @@
 .Nm
 will look up the password database
 .Pq Xr passwd 5
-when authenticating.  If the client does not offer a suitable
-response based on any
+when authenticating.
+If the client does not offer a suitable response based on any
 .Ar name Ns No / Ns Ar key
 combination in
 .Pa ppp.secret ,
@@ -1230,7 +1308,8 @@
 If authentication is successful,
 .Ar hisaddr
 .Pq if specified
-is used when negotiating IP numbers.  See the
+is used when negotiating IP numbers.
+See the
 .Dq set ifaddr
 command for details.
 .Pp
@@ -1250,14 +1329,16 @@
 .Dq set callback
 has been used in
 .Pa ppp.conf ,
-the client will be called back on the given number.  If CBCP is being used,
+the client will be called back on the given number.
+If CBCP is being used,
 .Ar callback-number
 may also contain a list of numbers or a
 .Dq \&* ,
 as if passed to the
 .Dq set cbcp
-command.  The value will be used in
-.Nm ppp Ns No s
+command.
+The value will be used in
+.Nm Ns No 's
 subsequent CBCP phase.
 .Sh PPP OVER TCP and UDP (a.k.a Tunnelling)
 Instead of running
@@ -1271,13 +1352,15 @@
 Instead of opening a serial device,
 .Nm
 will open a TCP connection to the given machine on the given
-socket.  It should be noted however that
+socket.
+It should be noted however that
 .Nm
 doesn't use the telnet protocol and will be unable to negotiate
-with a telnet server.  You should set up a port for receiving this
+with a telnet server.
+You should set up a port for receiving this
 .Em PPP
-connection on the receiving machine (ui-gate).  This is
-done by first updating
+connection on the receiving machine (ui-gate).
+This is done by first updating
 .Pa /etc/services
 to name the service:
 .Pp
@@ -1309,8 +1392,8 @@
  add 10.0.1.0/24 10.0.4.2
 .Ed
 .Pp
-You may also want to enable PAP or CHAP for security.  To enable PAP, add
-the following line:
+You may also want to enable PAP or CHAP for security.
+To enable PAP, add the following line:
 .Bd -literal -offset indent
  enable PAP
 .Ed
@@ -1370,15 +1453,18 @@
 "guaranteed delivery" mechanisms in place - the underlying TCP
 stream and whatever protocol is used over the
 .Em PPP
-link - probably TCP again.  If packets are lost, both levels will
+link - probably TCP again.
+If packets are lost, both levels will
 get in each others way trying to negotiate sending of the missing
 packet.
 .Pp
 To avoid this overhead, it is also possible to do all this using
 UDP instead of TCP as the transport by simply changing the protocol
-from "tcp" to "udp".  When using UDP as a transport,
+from "tcp" to "udp".
+When using UDP as a transport,
 .Nm
-will operate in synchronous mode.  This is another gain as the incoming
+will operate in synchronous mode.
+This is another gain as the incoming
 data does not have to be rearranged into packets.
 .Pp
 .Sh NETWORK ADDRESS TRANSLATION (PACKET ALIASING)
@@ -1386,11 +1472,12 @@
 .Fl nat
 .Pq \&or Fl alias
 command line option enables network address translation (a.k.a. packet
-aliasing).  This allows the
+aliasing).
+This allows the
 .Nm
 host to act as a masquerading gateway for other computers over
-a local area network.  Outgoing IP packets are aliased so that
-they appear to come from the
+a local area network.
+Outgoing IP packets are aliased so that they appear to come from the
 .Nm
 host, and incoming packets are de-aliased so that they are routed
 to the correct machine on the local area network.
@@ -1400,7 +1487,7 @@
 In general, correct
 .Nm
 operation should first be verified with network address translation disabled.
-Then, the 
+Then, the
 .Fl nat
 option should be switched on, and network applications (web browser,
 .Xr telnet 1 ,
@@ -1409,19 +1496,22 @@
 .Xr traceroute 8 )
 should be checked on the
 .Nm
-host.  Finally, the same or similar applications should be checked on other
+host.
+Finally, the same or similar applications should be checked on other
 computers in the LAN.
 If network applications work correctly on the
 .Nm
 host, but not on other machines in the LAN, then the masquerading
 software is working properly, but the host is either not forwarding
-or possibly receiving IP packets.  Check that IP forwarding is enabled in
+or possibly receiving IP packets.
+Check that IP forwarding is enabled in
 .Pa /etc/rc.conf
 and that other machines have designated the
 .Nm
 host as the gateway for the LAN.
 .Sh PACKET FILTERING
-This implementation supports packet filtering. There are four kinds of
+This implementation supports packet filtering.
+There are four kinds of
 filters; the
 .Em in
 filter, the
@@ -1430,7 +1520,8 @@
 .Em dial
 filter and the
 .Em alive
-filter.  Here are the basics:
+filter.
+Here are the basics:
 .Bl -bullet
 .It
 A filter definition has the following syntax:
@@ -1466,7 +1557,8 @@
 .Sq 0
 and
 .Sq 39
-specifying the rule number.  Rules are specified in numeric order according to
+specifying the rule number.
+Rules are specified in numeric order according to
 .Ar rule-no ,
 but only if rule
 .Sq 0
@@ -1483,7 +1575,8 @@
 can also be specified as
 .Sq clear
 to clear the action associated with that particular rule, or as a new
-rule number greater than the current rule.  In this case, if a given
+rule number greater than the current rule.
+In this case, if a given
 packet matches the current rule, the packet will next be matched against
 the new rule number (rather than the next rule number).
 .Pp
@@ -1498,7 +1591,8 @@
 .Op Ar src_addr Ns Op / Ns Ar width
 and
 .Op Ar dst_addr Ns Op / Ns Ar width
-are the source and destination IP number specifications.  If
+are the source and destination IP number specifications.
+If
 .Op / Ns Ar width
 is specified, it gives the number of relevant netmask bits,
 allowing the specification of an address range.
@@ -1513,9 +1607,10 @@
 .Dv HISADDR
 (refer to the description of the
 .Dq bg
-command for a description of these values).  When these values are used,
-the filters will be updated any time the values change.  This is similar
-to the behaviour of the
+command for a description of these values).
+When these values are used,
+the filters will be updated any time the values change.
+This is similar to the behaviour of the
 .Dq add
 command below.
 .It
@@ -1554,7 +1649,7 @@
 .It
 Each filter can hold up to 40 rules, starting from rule 0.
 The entire rule set is not effective until rule 0 is defined,
-ie. the default is to allow everything through.
+i.e., the default is to allow everything through.
 .It
 If no rule is matched to a packet, that packet will be discarded
 (blocked).
@@ -1576,7 +1671,7 @@
 ppp ON awfulhak> set timeout 600
 .Ed
 .Pp
-The timeout period is measured in seconds, the  default value for which
+The timeout period is measured in seconds, the default value for which
 is 180 seconds
 .Pq or 3 min .
 To disable the idle timer function, use the command
@@ -1588,15 +1683,16 @@
 .Fl ddial
 and
 .Fl dedicated
-modes, the idle timeout is ignored.  In
+modes, the idle timeout is ignored.
+In
 .Fl auto
 mode, when the idle timeout causes the
 .Em PPP
 session to be
 closed, the
 .Nm
-program itself remains running.  Another trigger packet will cause it to
-attempt to re-establish the link.
+program itself remains running.
+Another trigger packet will cause it to attempt to re-establish the link.
 .Sh PREDICTOR-1 and DEFLATE COMPRESSION
 .Nm
 supports both Predictor type 1 and deflate compression.
@@ -1622,26 +1718,32 @@
 .Pp
 By default, when negotiating DEFLATE,
 .Nm
-will use a window size of 15.  Refer to the
+will use a window size of 15.
+Refer to the
 .Dq set deflate
 command if you wish to change this behaviour.
 .Pp
 A special algorithm called DEFLATE24 is also available, and is disabled
-and denied by default.  This is exactly the same as DEFLATE except that
-it uses CCP ID 24 to negotiate.  This allows
+and denied by default.
+This is exactly the same as DEFLATE except that
+it uses CCP ID 24 to negotiate.
+This allows
 .Nm
 to successfully negotiate DEFLATE with
 .Nm pppd
 version 2.3.*.
 .Sh CONTROLLING IP ADDRESS
 .Nm
-uses IPCP to negotiate IP addresses. Each side of the connection
+uses IPCP to negotiate IP addresses.
+Each side of the connection
 specifies the IP address that it's willing to use, and if the requested
 IP address is acceptable then
 .Nm
-returns ACK to the requester.  Otherwise,
+returns ACK to the requester.
+Otherwise,
 .Nm
-returns NAK to suggest that the peer use a different IP address. When
+returns NAK to suggest that the peer use a different IP address.
+When
 both sides of the connection agree to accept the received request (and
 send ACK), IPCP is set to the open state and a network level connection
 is established.
@@ -1676,7 +1778,8 @@
 .Sq src_addr .
 It is only possible to make
 .Sq netmask
-smaller than the default.  The usual value is 255.255.255.255, as
+smaller than the default.
+The usual value is 255.255.255.255, as
 most kernels ignore the netmask of a POINTOPOINT interface.
 .Pp
 Some incorrect
@@ -1686,7 +1789,8 @@
 .Sq src_addr .
 If this is the case,
 .Sq trigger_addr
-may be used to specify this IP number.  This will not affect the
+may be used to specify this IP number.
+This will not affect the
 routing table unless the other side agrees with this proposed number.
 .Bd -literal -offset indent
 set ifaddr 192.244.177.38 192.244.177.2 255.255.255.255 0.0.0.0
@@ -1709,8 +1813,8 @@
 .Pp
 This is all fine when each side has a pre-determined IP address, however
 it is often the case that one side is acting as a server which controls
-all IP addresses and the other side should go along with it.  In order
-to allow more flexible behaviour, the
+all IP addresses and the other side should go along with it.
+In order to allow more flexible behaviour, the
 .Dq set ifaddr
 command allows the user to specify IP addresses more loosely:
 .Pp
@@ -1718,8 +1822,8 @@
 .Pp
 A number followed by a slash
 .Pq Dq /
-represents the number of bits significant in the IP address.  The above
-example means:
+represents the number of bits significant in the IP address.
+The above example means:
 .Pp
 .Bl -bullet -compact
 .It
@@ -1734,8 +1838,8 @@
 192.244.177.2/32.
 .It
 As an exception, 0 is equivalent to 0.0.0.0/0, meaning that I have no
-preferred IP address and will obey the remote peers selection.  When
-using zero, no routing table entries will be made until a connection
+preferred IP address and will obey the remote peers selection.
+When using zero, no routing table entries will be made until a connection
 is established.
 .It
 192.244.177.2/0 means that I'll accept/permit any IP address but I'll
@@ -1748,7 +1852,8 @@
 .It
 Describe your providers phone number(s) in the dial script using the
 .Dq set phone
-command.  This command allows you to set multiple phone numbers for
+command.
+This command allows you to set multiple phone numbers for
 dialing and redialing separated by either a pipe
 .Pq Dq \&|
 or a colon
@@ -1762,22 +1867,29 @@
 .Ed
 .Pp
 Numbers after the first in a pipe-separated list are only used if the
-previous number was used in a failed dial or login script.  Numbers
+previous number was used in a failed dial or login script.
+Numbers
 separated by a colon are used sequentially, irrespective of what happened
-as a result of using the previous number.  For example:
+as a result of using the previous number.
+For example:
 .Bd -literal -offset indent
 set phone "1234567|2345678:3456789|4567890"
 .Ed
 .Pp
-Here, the 1234567 number is attempted.  If the dial or login script fails,
+Here, the 1234567 number is attempted.
+If the dial or login script fails,
 the 2345678 number is used next time, but *only* if the dial or login script
-fails.  On the dial after this, the 3456789 number is used.  The 4567890
-number is only used if the dial or login script using the 3456789 fails.  If
-the login script of the 2345678 number fails, the next number is still the
-3456789 number.  As many pipes and colons can be used as are necessary
+fails.
+On the dial after this, the 3456789 number is used.
+The 4567890
+number is only used if the dial or login script using the 3456789 fails.
+If the login script of the 2345678 number fails, the next number is still the
+3456789 number.
+As many pipes and colons can be used as are necessary
 (although a given site would usually prefer to use either the pipe or the
-colon, but not both).  The next number redial timeout is used between all
-numbers.  When the end of the list is reached, the normal redial period is
+colon, but not both).
+The next number redial timeout is used between all numbers.
+When the end of the list is reached, the normal redial period is
 used before starting at the beginning again.
 The selected phone number is substituted for the \\\\T string in the
 .Dq set dial
@@ -1799,7 +1911,8 @@
 .Dq set dial
 and
 .Dq set login
-commands.  The
+commands.
+The
 .Dq set dial
 command is used to talk to your modem and establish a link with your
 ISP, for example:
@@ -1819,7 +1932,8 @@
 .It
 Send ATZ.
 .It
-Expect OK.  If that's not received within the 4 second timeout, send ATZ
+Expect OK.
+If that's not received within the 4 second timeout, send ATZ
 and expect OK.
 .It
 Send ATDTxxxxxxx where xxxxxxx is the next number in the phone list from
@@ -1830,8 +1944,8 @@
 Wait for the CONNECT string.
 .El
 .Pp
-Once the connection is established, the login script is executed.  This
-script is written in the same style as the dial script, but care should
+Once the connection is established, the login script is executed.
+This script is written in the same style as the dial script, but care should
 be taken to avoid having your password logged:
 .Bd -literal -offset indent
 set authkey MySecret
@@ -1844,7 +1958,8 @@
 .It
 Set the timeout to 15 seconds.
 .It
-Expect "login:".  If it's not received, send a carriage return and expect
+Expect "login:".
+If it's not received, send a carriage return and expect
 "login:" again.
 .It
 Send "awfulhak"
@@ -1864,7 +1979,8 @@
 .Pp
 The
 .Dq set authkey
-command is logged specially.  When
+command is logged specially.
+When
 .Ar command
 or
 .Ar chat
@@ -1872,8 +1988,8 @@
 .Sq ******** Ns
 is logged instead.
 .Pp
-Login scripts vary greatly between ISPs.  If you're setting one up
-for the first time,
+Login scripts vary greatly between ISPs.
+If you're setting one up for the first time,
 .Em ENABLE CHAT LOGGING
 so that you can see if your script is behaving as you expect.
 .It
@@ -1887,11 +2003,16 @@
 set speed 115200
 .Ed
 .Pp
-Cuaa0 is the first serial port on FreeBSD.  If you're running
+Cuaa0 is the first serial port on
+.Fx .
+If you're running
 .Nm
-on OpenBSD, cua00 is the first.  A speed of 115200 should be specified
-if you have a modem capable of bit rates of 28800 or more.  In general,
-the serial speed should be about four times the modem speed.
+on
+.Ox ,
+cua00 is the first.
+A speed of 115200 should be specified
+if you have a modem capable of bit rates of 28800 or more.
+In general, the serial speed should be about four times the modem speed.
 .It
 Use the
 .Dq set ifaddr
@@ -1905,15 +2026,17 @@
 it as your address (src_addr).
 .It
 If your provider assigns your address dynamically, choose a suitably
-unobtrusive and unspecific IP number as your address.  10.0.0.1/0 would
-be appropriate.  The bit after the / specifies how many bits of the
+unobtrusive and unspecific IP number as your address.
+10.0.0.1/0 would be appropriate.
+The bit after the / specifies how many bits of the
 address you consider to be important, so if you wanted to insist on
 something in the class C network 1.2.3.0, you could specify 1.2.3.1/24.
 .It
 If you find that your ISP accepts the first IP number that you suggest,
 specify third and forth arguments of
 .Dq 0.0.0.0 .
-This will force your ISP to assign a number.  (The third argument will
+This will force your ISP to assign a number.
+(The third argument will
 be ignored as it is less restrictive than the default mask for your
 .Sq src_addr .
 .El
@@ -1925,8 +2048,8 @@
 .Ed
 .Pp
 .It
-In most cases, your ISP will also be your default router.  If this is
-the case, add the line
+In most cases, your ISP will also be your default router.
+If this is the case, add the line
 .Bd -literal -offset indent
 add default HISADDR
 .Ed
@@ -1948,7 +2071,8 @@
 .Nm
 required a similar entry in the
 .Pa /etc/ppp/ppp.linkup
-file.  Since the advent of
+file.
+Since the advent of
 .Sq sticky routes ,
 this is no longer required.
 .It
@@ -1972,9 +2096,16 @@
 .Bd -literal -offset indent
 enable dns
 .Ed
+.Pp
 Do
 .Em NOT
-do this if you are running an local DNS, as
+do this if you are running a local DNS unless you also either use
+.Dq resolv readonly
+or have
+.Dq resolv restore
+in
+.Pa /etc/ppp/ppp.linkdown ,
+as
 .Nm
 will simply circumvent its use by entering some nameserver lines in
 .Pa /etc/resolv.conf .
@@ -2014,6 +2145,8 @@
 Log Chat lines containing the string "CONNECT".
 .It Li Debug
 Log debug information.
+.It Li DNS
+Log DNS QUERY packets.
 .It Li HDLC
 Dump HDLC packet in hex.
 .It Li ID0
@@ -2037,7 +2170,8 @@
 .It Li TUN
 Include the tun device on each log line.
 .It Li Warning
-Output to the terminal device.  If there is currently no terminal,
+Output to the terminal device.
+If there is currently no terminal,
 output is sent to the log file using syslogs
 .Dv LOG_WARNING .
 .It Li Error
@@ -2051,18 +2185,19 @@
 .Pp
 The
 .Dq set log
-command allows you to set the logging output level.  Multiple levels
-can be specified on a single command line.  The default is equivalent to
+command allows you to set the logging output level.
+Multiple levels can be specified on a single command line.
+The default is equivalent to
 .Dq set log Phase .
 .Pp
-It is also possible to log directly to the screen.  The syntax is
-the same except that the word
+It is also possible to log directly to the screen.
+The syntax is the same except that the word
 .Dq local
 should immediately follow
 .Dq set log .
 The default is
 .Dq set log local
-(ie. only the un-maskable warning, error and alert output).
+(i.e., only the un-maskable warning, error and alert output).
 .Pp
 If The first argument to
 .Dq set log Op local
@@ -2098,7 +2233,8 @@
 .Bl -tag -width XX
 .It INT
 Receipt of this signal causes the termination of the current connection
-(if any).  This will cause
+(if any).
+This will cause
 .Nm
 to exit unless it is in
 .Fl auto
@@ -2121,29 +2257,32 @@
 .Em PPP
 peer, that peer must also understand the
 .Em MULTI-LINK PPP
-protocol.  Refer to RFC 1990 for specification details.
+protocol.
+Refer to RFC 1990 for specification details.
 .Pp
 The peer is identified using a combination of his
 .Dq endpoint discriminator
 and his
 .Dq authentication id .
-Either or both of these may be specified.  It is recommended that
+Either or both of these may be specified.
+It is recommended that
 at least one is specified, otherwise there is no way of ensuring that
 all links are actually connected to the same peer program, and some
-confusing lock-ups may result.  Locally, these identification variables
-are specified using the
+confusing lock-ups may result.
+Locally, these identification variables are specified using the
 .Dq set enddisc
 and
 .Dq set authname
-commands.  The
+commands.
+The
 .Sq authname
 .Pq and Sq authkey
 must be agreed in advance with the peer.
 .Pp
 Multi-link capabilities are enabled using the
 .Dq set mrru
-command (set maximum reconstructed receive unit).  Once multi-link
-is enabled,
+command (set maximum reconstructed receive unit).
+Once multi-link is enabled,
 .Nm
 will attempt to negotiate a multi-link connection with the peer.
 .Pp
@@ -2153,7 +2292,8 @@
 .Pq called Sq deflink .
 To create more links, the
 .Dq clone
-command is used.  This command will clone existing links, where all
+command is used.
+This command will clone existing links, where all
 characteristics are the same except:
 .Bl -enum
 .It
@@ -2163,7 +2303,8 @@
 .It
 The new link is an
 .Sq interactive
-link.  It's mode may subsequently be changed using the
+link.
+Its mode may subsequently be changed using the
 .Dq set mode
 command.
 .It
@@ -2176,11 +2317,11 @@
 .Dq show links
 command.
 .Pp
-Once a new link has been created, command usage varies.  All link
-specific commands must be prefixed with the
+Once a new link has been created, command usage varies.
+All link specific commands must be prefixed with the
 .Dq link Ar name
-command, specifying on which link the command is to be applied.  When
-only a single link is available,
+command, specifying on which link the command is to be applied.
+When only a single link is available,
 .Nm
 is smart enough not to require the
 .Dq link Ar name
@@ -2189,7 +2330,8 @@
 Some commands can still be used without specifying a link - resulting
 in an operation at the
 .Sq bundle
-level.  For example, once two or more links are available, the command
+level.
+For example, once two or more links are available, the command
 .Dq show ccp
 will show CCP configuration and statistics at the multi-link level, and
 .Dq link deflink show ccp
@@ -2217,8 +2359,9 @@
  link deflink remove
 .Ed
 .Pp
-Note how all cloning is done at the end of the configuration.  Usually,
-the link will be configured first, then cloned.  If you wish all links
+Note how all cloning is done at the end of the configuration.
+Usually, the link will be configured first, then cloned.
+If you wish all links
 to be up all the time, you can add the following line to the end of your
 configuration.
 .Pp
@@ -2257,11 +2400,13 @@
 .Em MULTI-LINK
 mode with the peer, it creates a local domain socket in the
 .Pa /var/run
-directory.  This socket is used to pass link information (including
+directory.
+This socket is used to pass link information (including
 the actual link file descriptor) between different
 .Nm
-invocations.  This facilitates
-.Nm ppp Ns No s
+invocations.
+This facilitates
+.Nm Ns No 's
 ability to be run from a
 .Xr getty 8
 or directly from
@@ -2269,16 +2414,18 @@
 (using the
 .Sq pp=
 capability), without needing to have initial control of the serial
-line.  Once
+line.
+Once
 .Nm
 negotiates multi-link mode, it will pass its open link to any
-already running process.  If there is no already running process,
+already running process.
+If there is no already running process,
 .Nm
 will act as the master, creating the socket and listening for new
 connections.
 .Sh PPP COMMAND LIST
-This section lists the available commands and their effect.  They are
-usable either from an interactive
+This section lists the available commands and their effect.
+They are usable either from an interactive
 .Nm
 session, from a configuration file or from a
 .Xr pppctl 8
@@ -2289,7 +2436,8 @@
 .It accept|deny|enable|disable Ar option....
 These directives tell
 .Nm
-how to negotiate the initial connection with the peer.  Each
+how to negotiate the initial connection with the peer.
+Each
 .Dq option
 has a default of either accept or deny and enable or disable.
 .Dq Accept
@@ -2305,10 +2453,12 @@
 may be one of the following:
 .Bl -tag -width XX
 .It acfcomp
-Default: Enabled and Accepted.  ACFComp stands for Address and Control
-Field Compression.  Non LCP packets will usually have an address
+Default: Enabled and Accepted.
+ACFComp stands for Address and Control Field Compression.
+Non LCP packets will usually have an address
 field of 0xff (the All-Stations address) and a control field of
-0x03 (the Unnumbered Information command).  If this option is
+0x03 (the Unnumbered Information command).
+If this option is
 negotiated, these two bytes are simply not sent, thus minimising
 traffic.
 .Pp
@@ -2316,16 +2466,18 @@
 .Pa rfc1662
 for details.
 .It chap Ns Op \&05
-Default: Disabled and Accepted.  CHAP stands for Challenge Handshake
-Authentication Protocol.  Only one of CHAP and PAP (below) may be
-negotiated.  With CHAP, the authenticator sends a "challenge" message
-to its peer.  The peer uses a one-way hash function to encrypt the
-challenge and sends the result back.  The authenticator does the same,
-and compares the results.  The advantage of this mechanism is that no
+Default: Disabled and Accepted.
+CHAP stands for Challenge Handshake Authentication Protocol.
+Only one of CHAP and PAP (below) may be negotiated.
+With CHAP, the authenticator sends a "challenge" message to its peer.
+The peer uses a one-way hash function to encrypt the
+challenge and sends the result back.
+The authenticator does the same, and compares the results.
+The advantage of this mechanism is that no
 passwords are sent across the connection.
-A challenge is made when the connection is first made.  Subsequent
-challenges may occur.  If you want to have your peer authenticate
-itself, you must
+A challenge is made when the connection is first made.
+Subsequent challenges may occur.
+If you want to have your peer authenticate itself, you must
 .Dq enable chap .
 in
 .Pa /etc/ppp/ppp.conf ,
@@ -2343,12 +2495,15 @@
 Some
 .Em PPP
 implementations use "MS-CHAP" rather than MD5 when encrypting the
-challenge.  MS-CHAP is a combination of MD4 and DES.  If
+challenge.
+MS-CHAP is a combination of MD4 and DES.
+If
 .Nm
 was built on a machine with DES libraries available, it will respond
 to MS-CHAP authentication requests, but will never request them.
 .It deflate
-Default: Enabled and Accepted.  This option decides if deflate
+Default: Enabled and Accepted.
+This option decides if deflate
 compression will be used by the Compression Control Protocol (CCP).
 This is the same algorithm as used by the
 .Xr gzip 1
@@ -2385,16 +2540,20 @@
 and
 .Ar accept Ns No ed .
 .It deflate24
-Default: Disabled and Denied.  This is a variance of the
+Default: Disabled and Denied.
+This is a variance of the
 .Ar deflate
 option, allowing negotiation with the
 .Xr pppd 8
-program.  Refer to the
+program.
+Refer to the
 .Ar deflate
-section above for details.  It is disabled by default as it violates
+section above for details.
+It is disabled by default as it violates
 .Pa rfc1975 .
 .It dns
-Default: Disabled and Denied.  This option allows DNS negotiation.
+Default: Disabled and Denied.
+This option allows DNS negotiation.
 .Pp
 If
 .Dq enable Ns No d,
@@ -2409,22 +2568,27 @@
 .Dq accept Ns No ed,
 .Nm
 will answer any DNS queries requested by the peer rather than rejecting
-them.  The answer is taken from
+them.
+The answer is taken from
 .Pa /etc/resolv.conf
 unless the
 .Dq set dns
 command is used as an override.
 .It enddisc
-Default: Enabled and Accepted.  This option allows control over whether we
-negotiate an endpoint discriminator.  We only send our discriminator if
+Default: Enabled and Accepted.
+This option allows control over whether we
+negotiate an endpoint discriminator.
+We only send our discriminator if
 .Dq set enddisc
 is used and
 .Ar enddisc
-is enabled.  We reject the peers discriminator if
+is enabled.
+We reject the peers discriminator if
 .Ar enddisc
 is denied.
 .It LANMan|chap80lm
-Default: Disabled and Accepted.  The use of this authentication protocol
+Default: Disabled and Accepted.
+The use of this authentication protocol
 is discouraged as it partially violates the authentication protocol by
 implementing two different mechanisms (LANMan & NT) under the guise of
 a single CHAP type (0x80).
@@ -2436,41 +2600,50 @@
 .Dq MSChap
 description below for more details.
 .It lqr
-Default: Disabled and Accepted.  This option decides if Link Quality
-Requests will be sent or accepted.  LQR is a protocol that allows
+Default: Disabled and Accepted.
+This option decides if Link Quality Requests will be sent or accepted.
+LQR is a protocol that allows
 .Nm
 to determine that the link is down without relying on the modems
-carrier detect.  When LQR is enabled,
+carrier detect.
+When LQR is enabled,
 .Nm
 sends the
 .Em QUALPROTO
 option (see
 .Dq set lqrperiod
-below) as part of the LCP request.  If the peer agrees, both sides will
+below) as part of the LCP request.
+If the peer agrees, both sides will
 exchange LQR packets at the agreed frequency, allowing detailed link
-quality monitoring by enabling LQM logging.  If the peer doesn't agree,
-ppp will send ECHO LQR requests instead.  These packets pass no
-information of interest, but they
+quality monitoring by enabling LQM logging.
+If the peer doesn't agree,
+.Nm
+will send ECHO LQR requests instead.
+These packets pass no information of interest, but they
 .Em MUST
 be replied to by the peer.
 .Pp
 Whether using LQR or ECHO LQR,
 .Nm
 will abruptly drop the connection if 5 unacknowledged packets have been
-sent rather than sending a 6th.  A message is logged at the
+sent rather than sending a 6th.
+A message is logged at the
 .Em PHASE
 level, and any appropriate
 .Dq reconnect
 values are honoured as if the peer were responsible for dropping the
 connection.
 .It MSChap|chap80nt
-Default: Disabled and Accepted.  The use of this authentication protocol
+Default: Disabled and Accepted.
+The use of this authentication protocol
 is discouraged as it partially violates the authentication protocol by
 implementing two different mechanisms (LANMan & NT) under the guise of
-a single CHAP type (0x80).  It is very similar to standard CHAP (type 0x05)
+a single CHAP type (0x80).
+It is very similar to standard CHAP (type 0x05)
 except that it issues challenges of a fixed 8 bytes in length and uses a
 combination of MD4 and DES to encrypt the challenge rather than using the
-standard MD5 mechanism.  CHAP type 0x80 for LANMan is also supported - see
+standard MD5 mechanism.
+CHAP type 0x80 for LANMan is also supported - see
 .Dq enable LANMan
 for details.
 .Pp
@@ -2482,8 +2655,8 @@
 .Dq enable Ns No d ,
 .Nm
 will rechallenge the peer up to three times if it responds using the wrong
-one of the two protocols.  This gives the peer a chance to attempt using
-both protocols.
+one of the two protocols.
+This gives the peer a chance to attempt using both protocols.
 .Pp
 Conversely, when
 .Nm
@@ -2491,18 +2664,20 @@
 .Dq accept Ns No ed ,
 the protocols are used alternately in response to challenges.
 .Pp
-Note:  If only LANMan is enabled,
+Note: If only LANMan is enabled,
 .Xr pppd 8
-(version 2.3.5) misbehaves when acting as authenticatee.  It provides both
+(version 2.3.5) misbehaves when acting as authenticatee.
+It provides both
 the NT and the LANMan answers, but also suggests that only the NT answer
 should be used.
 .It pap
-Default: Disabled and Accepted.  PAP stands for Password Authentication
-Protocol.  Only one of PAP and CHAP (above) may be negotiated.  With
-PAP, the ID and Password are sent repeatedly to the peer until
-authentication is acknowledged or the connection is terminated.  This
-is a rather poor security mechanism.  It is only performed when the
-connection is first established.
+Default: Disabled and Accepted.
+PAP stands for Password Authentication Protocol.
+Only one of PAP and CHAP (above) may be negotiated.
+With PAP, the ID and Password are sent repeatedly to the peer until
+authentication is acknowledged or the connection is terminated.
+This is a rather poor security mechanism.
+It is only performed when the connection is first established.
 If you want to have your peer authenticate itself, you must
 .Dq enable pap .
 in
@@ -2523,29 +2698,33 @@
 .Pa /etc/ppp/ppp.conf .
 PAP is accepted by default.
 .It pred1
-Default: Enabled and Accepted.  This option decides if Predictor 1
+Default: Enabled and Accepted.
+This option decides if Predictor 1
 compression will be used by the Compression Control Protocol (CCP).
 .It protocomp
-Default: Enabled and Accepted.  This option is used to negotiate
+Default: Enabled and Accepted.
+This option is used to negotiate
 PFC (Protocol Field Compression), a mechanism where the protocol
 field number is reduced to one octet rather than two.
 .It shortseq
-Default: Enabled and Accepted.  This option determines if
+Default: Enabled and Accepted.
+This option determines if
 .Nm
 will request and accept requests for short
 .Pq 12 bit
-sequence numbers when negotiating multi-link mode.  This is only
-applicable if our MRRU is set (thus enabling multi-link).
+sequence numbers when negotiating multi-link mode.
+This is only applicable if our MRRU is set (thus enabling multi-link).
 .It vjcomp
-Default: Enabled and Accepted.  This option determines if Van Jacobson
-header compression will be used.
+Default: Enabled and Accepted.
+This option determines if Van Jacobson header compression will be used.
 .El
 .Pp
 The following options are not actually negotiated with the peer.
 Therefore, accepting or denying them makes no sense.
 .Bl -tag -width XX
 .It idcheck
-Default: Enabled.  When
+Default: Enabled.
+When
 .Nm
 exchanges low-level LCP, CCP and IPCP configuration traffic, the
 .Em Identifier
@@ -2553,17 +2732,20 @@
 By default,
 .Nm
 drops any reply packets that do not contain the expected identifier
-field, reporting the fact at the respective log level.  If
+field, reporting the fact at the respective log level.
+If
 .Ar idcheck
 is disabled,
 .Nm
 will ignore the identifier field.
 .It keep-session
-Default: Disabled.  When
+Default: Disabled.
+When
 .Nm
 runs as a Multi-link server, a different
 .Nm
-instance initially receives each connection.  After determining that
+instance initially receives each connection.
+After determining that
 the link belongs to an already existing bundle (controlled by another
 .Nm
 invocation),
@@ -2578,7 +2760,7 @@
 .Nm
 to finish with the link and deliver a signal back to the idle process.
 This prevents the confusion that results from
-.Nm ppp Ns No 's
+.Nm Ns No 's
 parent considering the link resource available again.
 .Pp
 For tty devices that have entries in
@@ -2589,42 +2771,50 @@
 .Xr sshd 8 ,
 it prevents
 .Xr sshd 8
-from exiting due to the death of its child.  As
+from exiting due to the death of its child.
+As
 .Nm
 cannot determine its parents requirements (except for the tty case), this
 option must be enabled manually depending on the circumstances.
 .It loopback
-Default: Enabled.  When
+Default: Enabled.
+When
 .Ar loopback
 is enabled,
 .Nm
 will automatically loop back packets being sent
 out with a destination address equal to that of the
 .Em PPP
-interface.  If disabled,
+interface.
+If disabled,
 .Nm
 will send the packet, probably resulting in an ICMP redirect from
-the other end.  It is convenient to have this option enabled when
+the other end.
+It is convenient to have this option enabled when
 the interface is also the default route as it avoids the necessity
 of a loopback route.
 .It passwdauth
-Default: Disabled.  Enabling this option will tell the PAP authentication
+Default: Disabled.
+Enabling this option will tell the PAP authentication
 code to use the password database (see
 .Xr passwd 5 )
 to authenticate the caller if they cannot be found in the
 .Pa /etc/ppp/ppp.secret
 file.
 .Pa /etc/ppp/ppp.secret
-is always checked first.  If you wish to use passwords from
+is always checked first.
+If you wish to use passwords from
 .Xr passwd 5 ,
 but also to specify an IP number or label for a given client, use
 .Dq \&*
 as the client password in
 .Pa /etc/ppp/ppp.secret .
 .It proxy
-Default: Disabled.  Enabling this option will tell
+Default: Disabled.
+Enabling this option will tell
 .Nm
-to proxy ARP for the peer.  This means that
+to proxy ARP for the peer.
+This means that
 .Nm
 will make an entry in the ARP table using
 .Dv HISADDR
@@ -2632,7 +2822,9 @@
 .Dv MAC
 address of the local network in which
 .Dv HISADDR
-appears.  The proxy entry cannot be made unless
+appears.  This allows other machines connecteed to the LAN to talk to
+the peer as if the peer itself was connected to the LAN.  The proxy entry
+cannot be made unless
 .Dv HISADDR
 is an address from a LAN.
 .It proxyall
@@ -2644,12 +2836,14 @@
 Proxy arp entries are only made for sticky routes that are added
 using the
 .Dq add
-command.  No proxy arp entries are made for the interface address itself
+command.
+No proxy arp entries are made for the interface address itself
 (as created by the
 .Dq set ifaddr
 command).
 .It sroutes
-Default: Enabled.  When the
+Default: Enabled.
+When the
 .Dq add
 command is used with the
 .Dv HISADDR
@@ -2657,7 +2851,8 @@
 .Dv MYADDR
 values, entries are stored in the
 .Sq stick route
-list.  Each time
+list.
+Each time
 .Dv HISADDR
 or
 .Dv MYADDR
@@ -2668,34 +2863,39 @@
 .Sq stick route
 list will still be maintained.
 .It throughput
-Default: Enabled.  This option tells
+Default: Enabled.
+This option tells
 .Nm
-to gather throughput statistics.  Input and output is sampled over
-a rolling 5 second window, and current, best and total figures are
-retained.  This data is output when the relevant
+to gather throughput statistics.
+Input and output is sampled over
+a rolling 5 second window, and current, best and total figures are retained.
+This data is output when the relevant
 .Em PPP
 layer shuts down, and is also available using the
 .Dq show
-command.  Throughput statistics are available at the
+command.
+Throughput statistics are available at the
 .Dq IPCP
-and 
+and
 .Dq physical
 levels.
 .It utmp
-Default: Enabled.  Normally, when a user is authenticated using PAP or
-CHAP, and when
+Default: Enabled.
+Normally, when a user is authenticated using PAP or CHAP, and when
 .Nm
 is running in
 .Fl direct
-mode, an entry is made in the utmp and wtmp files for that user.  Disabling
-this option will tell
+mode, an entry is made in the utmp and wtmp files for that user.
+Disabling this option will tell
 .Nm
-not to make any utmp or wtmp entries.  This is usually only necessary if
+not to make any utmp or wtmp entries.
+This is usually only necessary if
 you require the user to both login and authenticate themselves.
 .It iface-alias
 Default: Enabled if
 .Fl nat
-is specified.  This option simply tells
+is specified.
+This option simply tells
 .Nm
 to add new interface addresses to the interface rather than replacing them.
 The option can only be enabled if network address translation is enabled
@@ -2704,7 +2904,7 @@
 With this option enabled,
 .Nm
 will pass traffic for old interface addresses through the NAT engine
-.Pq see Xr libalias 5 ,
+.Pq see Xr libalias 3 ,
 resulting in the ability (in
 .Fl auto
 mode) to properly connect the process that caused the PPP link to
@@ -2723,23 +2923,24 @@
 .Op Ar gateway
 .Xc
 .Ar Dest
-is the destination IP address.  The netmask is specified either as a
-number of bits with
+is the destination IP address.
+The netmask is specified either as a number of bits with
 .Ar /nn
 or as an IP number using
 .Ar mask .
 .Ar 0 0
 or simply
 .Ar 0
-with no mask refers to the default route.  It is also possible to use the
-literal name
+with no mask refers to the default route.
+It is also possible to use the literal name
 .Sq default
 instead of
 .Ar 0 .
 .Ar Gateway
 is the next hop gateway to get to the given
 .Ar dest
-machine/network.  Refer to the
+machine/network.
+Refer to the
 .Xr route 8
 command for further details.
 .Pp
@@ -2767,27 +2968,33 @@
 for further details).
 .Pp
 Routes that contain the
-.Dq HISADDR
+.Dq HISADDR ,
+.Dq MYADDR ,
+.Dq DNS0 ,
 or
-.Dq MYADDR
+.Dq DNS1
 constants are considered
 .Sq sticky .
 They are stored in a list (use
 .Dq show ipcp
 to see the list), and each time the value of
-.Dv HISADDR
+.Dv HISADDR ,
+.Dv MYADDR ,
+.Dv DNS0 ,
 or
-.Dv MYADDR
-changes, the appropriate routing table entries are updated.  This facility
-may be disabled using
+.Dv DNS1
+changes, the appropriate routing table entries are updated.
+This facility may be disabled using
 .Dq disable sroutes .
 .It allow Ar command Op Ar args
 This command controls access to
 .Nm
-and its configuration files.  It is possible to allow user-level access,
+and its configuration files.
+It is possible to allow user-level access,
 depending on the configuration file label and on the mode that
 .Nm
-is being run in.  For example, you may wish to configure
+is being run in.
+For example, you may wish to configure
 .Nm
 so that only user
 .Sq fred
@@ -2808,10 +3015,12 @@
 If this command is used, all of the listed users are allowed access to
 the section in which the
 .Dq allow users
-command is found.  The
+command is found.
+The
 .Sq default
 section is always checked first (even though it is only ever automatically
-loaded at startup).  Each successive
+loaded at startup).
+Each successive
 .Dq allow users
 command overrides the previous one, so it's possible to allow users access
 to everything except a given label by specifying default users in the
@@ -2827,7 +3036,8 @@
 .Xc
 By default, access using any
 .Nm
-mode is possible.  If this command is used, it restricts the access
+mode is possible.
+If this command is used, it restricts the access
 .Ar modes
 allowed to load the label under which this command is specified.
 Again, as with the
@@ -2891,7 +3101,6 @@
 This option causes various NAT statistics and information to
 be logged to the file
 .Pa /var/log/alias.log .
-This file name is likely to change in the near future.
 .It nat port Ar proto Ar targetIP Ns Xo
 .No : Ns Ar targetPort Ns
 .Oo
@@ -2919,8 +3128,8 @@
 or
 .Dq udp .
 .Pp
-A range of port numbers may be specified as shown above.  The ranges
-must be of the same size.
+A range of port numbers may be specified as shown above.
+The ranges must be of the same size.
 .Pp
 If
 .Ar remoteIP
@@ -2944,7 +3153,8 @@
 .Pq Dv IPPROTO_GRE
 packets using
 .Ar addr
-rather than the local interface address.  This allows the uses of the
+rather than the local interface address.
+This allows the uses of the
 .Em P Ns No oint
 to
 .Em P Ns No oint
@@ -2960,24 +3170,36 @@
 .It "nat proxy cmd" Ar arg Ns No ...
 This command tells
 .Nm
-to proxy certain connections, redirecting them to a given server.  Refer
-to the description of
+to proxy certain connections, redirecting them to a given server.
+Refer to the description of
 .Fn PacketAliasProxyRule
 in
 .Xr libalias 3
 for details of the available commands.
 .It nat same_ports yes|no
 When enabled, this command will tell the network address translation engine to
- attempt to avoid changing the port number on outgoing packets.  This is useful
+attempt to avoid changing the port number on outgoing packets.
+This is useful
 if you want to support protocols such as RPC and LPD which require
 connections to come from a well known port.
+.It nat target Op Ar address
+Set the given target address or clear it if no address is given.  The target
+address is used by libalias to specify how to NAT incoming packets by default.
+If a target address is not set or if
+.Dq default
+is given, packets are not altered and are allowed to route to the internal
+network.
+.Pp
+The target address may be set to
+.Dq MYADDR ,
+in which case libalias will redirect all packets to the interface address.
 .It nat use_sockets yes|no
 When enabled, this option tells the network address translation engine to
 create a socket so that it can guarantee a correct incoming ftp data or
 IRC connection.
 .It nat unregistered_only yes|no
-Only alter outgoing packets with an unregistered source ad-
-dress.  According to RFC 1918, unregistered source addresses
+Only alter outgoing packets with an unregistered source address.
+According to RFC 1918, unregistered source addresses
 are 10.0.0.0/8, 172.16.0.0/12 and 192.168.0.0/16.
 .El
 .Pp
@@ -2995,11 +3217,13 @@
 .It Li AUTHNAME
 This is replaced with the local
 .Ar authname
-value.  See the
+value.
+See the
 .Dq set authname
 command below.
 .It Li ENDDISC
-This is replaced with the local endpoint discriminator value.  See the
+This is replaced with the local endpoint discriminator value.
+See the
 .Dq set enddisc
 command below.
 .It Li HISADDR
@@ -3007,8 +3231,8 @@
 .It Li INTERFACE
 This is replaced with the name of the interface that's in use.
 .It Li LABEL
-This is replaced with the last label name used.  A label may be specified
-on the
+This is replaced with the last label name used.
+A label may be specified on the
 .Nm
 command line, via the
 .Dq load
@@ -3025,8 +3249,12 @@
 This is replaced with the current process id.
 .It Li USER
 This is replaced with the username that has been authenticated with PAP or
-CHAP.  Normally, this variable is assigned only in -direct mode.  This value
-is available irrespective of whether utmp logging is enabled.
+CHAP.
+Normally, this variable is assigned only in -direct mode.
+This value is available irrespective of whether utmp logging is enabled.
+.It Li DNS0 No " & " Li DNS1
+These are replaced with the primary and secondary nameserver IP numbers.
+If nameservers are negotiated by IPCP, the values of these macros will change.
 .El
 .Pp
 These substitutions are also done by the
@@ -3043,22 +3271,25 @@
 .Dq physical
 or
 .Dq ipcp
-level.  If
+level.
+If
 .Dq physical
 is specified, context must be given (see the
 .Dq link
-command below).  If no second argument is given, all values are
-cleared.
+command below).
+If no second argument is given, all values are cleared.
 .It clone Ar name Ns Xo
 .Op \&, Ns Ar name Ns
 .No ...
 .Xc
 Clone the specified link, creating one or more new links according to the
 .Ar name
-argument(s).  This command must be used from the
+argument(s).
+This command must be used from the
 .Dq link
 command below unless you've only got a single link (in which case that
-link  becomes the default).  Links may be removed using the
+link becomes the default).
+Links may be removed using the
 .Dq remove
 command below.
 .Pp
@@ -3066,23 +3297,27 @@
 .Dq deflink .
 .It close Op lcp|ccp Ns Op \&!
 If no arguments are given, the relevant protocol layers will be brought
-down and the link will be closed.  If
+down and the link will be closed.
+If
 .Dq lcp
 is specified, the LCP layer is brought down, but
 .Nm
-will not bring the link offline.  It is subsequently possible to use
+will not bring the link offline.
+It is subsequently possible to use
 .Dq term
 .Pq see below
 to talk to the peer machine if, for example, something like
 .Dq slirp
-is being used.  If
+is being used.
+If
 .Dq ccp
-is specified, only the relevant compression layer is closed.  If the
+is specified, only the relevant compression layer is closed.
+If the
 .Dq \&!
 is used, the compression layer will remain in the closed state, otherwise
 it will re-enter the STOPPED state, waiting for the peer to initiate
-further CCP negotiation.  In any event, this command does not disconnect
-the user from
+further CCP negotiation.
+In any event, this command does not disconnect the user from
 .Nm
 or exit
 .Nm ppp .
@@ -3095,14 +3330,16 @@
 .Xc
 This command deletes the route with the given
 .Ar dest
-IP address.  If
+IP address.
+If
 .Ar dest
 is specified as
 .Sq ALL ,
 all non-direct entries in the routing table for the current interface,
 and all
 .Sq sticky route
-entries are deleted.  If
+entries are deleted.
+If
 .Ar dest
 is specified as
 .Sq default ,
@@ -3124,19 +3361,24 @@
 and is provided for backwards compatibility.
 .It down Op Ar lcp|ccp
 Bring the relevant layer down ungracefully, as if the underlying layer
-had become unavailable.  It's not considered polite to use this command on
-a Finite State Machine that's in the OPEN state.  If no arguments are
+had become unavailable.
+It's not considered polite to use this command on
+a Finite State Machine that's in the OPEN state.
+If no arguments are
 supplied, the entire link is closed (or if no context is given, all links
-are terminated).  If
+are terminated).
+If
 .Sq lcp
 is specified, the
 .Em LCP
 layer is terminated but the device is not brought offline and the link
-is not closed.  If
+is not closed.
+If
 .Sq ccp
 is specified, only the relevant compression layer(s) are terminated.
 .It help|? Op Ar command
-Show a list of available commands.  If
+Show a list of available commands.
+If
 .Ar command
 is specified, show the usage string for that command.
 .It iface Ar command Op args
@@ -3158,7 +3400,8 @@
 .Xc
 Add the given
 .Ar addr mask peer
-combination to the interface.  Instead of specifying
+combination to the interface.
+Instead of specifying
 .Ar mask ,
 .Ar /bits
 can be used
@@ -3187,7 +3430,8 @@
 is in the OPENED state or while in
 .Fl auto
 mode, all addresses except for the IPCP negotiated address are deleted
-from the interface.  If
+from the interface.
+If
 .Nm
 is not in the OPENED state and is not in
 .Fl auto
@@ -3200,20 +3444,22 @@
 .Xc
 This command deletes the given
 .Ar addr
-from the interface.  If the
+from the interface.
+If the
 .Dq \&!
 is used, no error is given if the address isn't currently assigned to
 the interface (and no deletion takes place).
 .It iface show
-Shows the current state and current addresses for the interface.  It is
-much the same as running
+Shows the current state and current addresses for the interface.
+It is much the same as running
 .Dq ifconfig INTERFACE .
 .It iface help Op Ar sub-command
 This command, when invoked without
 .Ar sub-command ,
 will show a list of possible
 .Dq iface
-sub-commands and a brief synopsis for each.  When invoked with
+sub-commands and a brief synopsis for each.
+When invoked with
 .Ar sub-command ,
 only the synopsis for the given sub-command is shown.
 .El
@@ -3223,18 +3469,20 @@
 .No ... Ar command Op Ar args
 .Xc
 This command may prefix any other command if the user wishes to
-specify which link the command should affect.  This is only
-applicable after multiple links have been created in Multi-link
+specify which link the command should affect.
+This is only applicable after multiple links have been created in Multi-link
 mode using the
 .Dq clone
 command.
 .Pp
 .Ar Name
-specifies the name of an existing link.  If
+specifies the name of an existing link.
+If
 .Ar name
 is a comma separated list,
 .Ar command
-is executed on each link.  If
+is executed on each link.
+If
 .Ar name
 is
 .Dq * ,
@@ -3247,7 +3495,8 @@
 .Ar label Ns No (s)
 from the
 .Pa ppp.conf
-file.  If
+file.
+If
 .Ar label
 is not given, the
 .Ar default
@@ -3266,8 +3515,8 @@
 .It open Op lcp|ccp|ipcp
 This is the opposite of the
 .Dq close
-command.  All closed links are immediately brought up apart from second
-and subsequent
+command.
+All closed links are immediately brought up apart from second and subsequent
 .Ar demand-dial
 links - these will come up based on the
 .Dq set autoload
@@ -3276,15 +3525,17 @@
 If the
 .Dq lcp
 argument is used while the LCP layer is already open, LCP will be
-renegotiated.  This allows various LCP options to be changed, after which
+renegotiated.
+This allows various LCP options to be changed, after which
 .Dq open lcp
-can be used to put them into effect.  After renegotiating LCP,
+can be used to put them into effect.
+After renegotiating LCP,
 any agreed authentication will also take place.
 .Pp
 If the
 .Dq ccp
-argument is used, the relevant compression layer is opened.  Again,
-if it is already open, it will be renegotiated.
+argument is used, the relevant compression layer is opened.
+Again, if it is already open, it will be renegotiated.
 .Pp
 If the
 .Dq ipcp
@@ -3300,14 +3551,15 @@
 .It passwd Ar pass
 Specify the password required for access to the full
 .Nm
-command set.  This password is required when connecting to the diagnostic
-port (see the
+command set.
+This password is required when connecting to the diagnostic port (see the
 .Dq set server
 command).
 .Ar Pass
 is specified on the
 .Dq set server
-command line.  The value of
+command line.
+The value of
 .Ar pass
 is not logged when
 .Ar command
@@ -3318,7 +3570,8 @@
 If
 .Dq quit
 is executed from the controlling connection or from a command file,
-ppp will exit after closing all connections.  Otherwise, if the user
+ppp will exit after closing all connections.
+Otherwise, if the user
 is connected to a diagnostic socket, the connection is simply dropped.
 .Pp
 If the
@@ -3328,9 +3581,9 @@
 will exit despite the source of the command after closing all existing
 connections.
 .It remove|rm
-This command removes the given link.  It is only really useful in
-multi-link mode.  A link must be
-in the
+This command removes the given link.
+It is only really useful in multi-link mode.
+A link must be in the
 .Dv CLOSED
 state before it is removed.
 .It rename|mv Ar name
@@ -3348,6 +3601,77 @@
 or
 .Sq USR
 may make the log file more readable.
+.It resolv Ar command
+This command controls
+.Nm Ns No 's
+manipulation of the
+.Xr resolv.conf 5
+file.
+When
+.Nm
+starts up, it loads the contents of this file into memory and retains this
+image for future use.
+.Ar command
+is one of the following:
+.Bl -tag -width readonly
+.It Em readonly
+Treat
+.Pa /etc/resolv.conf
+as read only.
+If
+.Dq dns
+is enabled,
+.Nm
+will still attempt to negotiate nameservers with the peer, making the results
+available via the
+.Dv DNS0
+and
+.Dv DNS1
+macros.
+This is the opposite of the
+.Dq resolv writable
+command.
+.It Em reload
+Reload
+.Pa /etc/resolv.conf
+into memory.
+This may be necessary if for example a DHCP client overwrote
+.Pa /etc/resolv.conf .
+.It Em restore
+Replace
+.Pa /etc/resolv.conf
+with the version originally read at startup or with the last
+.Dq resolv reload
+command.
+This is sometimes a useful command to put in the
+.Pa /etc/ppp/ppp.linkdown
+file.
+.It Em rewrite
+Rewrite the
+.Pa /etc/resolv.conf
+file.
+This command will work even if the
+.Dq resolv readonly
+command has been used.
+It may be useful as a command in the
+.Pa /etc/ppp/ppp.linkup
+file if you wish to defer updating
+.Pa /etc/resolv.conf
+until after other commands have finished.
+.It Em writable
+Allow
+.Nm
+to update
+.Pa /etc/resolv.conf
+if
+.Dq dns
+is enabled and
+.Nm
+successfully negotiates a DNS.
+This is the opposite of the
+.Dq resolv readonly
+command.
+.El
 .It save
 This option is not (yet) implemented.
 .It set Ns Xo
@@ -3357,7 +3681,8 @@
 This option allows the setting of any of the following variables:
 .Bl -tag -width XX
 .It set accmap Ar hex-value
-ACCMap stands for Asynchronous Control Character Map.  This is always
+ACCMap stands for Asynchronous Control Character Map.
+This is always
 negotiated with the peer, and defaults to a value of 00000000 in hex.
 This protocol is required to defeat hardware that depends on passing
 certain characters from end to end (such as XON/XOFF etc).
@@ -3368,10 +3693,12 @@
 .No key Ar value
 .Xc
 This sets the authentication key (or password) used in client mode
-PAP or CHAP negotiation to the given value.  It also specifies the
+PAP or CHAP negotiation to the given value.
+It also specifies the
 password to be used in the dial or login scripts in place of the
 .Sq \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\P
-sequence, preventing the actual password from being logged.  If
+sequence, preventing the actual password from being logged.
+If
 .Ar command
 or
 .Ar chat
@@ -3398,7 +3725,8 @@
 .Ar value
 is parsed as a program to execute in the same was as the
 .Dq !bg
-command above, substituting special names in the same manner.  Once executed,
+command above, substituting special names in the same manner.
+Once executed,
 .Nm
 will feed the program three lines of input, each terminated by a newline
 character:
@@ -3428,7 +3756,8 @@
 When configuring
 .Nm
 in this manner, it's expected that the host challenge is a series of ASCII
-digits or characters.  An encryption device or Secure ID card is usually
+digits or characters.
+An encryption device or Secure ID card is usually
 required to calculate the secret appropriate for the given challenge.
 .It set authname Ar id
 This sets the authentication id used in client mode PAP or CHAP negotiation.
@@ -3449,13 +3778,15 @@
 .Pq also known as Fl auto
 mode link is available, only the first link is made active when
 .Nm
-first reads data from the tun device.  The next
+first reads data from the tun device.
+The next
 .Ar demand-dial
 link will be opened only when the current bundle throughput is at least
 .Ar max-percent
 percent of the total bundle bandwidth for
 .Ar period
-seconds.  When the current bundle throughput decreases to
+seconds.
+When the current bundle throughput decreases to
 .Ar min-percent
 percent or less of the total bundle bandwidth for
 .Ar period
@@ -3478,7 +3809,8 @@
 .It set bandwidth Ar value
 This command sets the connection bandwidth in bits per second.
 .Ar value
-must be greater than zero.  It is currently only used by the
+must be greater than zero.
+It is currently only used by the
 .Dq set autoload
 command above.
 .It set callback Ar option Ns No ...
@@ -3504,7 +3836,8 @@
 .Nm
 will accept any of the given protocols - but the client
 .Em must
-request one of them.  If you wish callback to be optional, you must include
+request one of them.
+If you wish callback to be optional, you must include
 .Ar none
 as an option.
 .Pp
@@ -3512,16 +3845,18 @@
 .Ar option Ns No s
 are as follows (in this order of preference):
 .Pp
-.Bl -tag
+.Bl -tag -width Ds
 .It auth
 The callee is expected to decide the callback number based on
-authentication.  If
+authentication.
+If
 .Nm
 is the callee, the number should be specified as the fifth field of
 the peers entry in
 .Pa /etc/ppp/ppp.secret .
 .It cbcp
-Microsofts callback control protocol is used.  See
+Microsoft's callback control protocol is used.
+See
 .Dq set cbcp
 below.
 .Pp
@@ -3545,7 +3880,8 @@
 .Ar number
 should be either a comma separated list of allowable numbers or a
 .Dq \&* ,
-meaning any number is permitted.  If
+meaning any number is permitted.
+If
 .Nm
 is the caller, only a single number should be specified.
 .Pp
@@ -3559,7 +3895,8 @@
 If the peer does not wish to do callback at all,
 .Nm
 will accept the fact and continue without callback rather than terminating
-the connection.  This is required (in addition to one or more other callback
+the connection.
+This is required (in addition to one or more other callback
 options) if you wish callback to be optional.
 .El
 .Pp
@@ -3572,7 +3909,7 @@
 .Op Ar delay Op Ar retry
 .Oc
 .Xc
-If no arguments are given, CBCP (Microsofts CallBack Control Protocol)
+If no arguments are given, CBCP (Microsoft's CallBack Control Protocol)
 is disabled - ie, configuring CBCP in the
 .Dq set callback
 command will result in
@@ -3598,22 +3935,57 @@
 is specified,
 .Nm
 will expect the peer to specify the number.
-.It "set cd off|" Ns Ar seconds Ns Op \&!
+.It set cd Oo
+.No off| Ns Ar seconds Ns Op \&!
+.Oc
 Normally,
 .Nm
-checks for the existence of carrier one second after the login script is
-complete.  If it's not set,
+checks for the existence of carrier depending on the type of device
+that has been opened:
+.Bl -tag -width XXX -offset XXX
+.It Terminal Devices
+Carrier is checked one second after the login script is complete.
+If it's not set,
 .Nm
 assumes that this is because the device doesn't support carrier (which
 is true for most
 .Dq laplink
 NULL-modem cables), logs the fact and stops checking
-for carrier.  However, some modems take some time to assert the carrier
-signal, resulting in
-.Nm ppp Ns No s
-inability to detect when the link is dropped.
+for carrier.
+.Pp
+As ptys don't support the TIOCMGET ioctl, the tty device will switch all
+carrier detection off when it detects that the device is a pty.
+.It ISDN (i4b) Devices
+Carrier is checked once per second for 6 seconds.
+If it's not set after
+the sixth second, the connection attempt is considered to have failed and
+the device is closed.
+Carrier is always required for i4b devices.
+.It PPPoE (netgraph) Devices
+Carrier is checked once per second for 5 seconds.
+If it's not set after
+the fifth second, the connection attempt is considered to have failed and
+the device is closed.
+Carrier is always required for PPPoE devices.
+.El
+.Pp
+All other device types don't support carrier.
+Setting a carrier value will
+result in a warning when the device is opened.
+.Pp
+Some modems take more than one second after connecting to assert the carrier
+signal.
+If this delay isn't increased, this will result in
+.Nm Ns No 's
+inability to detect when the link is dropped, as
+.Nm
+assumes that the device isn't asserting carrier.
+.Pp
+The
+.Dq set cd
+command overrides the default carrier behaviour.
 .Ar seconds
-specifies the number of seconds that
+specifies the maximum number of seconds that
 .Nm
 should wait after the dial script has finished before deciding if
 carrier is available or not.
@@ -3627,7 +3999,12 @@
 will not proceed to the login script until either carrier is detected
 or until
 .Ar seconds
-has elapsed.
+has elapsed, at which point
+.Nm
+assumes that the device will not set carrier.
+.Pp
+If no arguments are given, carrier settings will go back to their default
+values.
 .Pp
 If
 .Ar seconds
@@ -3636,24 +4013,10 @@
 .Nm
 will
 .Em require
-carrier.  If carrier is not detected after
+carrier.
+If carrier is not detected after
 .Ar seconds
 seconds, the link will be disconnected.
-.Pp
-For ISDN devices,
-.Nm
-will always insist on carrier (the value
-.Dq off
-is invalid).  Carrier is raised by the i4brbchX device driver only after
-the call has connected.  It is therefore wise to set a reasonable value
-such as
-.Ar 6
-seconds.
-.Pp
-Carrier
-.Em require Ns No ment
-is ignored for all other device types - as if set to
-.Dq off .
 .It set choked Op Ar timeout
 This sets the number of seconds that
 .Nm
@@ -3670,7 +4033,8 @@
 has read a certain number of packets from the local network for transmission,
 but cannot send the data due to link failure (the peer is busy etc.).
 .Nm
-will not read packets indefinitely.  Instead, it reads up to
+will not read packets indefinitely.
+Instead, it reads up to
 .Em 30
 packets (or
 .Em 30 No +
@@ -3685,12 +4049,14 @@
 .Ar timeout
 seconds pass, all pending output packets are dropped.
 .It set ctsrts|crtscts on|off
-This sets hardware flow control.  Hardware flow control is
+This sets hardware flow control.
+Hardware flow control is
 .Ar on
 by default.
 .It set deflate Ar out-winsize Op Ar in-winsize
 This sets the DEFLATE algorithms default outgoing and incoming window
-sizes.  Both
+sizes.
+Both
 .Ar out-winsize
 and
 .Ar in-winsize
@@ -3707,10 +4073,11 @@
 .It set dns Op Ar primary Op Ar secondary
 This command specifies DNS overrides for the
 .Dq accept dns
-command.  Refer to the
+command.
+Refer to the
 .Dq accept
-command description above for details.  This command does not affect the
-IP numbers requested using
+command description above for details.
+This command does not affect the IP numbers requested using
 .Dq enable dns .
 .It set device|line Xo
 .Ar value Ns No ...
@@ -3725,7 +4092,7 @@
 ISDN devices are usually called
 .Pa i4brbchX
 and serial devices are usually called
-.Pa cuaaX .
+.Pa cuaXX .
 .Pp
 If
 .Dq value
@@ -3744,7 +4111,8 @@
 .Pp
 If it begins with an exclamation mark, the rest of the device name is
 treated as a program name, and that program is executed when the device
-is opened.  Standard input, output and error are fed back to
+is opened.
+Standard input, output and error are fed back to
 .Nm
 and are read and written as if they were a regular device.
 .Pp
@@ -3758,10 +4126,13 @@
 .Em PPP
 over Ethernet connection using the given
 .Ar iface
-interface.  The given
+interface.
+The given
 .Ar provider
 is passed as the service name in the PPPoE Discovery Initiation (PADI)
-packet.  If no provider is given, an empty value will be used.  Refer to
+packet.
+If no provider is given, an empty value will be used.
+Refer to
 .Xr netgraph 4
 and
 .Xr ng_pppoe 8
@@ -3795,9 +4166,11 @@
 devices.
 .It set dial Ar chat-script
 This specifies the chat script that will be used to dial the other
-side.  See also the
+side.
+See also the
 .Dq set login
-command below.  Refer to
+command below.
+Refer to
 .Xr chat 8
 and to the example configuration files for details of the chat script
 format.
@@ -3859,7 +4232,8 @@
 .Dq set device
 command), and standard error is read by
 .Nm
-and substituted as the expect or send string.  If
+and substituted as the expect or send string.
+If
 .Nm
 is running in interactive mode, file descriptor 3 is attached to
 .Pa /dev/tty .
@@ -3867,7 +4241,7 @@
 For example (wrapped for readability);
 .Bd -literal -offset indent
 set login "TIMEOUT 5 \\"\\" \\"\\" login:--login: ppp \e
-word: ppp \\"!sh \\\\\\\\-c \\\\\\"echo \\\\\\\\-n label: >&2\\\\\\"\\" \e
+word: ppp \\"!sh \\\\-c \\\\\\"echo \\\\-n label: >&2\\\\\\"\\" \e
 \\"!/bin/echo in\\" HELLO"
 .Ed
 .Pp
@@ -3877,8 +4251,8 @@
 .Bd -literal -offset indent
 Dial attempt 1 of 1
 dial OK!
-Chat: Expecting: 
-Chat: Sending: 
+Chat: Expecting:
+Chat: Sending:
 Chat: Expecting: login:--login:
 Chat: Wait for (5): login:
 Chat: Sending: ppp
@@ -3889,20 +4263,23 @@
 Chat: Exec: sh -c "echo -n label: >&2"
 Chat: Wait for (5): !sh \\-c "echo \\-n label: >&2" --> label:
 Chat: Exec: /bin/echo in
-Chat: Sending: 
+Chat: Sending:
 Chat: Expecting: HELLO
 Chat: Wait for (5): HELLO
 login OK!
 .Ed
 .Pp
 Note (again) the use of the escape character, allowing many levels of
-nesting.  Here, there are four parsers at work.  The first parses the
-original line, reading it as three arguments.  The second parses the
-third argument, reading it as 11 arguments.  At this point, it is
+nesting.
+Here, there are four parsers at work.
+The first parses the original line, reading it as three arguments.
+The second parses the third argument, reading it as 11 arguments.
+At this point, it is
 important that the
 .Dq \&-
 signs are escaped, otherwise this parser will see them as constituting
-an expect-send-expect sequence.  When the
+an expect-send-expect sequence.
+When the
 .Dq \&!
 character is seen, the execution parser reads the first command as three
 arguments, and then
@@ -3917,7 +4294,8 @@
 .Pp
 This, of course means that it is possible to execute an entirely external
 .Dq chat
-command rather than using the internal one.  See
+command rather than using the internal one.
+See
 .Xr chat 8
 for a good alternative.
 .Pp
@@ -3926,26 +4304,30 @@
 .Dq !bg
 command.
 .It set enddisc Op label|IP|MAC|magic|psn value
-This command sets our local endpoint discriminator.  If set prior to
-LCP negotiation, and if no
+This command sets our local endpoint discriminator.
+If set prior to LCP negotiation, and if no
 .Dq disable enddisc
 command has been used,
 .Nm
 will send the information to the peer using the LCP endpoint discriminator
-option.  The following discriminators may be set:
+option.
+The following discriminators may be set:
 .Bd -unfilled -offset indent
 .It Li label
 The current label is used.
 .It Li IP
-Our local IP number is used.  As LCP is negotiated prior to IPCP, it is
-possible that the IPCP layer will subsequently change this value.  If
+Our local IP number is used.
+As LCP is negotiated prior to IPCP, it is
+possible that the IPCP layer will subsequently change this value.
+If
 it does, the endpoint discriminator stays at the old value unless manually
 reset.
 .It Li MAC
 This is similar to the
 .Ar IP
 option above, except that the MAC address associated with the local IP
-number is used.  If the local IP number is not resident on any Ethernet
+number is used.
+If the local IP number is not resident on any Ethernet
 interface, the command will fail.
 .Pp
 As the local IP number defaults to whatever the machine host name is,
@@ -3954,14 +4336,14 @@
 .Dq set ifaddr
 commands.
 .It Li magic
-A 20 digit random number is used.  Care should be taken when using magic
-numbers as restarting
+A 20 digit random number is used.
+Care should be taken when using magic numbers as restarting
 .Nm
 or creating a link using a different
 .Nm
 invocation will also use a different magic number and will therefore not
-be recognised by the peer as belonging to the same bundle.  This makes it
-unsuitable for
+be recognised by the peer as belonging to the same bundle.
+This makes it unsuitable for
 .Fl direct
 connections.
 .It Li psn Ar value
@@ -3977,8 +4359,8 @@
 .It set escape Ar value...
 This option is similar to the
 .Dq set accmap
-option above.  It allows the user to specify a set of characters that
-will be
+option above.
+It allows the user to specify a set of characters that will be
 .Sq escaped
 as they travel across the link.
 .It set filter dial|alive|in|out Ar rule-no Xo
@@ -3995,16 +4377,19 @@
 .Oc
 .Xc
 .Nm
-supports four filter sets.  The
+supports four filter sets.
+The
 .Em alive
 filter specifies packets that keep the connection alive - resetting the
-idle timer.  The
+idle timer.
+The
 .Em dial
 filter specifies packets that cause
 .Nm
 to dial when in
 .Fl auto
-mode.  The
+mode.
+The
 .Em in
 filter specifies packets that are allowed to travel
 into the machine and the
@@ -4013,29 +4398,35 @@
 .Pp
 Filtering is done prior to any IP alterations that might be done by the
 NAT engine on outgoing packets and after any IP alterations that might
-be done by the NAT engine on incoming packets.  By default all filter
-sets allow all packets to pass.  Rules are processed in order according to
+be done by the NAT engine on incoming packets.
+By default all filter sets allow all packets to pass.
+Rules are processed in order according to
 .Ar rule-no
 (unless skipped by specifying a rule number as the
 .Ar action ) .
-Up to 40 rules may be given for each set.  If a packet doesn't match
-any of the rules in a given set, it is discarded.  In the case of
+Up to 40 rules may be given for each set.
+If a packet doesn't match
+any of the rules in a given set, it is discarded.
+In the case of
 .Em in
 and
 .Em out
-filters, this means that the packet is dropped.  In the case of
+filters, this means that the packet is dropped.
+In the case of
 .Em alive
 filters it means that the packet will not reset the idle timer and in
 the case of
 .Em dial
-filters it means that the packet will not trigger a dial.  A packet failing
-to trigger a dial will be dropped rather than queued.  Refer to the
+filters it means that the packet will not trigger a dial.
+A packet failing to trigger a dial will be dropped rather than queued.
+Refer to the
 section on
 .Sx PACKET FILTERING
 above for further details.
 .It set hangup Ar chat-script
 This specifies the chat script that will be used to reset the device
-before it is closed.  It should not normally be necessary, but can
+before it is closed.
+It should not normally be necessary, but can
 be used for devices that fail to reset themselves properly on close.
 .It set help|? Op Ar command
 This command gives a summary of available set commands, or if
@@ -4049,7 +4440,8 @@
 .Oc Oc
 .Oc
 This command specifies the IP addresses that will be used during
-IPCP negotiation.  Addresses are specified using the format
+IPCP negotiation.
+Addresses are specified using the format
 .Pp
 .Dl a.b.c.d/nn
 .Pp
@@ -4057,7 +4449,8 @@
 .Dq a.b.c.d
 is the preferred IP, but
 .Ar nn
-specifies how many bits of the address we will insist on.  If
+specifies how many bits of the address we will insist on.
+If
 .No / Ns Ar nn
 is omitted, it defaults to
 .Dq /32
@@ -4082,10 +4475,12 @@
 will only negotiate
 .Dq 10.0.0.1
 as the local IP number, but may assign any of the given 10 IP
-numbers to the peer.  If the peer requests one of these numbers,
+numbers to the peer.
+If the peer requests one of these numbers,
 and that number is not already in use,
 .Nm
-will grant the peers request.  This is useful if the peer wants
+will grant the peers request.
+This is useful if the peer wants
 to re-establish a link using the same IP number as was previously
 allocated (thus maintaining any existing tcp or udp connections).
 .Pp
@@ -4098,9 +4493,11 @@
 .Ar triggeraddr
 is specified, it is used in place of
 .Ar myaddr
-in the initial IPCP negotiation.  However, only an address in the
+in the initial IPCP negotiation.
+However, only an address in the
 .Ar myaddr
-range will be accepted.  This is useful when negotiating with some
+range will be accepted.
+This is useful when negotiating with some
 .Dv PPP
 implementations that will not assign an IP number unless their peer
 requests
@@ -4112,7 +4509,8 @@
 .Nm
 will configure the interface immediately upon reading the
 .Dq set ifaddr
-line in the config file.  In any other mode, these values are just
+line in the config file.
+In any other mode, these values are just
 used for IPCP negotiations, and the interface isn't configured
 until the IPCP layer is up.
 .Pp
@@ -4157,7 +4555,8 @@
 is specified, it tells
 .Nm
 how many configuration request attempts it should make while receiving
-no reply from the peer before giving up.  The default is 5 attempts for
+no reply from the peer before giving up.
+The default is 5 attempts for
 CCP, LCP and IPCP and 3 attempts for PAP and CHAP.
 .Pp
 If
@@ -4165,7 +4564,9 @@
 is specified, it tells
 .Nm
 how many terminate requests should be sent before giving up waiting for the
-peers response.  The default is 3 attempts.  Authentication protocols are
+peers response.
+The default is 3 attempts.
+Authentication protocols are
 not terminated and it is therefore invalid to specify
 .Ar trmtries
 for PAP or CHAP.
@@ -4180,17 +4581,19 @@
 .Op +|- Ns
 .Ar value Ns No ...
 .Xc
-This command allows the adjustment of the current log level.  Refer
-to the Logging Facility section for further details.
+This command allows the adjustment of the current log level.
+Refer to the Logging Facility section for further details.
 .It set login Ar chat-script
 This
 .Ar chat-script
-compliments the dial-script.  If both are specified, the login
-script will be executed after the dial script.  Escape sequences
-available in the dial script are also available here.
+compliments the dial-script.
+If both are specified, the login
+script will be executed after the dial script.
+Escape sequences available in the dial script are also available here.
 .It set logout Ar chat-script
 This specifies the chat script that will be used to logout
-before the hangup script is called.  It should not normally be necessary.
+before the hangup script is called.
+It should not normally be necessary.
 .It set lqrperiod Ar frequency
 This command sets the
 .Ar frequency
@@ -4198,13 +4601,16 @@
 .Em LQR
 or
 .Em ECHO LQR
-packets are sent.  The default is 30 seconds.  You must also use the
+packets are sent.
+The default is 30 seconds.
+You must also use the
 .Dq enable lqr
 command if you wish to send LQR requests to the peer.
 .It set mode Ar interactive|auto|ddial|background
 This command allows you to change the
 .Sq mode
-of the specified link.  This is normally only useful in multi-link mode,
+of the specified link.
+This is normally only useful in multi-link mode,
 but may also be used in uni-link mode.
 .Pp
 It is not possible to change a link that is
@@ -4216,33 +4622,37 @@
 .Dq set mode auto ,
 and have network address translation enabled, it may be useful to
 .Dq enable iface-alias
-afterwards.  This will allow
+afterwards.
+This will allow
 .Nm
 to do the necessary address translations to enable the process that
 triggers the connection to connect once the link is up despite the
 peer assigning us a new (dynamic) IP address.
 .It set mrru Op Ar value
 Setting this option enables Multi-link PPP negotiations, also known as
-Multi-link Protocol or MP.  There is no default MRRU (Maximum
-Reconstructed Receive Unit) value.  If no argument is given, multi-link
-mode is disabled.
+Multi-link Protocol or MP.
+There is no default MRRU (Maximum Reconstructed Receive Unit) value.
+If no argument is given, multi-link mode is disabled.
 .It set mru Op Ar value
-The default MRU (Maximum Receive Unit) is 1500.  If it is increased, the
-other side *may* increase its mtu.  There is no point in decreasing the
-MRU to below the default as the
+The default MRU (Maximum Receive Unit) is 1500.
+If it is increased, the other side *may* increase its MTU.
+There is no point in decreasing the MRU to below the default as the
 .Em PPP
-protocol *must* be able to accept packets of at least 1500 octets.  If
-no argument is given, 1500 is assumed.
+protocol *must* be able to accept packets of at least 1500 octets.
+If no argument is given, 1500 is assumed.
 .It set mtu Op Ar value
-The default MTU is 1500.  At negotiation time,
+The default MTU is 1500.
+At negotiation time,
 .Nm
 will accept whatever MRU or MRRU that the peer wants (assuming it's
-not less than 296 bytes).  If the MTU is set,
+not less than 296 bytes).
+If the MTU is set,
 .Nm
 will not accept MRU/MRRU values less than
 .Ar value .
 When negotiations are complete, the MTU is assigned to the interface, even
-if the peer requested a higher value MRU/MRRU.  This can be useful for
+if the peer requested a higher value MRU/MRRU.
+This can be useful for
 limiting your packet size (giving better bandwidth sharing at the expense
 of more header data).
 .Pp
@@ -4251,7 +4661,8 @@
 is given, 1500, or whatever the peer asks for is used.
 .It set nbns Op Ar x.x.x.x Op Ar y.y.y.y
 This option allows the setting of the Microsoft NetBIOS name server
-values to be returned at the peers request.  If no values are given,
+values to be returned at the peers request.
+If no values are given,
 .Nm
 will reject any such requests.
 .It set openmode active|passive Op Ar delay
@@ -4264,7 +4675,8 @@
 That is,
 .Nm
 will always initiate LCP/IPCP/CCP negotiation one second after the line
-comes up.  If you want to wait for the peer to initiate negotiations, you
+comes up.
+If you want to wait for the peer to initiate negotiations, you
 can use the value
 .Ar passive .
 If you want to initiate negotiations immediately or after more than one
@@ -4272,7 +4684,8 @@
 .Ar delay
 may be specified here in seconds.
 .It set parity odd|even|none|mark
-This allows the line parity to be set.  The default value is
+This allows the line parity to be set.
+The default value is
 .Ar none .
 .It set phone Ar telno Ns Xo
 .Oo \&| Ns Ar backupnumber
@@ -4297,7 +4710,8 @@
 will dial them according to these rules until a connection is made, retrying
 the maximum number of times specified by
 .Dq set redial
-below.  In
+below.
+In
 .Fl background
 mode, each number is attempted at most once.
 .It set Op proc Ns Xo
@@ -4309,7 +4723,8 @@
 .Ar value .
 If
 .Ar value
-is not specified, the original process title is restored.  All the
+is not specified, the original process title is restored.
+All the
 word replacements done by the shell commands (see the
 .Dq bg
 command above) are done here too.
@@ -4400,8 +4815,8 @@
 .Dv HISADDR .
 .Pp
 All RADIUS routes are applied after any sticky routes are applied, making
-RADIUS routes override configured routes.  This also applies for RADIUS
-routes that don't include the
+RADIUS routes override configured routes.
+This also applies for RADIUS routes that don't include the
 .Dv MYADDR
 or
 .Dv HISADDR
@@ -4418,14 +4833,16 @@
 .Ar ntries
 times.
 .Ar Ntries
-defaults to zero.  A value of
+defaults to zero.
+A value of
 .Ar random
 for
 .Ar timeout
 will result in a variable pause, somewhere between 1 and 30 seconds.
 .It set recvpipe Op Ar value
-This sets the routing table RECVPIPE value.  The optimum value is
-just over twice the MTU value.  If
+This sets the routing table RECVPIPE value.
+The optimum value is just over twice the MTU value.
+If
 .Ar value
 is unspecified or zero, the default kernel controlled value is used.
 .It set redial Ar secs Ns Xo
@@ -4437,13 +4854,16 @@
 .Nm
 can be instructed to attempt to redial
 .Ar attempts
-times.  If more than one phone number is specified (see
+times.
+If more than one phone number is specified (see
 .Dq set phone
 above), a pause of
 .Ar next
-is taken before dialing each number.  A pause of
+is taken before dialing each number.
+A pause of
 .Ar secs
-is taken before starting at the first number again.  A literal value of
+is taken before starting at the first number again.
+A literal value of
 .Dq Li random
 may be used here in place of
 .Ar secs
@@ -4470,16 +4890,19 @@
 delay will be effective, even after
 .Ar attempts
 has been exceeded, so an immediate manual dial may appear to have
-done nothing.  If an immediate dial is required, a
+done nothing.
+If an immediate dial is required, a
 .Dq \&!
 should immediately follow the
 .Dq open
-keyword.  See the
+keyword.
+See the
 .Dq open
 description above for further details.
 .It set sendpipe Op Ar value
-This sets the routing table SENDPIPE value.  The optimum value is
-just over twice the MTU value.  If
+This sets the routing table SENDPIPE value.
+The optimum value is just over twice the MTU value.
+If
 .Ar value
 is unspecified or zero, the default kernel controlled value is used.
 .It set server|socket Ar TcpPort|LocalName|none password Op Ar mask
@@ -4498,23 +4921,27 @@
 If you wish to specify a local domain socket,
 .Ar LocalName
 must be specified as an absolute file name, otherwise it is assumed
-to be the name or number of a TCP port.  You must specify the octal umask
-to be used with a local domain socket.  Refer to
+to be the name or number of a TCP port.
+You must specify the octal umask to be used with a local domain socket.
+Refer to
 .Xr umask 2
-for umask details.  Refer to
+for umask details.
+Refer to
 .Xr services 5
 for details of how to translate TCP port names.
 .Pp
 You must also specify the password that must be entered by the client
 (using the
 .Dq passwd
-command above) when connecting to this socket.  If the password is
+command above) when connecting to this socket.
+If the password is
 specified as an empty string, no password is required for connecting clients.
 .Pp
 When specifying a local domain socket, the first
 .Dq %d
 sequence found in the socket name will be replaced with the current
-interface unit number.  This is useful when you wish to use the same
+interface unit number.
+This is useful when you wish to use the same
 profile for more than one connection.
 .Pp
 In a similar manner TCP sockets may be prefixed with the
@@ -4526,19 +4953,22 @@
 .Nm
 with a server socket, the
 .Xr pppctl 8
-command is the preferred mechanism of communications.  Currently,
+command is the preferred mechanism of communications.
+Currently,
 .Xr telnet 1
 can also be used, but link encryption may be implemented in the future, so
 .Xr telnet 1
 should not be relied upon.
 .It set speed Ar value
-This sets the speed of the serial device.  If speed is specified as
+This sets the speed of the serial device.
+If speed is specified as
 .Dq sync ,
 .Nm
 treats the device as a synchronous device.
 .Pp
 Certain device types will know whether they should be specified as
-synchronous or asynchronous.  These devices will override incorrect
+synchronous or asynchronous.
+These devices will override incorrect
 settings and log a warning to this effect.
 .It set stopped Op Ar LCPseconds Op Ar CCPseconds
 If this option is set,
@@ -4548,10 +4978,12 @@
 .Dq seconds .
 This option may be useful if the peer sends a terminate request,
 but never actually closes the connection despite our sending a terminate
-acknowledgement.  This is also useful if you wish to
+acknowledgement.
+This is also useful if you wish to
 .Dq set openmode passive
 and time out if the peer doesn't send a Configure Request within the
-given time.  Use
+given time.
+Use
 .Dq set log +lcp +ccp
 to make
 .Nm
@@ -4565,8 +4997,8 @@
 .Dq set openmode
 above).
 .It set timeout Ar idleseconds Op Ar mintimeout
-This command allows the setting of the idle timer.  Refer to the
-section titled
+This command allows the setting of the idle timer.
+Refer to the section titled
 .Sx SETTING THE IDLE TIMER
 for further details.
 .Pp
@@ -4584,9 +5016,11 @@
 .Xc
 This command controls the ports that
 .Nm
-prioritizes when transmitting data.  The default priority TCP ports
+prioritizes when transmitting data.
+The default priority TCP ports
 are ports 21 (ftp control), 22 (ssh), 23 (telnet), 513 (login), 514 (shell),
-543 (klogin) and 544 (kshell).  There are no priority UDP ports by default.
+543 (klogin) and 544 (kshell).
+There are no priority UDP ports by default.
 See
 .Xr services 5
 for details.
@@ -4605,7 +5039,8 @@
 .Dq tcp
 or
 .Dq udp
-is specified, only that list is cleared).  If the first
+is specified, only that list is cleared).
+If the first
 .Ar port
 argument is prefixed with a plus
 .Pq Dq \&+
@@ -4619,15 +5054,16 @@
 .It set vj slotcomp on|off
 This command tells
 .Nm
-whether it should attempt to negotiate VJ slot compression.  By default,
-slot compression is turned
+whether it should attempt to negotiate VJ slot compression.
+By default, slot compression is turned
 .Ar on .
 .It set vj slots Ar nslots
 This command sets the initial number of slots that
 .Nm
 will try to negotiate with the peer when VJ compression is enabled (see the
 .Sq enable
-command above).  It defaults to a value of 16.
+command above).
+It defaults to a value of 16.
 .Ar Nslots
 must be between
 .Ar 4
@@ -4641,17 +5077,20 @@
 .Ar command
 is not specified a shell is invoked according to the
 .Dv SHELL
-environment variable.  Otherwise, the given
+environment variable.
+Otherwise, the given
 .Ar command
-is executed.  Word replacement is done in the same way as for the
+is executed.
+Word replacement is done in the same way as for the
 .Dq !bg
 command as described above.
 .Pp
 Use of the ! character
-requires a following space as with any of the other commands.  You should
-note that this command is executed in the foreground -
+requires a following space as with any of the other commands.
+You should note that this command is executed in the foreground;
 .Nm
-will not continue running until this process has exited.  Use the
+will not continue running until this process has exited.
+Use the
 .Dv bg
 command if you wish processing to happen in the background.
 .It show Ar var
@@ -4666,7 +5105,8 @@
 .It show escape
 Show the current escape characters.
 .It show filter Op Ar name
-List the current rules for the given filter.  If
+List the current rules for the given filter.
+If
 .Ar name
 is not specified, all filters are shown.
 .It show hdlc
@@ -4710,9 +5150,10 @@
 .El
 .Pp
 .It term
-Go into terminal mode.  Characters typed at the keyboard are sent to
-the device.  Characters read from the device are displayed on the
-screen.  When a remote
+Go into terminal mode.
+Characters typed at the keyboard are sent to the device.
+Characters read from the device are displayed on the screen.
+When a remote
 .Em PPP
 peer is detected,
 .Nm
@@ -4722,7 +5163,8 @@
 .Sh MORE DETAILS
 .Bl -bullet
 .It
-Read the example configuration files.  They are a good source of information.
+Read the example configuration files.
+They are a good source of information.
 .It
 Use
 .Dq help ,
@@ -4768,13 +5210,15 @@
 .Nm
 closes a network level connection.
 .It Pa /var/log/ppp.log
-Logging and debugging information file.  Note, this name is specified in
+Logging and debugging information file.
+Note, this name is specified in
 .Pa /etc/syslogd.conf .
 See
 .Xr syslog.conf 5
 for further details.
-.It Pa /var/spool/lock/LCK..* 
-tty port locking file.  Refer to
+.It Pa /var/spool/lock/LCK..*
+tty port locking file.
+Refer to
 .Xr uucplock 3
 for further details.
 .It Pa /var/run/tunN.pid
@@ -4784,7 +5228,8 @@
 .Sq N
 is the number of the device.
 .It Pa /var/run/ttyXX.if
-The tun interface used by this port.  Again, this file is only created in
+The tun interface used by this port.
+Again, this file is only created in
 .Fl background ,
 .Fl auto
 and
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/pppd.8 man8/pppd.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/pppd.8	Mon Dec 20 16:00:48 1999
+++ man8/pppd.8	Wed Jun 14 10:23:55 2000
@@ -1,5 +1,5 @@
 .\" manual page [] for pppd 2.3
-.\" %FreeBSD: src/usr.sbin/pppd/pppd.8,v 1.18.2.1 1999/08/29 15:47:08 peter Exp %
+.\" %FreeBSD: src/usr.sbin/pppd/pppd.8,v 1.18.2.2 2000/03/03 22:37:15 sheldonh Exp %
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
@@ -58,7 +58,8 @@
 except that qualifiers which are inappropriate for a PPP link, such as
 \fBether\fR and \fBarp\fR, are not permitted.  Generally the filter
 expression should be enclosed in single-quotes to prevent whitespace
-in the expression from being interpreted by the shell. This option
+in the expression from being interpreted by the shell.
+This option
 only available
 if both the kernel and pppd were compiled with PPP_FILTER defined.
 .TP
@@ -136,7 +137,8 @@
 serial device to ensure exclusive access to the device.
 .TP
 .B mru \fIn
-Set the MRU [Maximum Receive Unit] value to \fIn\fR. Pppd
+Set the MRU [Maximum Receive Unit] value to \fIn\fR.
+Pppd
 will ask the peer to send packets of no more than \fIn\fR bytes.  The
 minimum MRU value is 128.  The default MRU value is 1500.  A value of
 296 is recommended for slow links (40 bytes for TCP/IP header + 256
@@ -305,55 +307,74 @@
 the IPX protocol will not be started.
 .TP
 .B ipx-node \fIn\fB:\fIm
-Set the IPX node numbers. The two node numbers are separated from each
-other with a colon character. The first number \fIn\fR is the local
-node number. The second number \fIm\fR is the peer's node number. Each
-node number is a hexadecimal number, at most 10 digits long. The node
-numbers on the ipx-network must be unique. There is no valid
-default. If this option is not specified then the node numbers are
+Set the IPX node numbers.
+The two node numbers are separated from each
+other with a colon character.
+The first number \fIn\fR is the local
+node number.
+The second number \fIm\fR is the peer's node number.
+Each
+node number is a hexadecimal number, at most 10 digits long.
+The node
+numbers on the ipx-network must be unique.
+There is no valid
+default.
+If this option is not specified then the node numbers are
 obtained from the peer.
 .TP
 .B ipx-router-name \fI<string>
-Set the name of the router. This is a string and is sent to the peer
+Set the name of the router.
+This is a string and is sent to the peer
 as information data.
 .TP
 .B ipx-routing \fIn
-Set the routing protocol to be received by this option. More than one
-instance of \fIipx-routing\fR may be specified. The '\fInone\fR'
-option (0) may be specified as the only instance of ipx-routing. The
+Set the routing protocol to be received by this option.
+More than one
+instance of \fIipx-routing\fR may be specified.
+The '\fInone\fR'
+option (0) may be specified as the only instance of ipx-routing.
+The
 values may be \fI0\fR for \fINONE\fR, \fI2\fR for \fIRIP/SAP\fR, and
 \fI4\fR for \fINLSP\fR.
 .TP
 .B ipxcp-accept-local
 Accept the peer's NAK for the node number specified in the ipx-node
-option. If a node number was specified, and non-zero, the default is
-to insist that the value be used. If you include this option then you
+option.
+If a node number was specified, and non-zero, the default is
+to insist that the value be used.
+If you include this option then you
 will permit the peer to override the entry of the node number.
 .TP
 .B ipxcp-accept-network
 Accept the peer's NAK for the network number specified in the
-ipx-network option. If a network number was specified, and non-zero, the
-default is to insist that the value be used. If you include this
+ipx-network option.
+If a network number was specified, and non-zero, the
+default is to insist that the value be used.
+If you include this
 option then you will permit the peer to override the entry of the node
 number.
 .TP
 .B ipxcp-accept-remote
 Use the peer's network number specified in the configure request
-frame. If a node number was specified for the peer and this option was
+frame.
+If a node number was specified for the peer and this option was
 not specified, the peer will be forced to use the value which you have
 specified.
 .TP
 .B ipxcp-max-configure \fIn
 Set the maximum number of IPXCP configure request frames which the
-system will send to \fIn\fR. The default is 10.
+system will send to \fIn\fR.
+The default is 10.
 .TP
 .B ipxcp-max-failure \fIn
 Set the maximum number of IPXCP NAK frames which the local system will
-send before it rejects the options. The default value is 3.
+send before it rejects the options.
+The default value is 3.
 .TP
 .B ipxcp-max-terminate \fIn
 Set the maximum nuber of IPXCP terminate request frames before the
-local system considers that the peer is not listening to them. The
+local system considers that the peer is not listening to them.
+The
 default value is 3.
 .TP
 .B kdebug \fIn
@@ -574,7 +595,8 @@
 expression should be enclosed in single-quotes to prevent whitespace
 in the expression from being interpreted by the shell.  Note that it
 is possible to apply different constraints to incoming and outgoing
-packets using the \fBinbound\fR and \fBoutbound\fR qualifiers. This
+packets using the \fBinbound\fR and \fBoutbound\fR qualifiers.
+This
 option is currently only available under NetBSD, and then only if both
 the kernel and pppd were compiled with PPP_FILTER defined.
 .TP
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/pppstats.8 man8/pppstats.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/pppstats.8	Mon Dec 20 14:52:56 1999
+++ man8/pppstats.8	Wed Jun 14 10:07:55 2000
@@ -1,4 +1,4 @@
-.\"	@(#) %FreeBSD: src/usr.sbin/pppstats/pppstats.8,v 1.8.2.1 1999/08/29 15:47:13 peter Exp %
+.\"	@(#) %FreeBSD: src/usr.sbin/pppstats/pppstats.8,v 1.8.2.2 2000/03/03 22:37:16 sheldonh Exp %
 .TH PPPSTATS 8 "26 June 1995"
 .SH NAME
 pppstats \- print PPP statistics
@@ -99,7 +99,8 @@
 option is specified.
 .TP
 .B NON-VJ
-The total number of non-TCP packets received by this interface. Only
+The total number of non-TCP packets received by this interface.
+Only
 reported when the
 .B -v
 option is specified.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/procctl.8 man8/procctl.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/procctl.8	Mon Dec 20 14:52:56 1999
+++ man8/procctl.8	Wed Jun 14 10:07:55 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.sbin/procctl/procctl.8,v 1.3.2.2 1999/08/29 15:47:16 peter Exp %
+.\" %FreeBSD: src/usr.sbin/procctl/procctl.8,v 1.3.2.3 2000/06/13 09:04:35 ru Exp %
 .Dd Nov 23, 1997
 .Dt PROCCTL 8
 .Os FreeBSD
@@ -6,12 +6,12 @@
 .Nm procctl
 .Nd clear procfs event flags
 .Sh SYNOPSIS
-.Nm procctl
-.Ar command
-.Op Ar ...
+.Nm
+.Ar pid ...
 .Sh DESCRIPTION
-.Nm Procctl
-clears the
+The
+.Nm
+command clears the
 .Xr procfs 5
 event mask used by
 .Xr truss 1 .
@@ -19,7 +19,7 @@
 the
 .Xr procfs 5
 events result in a non-killable process.
-The options are a list of process ID's;
+The arguments are a list of process IDs;
 .Nm
 goes through the list and clears the event masks for each specified process.
 .Sh SEE ALSO
@@ -31,4 +31,4 @@
 command was written by
 .An Sean Eric Fagan
 for
-.Bx Free .
+.Fx .
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/pw.8 man8/pw.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/pw.8	Mon Dec 20 14:52:57 1999
+++ man8/pw.8	Wed Jun 14 10:07:55 2000
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/pw/pw.8,v 1.15.2.2 1999/10/14 18:32:41 davidn Exp %
+.\" %FreeBSD: src/usr.sbin/pw/pw.8,v 1.15.2.3 2000/03/06 11:37:03 sheldonh Exp %
 .\"
 .Dd December 9, 1996
 .Dt PW 8
@@ -203,7 +203,8 @@
 .Ar show ,
 or
 .Ar next
-in any order. (For example,
+in any order.
+(For example,
 .Ar showuser , 
 .Ar usershow , 
 .Ar show user , and
@@ -450,7 +451,8 @@
 field in the user's passwd record.
 This field is not currently used, but will be used in the future to specify a
 .Em termcap
-entry like tag. See
+entry like tag.
+See
 .Xr passwd 5
 for details.
 .It Fl h Ar fd
@@ -628,7 +630,8 @@
 .Pp
 The
 .Ar userdel
-command has only three valid options. The
+command has only three valid options.
+The
 .Ql Fl n Ar name
 and
 .Ql Fl u Ar uid
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/pwd_mkdb.8 man8/pwd_mkdb.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/pwd_mkdb.8	Mon Dec 20 14:52:57 1999
+++ man8/pwd_mkdb.8	Wed Jun 14 10:07:55 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pwd_mkdb.8	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.sbin/pwd_mkdb/pwd_mkdb.8,v 1.8.2.2 1999/08/31 06:44:17 sheldonh Exp %
+.\" %FreeBSD: src/usr.sbin/pwd_mkdb/pwd_mkdb.8,v 1.8.2.4 2000/03/27 10:07:27 sheldonh Exp %
 .\"
 .Dd June 6, 1993
 .Dt PWD_MKDB 8
@@ -67,7 +67,8 @@
 The options are as follows:
 .Bl -tag -width flag
 .It Fl C
-Check if the password file is in the correct format. Do not
+Check if the password file is in the correct format.
+Do not
 change, add, or remove any files.
 .It Fl N
 Tell
@@ -103,6 +104,15 @@
 .Pp
 .Nm Pwd_mkdb
 exits zero on success, non-zero on failure.
+.Sh ENVIRONMENT
+If the
+.Ev PW_SCAN_BIG_IDS
+environment variable is set,
+.Nm
+will suppress the warning messages that are
+normally generated for large user and group IDs.
+Such IDs can cause serious problems with software
+that makes assumptions about the values of IDs.
 .Sh FILES
 .Bl -tag -width Pa -compact
 .It Pa /etc/pwd.db
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/rc.8 man8/rc.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/rc.8	Mon Dec 20 14:50:15 1999
+++ man8/rc.8	Wed Jun 14 10:05:47 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rc.8	8.2 (Berkeley) 12/11/93
-.\" %FreeBSD: src/share/man/man8/rc.8,v 1.7.2.1 1999/08/29 16:47:04 peter Exp %
+.\" %FreeBSD: src/share/man/man8/rc.8,v 1.7.2.2 2000/03/06 11:33:55 sheldonh Exp %
 .\"
 .Dd December 11, 1993
 .Dt RC 8
@@ -115,7 +115,8 @@
 .Pp
 .Nm Rc.firewall
 is used to configure rules for the kernel based firewall
-service. It has several possible options:
+service.
+It has several possible options:
 .Pp
 .Bl -tag -width "fBfilename" -compact -offset indent
 .It open
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/reboot.8 man8/reboot.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/reboot.8	Mon Dec 20 14:49:22 1999
+++ man8/reboot.8	Wed Jun 14 10:05:13 2000
@@ -30,16 +30,17 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)reboot.8	8.1 (Berkeley) 6/9/93
-.\" %FreeBSD: src/sbin/reboot/reboot.8,v 1.5.2.2 1999/08/29 15:15:12 peter Exp %
+.\" %FreeBSD: src/sbin/reboot/reboot.8,v 1.5.2.4 2000/03/03 15:13:11 sheldonh Exp %
 .\"
 .Dd June 9, 1993
 .Dt REBOOT 8
 .Os
 .Sh NAME
 .Nm reboot ,
-.Nm halt
-.Nd
-stopping and restarting the system
+.Nm halt ,
+.Nm fastboot ,
+.Nm fasthalt
+.Nd stopping and restarting the system
 .Sh SYNOPSIS
 .Nm halt
 .Op Fl nqp
@@ -77,7 +78,8 @@
 This option should probably not be used.
 .It Fl p
 The system will turn off the power
-if it can. This is of course likely to make 
+if it can.
+This is of course likely to make 
 .Nm
 rather similar to 
 .Nm halt .
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/restore.8 man8/restore.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/restore.8	Mon Dec 20 14:49:23 1999
+++ man8/restore.8	Wed Jun 14 10:05:14 2000
@@ -30,13 +30,14 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)restore.8	8.4 (Berkeley) 5/1/95
-.\" %FreeBSD: src/sbin/restore/restore.8,v 1.15.2.1 1999/08/29 15:15:18 peter Exp %
+.\" %FreeBSD: src/sbin/restore/restore.8,v 1.15.2.3 2000/03/03 15:13:13 sheldonh Exp %
 .\"
 .Dd May 1, 1995
 .Dt RESTORE 8
 .Os BSD 4
 .Sh NAME
-.Nm restore
+.Nm restore ,
+.Nm rrestore
 .Nd "restore files or file systems from backups made with dump"
 .Sh SYNOPSIS
 .Nm restore
@@ -187,7 +188,8 @@
 mounted and the user
 .Xr cd Ns 'd
 into the pristine file system
-before starting the restoration of the initial level 0 backup. If the
+before starting the restoration of the initial level 0 backup.
+If the
 level 0 restores successfully, the
 .Fl r
 flag may be used to restore
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/rlogind.8 man8/rlogind.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/rlogind.8	Mon Dec 20 14:48:41 1999
+++ man8/rlogind.8	Wed Jun 14 10:04:45 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rlogind.8	8.1 (Berkeley) 6/4/93
-.\" %FreeBSD: src/libexec/rlogind/rlogind.8,v 1.10.2.1 1999/08/29 15:03:44 peter Exp %
+.\" %FreeBSD: src/libexec/rlogind/rlogind.8,v 1.10.2.2 2000/01/07 13:17:00 phantom Exp %
 .\"
 .Dd June 4, 1993
 .Dt RLOGIND 8
@@ -74,13 +74,17 @@
 Enable 
 .Tn DES
 encryption for all data passed via the rlogin
-session.   This may impact response time
-and CPU utilization, but provides increased security.
+session.  This may impact response time
+and
+.Tn CPU
+utilization, but provides increased security.
 .El
 .Pp
 .Nm Rlogind
 listens for service requests at the port indicated in
-the ``login'' service specification; see
+the
+.Dq login
+service specification; see
 .Xr services 5 .
 When a service request is received the following protocol
 is initiated:
@@ -169,21 +173,27 @@
 .Sh SEE ALSO
 .Xr login 1 ,
 .Xr ruserok 3 ,
+.Xr hosts.equiv 5 ,
 .Xr hosts 5 ,
+.Xr login.conf 5 ,
 .Xr nologin 5 ,
-.Xr rshd 8
+.Xr services 5 ,
+.Xr rshd 8 .
 .Sh FILES
 .Bl -tag -width /etc/hostsxxxxxxxx -compact
 .It Pa /etc/hosts
 .It Pa /etc/hosts.equiv
-.It Pa $HOME/.rhosts
+.Sm off
+.It Pa Ev $HOME /.rhosts
+.Sm on
 .It Pa /var/run/nologin
 .El
-
 .Sh BUGS
 The authentication procedure used here assumes the integrity
 of each client machine and the connecting medium.  This is
-insecure, but is useful in an ``open'' environment.
+insecure, but is useful in an
+.Dq open
+environment.
 .Pp
 A facility to allow all data exchanges to be encrypted should be
 present.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/rndcontrol.8 man8/rndcontrol.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/rndcontrol.8	Mon Dec 20 14:53:34 1999
+++ man8/rndcontrol.8	Wed Jun 14 10:08:22 2000
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/rndcontrol/rndcontrol.8,v 1.8.2.1 1999/08/29 15:47:44 peter Exp %
+.\" %FreeBSD: src/usr.sbin/rndcontrol/rndcontrol.8,v 1.8.2.2 2000/03/06 11:37:07 sheldonh Exp %
 .\"
 .Dd October 20, 1995
 .Dt RNDCONTROL 8
@@ -47,7 +47,8 @@
 The
 .Nm
 command is used to set which interrupts are used to help randomise
-the ``pool of entropy'' maintained by the kernel. The 
+the ``pool of entropy'' maintained by the kernel.
+The 
 .Pa /dev/random
 and
 .Pa /dev/urandom
@@ -61,12 +62,14 @@
 .It Fl s  Ar n
 Allow IRQ
 .Ar n
-to be used as a source of randomness. This option may be repeated for
+to be used as a source of randomness.
+This option may be repeated for
 more than one IRQ.
 .It Fl c  Ar n
 Stop IRQ
 .Ar n
-from being used as a source of randomness. This option may be repeated for
+from being used as a source of randomness.
+This option may be repeated for
 more than one IRQ.
 .El
 .Pp
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/routed.8 man8/routed.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/routed.8	Mon Dec 20 14:49:25 1999
+++ man8/routed.8	Wed Jun 14 10:05:15 2000
@@ -1,3 +1,5 @@
+.\" %FreeBSD: src/sbin/routed/routed.8,v 1.11.2.2 2000/02/17 04:26:38 peter Exp %
+.\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -30,17 +32,19 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)routed.8	8.2 (Berkeley) 12/11/93
-.\" %FreeBSD: src/sbin/routed/routed.8,v 1.11.2.1 1999/08/29 15:15:31 peter Exp %
+.\"
+.\" %FreeBSD: src/sbin/routed/routed.8,v 1.11.2.2 2000/02/17 04:26:38 peter Exp %
 .\"
 .Dd June 1, 1996
 .Dt ROUTED 8
 .Os BSD 4.4
 .Sh NAME
-.Nm routed
+.Nm routed ,
+.Nm rdisc
 .Nd network RIP and router discovery routing daemon
 .Sh SYNOPSIS
 .Nm routed
-.Op Fl sqdghmAt
+.Op Fl sqdghmpAtv
 .Op Fl T Ar tracefile
 .Oo
 .Fl F
@@ -55,7 +59,9 @@
 RIPv2 (RFC\ 1723),
 and Internet Router Discovery Protocol (RFC 1256)
 to maintain the kernel routing table.
-The RIPv1 protocol is based on the reference 4.3BSD daemon.
+The RIPv1 protocol is based on the reference
+.Bx 4.3
+daemon.
 .Pp
 It listens on the
 .Xr udp 4
@@ -116,7 +122,7 @@
 so setting the metric on an interface
 is an effective way to steer traffic.
 .Pp
-Responses do not contain routes with a first hop on the requesting
+Responses do not include routes with a first hop on the requesting
 network to implement in part
 .Em split-horizon .
 Requests from query programs
@@ -152,7 +158,7 @@
 is set to infinity and marked for deletion.
 Deletions are delayed until the route has been advertised with
 an infinite metric to insure the invalidation
-is propagated throughout the local Internet.
+is propagated throughout the local internet.
 This is a form of
 .Em poison reverse .
 .Pp
@@ -180,7 +186,7 @@
 If no response is received on a remote interface, if there are errors
 while sending responses,
 or if there are more errors than input or output (see
-.Xr netstat 8 ),
+.Xr netstat 1 ),
 then the cable or some other part of the interface is assumed to be
 disconnected or broken, and routes are adjusted appropriately.
 .Pp
@@ -189,15 +195,17 @@
 is handled similarly.
 When the daemon is supplying RIP routes, it also listens for
 Router Discovery Solicitations and sends Advertisements.
-When it is quiet and only listening to other RIP routers, it
+When it is quiet and listening to other RIP routers, it
 sends Solicitations and listens for Advertisements.
 If it receives
-a good Advertisement, it stops listening for broadcast or multicast
-RIP responses.
+a good Advertisement and it is not multi-homed,
+it stops listening for broadcast or multicast RIP responses.
 It tracks several advertising routers to speed recovery when the
 currently chosen router dies.
 If all discovered routers disappear,
 the daemon resumes listening to RIP responses.
+It continues listening to RIP while using Router Discovery
+if multi-homed to ensure all interfaces are used.
 .Pp
 The Router Discovery standard requires that advertisements
 have a default "lifetime" of 30 minutes.  That means should
@@ -217,9 +225,7 @@
 redirected host routes in the kernel table.
 On a host with more than one network interface,
 this default route will be via only one of the interfaces.
-Thus, multi-homed hosts running with
-.Fl q
-might need
+Thus, multi-homed hosts running with \f3\-q\f1 might need
 .Cm no_rdisc
 described below.
 .Pp
@@ -238,22 +244,24 @@
 The following options are available:
 .Bl -tag -width indent
 .It Fl s
-Force
+force
 .Nm
 to supply routing information.
 This is the default if multiple network interfaces are present on which
 RIP or Router Discovery have not been disabled, and if the kernel switch
 ipforwarding=1.
 .It Fl q
-Is the opposite of the
+is the opposite of the
 .Fl s
 option.
 This is the default when only one interface is present.
+With this explicit option, the daemon is always in "quite-mode" for RIP
+and does not supply routing information to other computers.
 .It Fl d
-Do not run in the background.
+do not run in the background.
 This option is meant for interactive use.
 .It Fl g
-Used on internetwork routers to offer a route
+used on internetwork routers to offer a route
 to the "default" destination.
 It is equivalent to
 .Fl F
@@ -266,23 +274,23 @@
 in the
 .Pa /etc/gateways
 file.
-Since a larger metric
+since a larger metric
 will be used, reducing the spread of the potentially dangerous
 default route.
 This is typically used on a gateway to the Internet,
 or on a gateway that uses another routing protocol whose routes
 are not reported to other local routers.
 Notice that because a metric of 1 is used, this feature is
-dangerous.  It is more commonly accidentally used to create chaos with routing
-loop than to solve problems.
+dangerous.  It is more commonly accidentally used to create chaos with a
+routing loop than to solve problems.
 .It Fl h
-Cause host or point-to-point routes to not be advertised,
+cause host or point-to-point routes to not be advertised,
 provided there is a network route going the same direction.
 That is a limited kind of aggregation.
 This option is useful on gateways to Ethernets that have other gateway
 machines connected with point-to-point links such as SLIP.
 .It Fl m
-Cause the machine to advertise a host or point-to-point route to
+cause the machine to advertise a host or point-to-point route to
 its primary interface.
 It is useful on multi-homed machines such as NFS servers.
 This option should not be used except when the cost of
@@ -296,20 +304,14 @@
 .Fl q
 option to the limited extent of advertising the host route.
 .It Fl A
-Do not ignore RIPv2 authentication if we do not care about RIPv2
+do not ignore RIPv2 authentication if we do not care about RIPv2
 authentication.
 This option is required for conformance with RFC 1723.
 However, it makes no sense and breaks using RIP as a discovery protocol
 to ignore all RIPv2 packets that carry authentication when this machine
 does not care about authentication.
-.It Fl T Ar tracefile
-Increase the debugging level to at least 1 and
-causes debugging information to be appended to the trace file.
-Note that because of security concerns, it is wisest to not run
-.Nm
-routinely with tracing directed to a file.
 .It Fl t
-Increase the debugging level, which causes more information to be logged
+increase the debugging level, which causes more information to be logged
 on the tracefile specified with
 .Fl T
 or standard out.
@@ -321,8 +323,16 @@
 signals or with the
 .Xr rtquery 8
 command.
+.It Fl T Ar tracefile
+increases the debugging level to at least 1 and
+causes debugging information to be appended to the trace file.
+Note that because of security concerns, it is wisest to not run
+.Nm
+routinely with tracing directed to a file.
+.It Fl v
+display and logs the version of daemon.
 .It Fl F Ar net[/mask][,metric]
-Minimize routes in transmissions via interfaces with addresses that match
+minimize routes in transmissions via interfaces with addresses that match
 .Em net/mask ,
 and synthesizes a default route to this machine with the
 .Em metric .
@@ -333,7 +343,6 @@
 .Em metric
 is absent, a value of 14 is assumed to limit
 the spread of the "fake" default route.
-
 This is a dangerous feature that when used carelessly can cause routing
 loops.
 Notice also that more than one interface can match the specified network
@@ -341,7 +350,7 @@
 See also
 .Fl g .
 .It Fl P Ar parms
-Is equivalent to adding the parameter
+is equivalent to adding the parameter
 line
 .Em parms
 to the
@@ -397,10 +406,12 @@
 Such gateways can be useful on media that do not support broadcasts
 or multicasts but otherwise act like classic shared media like
 Ethernets such as some ATM networks.
-One can list all RIP routers reachable on the ATM network in
+One can list all RIP routers reachable on the HIPPI or ATM network in
 .Pa /etc/gateways
 with a series of
 "host" lines.
+Note that it is usually desirable to use RIPv2 in such situations
+to avoid generating lists of inferred host routes.
 .Pp
 Gateways marked
 .Em external
@@ -409,7 +420,7 @@
 The function of external entries is to indicate
 that another routing process
 will install such a route if necessary,
-and that alternate routes to that destination should not be installed
+and that other routes to that destination should not be installed
 by
 .Nm Ns .
 Such entries are only required when both routers may learn of routes
@@ -418,7 +429,8 @@
 The
 .Pa /etc/gateways
 file is comprised of a series of lines, each in
-one of the following formats or consist of parameters described below:
+one of the following two formats or consist of parameters described later.
+Blank lines and lines starting with '#' are comments.
 .Pp
 .Bd -ragged
 .Cm net
@@ -488,6 +500,15 @@
 .Cm external
 to the scope of the RIP protocol.
 .Pp
+As can be seen when debugging is turned on with
+.Fl t ,
+such lines create pseudo-interfaces.
+To set parameters for remote or external interfaces,
+a line starting with
+.Cm if=alias(Hname) ,
+.Cm if=remote(Hname) ,
+etc. should be used.
+.Pp
 Lines that start with neither "net" nor "host" must consist of one
 or more of the following parameter settings, separated by commas or
 blanks:
@@ -504,14 +525,21 @@
 and the supplied metric (default 1).
 This is useful for filling "holes" in CIDR allocations.
 This parameter must appear by itself on a line.
+The network number must specify a full, 32-bit value, as in 192.0.2.0
+instead of 192.0.2.
 .Pp
 Do not use this feature unless necessary.  It is dangerous.
-.It Cm passwd Ns \&= Ns Ar XXX
-specifies a RIPv2 password that will be included on all RIPv2
-responses sent and checked on all RIPv2 responses received.
-The password must not contain any blanks, tab characters, commas
-or '#' characters.
-.It Cm passwd Ns \&= Ns Ar XXX1[|KeyID[start|stop]]
+.It Cm ripv1_mask Ns \&= Ns Ar nname/mask1,mask2
+specifies that netmask of the network of which
+.Cm nname/mask1\f1
+is
+a subnet should be
+.Cm mask2 .
+For example \f2ripv1_mask=192.0.2.16/28,27\f1 marks 192.0.2.16/28
+as a subnet of 192.0.2.0/27 instead of 192.0.2.0/24.
+It is better to turn on RIPv2 instead of using this facility, for example
+with \f2ripv2_out\f1.
+.It Cm passwd Ns \&= Ns Ar XXX[|KeyID[start|stop]]
 specifies a RIPv2 cleartext password that will be included on
 all RIPv2 responses sent, and checked on all RIPv2 responses received.
 Any blanks, tab characters, commas, or '#', '|', or NULL characters in the
@@ -533,15 +561,15 @@
 no password is output.
 Incoming packets can carry any password that is valid, will
 be valid within 24 hours, or that was valid within 24 hours.
-.It Cm md5_passwd Ns \&= Ns Ar XXX1|KeyID[start|stop]
+To protect the secrets, the passwd settings are valid only in the
+.Em /etc/gateways
+file and only when that file is readable only by UID 0.
+.It Cm md5_passwd Ns \&= Ns Ar XXX|KeyID[start|stop]
 specifies a RIPv2 MD5 password.
 Except that a
 .Cm KeyID
 is required, this keyword is similar to
 .Cm passwd .
-To protect the secrets, this parameter setting is valid only in the
-.Pa /etc/gateways
-file and only when that file is readable only by UID 0.
 .It Cm no_ag
 turns off aggregation of subnets in RIPv1 and RIPv2 responses.
 .It Cm no_super_ag
@@ -563,18 +591,21 @@
 causes
 .Nm
 to act as a client router discovery daemon, not advertising.
+.It Cm no_rip_mcast
+causes RIPv2 packets to be broadcast instead of multicast.
 .It Cm no_ripv1_in
 causes RIPv1 received responses to be ignored.
 .It Cm no_ripv2_in
 causes RIPv2 received responses to be ignored.
 .It Cm ripv2_out
-turns off RIPv1 output and causes RIPv2 advertisements to be
+turns on RIPv2 output and causes RIPv2 advertisements to be
 multicast when possible.
 .It Cm ripv2
 is equivalent to
 .Cm no_ripv1_in
 and
 .Cm no_ripv1_out .
+This enables RIPv2.
 .It Cm no_rdisc
 disables the Internet Router Discovery Protocol.
 .It Cm no_solicit
@@ -593,8 +624,12 @@
 specifies that Router Discovery packets should be broadcast instead of
 multicast.
 .It Cm rdisc_pref Ns \&= Ns Ar N
-sets the preference in Router Discovery Advertisements to the integer
+sets the preference in Router Discovery Advertisements to the optionally
+signed integer
 .Ar N .
+The default preference is 0.
+Default routes with smaller or more negative preferences are preferred by
+clients.
 .It Cm rdisc_interval Ns \&= Ns Ar N
 sets the nominal interval with which Router Discovery Advertisements
 are transmitted to N seconds and their lifetime to 3*N.
@@ -612,15 +647,17 @@
 .Cm fake_default ,
 the default route is broadcast with a metric of 14.
 That serves as a "poor man's router discovery" protocol.
-.It Cm trust_gateway Ns \&= Ns Ar rname
+.It Cm trust_gateway Ns \&= Ns Ar rname[|net1/mask1|net2/mask2|...]
 causes RIP packets from that router and other routers named in
 other
 .Cm trust_gateway
-keywords to be accept, and packets from other routers to be ignored.
+keywords to be accepted, and packets from other routers to be ignored.
+If networks are specified, then routes to other networks will be ignored
+from that router.
 .It Cm redirect_ok
 causes RIP to allow ICMP Redirect messages when the system is acting
 as a router and forwarding packets.
-Otherwise, ICMP Redirect messages are are overridden.
+Otherwise, ICMP Redirect messages are overridden.
 .El
 .Pp
 .Sh FILES
@@ -631,16 +668,15 @@
 .Sh SEE ALSO
 .Xr icmp 4 ,
 .Xr udp 4 ,
-.Xr gated 8 ,
-.Xr rtquery 8
+.Xr rtquery 8 .
 .Rs
 .%T Internet Transport Protocols
 .%R XSIS 028112
 .%Q Xerox System Integration Standard
 .Re
 .Sh BUGS
-It does not always detect unidirectional failures in network interfaces
-(e.g., when the output side fails).
+It does not always detect unidirectional failures in network interfaces,
+for example, when the output side fails.
 .Sh HISTORY
 The
 .Nm
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/rpc.yppasswdd.8 man8/rpc.yppasswdd.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/rpc.yppasswdd.8	Mon Dec 20 14:52:59 1999
+++ man8/rpc.yppasswdd.8	Wed Jun 14 10:07:57 2000
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8,v 1.9.2.1 1999/08/29 15:47:54 peter Exp %
+.\" %FreeBSD: src/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8,v 1.9.2.2 2000/03/06 11:37:11 sheldonh Exp %
 .\"
 .Dd February 8, 1996
 .Dt RPC.YPPASSWDD 8
@@ -72,16 +72,19 @@
 .Nm
 server allows a normal NIS user to change
 his or her NIS password, full name (also
-known as 'GECOS' field) or shell. These updates are typically done using
+known as 'GECOS' field) or shell.
+These updates are typically done using
 the
 .Xr yppasswd 1 ,
 .Xr ypchfn 1 ,
 .Xr ypchsh 1 ,
 or
 .Xr ypchpass 1
-commands. (Some administrators don't want users to be able to change their
+commands.
+(Some administrators don't want users to be able to change their
 full name information or shells; the server can be invoked with option flags
-that disallow such changes.) When the server receives an update request,
+that disallow such changes.)
+When the server receives an update request,
 it compares the address of the client making the request against the
 .Pa securenets
 rules outlined in
@@ -102,9 +105,11 @@
 .Pa /var/yp/master.passwd )
 and then runs the
 .Pa /usr/libexec/yppwupdate
-script to rebuild the NIS maps. (This script has two arguments passed
+script to rebuild the NIS maps.
+(This script has two arguments passed
 to it: the absolute pathname of the password template that was modified
-and the name of the domain that is to be updated. These in turn are
+and the name of the domain that is to be updated.
+These in turn are
 passed to
 .Pa /var/yp/Makefile ) .
 .Pp
@@ -113,7 +118,8 @@
 version of
 .Nm
 also allows the super-user on the NIS master server to perform more
-sophisticated updates on the NIS passwd maps. The super-user can modify
+sophisticated updates on the NIS passwd maps.
+The super-user can modify
 any field in any user's master.passwd entry in any domain, and can
 do so without knowing the user's existing NIS password (when the server
 receives a request from the super-user, the password authentication
@@ -159,39 +165,46 @@
 choose one domain as a default.
 It will try to use the system default domain name as set by the
 .Xr domainname 1
-command for this default. However,
+command for this default.
+However,
 if the system domain name is not
 set, a default domain must be specified on
-the command line. If the system default domain is set,
+the command line.
+If the system default domain is set,
 then this option can be used to override it.
 .It Fl p Ar path
 This option can be used to override the default path to
 the location of the NIS
-map databases. The compiled-in default path is
+map databases.
+The compiled-in default path is
 .Pa /var/yp .
 .It Fl s
 Disallow changing of shell information.
 .It Fl f
 Disallow changing of full name ('GECOS') information.
 .It Fl a
-Allow additions to be made to the NIS passwd databases. The super-user on the
+Allow additions to be made to the NIS passwd databases.
+The super-user on the
 NIS master server is permitted to use the
 .Xr ypchpass 1
 command to perform unrestricted modifications to any field in a user's
 .Pa master.passwd
-map entry. When
+map entry.
+When
 .Nm
 is started with this flag, it will also allow the super-user to add new
 records to the NIS passwd maps, just as is possible when using
 .Xr chpass 1
 to modify the local password database.
 .It Fl m
-Turn on multi-domain mode. Even though
+Turn on multi-domain mode.
+Even though
 .Xr ypserv 8
 can handle several simultaneous domains, most implementations of
 .Nm
 can only operate on a single NIS domain, which is generally the same as
-the system default domain of the NIS master server. The
+the system default domain of the NIS master server.
+The
 .Bx Free
 .Nm
 attempts to overcome this problem in spite of the inherent limitations
@@ -199,18 +212,22 @@
 .Pa yppasswd
 protocol, which does not allow for a
 .Pa domain
-argument in client requests. In multi-domain mode,
+argument in client requests.
+In multi-domain mode,
 .Nm
 will search through all the passwd maps of all the domains it
 can find under
 .Pa /var/yp
 until it finds an entry that matches the user information specified in
-a given update request. (Matches are determined by checking the username,
-UID and GID fields.) The matched entry and corresponding domain are then
+a given update request.
+(Matches are determined by checking the username,
+UID and GID fields.)
+The matched entry and corresponding domain are then
 used for the update.
 .Pp
 Note that in order for multi-domain mode to work, there have to be
-seperate template files for each domain. For example, if a server
+seperate template files for each domain.
+For example, if a server
 supports three domains,
 .Pa foo ,
 .Pa bar ,
@@ -232,26 +249,33 @@
 if it can't find it.
 .Pp
 Multi-domain mode is off by default since it can fail if there are
-duplicate or near-duplicate user entries in different domains. The server
+duplicate or near-duplicate user entries in different domains.
+The server
 will abort an update request if it finds more than one user entry that
-matches its search criteria. Even so, paranoid administrators
+matches its search criteria.
+Even so, paranoid administrators
 may wish to leave multi-domain mode disabled.
 .It Fl i
 If
 .Nm
-is invoked with this flag, it will perform map updates in place. This
+is invoked with this flag, it will perform map updates in place.
+This
 means that instead of just modifying the password template file and
 starting a map update, the server will modify the map databases
-directly. This is useful when the password maps are large: if, for
+directly.
+This is useful when the password maps are large: if, for
 example, the password database has tens of thousands of entries, it
-can take several minutes for a map update to complete. Updating the
+can take several minutes for a map update to complete.
+Updating the
 maps in place reduces this time to a few seconds.
 .It Fl v
-Turn on verbose logging mode. The server normally only logs messages
+Turn on verbose logging mode.
+The server normally only logs messages
 using the
 .Xr syslog 3
 facility when it encounters an error condition, or when processing
-updates for the super-user on the NIS master server. Running the server
+updates for the super-user on the NIS master server.
+Running the server
 with the
 .Fl v
 flag will cause it to log informational messages for all updates.
@@ -268,16 +292,19 @@
 By default,
 .Nm
 expects to receive requests from clients using reserved ports; requests
-received from non-privileged ports are rejected. Unfortunately, this
+received from non-privileged ports are rejected.
+Unfortunately, this
 behavior prevents any client systems that to not use privileged
-ports from sucessfully submitting password updates. Specifying
+ports from sucessfully submitting password updates.
+Specifying
 the
 .Fl u
 flag to
 .Nm
 disables the privileged port check so that it will work with
 .Xr yppasswd 1
-clients that don't use privileged ports. This reduces security to
+clients that don't use privileged ports.
+This reduces security to
 a certain small degree, but it might be necessary in cases where it
 is not possible to change the client behavior.
 .It Fl h
@@ -308,7 +335,8 @@
 As listed in the yppasswd.x protocol definition, the YPPASSWDPROC_UPDATE
 procedure takes two arguments: a V7-style passwd structure containing
 updated user information and the user's existing unencrypted (cleartext)
-password. Since
+password.
+Since
 .Nm
 is supposed to handle update requests from remote NIS client machines,
 this means that
@@ -320,7 +348,8 @@
 sent with the update will no longer be valid once the new encrypted password
 is put into place, but if the user is only updating his or her 'GECOS'
 information or shell, then the cleartext password sent with the update
-will still be valid once the update is completed. If the network is
+will still be valid once the update is completed.
+If the network is
 insecure, this cleartext password could be intercepted and used to
 gain unauthorized access to the user's account.
 .Sh AUTHORS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/rpc.ypxfrd.8 man8/rpc.ypxfrd.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/rpc.ypxfrd.8	Mon Dec 20 14:53:00 1999
+++ man8/rpc.ypxfrd.8	Wed Jun 14 10:07:58 2000
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8,v 1.7.2.1 1999/08/29 15:48:03 peter Exp %
+.\" %FreeBSD: src/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8,v 1.7.2.2 2000/03/06 11:37:12 sheldonh Exp %
 .\"
 .Dd June 2, 1996
 .Dt RPC.YPXFRD 8
@@ -43,7 +43,8 @@
 The
 .Nm
 daemon is used to speed up the distribtion of very large NIS maps
-from NIS master to NIS slave servers. The normal method for transfering
+from NIS master to NIS slave servers.
+The normal method for transfering
 maps involves several steps:
 .Bl -bullet -offset indent
 .It
@@ -71,12 +72,14 @@
 .El
 .Pp
 This process can take several minutes when there are very large
-maps involved. For example: a passwd database with several tens of
+maps involved.
+For example: a passwd database with several tens of
 thousands of entries can consume several megabytes of disk space,
 and it can take the
 .Xr db 3
 library package a long time to sort and store all the records
-in a hash database. Consider also that there are two sets of map
+in a hash database.
+Consider also that there are two sets of map
 files:
 .Pa master.passwd.by{name,uid}
 and
@@ -86,9 +89,11 @@
 .Nm
 server speeds up the transfer process by allowing NIS slave servers to
 simply copy the master server's map files rather than building their
-own from scratch. Simply put,
+own from scratch.
+Simply put,
 .Nm
-implements an RPC-based file transfer protocol. Transfering even
+implements an RPC-based file transfer protocol.
+Transfering even
 a multi-megabyte file in this fashion takes only a few seconds compared
 to the several minutes it would take even a reasonably fast slave server
 to build a new map from scratch.
@@ -100,7 +105,8 @@
 This means that slave servers will only be permitted to transfer
 files if the rules in the
 .Xr securenets 5
-database permit it. Furthermore, only slave servers using reserved
+database permit it.
+Furthermore, only slave servers using reserved
 ports will be allowed to transfer the
 .Pa master.passwd
 maps.
@@ -110,7 +116,8 @@
 .It Fl p Ar path
 This option can be used to override the default path to
 the location of the NIS
-map databases. The compiled-in default path is
+map databases.
+The compiled-in default path is
 .Pa /var/yp .
 .El
 .Sh FILES
@@ -127,13 +134,16 @@
 The
 .Bx Free
 .Nm ypxfrd
-protocol is not compatible with that used by SunOS. This is unfortunate
+protocol is not compatible with that used by SunOS.
+This is unfortunate
 but unavoidable: Sun's protocol is not freely available, and even if it
 were it would probably not be useful since the SunOS NIS v2 implementation
 uses the original ndbm package for its map databases whereas the
 .Bx Free
-implementation uses Berkeley DB. These two packages use vastly different
-file formats. Furthermore, ndbm is byte-order sensitive and not very
+implementation uses Berkeley DB.
+These two packages use vastly different
+file formats.
+Furthermore, ndbm is byte-order sensitive and not very
 smart about it, meaning that am ndbm database created on a big endian
 system can't be read on a little endian system.
 .Sh AUTHORS
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/rrestore.8 man8/rrestore.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/rrestore.8	Mon Dec 20 14:49:23 1999
+++ man8/rrestore.8	Wed Jun 14 10:05:14 2000
@@ -30,13 +30,14 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)restore.8	8.4 (Berkeley) 5/1/95
-.\" %FreeBSD: src/sbin/restore/restore.8,v 1.15.2.1 1999/08/29 15:15:18 peter Exp %
+.\" %FreeBSD: src/sbin/restore/restore.8,v 1.15.2.3 2000/03/03 15:13:13 sheldonh Exp %
 .\"
 .Dd May 1, 1995
 .Dt RESTORE 8
 .Os BSD 4
 .Sh NAME
-.Nm restore
+.Nm restore ,
+.Nm rrestore
 .Nd "restore files or file systems from backups made with dump"
 .Sh SYNOPSIS
 .Nm restore
@@ -187,7 +188,8 @@
 mounted and the user
 .Xr cd Ns 'd
 into the pristine file system
-before starting the restoration of the initial level 0 backup. If the
+before starting the restoration of the initial level 0 backup.
+If the
 level 0 restores successfully, the
 .Fl r
 flag may be used to restore
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/rshd.8 man8/rshd.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/rshd.8	Mon Dec 20 14:48:43 1999
+++ man8/rshd.8	Wed Jun 14 10:04:46 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rshd.8	8.1 (Berkeley) 6/4/93
-.\" %FreeBSD: src/libexec/rshd/rshd.8,v 1.15.2.1 1999/08/29 15:03:57 peter Exp %
+.\" %FreeBSD: src/libexec/rshd/rshd.8,v 1.15.2.2 2000/01/07 13:17:02 phantom Exp %
 .\"
 .Dd June 4, 1993
 .Dt RSHD 8
@@ -56,7 +56,9 @@
 .Nm
 server
 listens for service requests at the port indicated in
-the ``cmd'' service specification; see
+the
+.Dq cmd
+service specification; see
 .Xr services 5 .
 When a service request is received the following protocol
 is initiated:
@@ -87,7 +89,7 @@
 .Xr gethostbyaddr 3 ,
 .Xr hosts 5
 and
-.Xr named 8 ).
+.Xr named 8 ) .
 If the hostname cannot be determined or the hostname and address do
 not match after verification,
 the dot-notation representation of the host address is used.
@@ -218,6 +220,8 @@
 .Xr gethostbyaddr 3 ,
 .Xr rcmd 3 ,
 .Xr ruserok 3 ,
+.Xr auth.conf 5 ,
+.Xr hosts.equiv 5 ,
 .Xr hosts 5 ,
 .Xr login.conf 5 ,
 .Xr nologin 5 ,
@@ -230,13 +234,17 @@
 .It Pa /etc/hosts
 .It Pa /etc/hosts.equiv
 .It Pa /etc/login.conf
-.It Pa $HOME/.rhosts
+.Sm off
+.It Pa Ev $HOME /.rhosts
+.Sm on
 .It Pa /var/run/nologin
 .El
 .Sh BUGS
 The authentication procedure used here assumes the integrity
 of each client machine and the connecting medium.  This is
-insecure, but is useful in an ``open'' environment.
+insecure, but is useful in an
+.Dq open
+environment.
 .Pp
 A facility to allow all data exchanges to be encrypted should be
 present.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/rtquery.8 man8/rtquery.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/rtquery.8	Mon Dec 20 14:49:26 1999
+++ man8/rtquery.8	Wed Jun 14 10:05:15 2000
@@ -1,4 +1,6 @@
-.\" %FreeBSD: src/sbin/routed/rtquery/rtquery.8,v 1.8.2.1 1999/08/29 15:15:36 peter Exp %
+.\" $Revision: 1.11 $
+.\" %FreeBSD: src/sbin/routed/rtquery/rtquery.8,v 1.8.2.2 2000/02/17 04:26:41 peter Exp %
+.\"
 .Dd June 1, 1996
 .Dt RTQUERY 8
 .Os BSD 4.4
@@ -6,17 +8,16 @@
 .Nm rtquery
 .Nd query routing daemons for their routing tables
 .Sh SYNOPSIS
-.Nm rtquery
+.Nm
 .Op Fl np1
 .Op Fl w Ar timeout
 .Op Fl r Ar addr
 .Op Fl a Ar secret
-.Ar host
-.Ar
-.Nm rtquery
+.Ar host ...
+.br
+.Nm
 .Op Fl t Ar op
-.Ar host
-.Ar
+.Ar host ...
 .Sh DESCRIPTION
 .Nm Rtquery
 is used to query a RIP network routing daemon,
@@ -27,7 +28,8 @@
 .Em request
 or
 .Em poll
-command.  The routing information in any routing
+command.
+The routing information in any routing
 .Em response
 packets returned is displayed numerically and symbolically.
 .Pp
@@ -51,79 +53,72 @@
 command is preferred over the
 .Em request
 command because the response is not subject to Split Horizon and/or
-Poisoned Reverse, and because some versions of
-.Xr gated 8
-do not answer
-the
+Poisoned Reverse, and because some versions of gated do not answer the
 .Em request
 command.
-.Nm Routed
+.Xr Routed 8
 does not answer the
 .Em poll
-command, but
-recognizes
-.Em request
-commands coming from
+command, but recognizes
+.Em requests
+coming from
 .Nm
 and so answers completely.
 .Pp
 .Nm Rtquery
 is also used to turn tracing on or off in
-.Nm routed .
+.Xr routed 8 .
 .Pp
 The following options are available:
 .Bl -tag -width indent
 .It Fl n
-Normally network and host numbers are displayed both symbolically
-and numerically.
-The
-.Fl n
-option displays only the numeric network and host numbers.
+displays only the numeric network and host numbers instead of both
+numeric and symbolic.
 .It Fl p
-Use the
-.Em Poll
+uses the
+.Em poll
 command to request full routing information from
 .Xr gated 8 .
 This is an undocumented extension RIP protocol supported only by
 .Xr gated 8 .
 .It Fl 1
-Query using RIP version 1 instead of RIP version 2.
+queries using RIP version 1 instead of RIP version 2.
 .It Fl w Ar timeout
-Change the delay for an answer from each host.
+changes the delay for an answer from each host.
 By default, each host is given 15 seconds to respond.
 .It Fl r Ar addr
-Ask about the route to destination
+asks about the route to destination
 .Em addr .
 .It Fl a Ar passwd=XXX
 .It Fl a Ar md5_passwd=XXX|KeyID
-Cause the query to be sent with the indicated cleartext or MD5 password.
+causes the query to be sent with the indicated cleartext or MD5 password.
 .It Fl t Ar op
-Change tracing, where
+changes tracing, where
 .Em op
 is one of the following.
 Requests from processes not running with UID 0 or on distant networks
 are generally ignored by the daemon except for a message in the system log.
-.Xr Gated 8 
+.Xr Gated 8
 is likely to ignore these debugging requests.
 .El
 .Bl -tag -width Ds -offset indent-two
 .It Em on=tracefile
-Turn tracing on into the specified file.  That file must usually
-have been specified when the daemon was started or be the same
-as a fixed name, often
+turns tracing on into the specified file.
+That file must usually have been specified when the daemon was
+started or be the same as a fixed name, often
 .Pa /etc/routed.trace .
 .It Em more
-Increase the debugging level.
+increases the debugging level.
 .It Em off
-Turn off tracing.
+turns off tracing.
 .It Em dump
-Dump the daemon's routing table to the current tracefile.
+dumps the daemon's routing table to the current tracefile.
 .El
 .Sh SEE ALSO
 .Xr gated 8 ,
 .Xr routed 8
 .Rs
-.%T Routing Information Protocol, RIPV1
+.%T Routing Information Protocol, RIPv1
 .%O RFC1058
 .Re
 .Rs
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/showmount.8 man8/showmount.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/showmount.8	Mon Dec 20 14:51:48 1999
+++ man8/showmount.8	Wed Jun 14 10:07:03 2000
@@ -33,6 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)showmount.8	8.3 (Berkeley) 3/29/95
+.\" %FreeBSD: src/usr.bin/showmount/showmount.8,v 1.5.2.1 2000/03/06 11:35:13 sheldonh Exp %
 .\"
 .Dd March 29, 1995
 .Dt SHOWMOUNT 8
@@ -53,7 +54,8 @@
 By default it prints the names of all hosts that have
 .Tn NFS
 file systems mounted
-on the host. See
+on the host.
+See
 .%T "NFS: Network File System Protocol Specification" ,
 RFC 1094,
 Appendix A,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/sicontrol.8 man8/sicontrol.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/sicontrol.8	Mon Dec 20 14:53:35 1999
+++ man8/sicontrol.8	Wed Jun 14 10:08:22 2000
@@ -1,4 +1,4 @@
-.\" %FreeBSD: src/usr.sbin/sicontrol/sicontrol.8,v 1.8.2.2 1999/10/30 15:59:35 phantom Exp %
+.\" %FreeBSD: src/usr.sbin/sicontrol/sicontrol.8,v 1.8.2.3 2000/03/06 11:37:16 sheldonh Exp %
 .\"
 .Dd September 26,1995
 .Dt SICONTROL 8
@@ -60,7 +60,8 @@
 .It Cm mstate
 Show the current incoming modem control signals.
 .It Cm ccbstat
-Show the current "ccb" structure for the specified port. This is not of
+Show the current "ccb" structure for the specified port.
+This is not of
 much use outside of debugging the driver and determining why a port is
 wedged.
 .It Cm ttystat
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/slattach.8 man8/slattach.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/slattach.8	Mon Dec 20 14:49:28 1999
+++ man8/slattach.8	Wed Jun 14 10:05:16 2000
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)slattach.8	6.4 (Berkeley) 3/16/91
 .\"
-.\" %FreeBSD: src/sbin/slattach/slattach.8,v 1.13.2.1 1999/08/29 15:15:44 peter Exp %
+.\" %FreeBSD: src/sbin/slattach/slattach.8,v 1.13.2.2 2000/03/03 15:13:14 sheldonh Exp %
 .\"
 .Dd April 4, 1993
 .Dt SLATTACH 8
@@ -107,7 +107,8 @@
 cause connection reestablishing on leased line
 without any external command invoked.
 .It Fl s Ar baudrate
-Specifies the speed of the connection. If not specified, the
+Specifies the speed of the connection.
+If not specified, the
 default of 9600 is used.
 .It Fl u Ar unit-command
 When the line is switched to slip discipline, run
@@ -138,12 +139,14 @@
 .Ar redial-command
 upon startup irrespective of carrier.
 .It Fl L
-Use uucp-style device locking. You need it unless you start
+Use uucp-style device locking.
+You need it unless you start
 .Nm slattach
 from external program which already does uucp locking.
 Default case is no uucp locking to satisfy such programs.
 .It Fl K Ar keepalive
-Set SLIP "keep alive" timeout in seconds. If FRAME_END is not received in
+Set SLIP "keep alive" timeout in seconds.
+If FRAME_END is not received in
 this amount of time, re-connect occurs.
 The default value is no timeout.
 .It Fl O Ar outfill
@@ -152,7 +155,8 @@
 timeout on the remote side.
 The default value is no timeout.
 .It Fl S Ar unit
-Set the SLIP unit number directly. Use with caution, because no check is made
+Set the SLIP unit number directly.
+Use with caution, because no check is made
 for two interfaces with same number.
 By default sliplogin dynamically assigns the unit number.
 .It Ar ttyname
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/sliplogin.8 man8/sliplogin.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/sliplogin.8	Mon Dec 20 14:53:01 1999
+++ man8/sliplogin.8	Wed Jun 14 10:07:59 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sliplogin.8	8.2 (Berkeley) 1/5/94
+.\" %FreeBSD: src/usr.sbin/sliplogin/sliplogin.8,v 1.9.2.1 2000/03/06 11:37:18 sheldonh Exp %
 .\"
 .Dd January 5, 1994
 .Dt SLIPLOGIN 8
@@ -159,18 +160,21 @@
 .Ar slunit .
 .Bl -tag -width keepalive
 .It Ar keepalive
-Set SLIP "keep alive" timeout in seconds. If FRAME_END is not received in
+Set SLIP "keep alive" timeout in seconds.
+If FRAME_END is not received in
 this amount of time,
 .Nm
 closes the line and exits.
 The default value is no timeout (zero).
 .It Ar outfill
-Set SLIP "out fill" timeout in seconds. It forces at least one FRAME_END
+Set SLIP "out fill" timeout in seconds.
+It forces at least one FRAME_END
 to be sent during this time period, which is necessary for the "keep alive"
 timeout on the remote side.
 The default value is no timeout (zero).
 .It Ar slunit
-Set the SLIP unit number directly. Use with caution, because no check is made
+Set the SLIP unit number directly.
+Use with caution, because no check is made
 for two interfaces with same number.
 By default sliplogin dynamically assigns the unit number.
 .El
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/slstat.8 man8/slstat.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/slstat.8	Mon Dec 20 14:53:01 1999
+++ man8/slstat.8	Wed Jun 14 10:07:59 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)slstat.8	6.8 (Berkeley) 6/20/91
-.\" %FreeBSD: src/usr.sbin/slstat/slstat.8,v 1.12.2.1 1999/08/29 15:48:17 peter Exp %
+.\" %FreeBSD: src/usr.sbin/slstat/slstat.8,v 1.12.2.2 2000/03/06 11:37:19 sheldonh Exp %
 .\"
 .Dd October 11, 1996
 .Dt SLSTAT 8
@@ -68,7 +68,8 @@
 .Tn SLIP
 interface, or a
 .Tn SLIP
-interface name. The default unit is
+interface name.
+The default unit is
 .Sy 0
 for interface
 .Sy sl0 .
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/spppcontrol.8 man8/spppcontrol.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/spppcontrol.8	Mon Dec 20 14:49:28 1999
+++ man8/spppcontrol.8	Wed Jun 14 10:05:16 2000
@@ -22,7 +22,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/sbin/spppcontrol/spppcontrol.8,v 1.4.2.2 1999/08/29 15:15:47 peter Exp %
+.\" %FreeBSD: src/sbin/spppcontrol/spppcontrol.8,v 1.4.2.4 2000/05/10 10:01:29 sheldonh Exp %
 .\"
 .Dd October 11, 1997
 .Os
@@ -113,7 +113,8 @@
 interface as well (i.e. system name and authentication secret will
 be forgotten).
 .It Ar myauthproto Ns \&= Ns Em protoname
-Same as above, but only for my end of the link. I.e. this is the
+Same as above, but only for my end of the link.
+I.e. this is the
 protocol when remote is authenticator, and I am the peer required to
 authenticate.
 .It Ar hisauthproto Ns \&= Ns Em protoname
@@ -201,7 +202,8 @@
 .Xr sppp 4 ,
 .Xr ifconfig 8
 .Rs
-.%A B. Lloyd,  W. Simpson
+.%A B. Lloyd
+.%A W. Simpson
 .%T "PPP Authentication Protocols"
 .%O RFC 1334
 .Re
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/sticky.8 man8/sticky.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/sticky.8	Mon Dec 20 14:50:15 1999
+++ man8/sticky.8	Wed Jun 14 10:05:47 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)sticky.8	8.1 (Berkeley) 6/5/93
-.\" %FreeBSD: src/share/man/man8/sticky.8,v 1.4.2.2 1999/08/29 16:47:04 peter Exp %
+.\" %FreeBSD: src/share/man/man8/sticky.8,v 1.4.2.3 2000/03/06 11:33:56 sheldonh Exp %
 .\"
 .Dd June 5, 1993
 .Dt STICKY 8
@@ -43,7 +43,8 @@
 .Em sticky bit
 (mode S_ISVTX),
 is used to indicate special treatment
-for directories. It is ignored for regular files.
+for directories.
+It is ignored for regular files.
 See
 .Xr chmod 2
 or
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/sysctl.8 man8/sysctl.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/sysctl.8	Mon Dec 20 14:49:29 1999
+++ man8/sysctl.8	Wed Jun 14 10:05:17 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)sysctl.8	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/sbin/sysctl/sysctl.8,v 1.18.2.2 1999/11/22 08:43:59 des Exp %
+.\" %FreeBSD: src/sbin/sysctl/sysctl.8,v 1.18.2.3 2000/02/26 16:56:27 steve Exp %
 .\"
 .Dd September 23, 1994
 .Dt SYSCTL 8
@@ -178,13 +178,13 @@
 .El
 .Sh EXAMPLES
 For example, to retrieve the maximum number of processes allowed
-in the system, one would use the follow request:
+in the system, one would use the following request:
 .Bd -literal -offset indent -compact
 sysctl kern.maxproc
 .Ed
 .Pp
 To set the maximum number of processes allowed
-per uid to 1000, one would use the follow request:
+per uid to 1000, one would use the following request:
 .Bd -literal -offset indent -compact
 sysctl -w kern.maxprocperuid=1000
 .Ed
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/syslogd.8 man8/syslogd.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/syslogd.8	Mon Dec 20 14:53:02 1999
+++ man8/syslogd.8	Wed Jun 14 10:07:59 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syslogd.8	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.sbin/syslogd/syslogd.8,v 1.16.2.2 1999/08/29 15:48:31 peter Exp %
+.\" %FreeBSD: src/usr.sbin/syslogd/syslogd.8,v 1.16.2.3 2000/03/06 11:37:22 sheldonh Exp %
 .\"
 .Dd October 12, 1995
 .Dt SYSLOGD 8
@@ -239,6 +239,7 @@
 .Pp
 The log socket was moved from
 .Pa /dev
-to ease the use of a read-only root filesystem. This may confuse
+to ease the use of a read-only root filesystem.
+This may confuse
 some old binaries so that a symbolic link might be used for a
 transitional period.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/telnetd.8 man8/telnetd.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/telnetd.8	Mon Dec 20 14:48:50 1999
+++ man8/telnetd.8	Wed Jun 14 10:04:49 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnetd.8	8.3 (Berkeley) 3/1/94
-.\" %FreeBSD: src/libexec/telnetd/telnetd.8,v 1.13.2.1 1999/08/29 15:04:20 peter Exp %
+.\" %FreeBSD: src/libexec/telnetd/telnetd.8,v 1.13.2.2 2000/01/12 14:52:27 asmodai Exp %
 .\"
 .Dd March 1, 1994
 .Dt TELNETD 8
@@ -42,7 +42,7 @@
 protocol server
 .Sh SYNOPSIS
 .Nm /usr/libexec/telnetd
-.Op Fl BUhlkns
+.Op Fl Uhlkns
 .Op Fl D Ar debugmode
 .Op Fl I Ns Ar initid
 .Op Fl S Ar tos
@@ -137,17 +137,6 @@
 .Xr login 1
 program.
 .El
-.It Fl B
-Specify bftp server mode.  In this mode,
-.Nm
-causes login to start a
-.Xr bftp 1
-session rather than the user's
-normal shell.  In bftp daemon mode normal
-logins are not supported, and it must be used
-on a port other than the normal
-.Tn TELNET
-port.
 .It Fl D Ar debugmode
 This option may be used for debugging purposes.
 This allows
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/timed.8 man8/timed.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/timed.8	Mon Dec 20 14:53:05 1999
+++ man8/timed.8	Wed Jun 14 10:08:01 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)timed.8	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.sbin/timed/timed/timed.8,v 1.5.2.1 2000/03/14 10:57:08 sheldonh Exp %
 .\"
 .Dd June 6, 1993
 .Dt TIMED 8
@@ -39,21 +40,21 @@
 .Nd time server daemon
 .Sh SYNOPSIS
 .Nm timed
-.Op Fl M
-.Op Fl t
-.Op Fl d
+.Op Fl dtM
 .Op Fl i Ar network
 .Op Fl n Ar network
-.Op Fl F Ar host1 host2 ...
+.Op Fl F Ar host ...
 .Sh DESCRIPTION
-This
-is a time server daemon and is normally invoked
-at boot time from the
-.Xr rc 8
+The
+.Nm
+daemon is a time server daemon
+which is normally invoked at boot time from the
+.Xr rc.network 8
 file.  
 It synchronizes the host's time with the time of other
-machines in a local area network running 
-.Nm Ns .
+machines, which are also running
+.Nm Ns ,
+in a local area network.
 These time servers will slow down the clocks of some machines
 and speed up the clocks of others to bring them to the average network time.
 The average network time is computed from measurements of clock differences
@@ -61,9 +62,87 @@
 .Tn ICMP
 timestamp request message.
 .Pp
-The service provided by
+The following options are available:
+.Bl -tag -width indent
+.It Fl d
+Enable debugging mode;
+do not detach from the terminal.
+.It Fl i Ar network
+Add
+.Ar network
+to the list of networks to ignore.
+All other networks
+to which the machine is directly connected
+are used by
+.Nm Ns .
+This option may be specified multiple times
+to add more than one network to the list.
+.It Fl F Ar host ...
+Create a list of trusted hosts.  
+.Nm
+will only accept trusted hosts as masters.
+If it finds an untrusted host claiming to be master,
+.Nm
+will suppress incoming messages from that host
+and call for a new election.
+This option implies the
+.Fl M
+option.
+If this option is not specified,
+all hosts on the connected networks are treated as trustworthy.
+.It Fl M
+Allow this host to become a
+.Nm
+master if necessary.
+.It Fl n Ar network
+Add
+.Ar network
+to the list of allowed networks.
+All other networks
+to which the machine is directly connected
+are ignored by
+.Nm Ns .
+This option may be specified multiple times
+to add more than one network to the list.
+.It Fl t
+Enable tracing of received messages
+and log to the file
+.It Pa /var/log/timed.log .
+Tracing can be turned on or off while
+.Nm
+is running with the
+.Xr timedc 8
+utility.
+.El
+.Pp
+The 
+.Fl n 
+and 
+.Fl i
+are mutually exclusive
+and require as arguments real networks to which
+the host is connected
+(see
+.Xr networks 5 ) .
+If neither flag is specified,
 .Nm
-is based  on a master-slave
+will listen on all connected networks.
+.Pp
+A
+.Nm
+running without the 
+.Fl M 
+nor 
+.Fl F 
+flags will always remain a slave.  
+If the 
+.Fl F 
+flag is not used, 
+.Nm
+will treat all machines as trustworthy.
+.Pp
+.Nm
+is based on a master-slave
 scheme.
 When
 .Nm
@@ -79,80 +158,40 @@
 in order to set the date globally,
 and with 
 .Xr timedc 8 ,
-a timed control program.
-If the machine running the master crashes, then the slaves will elect
-a new master from among slaves running with the 
-.Fl M
-flag.
-A
+a 
 .Nm
-running without the
+control program.
+If the machine running the master becomes unreachable,
+the slaves will elect a new master
+from among those slaves
+which are running with at least one of the
 .Fl M
-or
+and
 .Fl F
-flags will remain a slave.
-The 
-.Fl t
-flag enables
-.Nm timed
-to trace the messages it receives in the
-file
-.Pa /var/log/timed.log .
-Tracing can be turned on or off by the program
-.Xr timedc 8 .
-The
-.Fl d
-flag is for debugging the daemon.
-It causes the program to not put itself into the background.
+flags.
 .Pp
-Normally
+At startup
 .Nm
-checks for a master time server on each network to which
-it is connected, except as modified by the options described below.
-It will request synchronization service from the first master server
-located.
-If permitted by the
-.Fl M
-flag, it will provide synchronization service on any attached networks
-on which no current master server was detected.
-Such a server propagates the time computed by the top-level master.
-The 
-.Fl n
-flag, followed by the name of a network which the host is connected to
-(see
-.Xr networks 5 ) ,
-overrides the default choice of the
-network addresses made by the program.
-Each time the
-.Fl n
-flag appears, that network name is added to a list of valid networks.
-All other networks are ignored.
-The 
-.Fl i
-flag, followed by the name of a network to which the host is connected
-(see
-.Xr networks 5 ) ,
-overrides the default choice of the network addresses made by the program.
-Each time the
-.Fl i
-flag appears, that network name is added to a list of networks to ignore.
-All other networks are used by the time daemon.
-The
-.Fl n
-and 
-.Fl i
-flags are meaningless if used together.
-.Pp
-.Nm Timed
-checks for a master time server on each network to which
+normally checks for a master time server on each network to which
 it is connected, except as modified by the
 .Fl n
 and
 .Fl i
 options described above.
-If it finds masters on more than one network, it chooses one network
-on which to be a "slave," and then periodically checks the other
-networks to see if the masters there have disappeared.
+It will request synchronization service from the first master server
+located.
+If permitted by the
+.Fl M
+or 
+.Fl F
+flags, it will provide synchronization service on any attached networks
+on which no trusted master server was detected.
+Such a server propagates the time computed by the top-level master.
+.Nm
+will periodically check for the presence of a master
+on those networks for which it is operating as a slave.
+If it finds that there are no trusted masters on a network,
+it will begin the election process on that network.
 .Pp
 One way to synchronize a group of machines is to use an
 .Tn NTP
@@ -213,6 +252,7 @@
 .Xr adjtime 2 ,
 .Xr gettimeofday 2 ,
 .Xr icmp 4 ,
+.Xr networks 5 ,
 .Xr timedc 8
 .Rs
 .%T "TSP: The Time Synchronization Protocol for UNIX 4.3BSD"
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/tunefs.8 man8/tunefs.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/tunefs.8	Mon Dec 20 14:49:30 1999
+++ man8/tunefs.8	Wed Jun 14 10:05:17 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tunefs.8	8.2 (Berkeley) 12/11/93
-.\" %FreeBSD: src/sbin/tunefs/tunefs.8,v 1.8.2.1 1999/08/29 15:15:58 peter Exp %
+.\" %FreeBSD: src/sbin/tunefs/tunefs.8,v 1.8.2.3 2000/03/03 15:13:17 sheldonh Exp %
 .\"
 .Dd December 11, 1993
 .Dt TUNEFS 8
@@ -98,18 +98,21 @@
 The default value used is 8%.
 This value can be set to zero, however up to a factor of three
 in throughput will be lost over the performance obtained at a 10%
-threshold. Settings of 5% and less force space optimization to
+threshold.
+Settings of 5% and less force space optimization to
 always be used which will greatly increase the overhead for file
 writes.
 Note that if the value is raised above the current usage level,
 users will be unable to allocate files until enough files have
 been deleted to get under the higher threshold.
 .It Fl n Ar enable | disable
-Turn on/off soft updates. An unmounted filesystem is required.
+Turn on/off soft updates.
+An unmounted filesystem is required.
 .It Fl o Ar optimize_preference
 The file system can either try to minimize the time spent
 allocating blocks, or it can attempt to minimize the space
-fragmentation on the disk. Optimization for space has much
+fragmentation on the disk.
+Optimization for space has much
 higher overhead for file writes.
 The kernel normally changes the preference automatically as
 the percent fragmentation changes on the file system.
@@ -120,6 +123,27 @@
 .Xr dumpfs 8
 manual page.
 .El
+.Sh ERRORS
+If
+.Nm
+.Fl n
+is run to enable/disable soft update on an unmounted file system
+after booting single-user then
+.Nm
+will output the warning
+.Pp
+reload\&: Invalid argument
+.Pp
+preceded by the raw device name.
+This occurs because the filesystem
+is not currently mounted read-only.
+.Nm
+is trying to reload the incore (r*) device, but it was never loaded
+to begin with.
+When you boot single user, only
+.Dq /
+is mounted, so all other filesystems will give you that warning.
+It is completely harmless.
 .Sh SEE ALSO
 .Xr fs 5 ,
 .Xr dumpfs 8 ,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/vinum.8 man8/vinum.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/vinum.8	Mon Dec 20 14:49:33 1999
+++ man8/vinum.8	Wed Jun 14 10:05:18 2000
@@ -34,9 +34,10 @@
 .\" otherwise) arising in any way out of the use of this software, even if
 .\" advised of the possibility of such damage.
 .\"
-.\" %FreeBSD: src/sbin/vinum/vinum.8,v 1.5.2.11 1999/09/22 01:32:20 grog Exp %
+.\" %Id: vinum.8,v 1.13 2000/01/03 03:12:56 grog Exp grog %
+.\" %FreeBSD: src/sbin/vinum/vinum.8,v 1.5.2.14 2000/06/08 07:28:59 grog Exp %
 .\"
-.Dd 28 March 1999
+.Dd 13 October 1999
 .Dt vinum 8
 .Os
 .Sh NAME
@@ -54,9 +55,10 @@
 .in +1i
 Attach a plex to a volume, or a subdisk to a plex.
 .in
-.Cd checkparity Ar plex
+.Cd checkparity Ar plex Op Fl f 
+.Op Fl v
 .in +1i
-Check the parity blocks of a RAID-5 plex.
+Check the parity blocks of a RAID-4 or RAID-5 plex.
 .in
 .Nm concat
 .Op Fl f
@@ -88,18 +90,25 @@
 .in +1i
 Detach a plex or subdisk from the volume or plex to which it is attached.
 .in
+.Cd dumpconfig
+.Op Ar drive ...
+.in +1i
+List the configuration information stored on the specified drives, or all drives
+in the system if no drive names are specified.
+.in
 .Cd info
 .Op Fl v
+.Op Fl V
 .in +1i
 List information about volume manager state.
 .in
 .Cd init
-.Op Fl v
+.Op Fl S Ar size
 .Op Fl w
-.Ar plex
+.Ar plex | subdisk
 .in +1i
 .\" XXX
-Initialize a plex by writing zeroes to all its subdisks.
+Initialize the contents of a subdisk or all the subdisks of a plex to all zeros.
 .in
 .Cd label
 .Ar volume
@@ -176,6 +185,12 @@
 .in +1i
 Create a mirrored volume from the specified drives.
 .in
+.Cd mv Fl f Ar drive Ar object ...
+.br
+.Cd move Fl f Ar drive Ar object ...
+.in +1i
+Move the object(s) to the specified drive.
+.in
 .Cd printconfig
 .Op Pa file
 .in +1i
@@ -203,19 +218,21 @@
 .Ar newname
 .in +1i
 Change the name of the specified object.
+.in
 .ig
 XXX
-.in
 .Cd replace
-.Ar [ subdisk | plex ]
-.Ar newobject
-.in +1i
-Replace the object with an identical other object.  XXX not implemented yet.
-..
+.Ar drive
+.Ar newdrive
+.in +1i 
+Move all the subdisks from the specified drive onto the new drive.
 .in
-.Cd rebuildparity Ar plex
+..
+.Cd rebuildparity Ar plex Op Fl f
+.Op Fl v 
+.Op Fl V
 .in +1i
-Rebuild the parity blocks of a RAID-5 plex.
+Rebuild the parity blocks of a RAID-4 or RAID-5 plex.
 .in
 .Cd resetconfig
 .in +1i
@@ -269,8 +286,10 @@
 Read configuration from all vinum drives.
 .in
 .Cd start
+.Op Fl i Ar interval
+.Op Fl S Ar size
 .Op Fl w
-.Op volume | plex | subdisk
+volume | plex | subdisk
 .in +1i
 Allow the system to access the objects
 .in
@@ -329,6 +348,14 @@
 .Ar myvolume
 even if it is open.  Any subsequent access to the volume will almost certainly
 cause a panic.
+.It Fl i Ar millisecs
+When performing the
+.Nm init
+and
+.Nm start
+commands, wait
+.Ar millisecs
+milliseconds between copying each block.  This lowers the load on the system.
 .It Fl n Ar name
 Use the
 .Fl n
@@ -357,7 +384,15 @@
 .if n ("statistics")
 option is used by the list commands to display statistical information.  The
 .Nm mirror
-command also uses this flag to specify that it should create striped plexes.
+command also uses this option to specify that it should create striped plexes.
+.It Fl S Ar size
+The
+.Fl S
+option specifies the transfer size for the
+.Nm init
+and
+.Nm start
+commands.
 .It Fl v
 The
 .Fl v
@@ -436,6 +471,27 @@
 first subdisk will have offset 0, the second offset 256k, the third 512k, etc.
 This calculation ignores parity blocks in RAID-5 plexes.
 .El
+.It Nm checkparity
+.Ar plex
+.Op Fl f
+.Op Fl v
+.Pp
+Check the parity blocks on the specified RAID-4 or RAID-5 plex.  This operation
+maintains a pointer in the plex, so it can be stopped and later restarted from
+the same position if desired.  In addition, this pointer is used by the
+.Nm rebuildparity
+command, so rebuilding the parity blocks need only start at the location where
+the first parity problem has been detected.
+.Pp
+If the
+.Fl f
+flag is specified,
+.Nm checkparity
+starts checking at the beginning of the plex.  If the
+.Fl v
+flag is specified,
+.Nm checkparity
+prints a running progress report.
 .It Nm concat
 .Op Fl f
 .Op Fl n Ar name
@@ -542,14 +598,16 @@
 .It DEBUG_ADDRESSES (1)
 .br
 Show buffer information during requests
+.ig
 .It DEBUG_NUMOUTPUT (2)
 .br
 Show the value of
 .Dv vp->v_numoutput.
+..
 .It DEBUG_RESID (4)
 .br
 Go into debugger in
-.Fd complete_rqe.
+.Fn complete_rqe.
 .It DEBUG_LASTREQS (8)
 .br
 Keep a circular buffer of last requests.
@@ -599,6 +657,18 @@
 the subdisk is marked absent, and can later be replaced with the
 .Nm attach
 command.
+.It Nm dumpconfig  Op Ar drive ...
+.Pp
+.Nm
+.Ar dumpconfig
+shows the configuration information stored on the specified drives.  If no drive
+names are specified,
+.Nm dumpconfig
+searches all drives on the system for Vinum partitions and dumps the
+information.  If configuration updates are disabled, it is possible that this
+information is not the same as the information returned by the
+.Nm list
+command.  This command is used primarily for maintenance and debugging.
 .It Nm info
 .br
 .Nm
@@ -744,20 +814,28 @@
 for the range lock.
 .El
 .\" XXX
-.It Nm init Op Fl w
-.Ar plex
+.It Nm init Op Fl S 
+.Ar size
+.Op Fl w
+.Ar plex | subdisk
 .Pp
 .Nm
 .Ar init
-initializes a plex by writing zeroes to all its subdisks.  This is the only way
-to ensure consistent data in a plex.  You must perform this initialization
-before using a RAID-5 plex.  It is also recommended for other new plexes.
+initializes a subdisk by writing zeroes to it.  You can initialize all subdisks
+in a plex by specifying the plex name.  This is the only way to ensure
+consistent data in a plex.  You must perform this initialization before using a
+RAID-5 plex.  It is also recommended for other new plexes.
 .Nm
 initializes all subdisks of a plex in parallel.  Since this operation can take a
 long time, it is normally performed in the background.  If you want to wait for
 completion of the command, use the
 .Fl w
 (wait) option.
+.Pp
+Specify the
+.Fl S
+option if you want to write blocks of a different size from the default value of
+16 kB.
 .Nm
 prints a console message when the initialization is complete.
 .It Nm label
@@ -919,6 +997,18 @@
 .Pp
 See the section SIMPLIFIED CONFIGURATION below for some examples of this
 command.
+.It Nm mv Fl f Ar drive Ar object ...
+.It Nm move Fl f Ar drive Ar object ...
+.Pp
+Move all the subdisks from the specified objects onto the new drive.  The
+objects may be subdisks, drives or plexes.  When drives or plexes are specified,
+all subdisks associated with the object are moved.
+.Pp
+The
+.Fl f
+option is required for this function, since it currently does not preserve the
+data in the subdisk.  This functionality will be added at a later date.  In this
+form, however, it is suited to recovering a failed disk drive.
 .It Nm printconfig Op Pa file
 Write a copy of the current configuration to
 .Pa file
@@ -973,8 +1063,36 @@
 .Nm setdaemon
 and
 .Nm saveconfig
-commands.  Reset bit 4 of the daemon options mask to re-enable configuration
-saves.
+commands.  Reset bit 2 (numerical value 4) of the daemon options mask to
+re-enable configuration saves.
+.It Nm rebuildparity
+.Ar plex
+.Op Fl f
+.Op Fl v
+.Op Fl V
+.Pp
+Rebuild the parity blocks on the specified RAID-4 or RAID-5 plex.  This
+operation maintains a pointer in the plex, so it can be stopped and later
+restarted from the same position if desired.  In addition, this pointer is used
+by the
+.Nm checkparity
+command, so rebuilding the parity blocks need only start at the location where
+the first parity problem has been detected.
+.Pp
+If the
+.Fl f
+flag is specified,
+.Nm rebuildparity
+starts rebuilding at the beginning of the plex.  If the
+.Fl v
+flag is specified,
+.Nm rebuildparity
+first checks the existing parity blocks prints information about those found to
+be incorrect before rebuilding.  If the
+.Fl V
+flag is specified,
+.Nm rebuildparity
+prints a running progress report.
 .It Nm rename
 .Op Fl r
 .Ar [ drive | subdisk | plex | volume ]
@@ -985,12 +1103,17 @@
 option is specified, subordinate objects will be named by the default rules:
 plex names will be formed by appending .p\f(BInumber\fP to the volume name, and
 subdisk names will be formed by appending .s\f(BInumber\fP to the plex name.
+.ig
 .It Nm replace
-.Ar [ subdisk | plex ]
-.Ar newobject
+.Ar drive
+.Ar newdrive
 .Pp
-Replace the object with an identical other object.  This command has not yet
-been implemented.
+Move all the subdisks from the specified drive onto the new drive.  This will
+attempt to recover those subdisks that can be recovered, and create the others
+from scratch.  If the new drive lacks the space for this operation, as many
+subdisks as possible will be fitted onto the drive, and the rest will be left on
+the original drive.
+..
 .It Nm resetconfig
 .Pp
 The
@@ -1058,13 +1181,13 @@
 .Nm
 to remove the object anyway by using the
 .Fl f
-flag, or you can cause
+option, or you can cause
 .Nm
 to remove the subordinate objects as well by using the
 .Fl r
-(recursive) flag.  If you remove a volume with the
+(recursive) option.  If you remove a volume with the
 .Fl r
-flag, it will remove both the plexes and the subdisks which belong to the
+option, it will remove both the plexes and the subdisks which belong to the
 plexes.
 .It Nm saveconfig
 .Pp
@@ -1110,8 +1233,10 @@
 and should be used only for recovery purposes.  It is possible to crash the
 system by incorrect use of this command.
 .It Nm start
+.Op Fl i Ar interval
+.Op Fl S Ar size
 .Op Fl w
-.Op volume | plex | subdisk
+.Op plex | subdisk
 .Pp
 .Nm start
 starts (brings into to the
@@ -1151,8 +1276,7 @@
 depends on the current state of the object:
 .Bl -bullet
 .It
-If the
-object is already in the
+If the object is already in the
 .Ar up
 state,
 .Nm
@@ -1203,18 +1327,25 @@
 automatically checks the state of any plex and volume to which it may belong and
 changes their state where appropriate.
 .Pp
-If the object is a volume or a plex,
+If the object is a plex,
 .Nm start
-currently has no effect: it checks the state of the subordinate subdisks (and
-plexes in the case of a volume) and sets the state of the object accordingly.
-In a later version, this operation will cause the subdisks
+checks the state of the subordinate subdisks (and plexes in the case of a
+volume) and starts any subdisks which can be started.
 .Pp
 To start a plex in a multi-plex volume, the data must be copied from another
 plex in the volume.  Since this frequently takes a long time, it is normally
 done in the background.  If you want to wait for this operation to complete (for
 example, if you are performing this operation in a script), use the
 .Fl w
-flag.
+option.
+.Pp
+Copying data doesn't just take a long time, it can also place a significant load
+on the system.  You can specify the transfer size in bytes or sectors with the
+.Fl S
+option, and an interval (in milliseconds) to wait between copying each block with
+the
+.Fl i
+option.  Both of these options lessen the load on the system.
 .It Nm stop
 .Op Fl f
 .Op volume | plex | subdisk
@@ -1225,9 +1356,21 @@
 .Nm
 kld and stops
 .Xr vinum 8 .
-This can only be done if no objects are active, In particular, the
+This can only be done if no objects are active.  In particular, the
+.Fl f
+option does not override this requirement.  Normally, the
+.Nm stop
+command writes the current configuration back to the drives before terminating.
+This will not be possible if configuration updates are disabled, so
+.Nm
+will not stop if configuration updates are disabled.  You can override this by
+specifying the
 .Fl f
-flag does not override this requirement.  This command can only work if
+option.
+.Pp
+The
+.Nm stop
+command can only work if
 .Nm
 has been loaded as a kld, since it is not possible to unload a statically
 configured driver.
@@ -1245,7 +1388,7 @@
 .Fl r
 and
 .Fl f
-flags must be specified.  This command does not remove the objects from the
+options must be specified.  This command does not remove the objects from the
 configuration.  They can be accessed again after a
 .Nm start
 command.
@@ -1794,7 +1937,7 @@
 .Pa /dev/da0
 and
 .Pa /dev/da0s1 ,
-both of which represent a device, not a partition,
+both of which represent a device, not a partition, and
 .Pa /dev/wd1c ,
 which represents a complete disk and should be of type
 .Nm unused .
@@ -2029,7 +2172,7 @@
 .Pp
 The
 .Fl v
-flag tells
+option tells
 .Nm
 to list the file as it configures.  Subsequently it lists the current
 configuration in the same format as the
@@ -2073,7 +2216,7 @@
 .Pp
 As this example (this time with the
 .Fl f
-flag) shows, re-running the
+option) shows, re-running the
 .Nm create
 has created four new plexes, each with a new subdisk.  If you want to add other
 volumes, create new configuration files for them.  They do not need to reference
@@ -2165,10 +2308,13 @@
 decrease in transfer time per disk is offset by the order of magnitude greater
 increase in latency.
 .Pp
-With modern disk sizes and the FreeBSD block I/O system, you can expect to have
-a reasonably small number of fragmented requests with a stripe size between 256
-kB and 512 kB; with correct RAID implementations there is no obvious reason not
-to increase the size to 2 or 4 MB on a large disk.
+With modern disk sizes and the FreeBSD I/O system, you can expect to have a
+reasonably small number of fragmented requests with a stripe size between 256 kB
+and 512 kB; with correct RAID implementations there is no obvious reason not to
+increase the size to 2 or 4 MB on a large disk.
+.Pp
+When choosing a stripe size, consider that most current ufs file systems have
+cylinder groups 32 MB in size.  
 .Pp
 The easiest way to consider the impact of any transfer in a multi-access system
 is to look at it from the point of view of the potential bottleneck, the disk
@@ -2272,21 +2418,17 @@
 before creating a file system on a
 .Nm
 volume.  Just run
-.Nm newfs
-against the raw device.  Use the
+.Nm newfs .
+Use the
 .Fl v
 option to state that the device is not divided into partitions.  For example, to
 create a file system on volume
 .Pa mirror ,
 enter the following command:
 .Bd -literal -offset 4n
-# newfs -v /dev/vinum/rmirror
+# newfs -v /dev/vinum/mirror
 .Ed
 .Pp
-Note the name
-.Pa rmirror ,
-indicating the raw device.
-.Sh Other considerations
 A number of other considerations apply to
 .Nm
 configuration:
@@ -2302,6 +2444,48 @@
 Currently the size of an existing UFS file system also cannot be increased, but
 it is planned to make both plexes and file systems extensible.
 .El
+.Sh STATE MANAGEMENT
+Vinum objects have the concept of
+.Em state .
+See
+.Xr vinum 4
+for more details.  They are only completely accessible if their state is
+.Em up .
+To change an object state to
+.Em up ,
+use the
+.Nm start
+command.  To change an object state to
+.Em down ,
+use the
+.Nm stop
+command.  Normally other states are created automatically by the relationship
+between objects.  For example, if you add a plex to a volume, the subdisks of
+the plex will be set in the
+.Em stale
+state, indicating that, though the hardware is accessible, the data on the
+subdisk is invalid.  As a result of this state, the plex will be set in the
+.Em faulty
+state.
+.Ss The 'reviving' state
+In many cases, when you start a subdisk the system must copy data to the
+subdisk.  Depending on the size of the subdisk, this can take a long time.
+During this time, the subdisk is set in the
+.Em reviving 
+state.  On successful completion of the copy operation, it is automatically set
+to the
+.Em up
+state.  It is possible for the process performing the revive to be stopped and
+restarted.  The system keeps track of how far the subdisk has been revived, and
+when the
+.Nm start
+command is reissued, the copying continues from this point.
+.Pp
+In order to maintain the consistency of a volume while one or more of its plexes
+is being revived,
+.Nm
+writes to subdisks which have been revived up to the point of the write.  It may
+also read from the plex if the area being read has already been revived.
 .Sh GOTCHAS
 The following points are not bugs, and they have good reasons for existing, but
 they have shown to cause confusion.  Each is discussed in the appropriate
@@ -2309,12 +2493,31 @@
 .Bl -enum
 .It
 .Nm
-will not create a device on UFS partitions.  Instead, it will return an error
-message 
-.if t ``wrong partition type''.  
-.if n "wrong partition type".  
-The partition type must be
+drives are UNIX disk partitions and must have the partition type
 .Ar vinum .
+This is different from
+.Nm ccd ,
+which expects partitions of type
+.Ar 4.2BSD .
+This behaviour of ccd is an invitation to shoot yourself in the foot: with
+.Nm ccd 
+you can easily overwrite a file system.  
+.Nm
+will not permit this.
+.Pp
+For similar reasons, the
+.Nm vinum Ar start
+command will not accept a drive on partition
+.Ar c .
+Partition
+.Ar c
+is used by the system to represent the whole disk, and must be of type
+.Ar unused .
+Clearly there is a conflict here, which
+.Nm
+resolves by not using the
+.Ar c
+partition.
 .It
 When you create a volume with multiple plexes,
 .Nm
@@ -2395,33 +2598,6 @@
 .Pp
 This error may also occur if you use old versions of kld or userland program.
 .It
-.Nm
-drives are UNIX disk partitions and should have the partition type
-.Ar vinum .
-This is different from
-.Nm ccd ,
-which expects partitions of type
-.Ar 4.2BSD .
-This behaviour of ccd is an invitation to shoot yourself in the foot: with
-.Nm ccd 
-you can easily overwrite a file system.  
-.Nm
-will not permit this.
-.Pp
-For similar reasons, the
-.Nm vinum Ar start
-command will not accept a drive on partition
-.Ar c .
-Partition
-.Ar c
-is used by the system to represent the whole disk, and must be of type
-.Ar unused .
-Clearly there is a conflict here, which
-.Nm
-resolves by not using the
-.Ar c
-partition.
-.It
 The
 .Nm vinum Ar read
 command has a particularly emetic syntax.  Once it was the only way to start
@@ -2478,7 +2654,7 @@
 The
 .Nm
 command first appeared in
-.Fx 3.0.
+.Fx 3.0 .
 The RAID-5 component of
 .Nm
 was developed for Cybernet Inc. 
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/vipw.8 man8/vipw.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/vipw.8	Mon Dec 20 14:53:07 1999
+++ man8/vipw.8	Wed Jun 14 10:08:02 2000
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vipw.8	8.1 (Berkeley) 6/6/93
+.\" %FreeBSD: src/usr.sbin/vipw/vipw.8,v 1.2.2.3 2000/03/27 10:07:29 sheldonh Exp %
 .\"
 .Dd June 6, 1993
 .Dt VIPW 8
@@ -47,7 +48,8 @@
 If the password file is already locked for editing by another user,
 .Nm
 will ask you
-to try again later. The default editor for
+to try again later.
+The default editor for
 .Nm
 is
 .Xr vi 1 .
@@ -84,12 +86,15 @@
 .Sh ENVIRONMENT
 If the following environment variable exists it will be utilized by
 .Nm Ns :
-.Bl -tag -width EDITOR
+.Bl -tag -width PW_SCAN_BIG_IDS
 .It Ev EDITOR
 The editor specified by the string
 .Ev EDITOR
 will be invoked instead of the default editor
 .Xr vi 1 .
+.It Ev PW_SCAN_BIG_IDS
+See
+.Xr pwd_mkdb 8 .
 .El
 .Sh SEE ALSO
 .Xr chpass 1 ,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/vmstat.8 man8/vmstat.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/vmstat.8	Mon Dec 20 14:52:03 1999
+++ man8/vmstat.8	Wed Jun 14 10:07:18 2000
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)vmstat.8	8.1 (Berkeley) 6/6/93
-.\" %FreeBSD: src/usr.bin/vmstat/vmstat.8,v 1.10.2.2 1999/08/29 15:34:33 peter Exp %
+.\" %FreeBSD: src/usr.bin/vmstat/vmstat.8,v 1.10.2.3 2000/03/06 07:38:31 jkoshy Exp %
 .\"
 .Dd June 6, 1996
 .Dt VMSTAT 8
@@ -41,7 +41,7 @@
 .Sh SYNOPSIS
 .Nm vmstat
 .\" .Op Fl fimst
-.Op Fl ims
+.Op Fl imsz
 .Op Fl c Ar count
 .Op Fl M Ar core
 .Op Fl N Ar system
@@ -175,6 +175,8 @@
 If no repeat
 .Ar wait
 interval is specified, the default is 1 second.
+.It Fl z
+Report on memory used by the kernel zone allocator, by zone.
 .El
 .Pp
 By default,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/wicontrol.8 man8/wicontrol.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/wicontrol.8	Mon Dec 20 14:53:36 1999
+++ man8/wicontrol.8	Wed Jun 14 10:08:23 2000
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/wicontrol/wicontrol.8,v 1.6.2.5 1999/08/29 15:49:02 peter Exp %
+.\" %FreeBSD: src/usr.sbin/wicontrol/wicontrol.8,v 1.6.2.6 2000/03/06 11:37:29 sheldonh Exp %
 .\"
 .Dd April 21, 1999
 .Dt WICONTROL 8
@@ -71,11 +71,14 @@
 command controls the operation of WaveLAN/IEEE wireless networking
 devices via the
 .Xr wi 4
-driver. Most of the parameters that can be changed relate to the
-IEEE 802.11 protocol which the WaveLAN implements. This includes
+driver.
+Most of the parameters that can be changed relate to the
+IEEE 802.11 protocol which the WaveLAN implements.
+This includes
 the station name, whether the station is operating in ad-hoc (point
 to point) or BSS (service set) mode, and the network name of a service
-set to join (IBSS) if BSS mode is enabled. The
+set to join (IBSS) if BSS mode is enabled.
+The
 .Nm
 command can also be used to view the current settings of these parameters
 and to dump out the values of the card's statistics counters.
@@ -92,17 +95,21 @@
 .It Fl i Ar iface Op Fl o
 Display the current settings of the specified WaveLAN/IEEE interface.
 This retrieves the current card settings from the driver and prints them
-out. Using the additional
+out.
+Using the additional
 .Fl o
 flag will cause
 .Nm
 to print out the statistics counters instead of the card settings.
 .It Fl i Ar iface Fl t Ar tx rate
-Set the transmit rate of the specified interface. The legal values
+Set the transmit rate of the specified interface.
+The legal values
 for the transmit rate vary depending on whether the interface is a
-standard WaveLAN/IEEE or a WaveLAN/IEEE Turbo adapter. The standard
+standard WaveLAN/IEEE or a WaveLAN/IEEE Turbo adapter.
+The standard
 NICs support a maximum transmit rate of 2Mbps while the turbo NICs
-support a maximum speed of 6Mbps. The following table shows the
+support a maximum speed of 6Mbps.
+The following table shows the
 legal transmit rate settings and the corresponding transmit speeds:
 .Bd -filled -offset indent
 .Bl -column "TX rate " "NIC speed "
@@ -122,11 +129,14 @@
 The default driver setting is 3 (auto rate select).
 .It Fl i Ar iface Fl n Ar network name
 Set the name of the service set (IBSS) that this station wishes to
-join. The
+join.
+The
 .Ar network name
-can be any text string up to 30 characters in length. The default name
+can be any text string up to 30 characters in length.
+The default name
 is the string "ANY" which should allow the station to connect to the first
-available access point. The interface should be set for BSS mode using
+available access point.
+The interface should be set for BSS mode using
 the
 .Fl p
 flag in order for this to work.
@@ -137,9 +147,11 @@
 .It Fl i Ar iface Fl s Ar station name
 Sets the
 .Ar station name
-for the specified interface. The
+for the specified interface.
+The
 .Ar station name
-is used for diagnostic purposes. The Lucent WaveMANAGER software can
+is used for diagnostic purposes.
+The Lucent WaveMANAGER software can
 poll the names of remote hosts.
 .It Fl i Ar iface Fl c Ar 0|1
 Allow the station to create a service set (IBSS). Permitted values
@@ -159,42 +171,56 @@
 .It Fl i Ar iface Fl p Ar port type
 Set the
 .Ar port type
-for a specified interface. The legal values for
+for a specified interface.
+The legal values for
 .Ar port type
-are 1 (BSS mode) and 3 (ad-hoc) mode. In ad-hoc mode, the station can
+are 1 (BSS mode) and 3 (ad-hoc) mode.
+In ad-hoc mode, the station can
 communicate directly with any other stations within direct radio range
 (provided that they are also operating in ad-hoc mode). In BSS mode,
 hosts must associate with a service set controlled by an access point,
-which relays traffic between end stations. The default setting is 3
+which relays traffic between end stations.
+The default setting is 3
 (ad-hoc mode).
 .It Fl i Ar iface Fl a Ar access_point_density
 Specify the
 .Ar access point density
-for a given interface. Legal values are 1 (low), 2 (medium) and 3 (high).
+for a given interface.
+Legal values are 1 (low), 2 (medium) and 3 (high).
 This setting influences some of the radio modem threshold settings.
 .It Fl i Ar iface Fl m Ar mac address
-Set the station address for the specified interface. The
+Set the station address for the specified interface.
+The
 .Ar mac address
 is specified as a series of six hexadecimal values separated by colons,
-e.g.: 00:60:1d:12:34:56. This programs the new address into the card
+e.g.: 00:60:1d:12:34:56.
+This programs the new address into the card
 and updates the interface as well.
 .It Fl i Ar iface Fl d Ar max_data_length
 Set the maximum receive and transmit frame size for a specified interface.
 The
 .Ar max data length
-can be any number from 350 to 2304. The default is 2304.
+can be any number from 350 to 2304.
+The default is 2304.
 .It Fl i Ar iface Fl r Ar RTS threshold
-Set the RTS/CTS threshold for a given interface. This controls the
-number of bytes used for the RTS/CTS handshake boundary. The
+Set the RTS/CTS threshold for a given interface.
+This controls the
+number of bytes used for the RTS/CTS handshake boundary.
+The
 .Ar RTS threshold
-can be any value between 0 and 2047. The default is 2347.
+can be any value between 0 and 2047.
+The default is 2347.
 .It Fl i Ar iface Fl f Ar frequency
-Set the radio frequency of a given interface. The
+Set the radio frequency of a given interface.
+The
 .Ar frequency
-should be specified as a channel ID as shown in the table below. The
+should be specified as a channel ID as shown in the table below.
+The
 list of available frequencies is dependent on radio regulations specified
-by regional authorities. Recognized regulatory authorities include
-the FCC (United States), ETSI (Europe), France and Japan. Frequencies
+by regional authorities.
+Recognized regulatory authorities include
+the FCC (United States), ETSI (Europe), France and Japan.
+Frequencies
 in the table are specified in Mhz.
 .Bd -filled -offset indent
 .Bl -column "Channel ID " "FCC " "ETSI " "France " "Japan "
@@ -217,27 +243,36 @@
 .Ed
 .Pp
 If an illegal channel is specified, the
-NIC will revert to its default channel. For NICs sold in the United States
+NIC will revert to its default channel.
+For NICs sold in the United States
 and Europe, the default channel is 3. For NICs sold in France, the default
-channel is 11. For NICs sold in Japan, the only available channel is 14.
+channel is 11.
+For NICs sold in Japan, the only available channel is 14.
 Note that two stations must be set to the same channel in order to
 communicate.
 .It Fl i Ar iface Fl P Ar 0|1
-Enable or disable power management on a given interface. Enabling
+Enable or disable power management on a given interface.
+Enabling
 power management uses an alternating sleep/wake protocol to help
 conserve power on mobile stations, at the cost of some increased
-receive latency. Power management is off by default. Note that power
+receive latency.
+Power management is off by default.
+Note that power
 management requires the cooperation of an access point in order to
-function; it is not functional in ad-hoc mode. Also, power management
+function; it is not functional in ad-hoc mode.
+Also, power management
 is only implemented in Lucent WavePOINT firmware version 2.03 or
-later, and in WaveLAN PCMCIA adapter firmware 2.00 or later. Older
-revisions will silently ignore the power management setting. Legal
+later, and in WaveLAN PCMCIA adapter firmware 2.00 or later.
+Older
+revisions will silently ignore the power management setting.
+Legal
 values for this parameter are 0 (off) and 1 (on).
 .It Fl i Ar iface Fl S Ar max_sleep_interval
 Specify the sleep interval to use when power management is enabled.
 The
 .Are max sleep interval
-is specified in milliseconds. The default is 100.
+is specified in milliseconds.
+The default is 100.
 .El
 .Sh SEE ALSO
 .Xr wi 4 ,
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/xntpd.8 man8/xntpd.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/xntpd.8	Mon Dec 20 14:53:09 1999
+++ man8/xntpd.8	Wed Jun 14 10:08:04 2000
@@ -1,5 +1,5 @@
 .\"
-.\" %FreeBSD: src/usr.sbin/xntpd/doc/xntpd.8,v 1.5.2.2 1999/08/29 15:49:16 peter Exp %
+.\" %FreeBSD: src/usr.sbin/xntpd/doc/xntpd.8,v 1.5.2.3 2000/03/03 11:29:23 sheldonh Exp %
 .\"
 .Dd December 21, 1993
 .Dt XNTPD 8
@@ -31,7 +31,8 @@
 respectively.
 .Nm Xntpd
 does all computations in fixed point arithmetic and requires no floating
-point code. The computations done in the protocol and clock adjustment
+point code.
+The computations done in the protocol and clock adjustment
 code are carried out with high precision and with attention to the
 details which might introduce systematic bias into the computations, to
 try to maintain an accuracy suitable for synchronizing with even the
@@ -39,17 +40,21 @@
 .Pp
 Ordinarily,
 .Nm
-reads its configuration from a configuration file at startup time. The
+reads its configuration from a configuration file at startup time.
+The
 default configuration file name is
 .Pa /etc/ntp.conf ,
-although this may be overridden from the command line. It is also
+although this may be overridden from the command line.
+It is also
 possible to specify a working, although limited,
 .Nm
 configuration entirely on the command line, obviating the need for a
-configuration file. This may be particularly appropriate when
+configuration file.
+This may be particularly appropriate when
 .Nm
 is to be configured as a broadcast or multicast client, with all peers
-being determined by listening to broadcasts at run time. Various
+being determined by listening to broadcasts at run time.
+Various
 internal
 .Nm
 variables can be displayed and configuration options altered while the
@@ -60,10 +65,12 @@
 programs.
 .Pp
 The daemon can operate in any of several modes, including symmetric
-active/passive, client/server and broadcast/multicast. A
+active/passive, client/server and broadcast/multicast.
+A
 broadcast/multicast client can automatically discover remote servers,
 compute one-way delay correction factors and configure itself
-automatically. This makes it possible to deploy a fleet of workstations
+automatically.
+This makes it possible to deploy a fleet of workstations
 without specifying a configuration file or configuration details
 specific to its environment.
 .Pp
@@ -81,7 +88,8 @@
 .It Fl c
 Specify an alternate configuration file.
 .It Fl d
-Specify debugging mode. This flag may occur multiple times, with each
+Specify debugging mode.
+This flag may occur multiple times, with each
 occurance indicating greater detail of display.
 .It Fl e
 Specify the time (in seconds) it takes to compute the NTP encryption
@@ -116,12 +124,17 @@
 Comments begin with a
 .Qq #
 character and extend to the end of the
-line. Blank lines are ignored. Configuration commands consist of an
+line.
+Blank lines are ignored.
+Configuration commands consist of an
 initial keyword followed by a list of arguments, some of which may be
-optional, separated by whitespace. These commands may not be continued
-over multiple lines. Arguments may be host names, host addresses written
+optional, separated by whitespace.
+These commands may not be continued
+over multiple lines.
+Arguments may be host names, host addresses written
 in numeric, dotted\-quad form, integers, floating point numbers (when
-specifying times in seconds) and text strings. Optional arguments are
+specifying times in seconds) and text strings.
+Optional arguments are
 delimited by
 .Qq []
 in the following descriptions, while
@@ -149,40 +162,50 @@
 .Xc
 .Pp
 These three commands specify various time servers to be used and/or time
-services to be provided. The
+services to be provided.
+The
 .Em peer
 command specifies that the local server is to operate in
 .Qq symmetric active
 mode with the remote server
 .Ar host_address
-named in the command. In this mode the local server can be synchronized
+named in the command.
+In this mode the local server can be synchronized
 to the remote server and, in addition, the remote server can be
-synchronized by the local server. This is useful in a network of servers
+synchronized by the local server.
+This is useful in a network of servers
 where, depending on various failure scenarios, either the local or
-remote server host may be the better source of time. The
+remote server host may be the better source of time.
+The
 .Em server
 command specifies that the local server is to operate in
 .Qq client
-mode with the remote server named in the command. In
+mode with the remote server named in the command.
+In
 this mode the local server can be synchronized to the remote server, but
-the remote server can never be synchronized to the local server. The
+the remote server can never be synchronized to the local server.
+The
 .Em broadcast
 command specifies that the local server is to operate in
 .Qq broadcast
 mode where the local server sends periodic broadcast
 messages to a client population at the broadcast/multicast address named
-in the command. Ordinarily, this specification applies only to the local
+in the command.
+Ordinarily, this specification applies only to the local
 server operating as a transmitter; for operation as a broadcast client,
 see the
 .Em broadcastclient
 or
 .Em multicastclient
-commands elsewhere in this document. In this mode the
+commands elsewhere in this document.
+In this mode the
 .Ar host_address
 is usually the broadcast address on [one of] the local network[s] or a
-multicast address assigned to NTP. The Numbers Czar has assigned the
+multicast address assigned to NTP.
+The Numbers Czar has assigned the
 address 224.0.1.1 to NTP; this is presently the only number that should
-be used. Note that the use of multicast features requires a multicast
+be used.
+Note that the use of multicast features requires a multicast
 kernel, which is not yet ubiquitous in vendor products.
 .Pp
 The
@@ -190,18 +213,25 @@
 option, when included, indicates that all packets sent to the address
 are to include authentication fields encrypted using the specified key
 number (the range of which is that of an unsigned 32 bit integer). The
-default is to not include an encryption field. The
+default is to not include an encryption field.
+The
 .Ar version
 option allows one to specify the version number to be used for outgoing
-NTP packets. Versions 1, 2, and 3 are the choices, version 3 is the
-default. The
+NTP packets.
+Versions 1, 2, and 3 are the choices, version 3 is the
+default.
+The
 .Ar prefer
-option marks the host as a preferred host. All other things being equal,
+option marks the host as a preferred host.
+All other things being equal,
 this host will be chosen for synchronization among a set of correctly
-operating hosts. The
+operating hosts.
+The
 .Ar ttl
-option is used only with the broadcast mode. It specifies the time-to-live
-(TTL) to use on multicast packets. Selection of the proper value,
+option is used only with the broadcast mode.
+It specifies the time-to-live
+(TTL) to use on multicast packets.
+Selection of the proper value,
 which defaults to 127, is something of a black art and must be
 coordinated with the network admistrator(s).
 .It broadcastclient
@@ -213,54 +243,68 @@
 .Qq broadcastclient
 mode,
 in which it listens for and synchronizes to succeeding broadcast
-messages. Note that, in order to avoid accidental or malicious
+messages.
+Note that, in order to avoid accidental or malicious
 disruption in this mode, both the local and remote servers must operate
 using authentication with the same trusted key and key identifier.
 .It multicastclient Op Ar IP address ...
 This command is used in the same way as the
 .Em broadcastclient
-command, but operates using IP multicasting. Support for this function
-requires a multicast kernel and the use of authentication. If one or
+command, but operates using IP multicasting.
+Support for this function
+requires a multicast kernel and the use of authentication.
+If one or
 more IP addresses are given, the server joins the respective multicast
 group(s). If none are given, the IP address assigned to NTP (224.0.1.1)
 is assumed.
 .It driftfile Ar filename
 This command specifies the name of the file used to record the frequency
-offset of the local clock oscillator. If the file exists, it is read at
+offset of the local clock oscillator.
+If the file exists, it is read at
 startup in order to set the initial frequency offset and then updated
-once per hour with the current offset computed by the daemon. If the
+once per hour with the current offset computed by the daemon.
+If the
 file does not exist or this command is not given, the initial frequency
-offset is assumed zero. In this case, it may take some hours for the
-frequency to stabilize and the residual timing errors to subside. The
+offset is assumed zero.
+In this case, it may take some hours for the
+frequency to stabilize and the residual timing errors to subside.
+The
 file contains a single floating point value equal to the offset in
 parts-per-million (ppm). Note that the file is updated by first writing
 the current drift value into a temporary file and then using
 .Xr rename 2
-to replace the old version. This implies that
+to replace the old version.
+This implies that
 .Nm
 must have write permission for the directory the drift file is located
 in, and that file system links, symbolic or otherwise, should probably
 be avoided.
 .It enable Ar auth|bclient|pll|monitor|stats Op Ar ...
-Provide a way to enable various server options. Flags not mentioned are
-unaffected. The
+Provide a way to enable various server options.
+Flags not mentioned are
+unaffected.
+The
 .Ar auth
 flag causes the server to synchronize
 with unconfigured peers only if the peer has been correctly
-authenticated using a trusted key and key identifier. The default for
+authenticated using a trusted key and key identifier.
+The default for
 this flag is disable (off). The
 .Ar bclient
 flag causes the server
 to listen for a message from a broadcast or multicast server, following
-which an association is automatically instantiated for that server. The
+which an association is automatically instantiated for that server.
+The
 default for this flag is disable (off). The
 .Ar pll
 flag enables
 the server to adjust its local clock, with default enable (on). If not
 set, the local clock free-runs at its intrinsic time and frequency
-offset. This flag is useful in case the local clock is controlled by
+offset.
+This flag is useful in case the local clock is controlled by
 some other device or protocol and NTP is used only to provide
-synchronization to other clients. The
+synchronization to other clients.
+The
 .Ar monitor
 flag enables the
 monitoring facility (see elsewhere), with default enable (on). The
@@ -268,8 +312,10 @@
 flag enables statistics facility filegen (see
 description elsewhere.), with default enable (on).
 .It disable Ar auth|bclient|pll|monitor|stats Op Ar ...
-Provide a way to disable various server options. Flags not mentioned
-are unaffected. The flags presently available are described under the
+Provide a way to disable various server options.
+Flags not mentioned
+are unaffected.
+The flags presently available are described under the
 enable command.
 .El
 .Sh "AUTHENTICATION OPTIONS"
@@ -278,23 +324,29 @@
 This command specifies the name of a file which contains the encryption
 keys and key identifiers used by
 .Nm
-when operating in authenticated mode. The format of this file is
+when operating in authenticated mode.
+The format of this file is
 described later in this document.
 .It trustedkey Ar # Op Ar # ...
 This command is used to specify the encryption key identifiers which are
 trusted for the purposes of authenticating peers suitable for
-sychonization. The authentication procedures require that both the local
+sychonization.
+The authentication procedures require that both the local
 and remote servers share the same key and key identifier for this
-purpose, although different keys can be used with different servers. The
-arguments are 32 bit unsigned integers. Note, however, that NTP key 0 is
-fixed and globally known. If meaningful authentication is to be
+purpose, although different keys can be used with different servers.
+The
+arguments are 32 bit unsigned integers.
+Note, however, that NTP key 0 is
+fixed and globally known.
+If meaningful authentication is to be
 performed the 0 key should not be trusted.
 .It requestkey Ar #
 This command specifies the key identifier to use with the
 .Xr xntpdc 8
 program, which is useful to diagnose and repair problems that affect
 .Nm
-operation. The operation of the
+operation.
+The operation of the
 .Nm xntpdc
 program are specific to this particular implementation of
 .Nm
@@ -304,8 +356,10 @@
 .Nm xntpdc
 program which affect the state of the
 local server must be authenticated, which requires bot the remote
-program and local server share a common key and key identifier. The
-argument to this command is a 32 bit unsigned integer. If no
+program and local server share a common key and key identifier.
+The
+argument to this command is a 32 bit unsigned integer.
+If no
 .Em controlkey
 command is included in the configuration file, or if the keys don't
 match, such requests will be ignored.
@@ -314,26 +368,33 @@
 .Xr ntpq 8
 program, which is useful to diagnose and repair problems that affect
 .Nm
-operation. The operation of the
+operation.
+The operation of the
 .Nm ntpq
 program and
 .Nm
-conform to those specified in RFC 1305. Requests from a remote
+conform to those specified in RFC 1305.
+Requests from a remote
 .Nm ntpq
 program which affect the state of the local server must be
 authenticated, which requires bot the remote program and local server
-share a common key and key identifier. The argument to this command is a
-32 bit unsigned integer. If no
+share a common key and key identifier.
+The argument to this command is a
+32 bit unsigned integer.
+If no
 .Em requestkey
 command is included in the configuration file, or if the keys don't
 match, such requests will be ignored.
 .It authdelay Ar seconds
 Indicate the amount of time it takes to encrypt an NTP authentication
-field on the local computer. This value is used to correct transmit
-timestamps when the authentication is used on outgoing packets. The
+field on the local computer.
+This value is used to correct transmit
+timestamps when the authentication is used on outgoing packets.
+The
 value usually lies somewhere in the range 0.0001 seconds to 0.003
 seconds, though it is very dependent on the CPU speed of the host
-computer. The value is usually computed using the
+computer.
+The value is usually computed using the
 .Em authspeed
 program included with the distribution.
 .El
@@ -349,19 +410,23 @@
 implements a general purpose address\-and\-mask based restriction list.
 The list is sorted by address and by mask, and the list is searched in
 this order for matches, with the last match found defining the
-restriction flags associated with the incoming packets. The source
+restriction flags associated with the incoming packets.
+The source
 address of incoming packets is used for the match, with the 32 bit
 address being and'ed with the mask associated with the restriction entry
 and then compared with the entry's address (which has also been and'ed
-with the mask) to look for a match. The
+with the mask) to look for a match.
+The
 .Em mask
 argument defaults
 to 255.255.255.255, meaning that the
 .Em address
 is treated as the
-address of an individual host. A default entry (address 0.0.0.0, mask
+address of an individual host.
+A default entry (address 0.0.0.0, mask
 0.0.0.0) is always included and, given the sort algorithm, is always the
-first entry in the list. Note that, while
+first entry in the list.
+Note that, while
 .Em address
 is normally
 given in dotted\-quad format, the text string
@@ -371,32 +436,40 @@
 .Pp
 In the current implementation, flags always restrict access, i.e. an
 entry with no flags indicates that free access to the server is to be
-given. The flags are not orthogonal, in that more restrictive flags will
-often make less restrictive ones redundant. The flags can generally be
+given.
+The flags are not orthogonal, in that more restrictive flags will
+often make less restrictive ones redundant.
+The flags can generally be
 classed into two catagories, those which restrict time service and those
 which restrict informational queries and attempts to do run time
-reconfiguration of the server. One or more of the following flags may be
+reconfiguration of the server.
+One or more of the following flags may be
 specified:
 .Bl -tag -width indent
 .It ignore
-Ignore all packets from hosts which match this entry. If this flag is
+Ignore all packets from hosts which match this entry.
+If this flag is
 specified neither queries nor time server polls will be responded to.
 .It noquery
 Ignore all NTP mode 6 and 7 packets (i.e. information queries and
-configuration requests) from the source. Time service is not affected.
+configuration requests) from the source.
+Time service is not affected.
 .It nomodify
 Ignore all NTP mode 6 and 7 packets which attempt to modify the state of
 the server (i.e. run time reconfiguration). Queries which return
 information are permitted.
 .It notrap
 Decline to provide mode 6 control message trap service to matching
-hosts. The trap service is a subsystem of the mode 6 control message
+hosts.
+The trap service is a subsystem of the mode 6 control message
 protocol which is intended for use by remote event logging programs.
 .It lowpriotrap
-Declare traps set by matching hosts to be low priority. The number of
+Declare traps set by matching hosts to be low priority.
+The number of
 traps a server can maintain is limited (the current limit is 3). Traps
 are usually assigned on a first come, first served basis, with later
-trap requestors being denied service. This flag modifies the assignment
+trap requestors being denied service.
+This flag modifies the assignment
 algorithm by allowing low priority traps to be overridden by later
 requests for normal priority traps.
 .It noserve
@@ -411,39 +484,47 @@
 synchronization sources.
 .It limited
 These hosts are subject to limitation of number of clients from the same
-net. Net in this context refers to the IP notion of net (class A, class
-B, class C, etc.). Only the first
+net.
+Net in this context refers to the IP notion of net (class A, class
+B, class C, etc.).
+Only the first
 .Qq client_limit
 hosts that have
 shown up at the server and that have been active during the last
 .Qq client_limit_period
-seconds are accepted. Requests from other
-clients from the same net are rejected. Only time request packets are
+seconds are accepted.
+Requests from other
+clients from the same net are rejected.
+Only time request packets are
 taken into account.
 .Qq Private ,
 .Qq control ,
 and
 .Qq broadcast
 packets are not subject to client limitation and
-therefore are not contributing to client count. History of clients is
+therefore are not contributing to client count.
+History of clients is
 kept using the monitoring capability of
 .Nm Ns .
 Thus, monitoring is active as long as there is a restriction entry with
 the
 .Qq limited
-flag. The default value for
+flag.
+The default value for
 .Qq client_limit
 is 3. The default value for
 .Qq client_limit_period
 is 3600 seconds.
 .It ntpport
 This is actually a match algorithm modifier, rather than a restriction
-flag. Its presence causes the restriction entry to be matched only if
+flag.
+Its presence causes the restriction entry to be matched only if
 the source port in the packet is the standard NTP UDP port (123). Both
 .Qq ntpport
 and
 .Pf non\- Qq ntpport
-may be specified. The
+may be specified.
+The
 .Qq ntpport
 is considered more specific and is sorted later in the
 list.
@@ -454,7 +535,8 @@
 .Qq ntpport ,
 for each of the local host's interface addresses are
 inserted into the table at startup to prevent the server from attempting
-to synchronize to its own time. A default entry is also always present,
+to synchronize to its own time.
+A default entry is also always present,
 though if it is otherwise unconfigured no flags are associated with the
 default entry (i.e. everything besides your own NTP server is
 unrestricted).
@@ -463,10 +545,12 @@
 of the time servers running on the NSFnet backbone to be implemented
 with
 .Nm
-as well. While this facility may be otherwise useful for keeping
+as well.
+While this facility may be otherwise useful for keeping
 unwanted or broken remote time servers from affecting your own, it
 should not be considered an alternative to the standard NTP
-authentication facility. Source address based restrictions are easily
+authentication facility.
+Source address based restrictions are easily
 circumvented by a determined cracker.
 .It clientlimit Ar limit
 Set
@@ -474,13 +558,15 @@
 to
 .Ar limit ,
 allow configuration of
-client limitation policy. This variable defines the number of clients
+client limitation policy.
+This variable defines the number of clients
 from the same network that are allowed to use the server.
 .It clientperiod Ar period
 Set
 .Qq client_limit_period ,
 allow configuration of client
-limitation policy. This variable specifies the number of seconds after
+limitation policy.
+This variable specifies the number of seconds after
 which a client is considered inactive and thus no longer is counted for
 client limit restriction.
 .El
@@ -494,11 +580,13 @@
 .Em filegen
 statement below).
 .It statistics Ar name Ns ...
-Enable writing of statistics records. Currently, three kinds of
+Enable writing of statistics records.
+Currently, three kinds of
 statistics are supported:
 .Bl -tag -width indent
 .It loopstats
-Enable recording of loop filter statistics information. Each update of
+Enable recording of loop filter statistics information.
+Each update of
 the local clock outputs a line of the following form to the file
 generation set named
 .Qq loopstats :
@@ -508,20 +596,25 @@
 time offset in seconds, frequency offset in parts-per-million and time
 constant of the clock-discipline algorithm at each update of the clock.
 .It peerstats
-Enable recording of peer statistics information. This includes
+Enable recording of peer statistics information.
+This includes
 statistics records of all peers of a NTP server and of the 1-pps signal,
-where present and configured. Each valid update appends a line of the
+where present and configured.
+Each valid update appends a line of the
 following form to the current element of a file generation set named
 .Qq peerstats :
 .Dl 48773 10847.650 127.127.4.1 9714 -0.001605 0.00000 0.00142
 The first two fields show the date (Modified Julian Day) and time
 (seconds and fraction past UTC midnight). The next two fields show the
-peer address in dotted-quad notation and status, respectively. The
+peer address in dotted-quad notation and status, respectively.
+The
 status field is encoded in hex in the format described in Appendix A of
-the NTP specification RFC 1305. The final three fields show the offset,
+the NTP specification RFC 1305.
+The final three fields show the offset,
 delay and dispersion, all in seconds.
 .It clockstats
-Enable recording of clock driver statistics information. Each update
+Enable recording of clock driver statistics information.
+Each update
 received from a clock driver outputs a line of the following form to the
 file generation set named
 .Qq clockstats :
@@ -531,9 +624,11 @@
 address in dotted-quad notation, The final field shows the last timecode
 received from the clock in decoded
 .Tn ASCII
-format, where meaningful. In
+format, where meaningful.
+In
 some clock drivers a good deal of additional information can be gathered
-and displayed as well. See information specific to each clock for
+and displayed as well.
+See information specific to each clock for
 further details.
 .El
 .Pp
@@ -542,7 +637,8 @@
 below). The information obtained by enabling statistics recording allows
 analysis of temporal properties of a
 .Nm
-server. It is usually only useful to primary servers or maybe main
+server.
+It is usually only useful to primary servers or maybe main
 campus servers.
 .It Xo filegen
 .Ar name
@@ -555,26 +651,36 @@
 Configure setting of generation file set
 .Ar name .
 Generation file sets provide a means for handling files that are
-continously growing during the lifetime of a server. Server statistics
-are a typical example for such files. Generation file sets provide
-access to a set of files used to store the actual data. At any time at
-most one element of the set is being written to. The
+continously growing during the lifetime of a server.
+Server statistics
+are a typical example for such files.
+Generation file sets provide
+access to a set of files used to store the actual data.
+At any time at
+most one element of the set is being written to.
+The
 .Em type
 given specifies when and how data will be directed to a new element of
-the set. This way, information stored in elements of a file set that are
+the set.
+This way, information stored in elements of a file set that are
 currently unused are available for administrational operations without
 the risc of desturbing the operation of
 .Nm Ns .
 (Most important: they can be removed to free space for new data
-produced.) Filenames of set members are built from three elements:
+produced.)
+Filenames of set members are built from three elements:
 .Bl -tag -width indent
 .It prefix
-This is a constant filename path. It is not subject to modifications via
+This is a constant filename path.
+It is not subject to modifications via
 the
 .Em filegen
-statement. It is defined by the server, usually specified as a compile
-time constant. It may, however, be configurable for individual file
-generation sets via other commands. For example, the prefix used with
+statement.
+It is defined by the server, usually specified as a compile
+time constant.
+It may, however, be configurable for individual file
+generation sets via other commands.
+For example, the prefix used with
 .Qq loopstats
 and
 .Qq peerstats
@@ -591,20 +697,23 @@
 .Ar file
 argument to the
 .Em filegen
-statement. No
+statement.
+No
 .Qq ..
 elements are allowed in this component to
 prevent filenames referring to parts outside the filesystem hierarchy
 denoted by
 .Em prefix .
 .It suffix
-This part is reflects individual elements of a file set. It is generated
+This part is reflects individual elements of a file set.
+It is generated
 according to the
 .Em type
 of a file set as explained below.
 .El
 .Pp
-A file generation set is characterized by its type. The following types
+A file generation set is characterized by its type.
+The following types
 are supported:
 .Bl -tag -width indent
 .It none
@@ -612,11 +721,13 @@
 .It pid
 One element of file set is used per incarnation of a
 .Nm
-server. This type does not perform any changes to file set members
+server.
+This type does not perform any changes to file set members
 during runtime, however it provides an easy way of seperating files
 belonging to different
 .Nm
-server incarnations. The set member filename is built by appending a dot
+server incarnations.
+The set member filename is built by appending a dot
 .Pf ( Sq \&. Ns )
 to concatentated
 .Em prefix
@@ -627,7 +738,8 @@
 .Nm
 server process.
 .It day
-One file generation set element is created per day. The term
+One file generation set element is created per day.
+The term
 .Em day
 is based on
 .Tn UTC .
@@ -644,7 +756,8 @@
 .Em MM
 is a two digit month number.
 .Em DD
-is a two digit day number. Thus, all information written at December
+is a two digit day number.
+Thus, all information written at December
 10th, 1992 would end up in a file named
 .Qq <prefix><filename>.19921210 .
 .It week
@@ -658,22 +771,27 @@
 suffix to the file set filename base: a dot, a four digit year number,
 the letter
 .Qq W ,
-and a two digit week number. For example,
+and a two digit week number.
+For example,
 information from Jamuary, 10th 1992 would end up in a file with suffix
 .Qq .1992W1 .
 .It month
-One generation file set element is generated per month. The file name
+One generation file set element is generated per month.
+The file name
 suffix consists of a dot, a four digit year number, and a two digit
 month.
 .It year
-One generation file element is generated per year. The filename suffix
+One generation file element is generated per year.
+The filename suffix
 consists of a dot and a 4 digit year number.
 .It age
 This type of file generation sets changes to a new element of the file
-set every 24 hours of server operation. The filename suffix consists of
+set every 24 hours of server operation.
+The filename suffix consists of
 a dot, the letter
 .Qq a ,
-and an eight digit number. This number is
+and an eight digit number.
+This number is
 taken to be the number of seconds the server is running at the start of
 the corresponding 24 hour period.
 .El
@@ -685,7 +803,8 @@
 .Pp
 It is convenient to be able to access the
 .Em current
-element of a file generation set by a fixed name. This feature is
+element of a file generation set by a fixed name.
+This feature is
 enabled by specifying
 .Qq link
 and disabled using
@@ -693,23 +812,28 @@
 If
 .Qq link
 is specified, a hard link from the
-current file set element to a file without suffix is created. When there
+current file set element to a file without suffix is created.
+When there
 is already a file with this name and the number of links of this file is
 one, it is renamed appending a dot, the letter
 .Qq C ,
 and the pid
 of the
 .Nm
-server process. When the number of links is greater than one, the file
-is unlinked. This allows the current file to be accessed by a constant
+server process.
+When the number of links is greater than one, the file
+is unlinked.
+This allows the current file to be accessed by a constant
 name.
 .El
 .Sh "MISCELLANEOUS OPTIONS"
 .Bl -tag -width indent
 .It precision Ar #
-This command specifies the nominal precision of the local clock. The
+This command specifies the nominal precision of the local clock.
+The
 value is an integer approximately equal to the base 2 logarithm of the
-local timekeeping precision in seconds. Normally, the daemon determines
+local timekeeping precision in seconds.
+Normally, the daemon determines
 the precision automatically at startup, so this command is necessary
 only in special cases when the precision cannot be determined
 automatically.
@@ -717,11 +841,15 @@
 The broadcast and multicast modes require a special calibration to
 determine the network delay between the local and remote servers.
 Ordinarily, this is done automatically by the initial protocol exchanges
-between the local and remote servers. In some cases, the calibration
+between the local and remote servers.
+In some cases, the calibration
 procedure may fail due to network or server access controls, for
-example. This command specifies the default delay to be used under these
-circumstances. Typically (for Ethernet), a number between 0.003 and
-0.007 seconds is appropriate. The default when this command is not used
+example.
+This command specifies the default delay to be used under these
+circumstances.
+Typically (for Ethernet), a number between 0.003 and
+0.007 seconds is appropriate.
+The default when this command is not used
 is 0.004 seconds.
 .It Xo trap
 .Ar host_address
@@ -730,38 +858,47 @@
 .Xc
 This command configures a trap receiver at the given host address and
 port number for sending messages with the specified local interface
-address. If the port number is unspecified a value of 18447 is used. If
+address.
+If the port number is unspecified a value of 18447 is used.
+If
 the interface address is not specified the message is sent with a source
 address which is that of the local interface the message is sent
-through. Note that on a multihomed host the interface used may vary from
+through.
+Note that on a multihomed host the interface used may vary from
 time to time with routing changes.
 .Pp
 The trap receiver will generally log event messages and other
-information from the server in a log file. While such monitor programs
+information from the server in a log file.
+While such monitor programs
 may also request their own trap dynamically, configuring a trap receiver
 will ensure that no messages are lost when the server is started.
 .It Xo setvar
 .Ar variable
 .Op Ar default
 .Xc
-This command adds an additional system variable. These variables can be
-used to distribute additional information such as the access policy. If
+This command adds an additional system variable.
+These variables can be
+used to distribute additional information such as the access policy.
+If
 the variable of the form <name>=<value> is followed by the
 .Em default
 keyword the variable will be listed as part of the default system
 variables
 .Pf ( Nm ntpq
 rv command). These additional variables serve informational purposes only.
-They are not related to the protocol other that they can be listed. The
+They are not related to the protocol other that they can be listed.
+The
 known protocol variables will always overide any variables defined via
 the
 .Em setvar
 mechanism.
 .Pp
 There are three special variables that contain the names of all variable
-of the same group. The
+of the same group.
+The
 .Em sys_var_list
-holds the names of all system variables. The
+holds the names of all system variables.
+The
 .Em peer_var_list
 holds the names of all peer variables and the
 .Em clock_var_list
@@ -772,35 +909,43 @@
 .Em enable
 and
 .Em disable
-commands. They are listed here for historical purposes.
+commands.
+They are listed here for historical purposes.
 .El
 .Sh "AUTHENTICATION KEY FILE FORMAT"
 The
 .Tn NTP
 standard specifies an extension allowing verification of the
 authenticity of received NTP packets, and to provide an indication of
-authenticity in outgoing packets. This is implemented in
+authenticity in outgoing packets.
+This is implemented in
 .Nm
 using the DES or MD5 algorithms to compute a digital signature, or
-message-digest. The specification allows any one of possibly 4 billion
+message-digest.
+The specification allows any one of possibly 4 billion
 keys, numbered with 32 bit key identifiers, to be used to authenticate
-an association. The servers involved in an association must agree on the
+an association.
+The servers involved in an association must agree on the
 key and key identifier used to authenticate their data, though they must
-each learn the key and key identifer independently. In the case of DES,
+each learn the key and key identifer independently.
+In the case of DES,
 the keys are 56 bits long with, depending on type, a parity check on
-each byte. In the case of MD5, the keys are 64 bits (8 bytes).
+each byte.
+In the case of MD5, the keys are 64 bits (8 bytes).
 .Nm Xntpd
 reads its keys from a file specified using the
 .Fl k
 command line option or the
 .Em keys
-statement in the configuration file. While key number 0 is fixed by the
+statement in the configuration file.
+While key number 0 is fixed by the
 .Tn NTP
 standard (as 56 zero bits) and may not be changed, one or more of
 the keys numbered 1 through 15 may be arbitrarily set in the keys file.
 .Pp
 The key file uses the same comment conventions as the configuration
-file. Key entries use a fixed format of the form:
+file.
+Key entries use a fixed format of the form:
 .Pp
 .Dl keyno type key
 .Pp
@@ -816,7 +961,8 @@
 The key may be given in one of three different formats, controlled by
 the
 .Em type
-character. The three key types, and corresponding
+character.
+The three key types, and corresponding
 formats, are listed following:
 .Bl -tag -width indent
 .It S
@@ -825,9 +971,11 @@
 is a 64 bit hexadecimal number in the format specified
 in the DES document, that is the high order 7 bits of each octet are
 used to form the 56 bit key while the low order bit of each octet is
-given a value such that odd parity is maintained for the octet. Leading
+given a value such that odd parity is maintained for the octet.
+Leading
 zeroes must be specified (i.e. the key must be exactly 16 hex digits
-long) and odd parity must be maintained. Hence a zero key, in standard
+long) and odd parity must be maintained.
+Hence a zero key, in standard
 format, would be given as
 .Em 0101010101010101 .
 .It N
@@ -836,10 +984,13 @@
 is a 64 bit hexadecimal number in the format specified
 in the
 .Tn NTP
-standard. This is the same as the DES format except the bits
+standard.
+This is the same as the DES format except the bits
 in each octet have been rotated one bit right so that the parity bit is
-now the high order bit of the octet. Leading zeroes must be specified
-and odd parity must be maintained. A zero key in NTP format would be
+now the high order bit of the octet.
+Leading zeroes must be specified
+and odd parity must be maintained.
+A zero key in NTP format would be
 specified as
 .Em 8080808080808080 .
 .It A
@@ -847,7 +998,8 @@
 .Em key
 is a 1\-to\-8 character
 .Tn ASCII
-string. A key is formed from this by using the lower order 7 bits of the
+string.
+A key is formed from this by using the lower order 7 bits of the
 .Tn ASCII
 representation of
 each character in the string, with zeroes being added on the right when
@@ -859,7 +1011,8 @@
 is a 1\-to\-8 character
 .Tn ASCII
 string, using the MD5
-authentication scheme. Note that both the keys and the authentication
+authentication scheme.
+Note that both the keys and the authentication
 schemes (DES or MD5) must be identical between a set of peers sharing
 the same key number.
 .El
@@ -870,7 +1023,8 @@
 statement, to authenticate run time configuration requests made using
 the
 .Xr xntpdc 8
-program. The latter program obtains the key from the terminal as a
+program.
+The latter program obtains the key from the terminal as a
 password, so it is generally appropriate to specify the key chosen to be
 used for this purpose in
 .Tn ASCII
@@ -878,14 +1032,16 @@
 .Sh PRIMARY CLOCK SUPPORT
 .Nm Xntpd
 can be optionally compiled to include support for a number of types of
-reference clocks. A reference clock will generally (though not always)
+reference clocks.
+A reference clock will generally (though not always)
 be a radio timecode receiver which is synchronized to a source of
 standard time such as the services offered by the NRC in Canada and NIST
 in the U.S. The interface between the computer and the timecode receiver
 is device dependent and will vary, but is often a serial port.
 .Pp
 Support for the various reference clock drivers is conditionally
-compiled using the compiler define codes described elsewhere. An attempt
+compiled using the compiler define codes described elsewhere.
+An attempt
 to configure a reference clock when specific support is not available or
 the hardware port has not been appropriately configured results in a
 scolding remark to the system log file, but is otherwise non hazardous.
@@ -895,20 +1051,24 @@
 treats reference clocks in a manner analogous to normal
 .Tn NTP
 peers as
-much as possible. Reference clocks are referred to by address, much as a
+much as possible.
+Reference clocks are referred to by address, much as a
 normal peer is, though an invalid IP address is used to distinguish them
-from normal peers. Reference clock addresses are of the form
+from normal peers.
+Reference clock addresses are of the form
 .Em 127.127.t.u
 where
 .Em t
 is an integer denoting the clock type and
 .Em u
-indicates the type\-specific unit number. Reference clocks are
+indicates the type\-specific unit number.
+Reference clocks are
 configured using a
 .Em server
 statement in the configuration file where the
 .Em host_address
-is the clock address. The
+is the clock address.
+The
 .Em key,
 .Em version
 and
@@ -917,7 +1077,8 @@
 .Em prefer
 option can be useful to persuade the server to cherish a reference clock
 with somewhat more enthusiasm than other reference clocks or peers, if
-this is advisable. Clock addresses may generally be used anywhere in the
+this is advisable.
+Clock addresses may generally be used anywhere in the
 configuration file a normal IP address can be used, for example, in
 .Em restrict
 statements, although such use would normally be considered strange.
@@ -925,7 +1086,8 @@
 Reference clock support provides the
 .Em fudge
 command, which can be used to configure reference clocks in special
-ways. Following is the generic format that applies to this command:
+ways.
+Following is the generic format that applies to this command:
 .Pp
 fudge
 .Ar 127.127.t.u
@@ -943,30 +1105,37 @@
 and
 .Em time2
 options are specified in fixed point seconds and used in some clock
-drivers as calibration constants. By convention, and unless indicated
+drivers as calibration constants.
+By convention, and unless indicated
 otherwise,
 .Em time1
 is used as a calibration constant to adjust the nominal time offset of a
 particular clock to agree with an external standard, such as a precision
-PPS signal. The specified offset is in addition to the propagation delay
-provided by other means, such as internal DIPswitches. The
+PPS signal.
+The specified offset is in addition to the propagation delay
+provided by other means, such as internal DIPswitches.
+The
 .Em stratum
 option is a number in the range zero to 15 and is used to assign a
-nonstandard operating stratum to the clock. The
+nonstandard operating stratum to the clock.
+The
 .Em refid
 option is an
 .Tn ASCII
 string in the range one to four characters and is
-used to assign a nonstandard reference identifier to the clock. Finally,
+used to assign a nonstandard reference identifier to the clock.
+Finally,
 the four binary flags
 .Em flag1,
 .Em flag2,
 .Em flag3
 and
 .Em flag4
-are used for customizing the clock driver. The interpretation of these
+are used for customizing the clock driver.
+The interpretation of these
 values, and whether they are used at all, is a function of the needs of
-the particular clock driver. However, by convention, and unless
+the particular clock driver.
+However, by convention, and unless
 indicated otherwise,
 .Em flag3
 is used to attach the ppsclock streams module to the configured driver,
@@ -975,35 +1144,44 @@
 is used to enable recording verbose monitoring data to the clockstats
 file configured with the
 .Em filegen
-command. Further information on the ppsclock streams module is in the
+command.
+Further information on the ppsclock streams module is in the
 .Pa README
 file in the
 .Pa ./kernel
 directory in the current xntp3 program
-distribution. Further information on this feature is available in the
+distribution.
+Further information on this feature is available in the
 .Pa ./scripts/stats
 directory in the same distribution.
 .Pp
-Ordinarily, the stratum of a reference clock is by default zero. Since
+Ordinarily, the stratum of a reference clock is by default zero.
+Since
 the
 .Nm
 daemon adds one to the stratum of each peer, a primary server ordinarily
-displays stratum one. In order to provide engineered backups, it is
+displays stratum one.
+In order to provide engineered backups, it is
 often useful to specify the reference clock stratum as greater than
-zero. The
+zero.
+The
 .Em stratum
-option is used for this purpose. Also, in cases involving both a
+option is used for this purpose.
+Also, in cases involving both a
 reference clock and a 1-pps discipline signal, it is useful to specify
 the reference clock identifier as other than the default, depending on
-the driver. The
+the driver.
+The
 .Em refid
-option is used for this purpose. Except where noted, these options apply
+option is used for this purpose.
+Except where noted, these options apply
 to all clock drivers.
 .Pp
 .Nm Xntpd
 on Unix machines currently supports several different types of clock
 hardware plus a special pseudo\-clock used for backup or when no other
-clock source is available. In the case of most of the clock drivers,
+clock source is available.
+In the case of most of the clock drivers,
 support for a 1-pps precision timing signal is available as described in
 the
 .Pa README
@@ -1025,9 +1203,11 @@
 (mode 7 messages) and the
 .Nm ntpq
 (mode 6 messages). Currently very few variables can be modified via mode
-6 messages. These variables are either created with the
+6 messages.
+These variables are either created with the
 .Em setvar
-directive or the leap warning variables. The leap warning bits that can
+directive or the leap warning variables.
+The leap warning bits that can
 be set in the
 .Em leapwarning
 variable (up to one month ahead). Both, the
@@ -1063,12 +1243,14 @@
 .Sh HISTORY
 Written by
 .An Dennis Ferguson
-at the University of Toronto. Text amended by
+at the University of Toronto.
+Text amended by
 .An David Mills
 at the University of Delaware.
 .Sh BUGS
 .Nm Xntpd
-has gotten rather fat. While not huge, it has gotten larger than might
+has gotten rather fat.
+While not huge, it has gotten larger than might
 be desireable for an elevated\-priority daemon running on a workstation,
 particularly since many of the fancy features which consume the space
 were designed more with a busy primary server, rather than a high
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/xntpdc.8 man8/xntpdc.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/xntpdc.8	Mon Dec 20 14:53:11 1999
+++ man8/xntpdc.8	Wed Jun 14 10:08:04 2000
@@ -1,5 +1,5 @@
 .\"
-.\" %FreeBSD: src/usr.sbin/xntpd/doc/xntpdc.8,v 1.3.2.1 1999/08/29 15:49:16 peter Exp %
+.\" %FreeBSD: src/usr.sbin/xntpd/doc/xntpdc.8,v 1.3.2.2 2000/03/03 11:29:24 sheldonh Exp %
 .\"
 .Dd December 21, 1993
 .Dt XNTPDC 8
@@ -16,12 +16,15 @@
 .Nm Xntpdc
 is used to query the
 .Xr xntpd 8
-daemon about its current state and to request changes in that state. The
+daemon about its current state and to request changes in that state.
+The
 program may be run either in interactive mode or controlled using
-command line arguments. Extensive state and statistics information is
+command line arguments.
+Extensive state and statistics information is
 available through the
 .Nm
-interface. In addition, nearly all the configuration options which can
+interface.
+In addition, nearly all the configuration options which can
 be specified at start up using
 .Nm xntpd Ns 's
 configuration file may also be specified at run time using
@@ -34,7 +37,8 @@
 servers
 running on each of the hosts given as command line arguments, or on
 .Ar localhost
-by default. If no request options are given,
+by default.
+If no request options are given,
 .Nm
 will attempt to read commands from the standard input and execute these
 on the
@@ -53,7 +57,8 @@
 .Tn NTP
 server, and hence
 can be used to query any compatable server on the network which permits
-it. Note that since
+it.
+Note that since
 .Tn NTP
 is a UDP protocol this communication will be
 somewhat unreliable, especially over large distances in terms of network
@@ -62,13 +67,15 @@
 makes no attempt to retransmit requests, and will time requests out if
 the remote host is not heard from within a suitable time out time.
 .Pp
-Command line options are described following. Specifying a command line
+Command line options are described following.
+Specifying a command line
 option other than
 .Fl i
 or
 .Fl n
 will cause the specified query (queries) to be sent to the indicated
-host(s) immediately. Otherwise,
+host(s) immediately.
+Otherwise,
 .Nm
 will attempt to read interactive format commands from the standard
 input.
@@ -82,7 +89,8 @@
 .It Fl i
 Force
 .Nm
-to operate in interactive mode. Prompts will be written to the standard
+to operate in interactive mode.
+Prompts will be written to the standard
 output and commands read from the standard input.
 .It Fl l
 Obtain a list of peers which are known to the server(s). This switch is
@@ -93,19 +101,23 @@
 converting to the canonical host names.
 .It Fl p
 Print a list of the peers known to the server as well as a summary of
-their state. This is equivalent to
+their state.
+This is equivalent to
 .Qq -c peers .
 .It Fl s
 Print a list of the peers known to the server as well as a summary of
 their state, but in a slightly different format than the
 .Fl p
-switch. This is equivalent to
+switch.
+This is equivalent to
 .Qq -c dmpeers .
 .El
 .Sh INTERNAL COMMANDS
 Interactive format commands consist of a keyword followed by zero to
-four arguments. Only enough characters of the full keyword to uniquely
-identify the command need be typed. The output of a command is normally
+four arguments.
+Only enough characters of the full keyword to uniquely
+identify the command need be typed.
+The output of a command is normally
 sent to the standard output, but optionally the output of individual
 commands may be sent to a file by appending a
 .Qq > ,
@@ -117,7 +129,8 @@
 program itself and do not result in
 .Tn NTP
 mode 7 requests being sent to a
-server. These are described following:
+server.
+These are described following:
 .Pp
 .Bl -tag -width indent
 .It Xo ?
@@ -131,7 +144,8 @@
 A
 .Em ?
 followed by a command keyword will print function and
-usage information about the command. This command is probably a better
+usage information about the command.
+This command is probably a better
 source of information about
 .Nm
 than this manual page.
@@ -140,11 +154,13 @@
 .Em ?
 command.
 .It timeout Ar millseconds
-Specify a time out period for responses to server queries. The default
+Specify a time out period for responses to server queries.
+The default
 is about 8000 milliseconds.
 .It delay Ar milliseconds
 Specify a time interval to be added to timestamps included in requests
-which require authentication. This is used to enable (unreliable) server
+which require authentication.
+This is used to enable (unreliable) server
 reconfiguration over long delay network paths or between machines whose
 clocks are unsynchronized.
 .It host Ar hostname
@@ -153,11 +169,13 @@
 may be either a host name or a numeric (dotted quad) dmaddress.
 .It keyid Ar #
 This command allows the specification of a key number to be used to
-authenticate configuration requests. This must correspond to the key
+authenticate configuration requests.
+This must correspond to the key
 number the server has been configured to use for this purpose.
 .It passwd
 This command prompts you to type in a password (which will not be
-echoed) which will be used to authenticate configuration requests. The
+echoed) which will be used to authenticate configuration requests.
+The
 password must correspond to the key configured for use by the
 .Tn NTP
 server for this purpose if such requests are to be successful.
@@ -165,10 +183,12 @@
 If
 .Ar yes
 is specified, host names are printed in information
-displays. If
+displays.
+If
 .Ar no
 is given, numeric addresses are printed
-instead. The default is
+instead.
+The default is
 .Ar yes
 unless modified using the command line
 .Fl n
@@ -181,26 +201,31 @@
 Query commands result in
 .Tn NTP
 mode 7 packets containing requests for
-information being sent to the server. These are
+information being sent to the server.
+These are
 .Qq read\-only
 commands in that they make no modification of the server configuration
 state.
 .Bl -tag -width indent
 .It listpeers
 Obtain and print a brief list of the peers for which the server is
-maintaining state. These should include all configured peer associations
+maintaining state.
+These should include all configured peer associations
 as well as those peers whose stratum is such that they are considered by
 the server to be possible future synchronization candidates.
 .It peers
 Obtain a list of peers for which the server is maintaining state, along
-with a summary of that state. Summary information includes the address
+with a summary of that state.
+Summary information includes the address
 of the remote peer, the local interface address (0.0.0.0 if a local
 address has yet to be determined), the stratum of the remote peer (a
 stratum of 16 indicates the remote peer is unsynchronized), the polling
 interval, in seconds, the reachability register, in octal, and the
 current estimated delay, offset and dispersion of the peer, all in
-seconds. In addition, the character in the left margin indicates the
-mode this peer entry is operating in. A
+seconds.
+In addition, the character in the left margin indicates the
+mode this peer entry is operating in.
+A
 .Qq +
 denotes symmetric
 active, a
@@ -216,7 +241,8 @@
 .Qq *
 marks the peer the server is currently synchronizing to.
 .Pp
-The contents of the host field may be one of four forms. It may be a
+The contents of the host field may be one of four forms.
+It may be a
 host name, an IP address, a reference clock implementation name with its
 parameter or
 .Qq REFCLK(<implementation number>, <parameter>) .
@@ -224,17 +250,21 @@
 .Qq hostnames no
 only IP\-addresses will be displayed.
 .It dmpeers
-A slightly different peer summary list. Identical to the output of the
+A slightly different peer summary list.
+Identical to the output of the
 .Em peers
-command except for the character in the leftmost column. Characters only
+command except for the character in the leftmost column.
+Characters only
 appear beside peers which were included in the final stage of the clock
-selection algorithm. A
+selection algorithm.
+A
 .Qq \&.
 indicates that this peer was cast off
 in the falseticker detection, while a
 .Qq +
 indicates that the
-peer made it through. A
+peer made it through.
+A
 .Qq *
 denotes the peer the server is
 currently synchronizing with.
@@ -245,7 +275,8 @@
 .Op Ar addr4
 .Xc
 Show a detailed display of the current peer variables for one or more
-peers. Most of these values are described in the
+peers.
+Most of these values are described in the
 .Tn NTP
 Version 2 specification.
 .It Xo pstats
@@ -261,21 +292,26 @@
 .Op Ar addr3
 .Op Ar addr4
 .Xc
-Obtain and print information concerning a peer clock. The values
+Obtain and print information concerning a peer clock.
+The values
 obtained provide information on the setting of fudge factors and other
 clock performance information.
 .It kerninfo
-Obtain and print kernel phase-lock loop operating parameters. This
+Obtain and print kernel phase-lock loop operating parameters.
+This
 information is available only if the kernel has been specially modified
 for a precision timekeeping function.
 .It loopinfo Op Ar oneline|multiline
-Print the values of selected loop filter variables. The loop filter is
+Print the values of selected loop filter variables.
+The loop filter is
 the part of
 .Tn NTP
-which deals with adjusting the local system clock. The
+which deals with adjusting the local system clock.
+The
 .Qq offset
 is the last offset given to the loop filter by the
-packet processing code. The
+packet processing code.
+The
 .Qq frequency
 is the frequency error
 of the local clock in parts-per-million (ppm). The
@@ -283,10 +319,12 @@
 controls the
 .Qq stiffness
 of the phase-lock loop and thus the speed at
-which it can adapt to oscillator drift. The
+which it can adapt to oscillator drift.
+The
 .Qq watchdog timer
 value is the number of seconds which have elapsed since the last sample
-offset was given to the loop filter. The
+offset was given to the loop filter.
+The
 .Ar oneline
 and
 .Ar multiline
@@ -296,26 +334,32 @@
 as the default.
 .It sysinfo
 Print a variety of system state variables, i.e. state related to the
-local server. All except the last four lines are described in the
+local server.
+All except the last four lines are described in the
 .Tn NTP
-Version 3 specification, RFC 1305. The
+Version 3 specification, RFC 1305.
+The
 .Qq system flags
 show various system flags, some of which can be set and cleared by the
 .Qq enable
 and
 .Qq disable
 configuration commands,
-respectively. The
+respectively.
+The
 .Qq stability
 is the residual frequency error
 remaining after the system frequency correction is applied and is
-intended for maintenance and debugging. In most architectures, this
+intended for maintenance and debugging.
+In most architectures, this
 value will initially decrease from as high as 500 ppm to a nominal value
-in the range .01 to 0.1 ppm. If it remains high for some time after
+in the range .01 to 0.1 ppm.
+If it remains high for some time after
 starting the daemon, something may be wrong with the local clock, or the
 value of the kernel variable
 .Qq tick
-may be incorrect. The
+may be incorrect.
+The
 .Qq broadcastdelay
 shows the default broadcast delay, as set by
 the
@@ -337,19 +381,22 @@
 Print statistics counters maintained in the timer/event queue support
 code.
 .It reslist
-Obtain and print the server's restriction list. This list is (usually)
+Obtain and print the server's restriction list.
+This list is (usually)
 printed in sorted order and may help to understand how the restrictions
 are applied.
 .It monlist Op Ar version
 Obtain and print traffic counts collected and maintained by the monitor
-facility. The version number should not normally need to be specified.
+facility.
+The version number should not normally need to be specified.
 .It Xo clkbug
 .Ar clock_peer_address
 .Op Ar addr2
 .Op Ar addr3
 .Op Ar addr4
 .Xc
-Obtain debugging information for a reference clock driver. This
+Obtain debugging information for a reference clock driver.
+This
 information is provided only by some clock drivers and is mostly
 undecodable without a copy of the driver source in hand.
 .El
@@ -366,7 +413,8 @@
 and
 .Em passwd
 commands, the latter of which will prompt at the terminal for a password
-to use as the encryption key. You will also be prompted automatically
+to use as the encryption key.
+You will also be prompted automatically
 for both the key number and password the first time a command which
 would result in an authenticated request to the server is given.
 Authentication not only provides verification that the requester has
@@ -374,16 +422,23 @@
 protection again transmission errors.
 .Pp
 Authenticated requests always include a timestamp in the packet data,
-which is included in the computation of the authentication code. This
-timestamp is compared by the server to its receive time stamp. If they
-differ by more than a small amount the request is rejected. This is done
-for two reasons. First, it makes simple replay attacks on the server, by
+which is included in the computation of the authentication code.
+This
+timestamp is compared by the server to its receive time stamp.
+If they
+differ by more than a small amount the request is rejected.
+This is done
+for two reasons.
+First, it makes simple replay attacks on the server, by
 someone who might be able to overhear traffic on your LAN, much more
-difficult. Second, it makes it more difficult to request configuration
-changes to your server from topologically remote hosts. While the
+difficult.
+Second, it makes it more difficult to request configuration
+changes to your server from topologically remote hosts.
+While the
 reconfiguration facility will work well with a server on the local host,
 and may work adequately between time\-synchronized hosts on the same
-LAN, it will work very poorly for more distant hosts. As such, if
+LAN, it will work very poorly for more distant hosts.
+As such, if
 reasonable passwords are chosen, care is taken in the distribution and
 protection of keys and appropriate source address restrictions are
 applied, the run time reconfiguration facility should provide an
@@ -398,15 +453,19 @@
 .Op Ar prefer
 .Xc
 Add a configured peer association at the given address and operating in
-symmetric active mode. Note that an existing association with the same
+symmetric active mode.
+Note that an existing association with the same
 peer may be deleted when this command is executed, or may simply be
-converted to conform to the new configuration, as appropriate. If the
+converted to conform to the new configuration, as appropriate.
+If the
 optional
 .Ar keyid
 is a nonzero integer, all outgoing packets to
 the remote server will have an authentication field attached encrypted
-with this key. If the value is 0 (or not given) no authentication will
-be done. The
+with this key.
+If the value is 0 (or not given) no authentication will
+be done.
+The
 .Ar version#
 can be 1, 2 or 3 and defaults to 3. The
 .Ar prefer
@@ -430,8 +489,10 @@
 .Xc
 Identical to the
 .Em addpeer
-command, except that the operating mode is broadcast. In this case a
-valid key identifier and key are required. The
+command, except that the operating mode is broadcast.
+In this case a
+valid key identifier and key are required.
+The
 .Ar peer_address
 parameter can be the broadcast address of the local network or a
 multicast group address assigned to
@@ -446,7 +507,8 @@
 .Xc
 This command causes the configured bit to be removed from the specified
 peer(s). In many cases this will cause the peer association to be
-deleted. When appropriate, however, the association may persist in an
+deleted.
+When appropriate, however, the association may persist in an
 unconfigured mode if the remote peer is willing to continue on in this
 fashion.
 .It Xo fudge
@@ -462,27 +524,33 @@
 .Ar auth|bclient|pll|monitor|stats
 .Op Ar ...
 .Xc
-Provide a way to enable various server options. Flags not mentioned are
-unaffected. The
+Provide a way to enable various server options.
+Flags not mentioned are
+unaffected.
+The
 .Ar auth
 flag causes the server to synchronize
 with unconfigured peers only if the peer has been correctly
-authenticated using a trusted key and key identifier. The default for
+authenticated using a trusted key and key identifier.
+The default for
 this flag is disable (off). The
 .Ar bclient
 flag causes the server
 to listen for a message from a broadcast or multicast server, following
-which an association is automatically instantiated for that server. The
+which an association is automatically instantiated for that server.
+The
 default for this flag is disable (off). The
 .Ar pll
 flag enables
 the server to adjust its local clock, with default enable (on). If not
 set, the local clock free-runs at its intrinsic time and frequency
-offset. This flag is useful in case the local clock is controlled by
+offset.
+This flag is useful in case the local clock is controlled by
 some other device or protocol and
 .Tn NTP
 is used only to provide
-synchronization to other clients. The
+synchronization to other clients.
+The
 .Ar monitor
 flag enables the
 monitoring facility (see elsewhere), with default disable (off). The
@@ -493,8 +561,10 @@
 .Ar auth|bclient|pll|monitor|stats
 .Op Ar ...
 .Xc
-Provide a way to disable various server options. Flags not mentioned
-are unaffected. The flags presently available are described under the
+Provide a way to disable various server options.
+Flags not mentioned
+are unaffected.
+The flags presently available are described under the
 enable command.
 .It Xo restrict
 .Ar address
@@ -507,13 +577,15 @@
 for the flags arguments are given in the following list:
 .Bl -tag -width indent
 .It ignore
-Ignore all packets from hosts which match this entry. If this flag is
+Ignore all packets from hosts which match this entry.
+If this flag is
 specified neither queries nor time server polls will be responded to.
 .It noquery
 Ignore all
 .Tn NTP
 mode 7 packets (i.e. information queries and
-configuration requests) from the source. Time service is not affected.
+configuration requests) from the source.
+Time service is not affected.
 .It nomodify
 Ignore all
 .Tn NTP
@@ -522,13 +594,16 @@
 are permitted.
 .It notrap
 Decline to provide mode 6 control message trap service to matching
-hosts. The trap service is a subsystem of the mode 6 control message
+hosts.
+The trap service is a subsystem of the mode 6 control message
 protocol which is intended for use by remote event logging programs.
 .It lowpriotrap
-Declare traps set by matching hosts to be low priority. The number of
+Declare traps set by matching hosts to be low priority.
+The number of
 traps a server can maintain is limited (the current limit is 3). Traps
 are usually assigned on a first come, first served basis, with later
-trap requestors being denied service. This flag modifies the assignment
+trap requestors being denied service.
+This flag modifies the assignment
 algorithm by allowing low priority traps to be overridden by later
 requests for normal priority traps.
 .It noserve
@@ -545,42 +620,51 @@
 synchronization sources.
 .It limited
 These hosts are subject to limitation of number of clients from the same
-net. Net in this context refers to the IP notion of net (class A, class
-B, class C, etc.). Only the first
+net.
+Net in this context refers to the IP notion of net (class A, class
+B, class C, etc.).
+Only the first
 .Qq client_limit
 hosts that have
 shown up at the server and that have been active during the last
 .Qq client_limit_period
-seconds are accepted. Requests from other
-clients from the same net are rejected. Only time request packets are
+seconds are accepted.
+Requests from other
+clients from the same net are rejected.
+Only time request packets are
 taken into account.
 .Qq Private ,
 .Qq control ,
 and
 .Qq broadcast
 packets are not subject to client limitation and
-therefore are not contributing to client count. History of clients is
+therefore are not contributing to client count.
+History of clients is
 kept using the monitoring capability of
 .Xr xntpd 8 .
 Thus, monitoring is active as long as there is a restriction entry with
 the
 .Ar limited
-flag. The default value for
+flag.
+The default value for
 .Qq client_limit
 is 3. The default value for
 .Qq client_limit_period
 is 3600
-seconds. Currently both variables are not runtime configurable.
+seconds.
+Currently both variables are not runtime configurable.
 .It ntpport
 This is actually a match algorithm modifier, rather than a restriction
-flag. Its presence causes the restriction entry to be matched only if
+flag.
+Its presence causes the restriction entry to be matched only if
 the source port in the packet is the standard
 .Tn NTP
 UDP port (123). Both
 .Em ntpport
 and
 .Pf non\- Em ntpport
-may be specified. The
+may be specified.
+The
 .Em ntpport
 is considered more specific and is sorted later in the list.
 .El
@@ -603,7 +687,8 @@
 .Xc
 Delete the matching entry from the restrict list.
 .It monitor Ar yes|no
-Enable or disable the monitoring facility. Note that a
+Enable or disable the monitoring facility.
+Note that a
 .Em monitor Ar no
 command followed by a
 .Em monitor Ar yes
@@ -621,7 +706,8 @@
 .Op Ar keyid
 .Op Ar keyid
 .Xc
-Add one or more keys to the trusted key list. When authentication is
+Add one or more keys to the trusted key list.
+When authentication is
 enabled, peers whose time is to be trusted must be authenticated using a
 trusted key.
 .It Xo untrustkey
@@ -639,24 +725,28 @@
 Set the precision which the server advertises to the specified value.
 This should be a negative integer in the range -4 through -20.
 .It traps
-Display the traps set in the server. See the source listing for further
+Display the traps set in the server.
+See the source listing for further
 information.
 .It Xo addtrap
 .Ar address
 .Op Ar port
 .Op Ar interface
 .Xc
-Set a trap for asynchronous messages. See the source listing for further
+Set a trap for asynchronous messages.
+See the source listing for further
 information.
 .It Xo clrtrap
 .Ar address
 .Op Ar port
 .Op Ar interface
 .Xc
-Clear a trap for asynchronous messages. See the source listing for
+Clear a trap for asynchronous messages.
+See the source listing for
 further information.
 .It reset Ar ...
-Clear the statistics counters in various modules of the server. See the
+Clear the statistics counters in various modules of the server.
+See the
 source listing for further information.
 .El
 .Sh SEE ALSO
@@ -667,8 +757,11 @@
 at the University of Toronto.
 .Sh BUGS
 .Nm Xntpdc
-is a crude hack. Much of the information it shows is deadly boring and
-could only be loved by its implementer. The program was designed so that
+is a crude hack.
+Much of the information it shows is deadly boring and
+could only be loved by its implementer.
+The program was designed so that
 new (and temporary) features were easy to hack in, at great expense to
-the program's ease of use. Despite this, the program is occasionally
+the program's ease of use.
+Despite this, the program is occasionally
 useful.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/yp_mkdb.8 man8/yp_mkdb.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/yp_mkdb.8	Mon Dec 20 14:53:13 1999
+++ man8/yp_mkdb.8	Wed Jun 14 10:08:05 2000
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/yp_mkdb/yp_mkdb.8,v 1.8.2.2 1999/08/29 15:49:41 peter Exp %
+.\" %FreeBSD: src/usr.sbin/yp_mkdb/yp_mkdb.8,v 1.8.2.3 2000/03/06 11:37:30 sheldonh Exp %
 .\"
 .Dd March 12, 1996
 .Dt YP_MKDB 8
@@ -68,7 +68,8 @@
 The input should be in 'key data' format, which is to say
 two fields of
 .Tn ASCII
-data separated by white space. The first field
+data separated by white space.
+The first field
 is assumed to be the key, and everything else is assumed to be
 the data.
 These databases are typically stored in
@@ -81,7 +82,8 @@
 .Pa /var/yp/Makefile .
 .Nm Yp_mkdb
 can also be used to dump an NIS database file so that its
-contents can be examined. For security reasons, all databases that
+contents can be examined.
+For security reasons, all databases that
 .Nm
 creates are readable and writable by owner only (and usually the
 owner is root).
@@ -95,9 +97,12 @@
 .Nm
 to send a YPPROC_CLEAR request to
 .Xr ypserv 8
-on the local host. This signal tells the server to close any open
-database descriptors and flush out its database cache. If used alone,
-this flag signals the server and does nothing else. If used as part
+on the local host.
+This signal tells the server to close any open
+database descriptors and flush out its database cache.
+If used alone,
+this flag signals the server and does nothing else.
+If used as part
 of a database creation command,
 .Nm
 will send the signal only after the new database has been successfully
@@ -107,39 +112,47 @@
 .Nm
 to add a special entry to the database with a key of
 .Em YP_INTERDOMAIN
-and an empty data field. If this key is present in a map, it alters the
+and an empty data field.
+If this key is present in a map, it alters the
 behavior of the 'match' procedure in
 .Xr ypserv 8
-slightly. If a match query fails (because the server couldn't find
+slightly.
+If a match query fails (because the server couldn't find
 a record that matched the supplied key), and the
 .Em YP_INTERDOMAIN
 key exists within the queried map,
 .Xr ypserv 8
-will try to match the entry again using a DNS lookup. Note that this
+will try to match the entry again using a DNS lookup.
+Note that this
 special behavior only applies to the
 .Em hosts
-maps. Using the
+maps.
+Using the
 .Fl b
 flag for other maps has no effect.
 .It Fl s
 This flag is used to add a special entry to the database with a key of
 .Em YP_SECURE
-and an empty data field. If this key is present in a map,
+and an empty data field.
+If this key is present in a map,
 .Xr ypserv 8
 will deny access to the map to any client that is not using a
-reserved port for its query. This is used mainly for the
+reserved port for its query.
+This is used mainly for the
 .Em master.passwd
 maps, which should be restricted to privileged access only.
 .It Fl f
 This flag is used to turn on filtering of lines in the source file
-input that start with ``+'' or ``-'' characters. These characters
+input that start with ``+'' or ``-'' characters.
+These characters
 have special meaning for the
 .Pa group ,
 .Pa passwd
 and
 .Pa master.passwd
 maps and hence should not be allowed to appear in them as the first
-character of a key or datum. If the
+character of a key or datum.
+If the
 .Fl f
 flag is used,
 .Nm
@@ -147,7 +160,8 @@
 character and issue a warning message displaying the line that
 was dropped.
 .It Fl u Ar dbname
-Dump (or 'unwind') an NIS database. This option can be used to
+Dump (or 'unwind') an NIS database.
+This option can be used to
 inspect the contents of an existing NIS database.
 .It Fl i Ar inputfile
 When generating an NIS map, encode
@@ -170,7 +184,8 @@
 as a special entry in the database with a key of
 .Em YP_MASTER_NAME .
 This entry in the database is frequently used by various NIS utilities
-to determine the name of an NIS master server for a domain. By default,
+to determine the name of an NIS master server for a domain.
+By default,
 .Nm
 assumes that the local host is the NIS master; the
 .Fl m
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/ypbind.8 man8/ypbind.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/ypbind.8	Mon Dec 20 14:53:13 1999
+++ man8/ypbind.8	Wed Jun 14 10:08:05 2000
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/ypbind/ypbind.8,v 1.12.2.1 1999/08/29 15:49:44 peter Exp %
+.\" %FreeBSD: src/usr.sbin/ypbind/ypbind.8,v 1.12.2.2 2000/03/06 11:37:31 sheldonh Exp %
 .\"
 .Dd April 9, 1995
 .Dt YPBIND 8
@@ -46,7 +46,8 @@
 .Op Fl S Ar domainname,server1,server2,...
 .Sh DESCRIPTION
 .Nm Ypbind
-is the process that maintains NIS binding information. At startup,
+is the process that maintains NIS binding information.
+At startup,
 it searches for an NIS server responsible for serving the system's
 default domain (as set by the
 .Xr domainname 1
@@ -56,14 +57,16 @@
 information in a special file located in
 .Pa /var/yp/binding .
 The NIS routines in the standard C library can then use this file
-when processing NIS requests. There may be several such files
+when processing NIS requests.
+There may be several such files
 since it is possible for an NIS client to be bound to more than
 one domain.
 .Pp
 After a binding has been established,
 .Nm
 will send DOMAIN_NONACK requests to the NIS server at one minute
-intervals. If it fails to receive a reply to one of these requests,
+intervals.
+If it fails to receive a reply to one of these requests,
 .Nm
 assumes that the server is no longer running and resumes its network
 broadcasts until another binding is established.
@@ -81,14 +84,17 @@
 .Nm
 to bind to a particular NIS server host for a given domain by using the
 .Xr ypset 8
-command. However,
+command.
+However,
 .Nm
 refuses YPBINDPROC_SETDOM requests by default since it has no way of
-knowing exactly who is sending them. Using the
+knowing exactly who is sending them.
+Using the
 .Fl ypset
 flag causes
 .Nm
-to accept YPBINDPROC_SETDOM requests from any host. This option should only
+to accept YPBINDPROC_SETDOM requests from any host.
+This option should only
 be used for diagnostic purposes and only for limited periods since allowing
 arbitrary users to reset the binding of an NIS client poses a severe
 security risk.
@@ -107,9 +113,11 @@
 Allow the system administrator to lock
 .Nm
 to a particular
-domain and group of NIS servers. Up to ten servers can be specified.
+domain and group of NIS servers.
+Up to ten servers can be specified.
 There must not be any spaces between the commas in the domain/server
-specification. This option is used to insure that the system binds
+specification.
+This option is used to insure that the system binds
 only to one domain and only to one of the specified servers, which 
 is useful for systems that are both NIS servers and NIS
 clients: it provides a way to restrict what machines the system can
@@ -117,10 +125,13 @@
 .Fl ypset
 or
 .Fl ypsetme
-options, which are often considered to be security holes. The specified
+options, which are often considered to be security holes.
+The specified
 servers must have valid entries in the local
 .Pa /etc/hosts
-file. IP addresses may be specified in place of hostnames. If
+file.
+IP addresses may be specified in place of hostnames.
+If
 .Nm
 can't make sense ouf of the arguments, it will ignore
 the
@@ -136,13 +147,15 @@
 Cause
 .Nm
 to use a 'many-cast' rather than a broadcast for choosing a server
-from the restricted mode server list. In many-cast mode,
+from the restricted mode server list.
+In many-cast mode,
 .Nm
 will transmit directly to the YPPROC_DOMAIN_NONACK procedure of the
 servers specified in the restricted list and bind to the server that
 responds the fastest.
 This mode of operation is useful for NIS clients on remote subnets
-where no local NIS servers are available. The
+where no local NIS servers are available.
+The
 .Fl m
 flag can only be used in conjunction with the
 .Fl S
@@ -156,10 +169,12 @@
 program will not make continuous attempts to keep secondary domains bound.
 If a server for a secondary domain fails to respond to a ping,
 .Nm
-will broadcast for a new server only once before giving up. If a
+will broadcast for a new server only once before giving up.
+If a
 client program attempts to reference the unbound domain,
 .Nm
-will try broadcasting again. By contrast,
+will try broadcasting again.
+By contrast,
 .Nm
 will automatically maintain a binding for the default domain whether
 client programs reference it ot not.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/ypinit.8 man8/ypinit.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/ypinit.8	Mon Dec 20 14:53:14 1999
+++ man8/ypinit.8	Wed Jun 14 10:08:06 2000
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/ypserv/ypinit.8,v 1.4.2.1 1999/08/29 15:49:58 peter Exp %
+.\" %FreeBSD: src/usr.sbin/ypserv/ypinit.8,v 1.4.2.2 2000/03/06 11:37:34 sheldonh Exp %
 .\"
 .Dd November 10, 1997
 .Dt YPINIT 8
@@ -61,10 +61,12 @@
 .Pa /var/yp/ypservers
 file, and calls
 .Pa /var/yp/Makefile
-to create and populate an initial set of NIS maps. The maps are
+to create and populate an initial set of NIS maps.
+The maps are
 created from local source files using the
 .Xr yp_mkdb 8
-command. The script will prompt the user for a list of servers
+command.
+The script will prompt the user for a list of servers
 that support the specified domain; this list is used to populate
 the ypservers map.
 .Pp
@@ -72,10 +74,12 @@
 .Nm
 creates the
 .Pa /var/yp/$DOMAINNAME ,
-populates it with copies of the NIS maps from the master. The maps
+populates it with copies of the NIS maps from the master.
+The maps
 are obtained from the master using the
 .Xr ypxfr 8
-command. The
+command.
+The
 .Nm
 script obtains the list of maps to transfer in one of two ways: if
 the system is configured as an NIS client and is bound to the master
@@ -87,8 +91,10 @@
 If the system is not configured as a client of the NIS master,
 .Nm
 uses a hardcoded list of maps, some of which may or may not actually
-exist on the master. The system administrator can edit the script and
-modify the map list if necessary. Otherwise, indivudual maps can
+exist on the master.
+The system administrator can edit the script and
+modify the map list if necessary.
+Otherwise, indivudual maps can
 be transfered manually from the master using
 .Xr ypxfr 8 .
 .Sh OPTIONS
@@ -96,8 +102,10 @@
 supports the following options:
 .Bl -tag -width indent
 .It Fl m Op Ar domainname
-Set up a master server. By default, the script sets up a server for
-the system default domain. The user can override this default by specifying
+Set up a master server.
+By default, the script sets up a server for
+the system default domain.
+The user can override this default by specifying
 .Ar domainname
 explicitly.
 Maps are constructed from scratch using local files as templates using
@@ -107,16 +115,19 @@
 .It Fl s Ar master_server Op Ar domainname
 Set up a slave server using
 .Ar master_name
-as the master. Maps are copied from
+as the master.
+Maps are copied from
 .Ar master_server
 to the slave using
 .Xr ypxfr 8 .
 By default, the script sets up a server for
-the system default domain. The user can override this default by specifying
+the system default domain.
+The user can override this default by specifying
 .Ar domainname
 explicitly.
 .It Fl u Op Ar domainname
-Update the ypservers map on the master server. When a new slave
+Update the ypservers map on the master server.
+When a new slave
 server is added to a domain, its hostname must be added to the
 ypservers map so that
 .Xr yppush 8
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/yppush.8 man8/yppush.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/yppush.8	Mon Dec 20 14:53:14 1999
+++ man8/yppush.8	Wed Jun 14 10:08:06 2000
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/yppush/yppush.8,v 1.8.2.1 1999/08/29 15:49:49 peter Exp %
+.\" %FreeBSD: src/usr.sbin/yppush/yppush.8,v 1.8.2.2 2000/03/06 11:37:32 sheldonh Exp %
 .\"
 .Dd February 5, 1995
 .Dt YPPUSH 8
@@ -51,9 +51,11 @@
 distributes updated NIS databases (or
 .Pa maps )
 from an NIS master server to NIS slave servers within an NIS
-domain. It is normally only run on the NIS master by
+domain.
+It is normally only run on the NIS master by
 .Pa /var/yp/Makefile
-whenever any of the NIS maps are updated. Note that
+whenever any of the NIS maps are updated.
+Note that
 .Pa /var/yp/Makefile
 does not invoke
 .Nm
@@ -71,7 +73,8 @@
 .Nm
 determines the names of the slave servers for a domain by searching the
 .Pa ypservers
-map. A destination host (or a list of hosts) can also be manually
+map.
+A destination host (or a list of hosts) can also be manually
 specified on the command line.
 Once it has a complete list of slave servers, it sends a 'map transfer'
 request to each slave, which in turn reads a copy of the map from
@@ -82,7 +85,8 @@
 .Xr ypxfr 8
 to successfully 'callback' to
 .Nm
-and carry out the transfer. Any error messages
+and carry out the transfer.
+Any error messages
 .Nm
 receives from
 .Xr ypxfr 8
@@ -92,11 +96,14 @@
 The following options are available:
 .Bl -tag -width indent
 .It Fl d Ar domain
-Specify a particular domain. The NIS domain of
-the local host system is used by default. If the local host's domain
+Specify a particular domain.
+The NIS domain of
+the local host system is used by default.
+If the local host's domain
 name is not set, the domain name must be specified with this flag.
 .It Fl t Ar timeout
-Specify a timeout value in seconds. This timeout
+Specify a timeout value in seconds.
+This timeout
 controls how long
 .Nm
 will wait for a response from a slave server before sending a
@@ -105,14 +112,17 @@
 .Nm Yppush
 normally performs transfers serially, meaning that it will
 send a map transfer request to one slave server and then wait for
-it to respond before moving on to the next slave server. In environments
+it to respond before moving on to the next slave server.
+In environments
 with many slaves, it is more efficient to initiate several map transfers
-at once so that the transfers can take place in parallel. The
+at once so that the transfers can take place in parallel.
+The
 .Fl j
 flag is used to specify the desired number of parallel jobs:
 .Nm
 will initiate the specified number of transfers immediately and
-listen for responses. If the number of specified parallel jobs is
+listen for responses.
+If the number of specified parallel jobs is
 less than the number of slave servers,
 .Nm
 will initiate only the number of specified jobs and then wait
@@ -130,7 +140,8 @@
 group of machines instead of the list of servers contained in
 the
 .Pa ypservers
-map. A list of hosts can be specified by using multiple
+map.
+A list of hosts can be specified by using multiple
 instances of the
 .Fl h
 flag.
@@ -146,7 +157,8 @@
 .It Fl v
 Verbose mode: causes
 .Nm
-to print debugging messages as it runs. Specifying this flag twice
+to print debugging messages as it runs.
+Specifying this flag twice
 makes
 .Nm
 even more verbose.
diff -ur /home/horikawa/man-jp/work/fbsd-340r/man/man8/ypserv.8 man8/ypserv.8
--- /home/horikawa/man-jp/work/fbsd-340r/man/man8/ypserv.8	Mon Dec 20 14:53:14 1999
+++ man8/ypserv.8	Wed Jun 14 10:08:06 2000
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" %FreeBSD: src/usr.sbin/ypserv/ypserv.8,v 1.15.2.2 1999/08/29 15:49:59 peter Exp %
+.\" %FreeBSD: src/usr.sbin/ypserv/ypserv.8,v 1.15.2.3 2000/03/06 11:37:35 sheldonh Exp %
 .\"
 .Dd February 4, 1995
 .Dt YPSERV 8
@@ -44,7 +44,8 @@
 .Sh DESCRIPTION
 .Tn NIS
 is an RPC-based service designed to allow a number of UNIX-based
-machines to share a common set of configuration files. Rather than
+machines to share a common set of configuration files.
+Rather than
 requiring a system administrator to update several copies of files
 such as
 .Pa /etc/hosts ,
@@ -70,7 +71,8 @@
 .Nm
 using the
 .Xr domainname 1
-command. The clients must also run
+command.
+The clients must also run
 .Xr ypbind 8
 in order to attach to a particular server, since it is possible to
 have several servers within a single
@@ -83,7 +85,8 @@
 .Pa /var/yp/[domainname]
 where
 .Pa domainname
-is the name of the domain being served. There can be several
+is the name of the domain being served.
+There can be several
 such directories with different domainnames, and you need only one
 .Nm
 daemon to handle them all.
@@ -93,13 +96,15 @@
 as they are often called,
 are created by
 .Pa /var/yp/Makefile
-using several system files as source. The database files are in
+using several system files as source.
+The database files are in
 .Xr db 3
 format to help speed retrieval when there are many records involved.
 In
 .Bx Free ,
 the maps are always readable and writable only by root for security
-reasons. Technically this is only necessary for the password
+reasons.
+Technically this is only necessary for the password
 maps, but since the data in the other maps can be found in
 other world-readable files anyway, it doesn't hurt and it's considered
 good general practice.
@@ -118,7 +123,8 @@
 normally only stores encrypted passwords
 in
 .Pa /etc/master.passwd ,
-which is readable and writable only by root. By turning this file
+which is readable and writable only by root.
+By turning this file
 into an
 .Tn NIS
 map, this security feature would be completely defeated.
@@ -131,10 +137,12 @@
 .Pa master.passwd.byname
 and
 .Pa master.basswd.byuid
-maps in a special way. When the server receives a request to access
+maps in a special way.
+When the server receives a request to access
 either of these two maps, it will check the TCP port from which the
 request originated and return an error if the port number is greater
-than 1023. Since only the superuser is allowed to bind to TCP ports
+than 1023.
+Since only the superuser is allowed to bind to TCP ports
 with values less than 1024, the server can use this test to determine
 whether or not the access request came from a privileged user.
 Any requests made by non-privileged users are therefore rejected.
@@ -153,12 +161,14 @@
 .Pa passwd.byname
 and
 .Pa passwd.byuid
-maps will be accessed instead. The latter two maps are constructed by
+maps will be accessed instead.
+The latter two maps are constructed by
 .Pa /var/yp/Makefile
 by parsing the
 .Pa master.passwd
 file and stripping out the password fields, and are therefore
-safe to pass on to unprivileged users. In this way, the shadow password
+safe to pass on to unprivileged users.
+In this way, the shadow password
 aspect of the protected
 .Pa master.passwd
 database is maintained through
@@ -206,7 +216,8 @@
 and retrieve the contents of your
 .Tn NIS
 maps, provided the remote user
-knows your domain name. To prevent such unauthorized transactions,
+knows your domain name.
+To prevent such unauthorized transactions,
 .Nm
 supports a feature called
 .Pa securenets
@@ -219,12 +230,14 @@
 (Note that this path varies depending on the path specified with
 the
 .Fl p
-option, which is explained below.) This file contains entries
+option, which is explained below.)
+This file contains entries
 that consist of a network specification and a network mask separated
 by white space.
 Lines starting with
 .Dq \&#
-are considered to be comments. A
+are considered to be comments.
+A
 sample securenets file might look like this:
 .Bd -unfilled -offset indent
 # allow connections from local host -- mandatory
@@ -240,9 +253,11 @@
 If
 .Nm
 receives a request from an address that matches one of these rules,
-it will process the request normally. If the address fails to match
+it will process the request normally.
+If the address fails to match
 a rule, the request will be ignored and a warning message will be
-logged. If the
+logged.
+If the
 .Pa /var/yp/securenets
 file does not exist,
 .Nm
@@ -263,7 +278,8 @@
 .Pa tcpd.h ,
 you can easily recompile
 .Nm
-with them. This allows the administrator to use the tcpwrapper
+with them.
+This allows the administrator to use the tcpwrapper
 configuration files (
 .Pa /etc/hosts.allow
 and
@@ -289,7 +305,8 @@
 .Tn NIS
 v2 protocol, however other implementations
 include support for the v1 protocol for backwards compatibility
-with older systems. The
+with older systems.
+The
 .Xr ypbind 8
 daemons supplied with these systems will try to establish a binding
 to an
@@ -303,18 +320,21 @@
 be used as a master or slave in conjunction with older
 .Tn NIS
 servers that
-only support the v1 protocol. Fortunately, there probably aren't any
+only support the v1 protocol.
+Fortunately, there probably aren't any
 such servers still in use today.
 .Ss NIS servers that are also NIS clients
 Care must be taken when running
 .Nm
 in a multi-server domain where the server machines are also
 .Tn NIS
-clients. It is generally a good idea to force the servers to
+clients.
+It is generally a good idea to force the servers to
 bind to themselves rather than allowing them to broadcast bind
 requests and possibly become bound to each other: strange failure
 modes can result if one server goes down and
-others are dependent upon on it. (Eventually all the clients will
+others are dependent upon on it.
+(Eventually all the clients will
 time out and attempt to bind to other servers, but the delay
 involved can be considerable and the failure mode is still present
 since the servers might bind to each other all over again).
@@ -334,16 +354,19 @@
 .Pa hosts.byname
 and
 .Pa hosts.byaddress
-maps. By default, if
+maps.
+By default, if
 .Nm
 can't find an entry for a given host in its hosts maps, it will
-return an error and perform no further processing. With the
+return an error and perform no further processing.
+With the
 .Fl n
 flag,
 .Nm
 will go one step further: rather than giving up immediately, it
 will try to resolve the hostname or address using a DNS nameserver
-query. If the query is successful,
+query.
+If the query is successful,
 .Nm
 will construct a fake database record and return it to the client,
 thereby making it seem as though the client's yp_match request
@@ -362,20 +385,25 @@
 .Tn NIS
 clients.
 .It Fl d
-Cause the server to run in debugging mode. Normally,
+Cause the server to run in debugging mode.
+Normally,
 .Nm
 reports only unusual errors (access violations, file access failures)
 using the
 .Xr syslog 3
-facility. In debug mode, the server does not background
+facility.
+In debug mode, the server does not background
 itself and prints extra status messages to stderr for each
-request that it receives. Also, while running in debug mode,
+request that it receives.
+Also, while running in debug mode,
 .Nm
 will not spawn any additional subprocesses as it normally does
-when handling yp_all requests or doing DNS lookups. (These actions
+when handling yp_all requests or doing DNS lookups.
+(These actions
 often take a fair amount of time to complete and are therefore handled
 in subprocesses, allowing the parent server process to go on handling
-other requests.) This makes it easier to trace the server with
+other requests.)
+This makes it easier to trace the server with
 a debugging tool.
 .It Fl p Ar path
 Normally,

----Next_Part(Wed_Jun_14_23:40:58_2000_518)----
