From owner-man-jp-reviewer@jp.freebsd.org  Mon May  3 02:27:02 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id CAA31762;
	Mon, 3 May 1999 02:27:02 +0900 (JST)
	(envelope-from owner-man-jp-reviewer@jp.FreeBSD.org)
Received: from mail.yk.rim.or.jp (root@mail.yk.rim.or.jp [202.247.130.37])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id CAA31757
	for <man-jp-reviewer@jp.freebsd.org>; Mon, 3 May 1999 02:27:01 +0900 (JST)
	(envelope-from k-horik@yk.rim.or.jp)
Received: from localhost (ppp867.yk.rim.or.jp [202.247.185.118])
	by mail.yk.rim.or.jp (8.8.8/3.6W-RIMNET-98-06-09) with ESMTP id CAA21690
	for <man-jp-reviewer@jp.freebsd.org>; Mon, 3 May 1999 02:26:56 +0900 (JST)
To: man-jp-reviewer@jp.freebsd.org
X-Mailer: Mew version 1.93 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Message-Id: <19990503022616D.k-horik@yk.rim.or.jp>
Date: Mon, 03 May 1999 02:26:16 +0900
From: Kazuo Horikawa <k-horik@yk.rim.or.jp>
X-Dispatcher: imput version 980905(IM100)
Lines: 867
Reply-To: man-jp-reviewer@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990430
X-Sequence: man-jp-reviewer 1336
Subject: [man-jp-reviewer 1336] diff to 3.1-19990501-STABLE
Errors-To: owner-man-jp-reviewer@jp.freebsd.org
Sender: owner-man-jp-reviewer@jp.freebsd.org
X-Originator: k-horik@yk.rim.or.jp

 $BKY@n$G$9!#(B

 3.1-19990501-STABLE $B$X$N:9J,$G$9(B ($B?75,%U%!%$%k=|$/(B)

diff -urNP man/man1/login.1 man/man1/login.1
--- man/man1/login.1	Sun May  2 21:02:28 1999
+++ man/man1/login.1	Sun May  2 21:06:20 1999
@@ -32,9 +32,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)login.1	8.2 (Berkeley) 5/5/94
-.\"	%Id: login.1,v 1.13 1999/01/11 09:07:42 asami Exp %
-.\" jpman %Id: login.1,v 1.3 1997/05/19 16:39:53 horikawa Stab %
+.\"	%Id: login.1,v 1.13.2.1 1999/04/29 09:42:21 jkoshy Exp %
 .\"
+.\" jpman %Id: login.1,v 1.3 1997/05/19 16:39:53 horikawa Stab %
 .Dd May 5, 1994
 .Dt LOGIN 1
 .Os BSD 4
@@ -180,6 +180,7 @@
 .Xr fbtab 5 ,
 .Xr login.access 5 ,
 .Xr login.conf 5 ,
+.Xr nologin 5 ,
 .Xr skey.access 5 ,
 .Xr utmp 5 ,
 .Xr environ 7 ,
diff -urNP man/man1/ls.1 man/man1/ls.1
--- man/man1/ls.1	Fri Mar 19 23:07:16 1999
+++ man/man1/ls.1	Sun May  2 21:06:22 1999
@@ -33,9 +33,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\"	%Id: ls.1,v 1.26 1998/11/30 22:56:44 billf Exp %
-.\" jpman %Id: ls.1,v 1.3 1997/05/19 17:21:06 horikawa Stab %
+.\"	%Id: ls.1,v 1.26.2.1 1999/04/27 23:34:21 hoek Exp %
 .\"
+.\" jpman %Id: ls.1,v 1.3 1997/05/19 17:21:06 horikawa Stab %
 .Dd July 29, 1994
 .Dt LS 1
 .Os
@@ -359,6 +359,7 @@
 $B%m%s%0%U%)!<%^%C%H7A<0$N=PNO$K$O=jM-%0%k!<%WL>%U%#!<%k%I$,<+F0E*$K(B
 $B4^$a$i$l$^$9!#(B
 .Sh $B4XO"9`L\(B
+.Xr chflags 1 ,
 .Xr chmod 1 ,
 .Xr symlink 7 ,
 .Xr sticky 8
diff -urNP man/man1/netstat.1 man/man1/netstat.1
--- man/man1/netstat.1	Sat Sep 26 15:19:57 1998
+++ man/man1/netstat.1	Sun May  2 21:06:24 1999
@@ -173,6 +173,7 @@
 $B$r;XDj$7$^$9!#%W%m%H%3%k$N$$$/$D$+$O(B
 .Pa /etc/protocols
 $B$NCf$GDj5A$5$l$F$$$^$9!#(B
+$BFCJL$J%W%m%H%3%kL>(B ``bdg'' $B$O!"%V%j%C%8$N>uBV$rI=<($9$k$?$a$K;HMQ$7$^$9!#(B
 $B%W%m%H%3%k$K$D$$$F>pJs$,I=<($5$l$J$$>l9g$O!"DL>o!"(B
 $BJs9p$9$Y$-M-0U$J?tCM$,$J$$$3$H$r0UL#$7$^$9!#(B
 .Ar protocol
diff -urNP man/man1/sh.1 man/man1/sh.1
--- man/man1/sh.1	Fri Apr 30 02:09:22 1999
+++ man/man1/sh.1	Sun May  2 21:06:31 1999
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\"	%Id: sh.1,v 1.23.2.1 1999/04/12 15:46:02 cracauer Exp %
+.\"	%Id: sh.1,v 1.23.2.2 1999/04/19 18:54:06 max Exp %
 .\"
 .\" jpman %Id: sh.1,v 1.2 1997/05/31 16:40:31 jsakai Stab %
 .\"	Japanese Translation amended by Norihiro Kumagai, 3/29/96,
diff -urNP man/man1/tcopy.1 man/man1/tcopy.1
--- man/man1/tcopy.1	Wed Feb 25 13:54:16 1998
+++ man/man1/tcopy.1	Sun May  2 21:06:31 1999
@@ -50,7 +50,7 @@
 $B5-O?$7$?%G!<%?$N=*$o$j$K(B 2 $B$D$N%F!<%W%^!<%/$,$"$k$h$&$J(B
 $B<'5$%F!<%W$rA[Dj$7$F$$$^$9!#(B
 $B%=!<%9%F!<%W(B ($B%G%U%)%k%H$G$O(B
-.Ar /dev/rst0 )
+.Ar /dev/rsa0 )
 $B$@$1$,;XDj$5$l$?>l9g$O!"(B
 $B%l%3!<%I%5%$%:$H%F!<%W$N%U%!%$%k$K4X$9$k>pJs$rI=<($7$^$9!#(B
 $B%G%#%9%F%#%M!<%7%g%s$,;XDj$5$l$?>l9g$O!"%=!<%9%F!<%W$,%3%T!<$5$l$^$9!#(B
diff -urNP man/man5/nologin.5 man/man5/nologin.5
--- man/man5/nologin.5	Mon Feb  1 23:37:38 1999
+++ man/man5/nologin.5	Sun May  2 21:06:48 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nologin.8	8.1 (Berkeley) 6/19/93
-.\"	%Id: nologin.5,v 1.5 1999/01/12 14:09:23 asami Exp %
+.\"	%Id: nologin.5,v 1.5.2.1 1999/04/29 09:43:49 jkoshy Exp %
 .\"
 .\" jpman %Id: nologin.5,v 1.3 1998/06/13 09:47:03 kumano Stab %
 .\"
@@ -64,4 +64,5 @@
 .Xr login 1 ,
 .Xr rlogin 1 ,
 .Xr telnet 1 ,
+.Xr nologin 8 ,
 .Xr shutdown 8
diff -urNP man/man5/passwd.5 man/man5/passwd.5
--- man/man5/passwd.5	Tue Oct 27 23:33:15 1998
+++ man/man5/passwd.5	Mon May  3 01:51:46 1999
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)passwd.5	8.1 (Berkeley) 6/5/93
-.\"	%Id: passwd.5,v 1.22 1998/08/31 16:41:07 wosch Exp %
+.\"	%Id: passwd.5,v 1.22.2.1 1999/04/23 03:54:19 grog Exp %
 .\"
 .\" jpman %Id: passwd.5,v 1.3 1998/07/30 15:26:15 horikawa Stab %
 .\"
@@ -47,7 +47,7 @@
 .Nm passwd
 $B%U%!%$%k$O2~9T$G6h@Z$i$l$?%l%3!<%I$+$i@.$j$^$9!#(B
 $B%f!<%6$4$H$K(B 1 $B%l%3!<%I$,BP1~$7!"(B
-$B%3%m%s(B(``:'')$B$G6h@Z$i$l$?(B 10 $B8D$NMs$,4^$^$l$^$9!#(B
+$B%3%m%s(B (``:'') $B$G6h@Z$i$l$?(B 10 $B8D$NMs$,4^$^$l$^$9!#(B
 $B$3$l$i$NMs$O0J2<$NDL$j$G$9(B:
 .Pp
 .Bl -tag -width password -offset indent
@@ -60,7 +60,7 @@
 .It uid
 $B%f!<%6$N(Bid$B!#(B
 .It gid
-$B%f!<%6$N%m%0%$%s%0%k!<%W(Bid$B!#(B
+$B%f!<%6$N%m%0%$%s%0%k!<%W(B id$B!#(B
 .It class
 $B%f!<%6$N%m%0%$%s%/%i%9!#(B
 .It change
@@ -75,27 +75,27 @@
 $B%f!<%6$N%m%0%$%s%7%'%k!#(B
 .El
 .Pp
-$B:G=i$N6uGrJ8;z$G$J$$J8;z$,%]%s%I5-9f(B(#)$B$G$"$k$h$&$J9T$OCm<a$G$"$j!"L5;k(B
+$B:G=i$N6uGrJ8;z$G$J$$J8;z$,%]%s%I5-9f(B (#) $B$G$"$k$h$&$J9T$OCm<a$G$"$j!"L5;k(B
 $B$5$l$^$9!#%9%Z!<%9!"%?%V!"2~9T$@$1$+$i$J$k6u9T$b$^$?L5;k$5$l$^$9!#(B
 .Pp
 .Ar name
 $BMs$O%3%s%T%e!<%?%"%+%&%s%H$K%"%/%;%9$9$k$N$KMQ$$$i$l$k%m%0%$%s$G$"$j!"(B
 .Ar uid
 $BMs$O$=$l$K7k$SIU$1$i$l$??t;z$G$9!#$3$l$i$O%U%!%$%k%"%/%;%9$r@)8f$9$k$N$G!"(B
-$BN>J}6&$=$N%7%9%F%`(B($B$^$?$7$P$7$PJ#?t$N%7%9%F%`$K$o$?$k(B1$B$D$N%0%k!<%W(B)$B$NCf(B
+$BN>J}6&$=$N%7%9%F%`(B ($B$^$?$7$P$7$PJ#?t$N%7%9%F%`$K$o$?$k(B 1 $B$D$N%0%k!<%W(B) $B$NCf(B
 $B$G0l0U$G$"$k$Y$-$G$9!#(B
 .Pp
-$BF1$8%m%0%$%sL>$dF1$8%f!<%6(Bid$B$N%(%s%H%j$rJ#?t;}$D$3$H$O2DG=$G(B
+$BF1$8%m%0%$%sL>$dF1$8%f!<%6(B id $B$N%(%s%H%j$rJ#?t;}$D$3$H$O2DG=$G(B
 $B$9$,!"IaDL$=$l$O8m$j$G$9!#$3$l$i$N%U%!%$%k$r<h$j07$&%k!<%A%s$O$7$P$7$P$=(B
 $B$NJ#?t%(%s%H%j$N(B 1 $B$D$@$1$rJV$7$^$9$7!"(B
 $B$=$7$F$=$l$O%i%s%@%`$JA*Br$K$h$k$b$N$G$9!#(B
 .Pp
-$B%m%0%$%sL>$O7h$7$F%O%$%U%s(B(``-'')$B$G;O$a$F$O$$$1$^$;$s!#$^$?!"%a!<%i$r(B
-$B:.Mp$5$;$k798~$K$"$k$N$G!"BgJ8;z$d%I%C%H(B(``.'')$B$b@dBP$KL>A0$N0lIt$K$7$J(B
-$B$$$3$H$r6/$/?d>)$7$^$9!#%3%m%s(B(``:'')$B$ONr;KE*$K%f!<%6%G!<%?%Y!<%9Cf$NMs(B
+$B%m%0%$%sL>$O7h$7$F%O%$%U%s(B (``-'') $B$G;O$a$F$O$$$1$^$;$s!#$^$?!"%a!<%i$r(B
+$B:.Mp$5$;$k798~$K$"$k$N$G!"BgJ8;z$d%I%C%H(B (``.'') $B$b@dBP$KL>A0$N0lIt$K$7$J(B
+$B$$$3$H$r6/$/?d>)$7$^$9!#%3%m%s(B (``:'') $B$ONr;KE*$K%f!<%6%G!<%?%Y!<%9Cf$NMs(B
 $B$rJ,$1$k$?$a$KMQ$$$i$l$F$-$?$N$G!"$$$+$J$kMs$K$b4^$^$l$^$;$s!#(B
 .Pp
-password$BMs$O%Q%9%o!<%I$N(B
+password $BMs$O%Q%9%o!<%I$N(B
 .Em $B0E9f2=$5$l$?(B
 $B7A$G$9!#(B
 .Ar password
@@ -103,16 +103,16 @@
 $B$7$g$&!#$3$l$O$[$H$s$I91>oE*$K8m$j$G$9!#$3$l$i$N%U%!%$%k$O0E9f2=$5$l$?(B
 $B%f!<%6%Q%9%o!<%I$r4^$s$G$$$k$N$G!"(B
 $BE,Ev$J8"MxL5$7$K$O$$$+$J$k?M$K$h$C$F$b2DFI$G$"$C(B
-$B$F$O$$$1$^$;$s!#4IM}>e$N%"%+%&%s%H$O(B1$B8D$N%"%9%?%j%9%/(B
+$B$F$O$$$1$^$;$s!#4IM}>e$N%"%+%&%s%H$O(B 1 $B8D$N%"%9%?%j%9%/(B
 .Ql \&*
 $B$r4^$`%Q%9%o!<%IMs$rM-$7$F$*$j!"$3$l$ODL>o$N%m%0%$%s$r5v$7$^$;$s!#(B
 .Pp
-group$BMs$O%f!<%6$,%m%0%$%s$7$?>e$G0LCVIU$1$i$l$k%0%k!<%W$G$9!#$3$N%7%9%F%`$O(B
+group $BMs$O%f!<%6$,%m%0%$%s$7$?>e$G0LCVIU$1$i$l$k%0%k!<%W$G$9!#$3$N%7%9%F%`$O(B
 $B%^%k%A%0%k!<%W(B(
 .Xr groups 1
 $B;2>H(B)
-$B$r%5%]!<%H$7$^$9$,!"$3$NMs$O%f!<%6$N(B1$B<!%0%k!<%W$r;XL>$7$^$9!#(B2$B<!%0%k!<%W$N(B
-$B%a%s%P$O(B
+$B$r%5%]!<%H$7$^$9$,!"$3$NMs$O%f!<%6$N(B 1 $B<!%0%k!<%W$r;XL>$7$^$9!#(B
+2 $B<!%0%k!<%W$N%a%s%P$O(B
 .Pa /etc/group
 $B$NCf$GA*$P$l$^$9!#(B
 .Pp
@@ -131,7 +131,7 @@
 $B$K$*$1$k4p=`;~E@$+$i$NIC?t$rI=$7$?$b$N$G$"$j!"(B
 $B$3$N;~$^$G$K%"%+%&%s%H$KBP$9$k%Q%9%o!<%I$rJQ99$9$kI,MW$,$"$j$^$9!#(B
 $B%Q%9%o!<%I%(!<%8%s%05!G=$r$J$/$9$K$O!"(B
-$B$3$NMs$r6uMs$K$7$F$*$/$+(B0$B$r%;%C%H$7$F$*$1$PNI$$$G$9!#(B
+$B$3$NMs$r6uMs$K$7$F$*$/$+(B 0 $B$r%;%C%H$7$F$*$1$PNI$$$G$9!#(B
 .Pp
 .Ar expire
 $BMs$O(B
@@ -139,10 +139,10 @@
 $B$K$*$1$k4p=`;~E@$+$i$NIC?t$rI=$7$?$b$N$G$"$j!"(B
 $B$=$N;~$K%"%+%&%s%H$,>CLG$7$^$9!#(B
 $B%"%+%&%s%H:F@_Dj5!G=$r$J$/$9$K$O!"(B
-$B$3$NMs$r6u$K%;%C%H$7$F$*$/$+(B0$B$r%;%C%H$7$F$*$1$PNI$$$G$9!#(B
+$B$3$NMs$r6u$K%;%C%H$7$F$*$/$+(B 0 $B$r%;%C%H$7$F$*$1$PNI$$$G$9!#(B
 .Pp
 .Ar gecos
-$BMs$O%3%s%^(B(``,'')$B$G6h@Z$i$l$?0J2<$N$h$&$JI{Ms$rDL>o4^$s$G$$$^$9(B:
+$BMs$O%3%s%^(B (``,'') $B$G6h@Z$i$l$?0J2<$N$h$&$JI{Ms$rDL>o4^$s$G$$$^$9(B:
 .Pp
 .Bd -unfilled -offset indent
 fullname		$B%f!<%6$N%U%k%M!<%`(B
@@ -164,14 +164,14 @@
 .Tn UNIX
 $B%Q%9L>$G$9!#(B
 .Pp
-shell$BMs$O%f!<%6$N9%$`%$%s%?%W%j%?$G$9!#(B
+shell $BMs$O%f!<%6$N9%$`%$%s%?%W%j%?$G$9!#(B
 .Ar shell
 $BMs$K$J$K$bL5$1$l$P(B Bourne $B%7%'%k(B
 .Pq Pa /bin/sh
 $B$,2>Dj$5$l$^$9!#%;%-%e%j%F%#>e$NM}M3$K$h$j!"%7%'%k$,%7%9%F%`$X$N%"%/%;%9(B
-$B$r5v$5$J$$%9%/%j%W%H(B($BNc$($P(B
+$B$r5v$5$J$$%9%/%j%W%H(B ($BNc$($P(B
 .Xr nologin 8
-$B%9%/%j%W%H(B)$B$K@_Dj$5$l$F$$$k>l9g!"$$$+$J$k4D6-JQ?t$bEO$5$l$J$$$h$&$KG[N8$5(B
+$B%9%/%j%W%H(B) $B$K@_Dj$5$l$F$$$k>l9g!"$$$+$J$k4D6-JQ?t$bEO$5$l$J$$$h$&$KG[N8$5(B
 $B$l$k$Y$-$G$9!#(B
 .Xr sh 1
 $B$K$D$$$F$O!"$3$l$O(B
@@ -179,17 +179,17 @@
 $B%U%i%0$r;XDj$9$k$3$H$G2DG=$G$9!#$3$l$,B>$N%7%'%k$G$I$N$h$&$K9T$J$o$l$k$+(B
 $B$O!"FCDj$N%7%'%k$NJ8=q$rD4$Y$F$/$@$5$$!#(B
 .Sh YP/NIS $B$H$NAj8_:nMQ(B
-.Ss NIS$B%Q%9%o!<%I%G!<%?$X$N%"%/%;%9$r2DG=$K$9$k(B
+.Ss NIS $B%Q%9%o!<%I%G!<%?$X$N%"%/%;%9$r2DG=$K$9$k(B
 $B%7%9%F%`4IM}<T$O(B
 .Pa /etc/master.passwd
 $B%U%!%$%k$KFCJL$J%l%3!<%I$rIU$12C$($k$3$H$K$h$C$F!"%Q%9%o!<%I>pJs$K$D$$$F(B
-NIS/YP$B$rMQ$$$k$h$&$K(B
+NIS/YP $B$rMQ$$$k$h$&$K(B
 .Tn FreeBSD
 $B$r@_Dj$G$-$^$9!#%O%C%7%e$5$l$?%Q%9%o!<%I%G!<%?%Y!<%9$*$h$S(B
 .Pa /etc/passwd
-$B%U%!%$%k(B(
+$B%U%!%$%k(B (
 .Pa /etc/passwd
-$B$O@dBP$K<jF0$GJT=8$7$F$O$$$1$^$;$s(B)$B$KJQ99$,E,@Z$K%^!<%8$5$l$k$h$&$K!"(B
+$B$O@dBP$K<jF0$GJT=8$7$F$O$$$1$^$;$s(B) $B$KJQ99$,E,@Z$K%^!<%8$5$l$k$h$&$K!"(B
 $B%(%s%H%j$O(B
 .Xr vipw 8
 $B$GIU2C$9$k$Y$-$G$9!#JL$NJ}K!$H$7$F$O!"$J$s$i$+$NJ}K!$G(B
@@ -198,7 +198,7 @@
 .Xr pwd_mkdb 8
 $B$rMQ$$$F%Q%9%o!<%I%G!<%?%Y!<%9$r<jF0$G99?7$9$k$3$H$,$G$-$^$9!#(B
 .Pp
-NIS$B$r3h@-2=$9$k$?$a$N:G$b4JC1$JJ}K!$O!"L>A0Ms$K%W%i%9Id9f(B(`+')$B$@$1$r;}$D!"(B
+NIS $B$r3h@-2=$9$k$?$a$N:G$b4JC1$JJ}K!$O!"L>A0Ms$K%W%i%9Id9f(B (`+') $B$@$1$r;}$D!"(B
 $B0J2<$N$h$&$J6u$N%l%3!<%I$rIU$12C$($k$3$H$G$9!#(B
 .Bd -literal -offset indent
 +:::::::::
@@ -213,7 +213,7 @@
 .Pp
 $B>e5-$N%(%s%H%j$O(B
 .Em $B%o%$%k%I%+!<%I(B
-$B%(%s%H%j$H$7$FCN$i$l$F$$$k$3$H$KCm0U$7$F$/$@$5$$!#$J$<$J$i!"$=$l$OA4$F$N(B
+$B%(%s%H%j$H$7$FCN$i$l$F$$$k$3$H$KCm0U$7$F$/$@$5$$!#$J$<$J$i!"$=$l$O$9$Y$F$N(B
 $B%f!<%6$H0lCW$7(B ($BB>$K>pJs$r;}$?$J$$(B `+' $B$O!"A40w$K0lCW$7$^$9(B)$B!"(B
 $BA4(B NIS $B%Q%9%o!<%I%G!<%?$rL5JQ99$K$F0z$-=P$9$3$H$r5v$7$^$9!#(B
 $B0lJ}!"(B
@@ -221,7 +221,7 @@
 $B$I$N$h$&$J%G!<%?$,(B NIS $B%Q%9%o!<%I%^%C%W$+$iE83+$5$l$k$N$+!"(B
 $B$*$h$S$=$l$,$I$N$h$&$K2r<a$5$l$k$N$+$K$D$$$F!"(B
 $B4IM}<T$,1F6A$rM?$($k$3$H$,$G$-$^$9!#(B
-$B$3$NFCD'$r<($9!">/?t$N%l%3!<%INc$r5s$2$^$9(B(1 $B$D$N(B
+$B$3$NFCD'$r<($9!">/?t$N%l%3!<%INc$r5s$2$^$9(B (1 $B$D$N(B
 .Pa master.passwd
 $B%U%!%$%kCf$K$OJ#?t$N(B NIS $B%(%s%H%j$r;}$D$3$H$,2DG=$G$"$k$3$H$KCm0U(B):
 .Bd -literal -offset indent
@@ -244,14 +244,15 @@
 $BNc30$O!"%f!<%6(B ``ken'' $B$N%7%'%k$,(B
 .Pa /bin/csh
 $B$K:F%^%C%W$5$l$k$3$H$G$9!#(B
-$B$3$l$O!"(BNIS$B%Q%9%o!<%I%^%C%W$G;XDj$5$l$?%7%'%k$NCM$,!"%m!<%+%k(B
+$B$3$l$O!"(BNIS $B%Q%9%o!<%I%^%C%W$G;XDj$5$l$?%7%'%k$NCM$,!"%m!<%+%k(B
 .Pa master.passwd
-$B%U%!%$%k$NFCJL$J(BNIS$B%(%s%H%j$G;XDj$5$l$?CM$K$h$C$F>e=q$-$5$l$k$3$H$r0UL#$7$^$9!#(B
+$B%U%!%$%k$NFCJL$J(B
+NIS $B%(%s%H%j$G;XDj$5$l$?CM$K$h$C$F>e=q$-$5$l$k$3$H$r0UL#$7$^$9!#(B
 $B%f!<%6(B ``ken'' $B$O(B csh $B%7%'%k$r3d$jEv$F$F$*$$$F$bNI$$$+$bCN$l$^$;$s!#(B
 $B$J$<$J$i!"(B
 $B@/<#E*$"$k$$$O5;=QE*$JM}M3$G%/%i%$%"%s%H%^%7%s$K%$%s%9%H!<%k$5$l$F$$$J$$(B
 $BJL$N%7%'%k$r!"H`$N(B NIS $B%Q%9%o!<%I%(%s%H%j$K;XDj$5$l$F$$$k$+$b$7$l$J$$$?$a$G$9!#(B
-$BB>J}!"(B``rejected-users''$B%M%C%H%0%k!<%W$N%f!<%6$O!"$=$N(BUID$B!"(B
+$BB>J}!"(B``rejected-users''$B%M%C%H%0%k!<%W$N%f!<%6$O!"$=$N(B UID$B!"(B
 GID$B!"%7%'%k$,IT@5$JCM$G>e=q$-$5$l$F$$$k$N$G%m%0%$%s$G$-$J$/$J$j$^$9!#(B
 .Pp
 $B%f!<%6(B ``mitnick'' $B$O!"$=$N%(%s%H%j$,(B `+' $B$G$O$J$/(B `-' $B$G;XDj$5$l$F$$$k$N$G!"(B
@@ -287,28 +288,29 @@
 $B:G8e$K!"(B
 .Pa /etc/master.passwd
 $B%U%!%$%k$N(B NIS $B%"%/%;%9%(%s%H%j$G;XDj$5$l$?%f!<%6$^$?$O%M%C%H%0%k!<%W(B
-$B$N$I$l$H$b0lCW$7$J$$(BNIS$B%Q%9%o!<%I%G!<%?%Y!<%9%l%3!<%I$O!"(B($B%^%$%J%9%(%s%H%j(B
-$B$r;H$C$F;XDj$7$?A4$F$N%f!<%6$H6&$K(B)$BA4$FL5;k$5$l$^$9!#@h$K<($7$?Nc(B
+$B$N$I$l$H$b0lCW$7$J$$(B NIS $B%Q%9%o!<%I%G!<%?%Y!<%9%l%3!<%I$O!"(B($B%^%$%J%9%(%s%H%j(B
+$B$r;H$C$F;XDj$7$?$9$Y$F$N%f!<%6$H6&$K(B) $B$9$Y$FL5;k$5$l$^$9!#@h$K<($7$?Nc(B
 $B$G$O%j%9%H$N:G8e$K%o%$%k%I%+!<%I%(%s%H%j$,L5$$$N$G!"(B
 ``ken'' $B$H(B ``dennis'' $B$H(B ``staff'' $B%M%C%H%0%k!<%W$H(B
-``permitted-users'' $B%M%C%H%0%k!<%W$H$r=|$/A4$F$N%f!<%6$r(B
+``permitted-users'' $B%M%C%H%0%k!<%W$H$r=|$/$9$Y$F$N%f!<%6$r(B
 $B%7%9%F%`$O8"8B$,$"$k%f!<%6$H$7$FG'<1$7$J$$$G$7$g$&!#(B
 ``rejected-users'' $B%M%C%H%0%k!<%W$OG'<1$5$l$^$9$,!"(B
 $BA4%a%s%P$N%7%'%k$O:F%^%C%W$5$l$^$9$N$G!"(B
-$B%"%/%;%9$O5qH]$5$l$k$G$7$g$&!#B>$NA4$F$N(BNIS$B%Q%9%o!<%I%l%3!<%I$OL5;k$5$l(B
+$B%"%/%;%9$O5qH]$5$l$k$G$7$g$&!#B>$N$9$Y$F$N(B NIS $B%Q%9%o!<%I%l%3!<%I$OL5;k$5$l(B
 $B$k$G$7$g$&!#(B $B4IM}<T$O0J2<$N$h$&$J%o%$%k%I%+!<%I%(%s%H%j$r%j%9%H$N:G8e$K(B
 $BIU$1$F$bNI$$$G$7$g$&!#(B
 .Bd -literal -offset indent
 +:::::::::/usr/local/bin/go_away
 
 .Ed
-$B$3$N%(%s%H%j$OB>$NA4$F$N%(%s%H%j$H0lCW$7$J$$A4$F$N%f!<%6$r0l5s$K$H$i$($k(B
+$B$3$N%(%s%H%j$OB>$N$9$Y$F$N%(%s%H%j$H0lCW$7$J$$$9$Y$F$N%f!<%6$r0l5s$K$H$i$($k(B
 $BF/$-$r$7$^$9!#(B
 .Pa /usr/local/bin/go_away
 $B$O!"%7%9%F%`$K%"%/%;%9$r5v2D$5$l$J$$%f!<%6$KEA$($k%a%C%;!<%8$r=PNO$9$kC;$+(B
 $B$$%9%/%j%W%H$^$?$O%W%m%0%i%`$G$7$g$&!#(B
 $BI,$:$7$b%m%0%$%s%"%/%;%9$r5v2D$;$:$K!"(B
-$BFCDj$N(BNIS$B%I%a%$%sFb$NA4%f!<%6$r%7%9%F%`$,G'<12DG=$G$"$k$3$H$,K>$^$7$$$H$-$K$O!"(B
+$BFCDj$N(B
+NIS $B%I%a%$%sFb$NA4%f!<%6$r%7%9%F%`$,G'<12DG=$G$"$k$3$H$,K>$^$7$$$H$-$K$O!"(B
 $B$3$N%F%/%K%C%/$,M-8z$J$3$H$,$"$j$^$9!#(B
 $B%m%0%$%s%7%'%k$H%7%'%k%9%/%j%W%H$r;HMQ$9$k$H$-$N%;%-%e%j%F%#$K4X$9$k;vJA(B
 $B$K$D$$$F!">e5-$N%7%'%kMs$N5-=R$r;2>H$7$F$/$@$5$$!#(B
@@ -316,7 +318,7 @@
 $B$3$N(B
 .Pa $B>e=q$-(B
 $B5!G=$N<g$JMQES$O!"(B
-$B4IM}<T$,(BNIS$B%/%i%$%"%s%H>e$G%"%/%;%9@)8B$r6/2=2DG=$H$9$k$3$H$G$9!#(B
+$B4IM}<T$,(B NIS $B%/%i%$%"%s%H>e$G%"%/%;%9@)8B$r6/2=2DG=$H$9$k$3$H$G$9!#(B
 $BC1$KFCDj$N%M%C%H%0%k!<%W$KBP$7$F%f!<%6$rDI2C$7$?$j:o=|$7$?$j$9$k$@$1$G!"(B
 $B$=$N%f!<%6$K$"$k%^%7%s72$X$N%"%/%;%9$r5v2D$7!"(B
 $B$+$DB>$N%^%7%s72$X$N%"%/%;%9$r5qH]$9$k$3$H$,$G$-$^$9!#(B
@@ -327,7 +329,7 @@
 $B$K@_Dj$5$l$k$H!"?7$K%M%C%H%0%k!<%W$,:n$i$l$J$$8B$j$=$l$O:FEYJQ99$9$kI,MW(B
 $B$O$"$j$^$;$s!#(B
 .Sh $BCm<a(B
-.Ss NIS$B7PM3$N%7%c%I%&%Q%9%o!<%I(B
+.Ss NIS $B7PM3$N%7%c%I%&%Q%9%o!<%I(B
 .Tn FreeBSD
 $B$O%7%c%I%&%Q%9%o!<%IK!$r:NMQ$7$F$*$j!"(B
 $B%f!<%6$N0E9f2=$5$l$?%Q%9%o!<%I$O%9!<%Q%f!<%6$@$1$,FI$_=q$-2DG=$J(B
@@ -339,7 +341,7 @@
 $B%f!<%6$,B>$N%f!<%6%"%+%&%s%H$KBP$7$FIT@5%"%/%;%9$9$k$3$H$rKI$0$?$a$G$9!#(B
 NIS $B$K$O%Q%9%o!<%I1#JC$N$?$a$NI8=`E*$JJ}K!$,$"$j$^$;$s!#(B
 $B$3$l$O!"(B
-$B%Q%9%o!<%I%G!<%?$rA4$F(BNIS$B%Q%9%o!<%I%^%C%W$KCV$-49$($k$3$H$O!"(B
+$B%Q%9%o!<%I%G!<%?$r$9$Y$F(B NIS $B%Q%9%o!<%I%^%C%W$KCV$-49$($k$3$H$O!"(B
 .Tn FreeBSD
 $B$N%Q%9%o!<%I1#JC%7%9%F%`$N%;%-%e%j%F%#$rL58z$K$7$F$7$^$&$3$H$r0UL#$7$^$9!#(B
 .Pp
@@ -371,8 +373,8 @@
 $B%9!<%Q%f!<%6$N$_$,FC8"%]!<%H$K%"%/%;%9$9$k$3$H$,5v$5$l$k$N$G!"(B
 $BMW5a$7$F$$$k%f!<%6$,%9!<%Q%f!<%6$G$"$k$+H]$+H=CG2DG=$G$9!#(B
 .Pa master.passwd
-$B%^%C%W$K%"%/%;%9$9$k8"8B$NL5$$%f!<%6$+$i$NA4$F$NMW5a$O5qH]$5$l$k$G$7$g$&!#(B
-$BA4$F$N%f!<%6G'>Z%W%m%0%i%`$O%9!<%Q%f!<%6$N8"8B$G<B9T$5$l$k$N$G!"(B
+$B%^%C%W$K%"%/%;%9$9$k8"8B$NL5$$%f!<%6$+$i$N$9$Y$F$NMW5a$O5qH]$5$l$k$G$7$g$&!#(B
+$B$9$Y$F$N%f!<%6G'>Z%W%m%0%i%`$O%9!<%Q%f!<%6$N8"8B$G<B9T$5$l$k$N$G!"(B
 $B%f!<%6$N0E9f2=$5$l$?%Q%9%o!<%I%G!<%?$X$NI,MW$J%"%/%;%9$r;}$A$^$9$,!"(B
 $BDL>o%f!<%6$O%Q%9%o!<%I>pJs$r4^$^$J$$I8=`(B
 .Pa passwd
@@ -385,14 +387,14 @@
 $B$KL5@)8B$K%"%/%;%9$G$-$k??$K8BDj$5$l$?%f!<%6$O0MA3(B
 .Pa master.passwd
 $B%^%C%W$r4m$&$/$9$k$3$H$K$bCm0U$7$F$/$@$5$$!#(B
-.Ss NIS$B$N>e=q$-$KH<$J$&(BUID$B$*$h$S(BGID$B$N:F%^%C%W(B
+.Ss NIS $B$N>e=q$-$KH<$J$&(B UID $B$*$h$S(B GID $B$N:F%^%C%W(B
 .Tn SunOS
 $B$d(B Sun $B$N(B NIS $B%3!<%I$rMxMQ$7$F$$$k%*%Z%l!<%F%#%s%0%7%9%F%`$H$O0[$J$j!"(B
 .Tn FreeBSD
-$B$G$O%f!<%6$,(BNIS
+$B$G$O%f!<%6$,(B NIS
 .Pa passwd
 $B%(%s%H%jCf$N(B
-.Pa $BA4$F(B
+.Pa $B$9$Y$F(B
 $B$NMs$r>e=q$-$9$k$3$H$r5v$7$F$$$^$9!#Nc$($P0J2<$N$h$&$J(B
 .Pa /etc/master.passwd
 $B%(%s%H%j$r9M$($F$_$^$7$g$&!#(B
@@ -400,14 +402,14 @@
 +@foo-users:???:666:666:0:0:0:Bogus user:/home/bogus:/bin/bogus
 
 .Ed
-$B$3$N%(%s%H%j$K$h$j!"(B`foo-users' $B%M%C%H%0%k!<%WCf$NA4$F$N%f!<%6$O!"(B
+$B$3$N%(%s%H%j$K$h$j!"(B`foo-users' $B%M%C%H%0%k!<%WCf$N$9$Y$F$N%f!<%6$O!"(B
 UID$B!"(BGID$B!"%Q%9%o!<%I$r4^$a$F(B
-.Pa $BA4$F(B
+.Pa $B$9$Y$F(B
 $B$N%Q%9%o!<%I>pJs$r>e=q$-$5$l$^$9!#$3$N7k2L!"H`Ey$N%Q%9%o!<%I$OIT@5$J(B
-$BCM$K:F%^%C%W$5$l$k$N$G!"A4$F$N(B `foo-users' $B$O%7%9%F%`$+$iDy$a=P$5(B
+$BCM$K:F%^%C%W$5$l$k$N$G!"$9$Y$F$N(B `foo-users' $B$O%7%9%F%`$+$iDy$a=P$5(B
 $B$l$k$3$H$K$J$k$G$7$g$&!#(B
 .Pp
-$B0J2<$N$h$&$K(BNIS$B%o%$%k%I%+!<%I%(%s%H%j$r;H$&=,47$N$"$k?M$,B?$$$N$G!"(B
+$B0J2<$N$h$&$K(B NIS $B%o%$%k%I%+!<%I%(%s%H%j$r;H$&=,47$N$"$k?M$,B?$$$N$G!"(B
 $B$3$N$3$H$O3P$($F$*$/$Y$-=EMW$J$3$H$G$9!#(B
 .Bd -literal -offset indent
 +:*:0:0:::
@@ -417,7 +419,7 @@
 .Tn FreeBSD
 $B4IM}<T$,0J2<$N$h$&$K(B
 .Pa master.passwd
-$B%U%!%$%k$N(BNIS$B%(%s%H%j$rA*$s$G$7$^$&$3$H$K$D$J$,$j$^$9!#(B
+$B%U%!%$%k$N(B NIS $B%(%s%H%j$rA*$s$G$7$^$&$3$H$K$D$J$,$j$^$9!#(B
 .Bd -literal -offset indent
 +:*:0:0::::::
 
@@ -430,20 +432,20 @@
 .Sy Pa master.passwd
 .Sy $B%U%!%$%k$K$O!V@dBP$K!W$3$N$h$&$J%(%s%H%j$OF~$l$J$$$G$/$@$5$$(B!!
 $B:G=i$N$b$N$O!"(B
-$BA4$F$N%Q%9%o!<%I$r(B `*' $B$K:F%^%C%W$7(B ($B$3$l$OC/$b%m%0%$%s$G$-$J$/$7$^$9(B)$B!"(B
-$BA4$F$N(B UID $B$*$h$S(B GID $B$r(B 0 $B$K:F%^%C%W$9$k(B ($B$3$l$O3'$r%9!<%Q%f!<%6$K$7$^$9(B)
+$B$9$Y$F$N%Q%9%o!<%I$r(B `*' $B$K:F%^%C%W$7(B ($B$3$l$OC/$b%m%0%$%s$G$-$J$/$7$^$9(B)$B!"(B
+$B$9$Y$F$N(B UID $B$*$h$S(B GID $B$r(B 0 $B$K:F%^%C%W$9$k(B ($B$3$l$O3'$r%9!<%Q%f!<%6$K$7$^$9(B)
 $B$3$H$r(B
 .Tn FreeBSD
 $B$K;X<($7$^$9!#(B
 2 $BHVL\$N$b$N$OA4(B UID $B$*$h$S(B GID $B$r$A$g$&$I(B 0 $B$K%^%C%W$7$^$9(B
 $B$,!"$3$l$O(B
-.Pa $BA4$F$N%f!<%6$,(Broot$B$K$J$C$F$7$^$&(B
+.Pa $B$9$Y$F$N%f!<%6$,(B root $B$K$J$C$F$7$^$&(B
 $B$3$H$r0UL#$7$^$9(B!
 .Pp
-.Ss NIS$B>e=q$-I>2A$N8_49@-(B
-Sun$B$,:G=i$K(B
+.Ss NIS $B>e=q$-I>2A$N8_49@-(B
+Sun $B$,:G=i$K(B
 .Xr getpwent 3
-$B%k!<%A%s$K(BNIS$B%5%]!<%H$rDI2C$7$?$H$-!"(B
+$B%k!<%A%s$K(B NIS $B%5%]!<%H$rDI2C$7$?$H$-!"(B
 .Tn SunOS
 $B$N%Q%9%o!<%I%U%!%$%k(B
 .Pa /etc/passwd
@@ -461,8 +463,9 @@
 $B%Q%9%o!<%I%U%!%$%k$NCf1{$K%3%T!<$5$l$?$+$N$h$&$K8=$o$l$k$G$7$g$&!#(B
 $B4IM}<T$,(B +:::::: $B%(%s%H%j$r(B
 .Pa /etc/passwd
-$B$NCf1{$H:G8e$NN>J}$KCV$1$P(BNIS$B%Q%9%o!<%I%^%C%W$O(B2$BEY8=$o$l$k$3$H$K$J$k$G$7$g(B
-$B$&!#$9$J$o$A(B 1 $BEYL\$O$=$N%U%!%$%k$NCf1{$K8=$l!"$b$&(B 1 $BEY$O:G8e$K8=$l$^$9(B
+$B$NCf1{$H:G8e$NN>J}$KCV$1$P(B NIS $B%Q%9%o!<%I%^%C%W$O(B
+2 $BEY8=$o$l$k$3$H$K$J$k$G$7$g$&!#(B
+$B$9$J$o$A(B 1 $BEYL\$O$=$N%U%!%$%k$NCf1{$K8=$l!"$b$&(B 1 $BEY$O:G8e$K8=$l$^$9(B
 ($BC1=c$J%o%$%k%I%+!<%I$NBe$j$K>e=q$-%(%s%H%j$rMQ$$$k$3$H$G!"(B
 $BB>$NAH$_9g$o$;$,2DG=$G$9(B)$B!#(B
 .Pp
@@ -491,12 +494,12 @@
 .Pp
 $BBe$j$K(B
 .Tn FreeBSD
-$B$G$OA4$F$N(B NIS $B>e=q$-%(%s%H%j$r0l=o$N%0%k!<%W$K$^$H$a!"$=$l$i$+$i(B 1 $B$D(B
+$B$G$O$9$Y$F$N(B NIS $B>e=q$-%(%s%H%j$r0l=o$N%0%k!<%W$K$^$H$a!"$=$l$i$+$i(B 1 $B$D(B
 $B$N%U%#%k%?$r:n$j$^$9!#3F(B NIS $B%Q%9%o!<%I%(%s%H%j$O$A$g$&$I(B 1 $B2s>e=q$-%U%#%k%?(B
 $B$KBP$7$FHf3S$5$l!"$=$l$K1~$8$F<h$j07$o$l$^$9!#%U%#%k%?$,%(%s%H%j$rJQ99$;(B
 $B$:$KDL$9$3$H$r5v$9$J$i%(%s%H%j$OJQ99$5$l$J$$$b$N$H$7$F<h$j07$o$l!"%U%#%k%?(B
 $B$,Ms$N:F%^%C%W$rMW5a$9$k$J$iMs$O:F%^%C%W$5$l!"%U%#%k%?$,L@Gr$J=|30$rMW5a(B
-$B$9$k$J$i(B($B$9$J$o$A%(%s%H%j$,(B '-' $B>e=q$-$H0lCW$9$k$J$i(B)$B%(%s%H%j$OL5;k$5$l!"(B
+$B$9$k$J$i(B($B$9$J$o$A%(%s%H%j$,(B '-' $B>e=q$-$H0lCW$9$k$J$i(B) $B%(%s%H%j$OL5;k$5$l!"(B
 $B%(%s%H%j$,%U%#%k%?;XDj$N$I$l$H$b0lCW$7$J$$$J$i%(%s%H%j$O<N$F$i$l$^$9!#(B
 .Pp
 $B$^$?!"(BNIS $B$N(B '+' $B$*$h$S(B '-' $B%(%s%H%j<+?H$O!"(B
@@ -525,12 +528,12 @@
 .Pp
 $B$"$i$f$k(B
 .Tn FreeBSD
-$B$N9=@.$N$&$A(B99%$B$K$*$$$F$O(BNIS$B%/%i%$%"%s%H$N?6Iq$$$O(B
+$B$N9=@.$N$&$A(B 99% $B$K$*$$$F$O(B NIS $B%/%i%$%"%s%H$N?6Iq$$$O(B
 .Tn SunOS
 $B$dB>$NF1<o$N%7%9%F%`$N$=$l$H6hJL$G$-$J$$$b$N$H$J$k$G$7$g$&!#$=$l$G$b$3$l(B
 $B$i$N%"!<%-%F%/%A%cE*$J0c$$$rCN$C$F$*$/$3$H$OI,MW$G$9!#(B
 .Pp
-.Ss NIS$B>e=q$-$K4X$7%M%C%H%0%k!<%W$NBe$j$K%0%k!<%W$rMQ$$$k(B
+.Ss NIS $B>e=q$-$K4X$7%M%C%H%0%k!<%W$NBe$j$K%0%k!<%W$rMQ$$$k(B
 .Tn FreeBSD
 $B$O%M%C%H%0%k!<%W$G$O$J$/%f!<%6%0%k!<%W$K4p$E$$$?>e=q$->H9g$r9T$J$&G=NO(B
 $B$rDs6!$7$^$9!#Nc$($P(B NIS $B%(%s%H%j$,0J2<$N$h$&$K;XDj$5$l$?$H$-!"(B
@@ -542,9 +545,9 @@
 $B>H9g$7$h$&$H$7$^$9!#(B
 `operator' $B%M%C%H%0%k!<%W$,B8:_$7$J$$$H$-!"(B
 $B%7%9%F%`$OBe$j$KDL>o$N(B `operator' $B%0%k!<%W$KBP$7$F>H9g$7$h$&$H$7$^$9!#(B
-.Ss FreeBSD$B$N8E$$%P!<%8%g%s$+$i$NF0:n$NJQA+(B
+.Ss FreeBSD $B$N8E$$%P!<%8%g%s$+$i$NF0:n$NJQA+(B
 .Tn FreeBSD
-$B$N(BNIS/YP$B$N<h$j07$$$K$D$$$F$O$$$/$D$+$N%P%0%U%#%C%/%9$H2~A1$,$"$j$^$7$?!#(B
+$B$N(B NIS/YP $B$N<h$j07$$$K$D$$$F$O$$$/$D$+$N%P%0%U%#%C%/%9$H2~A1$,$"$j$^$7$?!#(B
 $B$=$N$$$/$D$+$OF0:n>e$NJQ2=$r$b$?$i$7$^$7$?!#F0:n>e$NJQ2=$O0lHL$KNI$$J}8~(B
 $B$K$"$j$^$9$,!"%f!<%6$*$h$S%7%9%F%`4IM}<T$,$=$l$i$K$D$$$FCN$C$F$*$/$3$H$O(B
 $B=EMW$G$9!#(B
@@ -559,7 +562,7 @@
 $B$,G'<1$7$J$$%m%0%$%sL>$rJV$9$3$H$,$"$j$^$7$?!#(B
 $B$3$l$O8=:_$G$O(B
 .Pa /etc/master.passwd
-$B$G;XDj$5$l$?>e=q$-$rA4$F$N(B
+$B$G;XDj$5$l$?>e=q$-$r$9$Y$F$N(B
 .Xr getpwent 3
 $B4X?t$KE,MQ$9$k$3$H$G2r7h$5$l$^$7$?!#(B
 .It
@@ -574,7 +577,7 @@
 $B%M%C%H%0%k!<%W$r;XDj2DG=$H$J$j$^$7$?!#(B
 .It
 .Tn FreeBSD
-$B$O8=:_(BNIS$B%5!<%P$NG=NO$r;}$C$F$*$j!"I8=`Bh(B6$BHG7A<0$N(B
+$B$O8=:_(B NIS $B%5!<%P$NG=NO$r;}$C$F$*$j!"I8=`Bh(B 6 $BHG7A<0$N(B
 .Pa passwd
 $B%^%C%W$K2C$((B
 .Pa master.passwd
@@ -616,9 +619,9 @@
 .Xr pw 8 ,
 .Xr vipw 8
 .Sh $B%P%0(B
-$B%f!<%6>pJs$OB>$N$I$3$+(B $B$KF~$l$k$Y$-(B($B$=$7$F7k6I$OF~$l$k$3$H$K$J$k(B)$B$G$7$g$&!#(B
+$B%f!<%6>pJs$OB>$N$I$3$+(B $B$KF~$l$k$Y$-(B ($B$=$7$F7k6I$OF~$l$k$3$H$K$J$k(B) $B$G$7$g$&!#(B
 .Pp
-YP/NIS$B%Q%9%o!<%I%G!<%?%Y!<%9$G$O!"(B
+YP/NIS $B%Q%9%o!<%I%G!<%?%Y!<%9$G$O!"(B
 $BIaDL$N%f!<%6$K$O0E9f2=$5$l$?%Q%9%o!<%I$,8+$($F$7$^$$$^$9!#$7$?$,$C$F(B
 .Pa master.passwd
 $B%^%C%W$N%7%c%I%&%Q%9%o!<%I$*$h$S(B
@@ -664,7 +667,7 @@
 .Nm
 $B%U%!%$%k$O(B
 .At v6
-$B$G8=$o$l$^$7$?!#(BYP/NIS$B$N5!G=$O(B
+$B$G8=$o$l$^$7$?!#(BYP/NIS $B$N5!G=$O(B
 .Tn SunOS
 $B$r?w7?$H$7$F(B
 .Fx 1.1
diff -urNP man/man6/sail.6 man/man6/sail.6
--- man/man6/sail.6	Sun May  2 21:02:28 1999
+++ man/man6/sail.6	Mon May  3 01:51:28 1999
@@ -70,7 +70,7 @@
 $B$O!"$b$H$b$H$O!"(BS. Craig Taylor $B$K$h$C$F3+H/$5$l$?!"%"%P%m%s%R%k<R$N@oF.HAA%(B
 $B%\!<%I%2!<%`$N%3%s%T%e!<%?HG$G$9!#(B
 .PP
-.I Sail
+.I sail
 $B$N%W%l%$%d!<$O!"5l<0$N@o4O$N;X4x$r$H$jB>$N%W%l%$%d!<$d%3%s%T%e!<%?$H(B
 $B@o$$$^$9!#(B
 $B%W%l%$%d!<$O!"%2!<%`$NCf$K5-O?$5$l$??tB?$/$NNr;K>e$N3$@o$NCf$N0l$D$r:F8=$7$F$b(B
@@ -132,7 +132,7 @@
 $B$=$l$K2C$($F!"6&M-%U%!%$%k$X$NGSB>E*%"%/%;%9$rJ]>Z$9$k$?$a!"(B
 $B%m%C%/5!9=$,6!5k$5$l$J$1$l$P$J$j$^$;$s$G$7$?!#(B
 $BNc$($P!"(B
-.I Sail
+.I sail
 $B$O%7%J%j%*(B 21 $B$K$D$$$F$O!"(B
 /tmp/#sailsink.21 $B$H$$$&L>A0$N0l;~%U%!%$%k$r;H$$$^$9!#(B
 $B$=$7$F!"B>$N%7%J%j%*$KBP$7$F$O$=$l$KN`$9$k%U%!%$%kL>$r;HMQ$7$^$9!#(B
diff -urNP man/man7/environ.7 man/man7/environ.7
--- man/man7/environ.7	Tue Jan 26 00:29:00 1999
+++ man/man7/environ.7	Sun May  2 21:07:20 1999
@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)environ.7	8.3 (Berkeley) 4/19/94
-.\"	%Id: environ.7,v 1.10 1997/03/08 14:41:44 wosch Exp %
-.\" jpman %Id: environ.7,v 1.4 1999/01/21 17:56:13 kuma Stab %
+.\"	%Id: environ.7,v 1.10.2.1 1999/04/29 09:33:39 jkoshy Exp %
 .\"
+.\" jpman %Id: environ.7,v 1.4 1999/01/21 17:56:13 kuma Stab %
 .Dd April 19, 1994
 .Dt ENVIRON 7
 .Os BSD 4.2
@@ -67,7 +67,6 @@
 512 $B%P%$%H$h$j>.$5$$CM$d(B 1 $B%.%,%P%$%H$h$jBg$-$$CM$r;XDj$7$F$bL5;k$5$l$^$9!#(B
 .It Ev EXINIT
 .Xr ex  1  ,
-.Xr edit  1 ,
 .Xr vi  1
 $B$,;2>H$9$k!"%9%?!<%H%"%C%W;~$N%3%^%s%I%j%9%H!#(B
 .It Ev HOME
@@ -95,7 +94,7 @@
 .Ev PATH 
 $B$N=i4|CM$O!"(B
 .Xr login  1
-$B$K$h$C$F!"(B ``/usr/bin:/bin'' $B$K%;%C%H$5$l$^$9!#(B
+$B$K$h$C$F!"(B``/usr/bin:/bin'' $B$K%;%C%H$5$l$^$9!#(B
 .It Ev PRINTER
 .Xr lpr  1  ,
 .Xr lpq  1 ,
@@ -117,14 +116,13 @@
 .It Ev TERMCAP
 .Ev TERM
 $B$G;XDj$7$?C<Kv$N5!G=$r5-=R$9$kJ8;zNs!"$"$k$$$O!"J8;zNs$,(B `/' $B$G(B
-$B;O$^$k>l9g!"(B termcap $B%U%!%$%k$NL>A0!#(B
+$B;O$^$k>l9g!"(Btermcap $B%U%!%$%k$NL>A0!#(B
 $B2<5-$N(B
 .Ev TERMPATH ,
-.Xr termcap  5  ,
-.Xr termcap  3
+.Xr termcap  5
 $B$r;2>H$7$F$/$@$5$$!#(B
 .It Ev TERMPATH
-$B%3%m%s$"$k$$$O%9%Z!<%9$G6h@Z$i$l$?!"(B termcap $B$N%Q%9L>$NNs$G!"(B
+$B%3%m%s$"$k$$$O%9%Z!<%9$G6h@Z$i$l$?!"(Btermcap $B$N%Q%9L>$NNs$G!"(B
 $BC<Kv$N5!G=5-=R$rCN$k$?$a$K!"Ns5s$5$l$?=gHV$G8!:w$5$l$^$9!#(B
 .Ev TERMPATH
 $B$r;XDj$7$F$$$J$$>l9g$O!"(B
diff -urNP man/man7/ports.7 man/man7/ports.7
--- man/man7/ports.7	Mon Feb  1 23:37:38 1999
+++ man/man7/ports.7	Sun May  2 21:07:21 1999
@@ -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.
 .\"
-.\" %Id: ports.7,v 1.9 1998/12/30 17:32:47 hoek Exp %
+.\" %Id: ports.7,v 1.9.2.1 1999/04/29 21:41:11 hoek Exp %
 .\"
 .\" jpman %Id: ports.7,v 1.3 1999/01/24 06:53:11 horikawa Stab %
 .Dd January 25, 1998
@@ -329,7 +329,7 @@
 $B$GEP>l$7$^$7$?!#(B
 .Sh $B%P%0(B
 port $B$K4X$9$kJ8=q$,(B 4 $B$+=j$KJ,;6$5$l$F$7$^$C$F$$$^$9!#(B
-.Pa /usr/share/mk/bsd.port.mk ,
+.Pa /usr/ports/Mk/bsd.port.mk ,
 $B%O%s%I%V%C%/$N(B
 .Dq port $B%3%l%/%7%g%s(B
 $B$N%;%/%7%g%s$H!"(B
diff -urNP man/man8/IPXrouted.8 man/man8/IPXrouted.8
--- man/man8/IPXrouted.8	Mon May 18 10:06:11 1998
+++ man/man8/IPXrouted.8	Sun May  2 21:07:28 1999
@@ -40,6 +40,7 @@
 .Nd IPX Routing Information Protocol $B%G!<%b%s(B
 .Sh $B=q<0(B
 .Nm IPXrouted
+.Op Fl N
 .Op Fl q
 .Op Fl s
 .Op Fl S
@@ -53,6 +54,8 @@
 .Pp
 $B;HMQ2DG=$J%*%W%7%g%s(B:
 .Bl -tag -width logfile
+.It Fl N
+GetNearestServer SAP $BMW5a$KBP$7$F1~Ez$7$^$;$s!#(B
 .It Fl q
 ($B2<5-$N(B
 .Fl s
diff -urNP man/man8/ibcs2.8 man/man8/ibcs2.8
--- man/man8/ibcs2.8	Fri Apr 30 02:09:25 1999
+++ man/man8/ibcs2.8	Sun May  2 21:07:28 1999
@@ -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.
 .\"
-.\" %Id: ibcs2.8,v 1.6.2.2 1999/04/06 13:59:14 ghelmer Exp %
+.\" %Id: ibcs2.8,v 1.6.2.3 1999/04/23 16:15:28 ghelmer Exp %
 .\"
 .\" jpman %Id: ibcs2.8,v 1.3 1997/09/08 08:46:54 kuma Stab %
 .Dd November 27, 1995
@@ -53,7 +53,7 @@
 .It Pa /usr/share/examples/ibcs2/*
 $B%(%_%e%l!<%?8!::MQ$N%5%s%W%k%*%V%8%'%/%H%U%!%$%k!#(B
 .Sh $B4XO"9`L\(B
-.\"no equivalent yet for kld:.Xr lkm 4 ,
+.Xr kld 4 ,
 .Xr kldload 8
 .Sh $B%P%0(B
 $B%(%_%e%l!<%?$OA4$/IT40A4$G$9!#(B
diff -urNP man/man8/ipfw.8 man/man8/ipfw.8
--- man/man8/ipfw.8	Fri Apr 30 02:09:25 1999
+++ man/man8/ipfw.8	Sun May  2 21:07:30 1999
@@ -1,5 +1,8 @@
-.Dd July 20, 1996
+.\"
+.\" %Id: ipfw.8,v 1.47.2.3 1999/04/29 19:22:13 ghelmer Exp %
+.\"
 .\" jpman %Id: ipfw.8,v 1.4 1997/05/19 17:19:51 horikawa Stab %
+.Dd July 20, 1996
 .Dt IPFW 8 SMM
 .Os FreeBSD
 .Sh $BL>>N(B
diff -urNP man/man8/joy.8 man/man8/joy.8
--- man/man8/joy.8	Fri Apr 30 02:09:25 1999
+++ man/man8/joy.8	Sun May  2 21:07:30 1999
@@ -22,7 +22,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.
 .\"
-.\" %Id: joy.8,v 1.4.2.1 1999/04/06 13:55:20 ghelmer Exp %
+.\" %Id: joy.8,v 1.4.2.2 1999/04/23 16:15:39 ghelmer Exp %
 .\"
 .\" jpman %Id: joy.8,v 1.3 1997/07/22 16:48:04 horikawa Stab %
 .Dd March 16, 1996
@@ -42,5 +42,5 @@
 $B%8%g%$%9%F%#%C%/$NFI$_9~$_2DG=%+!<%M%k%b%8%e!<%k(B
 .Sh $B4XO"9`L\(B
 .Xr joy 4 ,
-.\"no equivalent for kld's yet":.Xr lkm 4 ,
+.Xr kld 4 ,
 .Xr kldload 8
diff -urNP man/man8/linux.8 man/man8/linux.8
--- man/man8/linux.8	Fri Apr 30 02:09:25 1999
+++ man/man8/linux.8	Sun May  2 21:07:30 1999
@@ -22,7 +22,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.
 .\"
-.\" %Id: linux.8,v 1.3.2.1 1999/04/06 13:51:38 ghelmer Exp %
+.\" %Id: linux.8,v 1.3.2.2 1999/04/23 16:15:50 ghelmer Exp %
 .\"
 .\" jpman %Id: linux.8,v 1.3 1997/07/22 16:50:43 horikawa Stab %
 .Dd January 9, 1997
@@ -41,7 +41,7 @@
 .It Pa /modules/linux.ko
 Linux $B%(%_%e%l!<%?$NFI$_9~$_2DG=%+!<%M%k%b%8%e!<%k(B
 .Sh $B4XO"9`L\(B
-.\"Can't find equivalent for modules (n_hibma@freebsd.org):.Xr lkm 4 ,
+.Xr kld 4 ,
 .Xr kldload 8 ,
 .Xr kldunload 8 ,
 .Xr kldstat 8
diff -urNP man/man8/mount_cd9660.8 man/man8/mount_cd9660.8
--- man/man8/mount_cd9660.8	Sun Jul 26 21:08:37 1998
+++ man/man8/mount_cd9660.8	Sun May  2 21:07:31 1999
@@ -69,6 +69,8 @@
 $B8+$($^$9(B)$B!#(B
 $B$I$A$i$N>l9g$G$b!"L@<(E*$K%P!<%8%g%sHV9f$r;XDj$7$J$/$F$b%U%!%$%k$r(B
 $B%*!<%W%s$9$k;v$,=PMh$^$9!#(B
+.It Fl j
+$B%U%!%$%k%7%9%F%`$K4^$^$l$k(B Joliet $B3HD%$r;HMQ$7$^$;$s!#(B
 .It Fl o
 .Fl o
 $B%U%i%0$N8e$K$O!"%3%s%^$G6h@Z$C$?%*%W%7%g%sJ8;zNs$r;XDj$9$k$3$H$,$G$-$^$9!#(B
diff -urNP man/man8/nologin.8 man/man8/nologin.8
--- man/man8/nologin.8	Sat Sep 26 15:20:19 1998
+++ man/man8/nologin.8	Sun May  2 21:07:31 1999
@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nologin.8	8.1 (Berkeley) 6/19/93
-.\"	%Id: nologin.8,v 1.2 1998/07/15 06:37:07 charnier Exp %
-.\" jpman %Id: nologin.8,v 1.2 1997/03/31 14:54:31 horikawa Stab %
+.\"	%Id: nologin.8,v 1.2.2.1 1999/04/29 09:45:38 jkoshy Exp %
 .\"
+.\" jpman %Id: nologin.8,v 1.2 1997/03/31 14:54:31 horikawa Stab %
 .Dd June 19, 1993
 .Dt NOLOGIN 8
 .Os BSD 4.4
@@ -49,7 +49,8 @@
 $B$3$N%3%^%s%I$O!"MxMQIT2DG=$H$9$k%"%+%&%s%H$N(B shell $B%U%#!<%k%I$r(B
 $BCV$-49$($k$H$$$&MQES$rA[Dj$7$F$$$^$9!#(B
 .Sh $B4XO"9`L\(B
-.Xr login 1
+.Xr login 1 ,
+.Xr nologin 5
 .Sh $BNr;K(B
 .Nm
 $B%3%^%s%I$O(B
diff -urNP man/man8/periodic.8 man/man8/periodic.8
--- man/man8/periodic.8	Sun Jan 31 00:44:17 1999
+++ man/man8/periodic.8	Sun May  2 21:07:32 1999
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	%Id: periodic.8,v 1.8 1998/12/29 22:45:15 hoek Exp %
+.\"	%Id: periodic.8,v 1.8.2.2 1999/04/23 18:28:10 ghelmer Exp %
 .\" jpman %Id: periodic.8,v 1.3 1998/10/10 09:07:49 yohta Stab %
 .\"
 .\" WORD: registry         $B%l%8%9%H%j(B
@@ -112,9 +112,9 @@
 .Dl 0      5       1       *       *       root    periodic monthly 2>&1
 .Pp
 $B$5$i$K!"E57?E*$J%7%9%F%`%l%8%9%H%j$K$OJQ?t(B
-.Va local_cron
+.Va local_periodic
 $B$K$D$$$F<!$N$h$&$K5-=R$7$F$"$k$G$7$g$&(B :
-.Dl local_cron="/usr/local/etc/periodic /usr/X11R6/etc/periodic" # cron script dirs.
+.Dl local_periodic="/usr/local/etc/periodic /usr/X11R6/etc/periodic" # cron script dirs.
 .Sh $B4XO"9`L\(B
 .Xr sh 1 ,
 .Xr crontab 5 ,
diff -urNP man/man8/ppp.8 man/man8/ppp.8
--- man/man8/ppp.8	Sun May  2 21:02:28 1999
+++ man/man8/ppp.8	Sun May  2 21:07:38 1999
@@ -1,4 +1,4 @@
-.\" %Id: ppp.8,v 1.142.2.3 1999/03/24 18:03:12 brian Exp %
+.\" %Id: ppp.8,v 1.142.2.5 1999/04/23 13:46:28 brian Exp %
 .\" jpman %Id: ppp.8,v 1.4 1997/06/08 18:41:58 saeki Stab %
 .\" WORD: expect string	$B<u?.BT$AJ8;zNs(B (chat.8)
 .\" WORD: negotiation	$B8r>D(B
@@ -2841,33 +2841,38 @@
 $B$3$N%*%W%7%g%s$O!"(Balias $B$NMM!9$JE}7W$H>pJs$,%U%!%$%k(B
 .Pa /var/log/alias.log
 $B$K5-O?$5$l$k$h$&$K$7$^$9!#(B
-.It alias port Xo
-.Op Ar proto
-.Ar targetIP Ns No \&: Ns Ar targetPORT
-.Op Ar aliasIP Ns No \&: Ns
-.Ar aliasPORT
+.It alias port Ar proto Ar targetIP Ns Xo
+.No : Ns Ar port Ns
+.Oo
+.No - Ns Ar port
+.Oc Ar aliasport Ns
+.Oo
+.No - Ns Ar aliasport Ns
+.Oc
 .Xc
-$B$3$N%3%^%s%I$K$h$j!"(B
-$B%^%7%s(B
-.Ar aliasIP
-$B$N(B
-.Ar aliasPORT
-$B$XE~Ce$9$k@\B3$r!"(B
+$B$3$N%3%^%s%I$O!"%]!<%H(B
+.Ar aliasport
+$B$X$NF~NO$N(B
+.Ar proto
+$B@\B3$r!"(B
 .Ar targetIP
-$B$N(B
-.Ar targetPORT
+$B$N%]!<%H(B
+.Ar port
 $B$X%j%@%$%l%/%H$7$^$9!#(B
-.Ar aliasIP
-$B$N%G%U%)%k%H$O!"8=:_$N%$%s%?%U%'!<%9%"%I%l%9$G$9!#(B
 .Ar proto
-$B$O(B
-.Sq tcp
-$B$b$7$/$O(B
-.Sq udp
-$B$N$$$:$l$+$G!";XDj$7$?%W%m%H%3%k$N@\B3$N$_%^%C%A$7$^$9!#(B
+$B$O!"(B
+.Dq tcp
+$B$^$?$O(B
+.Dq udp
+$B$G$9!#(B
+.Pp
+$B%]!<%HHV9f$NHO0O$O!"A0=R$N$h$&$K;XDj2DG=$G$9!#(B
+$BHO0O$OF1$8Bg$-$5$G$"$k$3$H$,I,MQ$G$9!#(B
+.Pp
 $B$"$J$?$N%2!<%H%&%'%$$N8e$N%^%7%s$G%$%s%?!<%M%C%HEEOCEy$r<B9T$7$?$$>l9g$K!"(B
 $B$3$N%*%W%7%g%s$OM-MQ$G$9!#(B
-.It "alias pptp" Op Ar addr
+$B$7$+$7!"%]!<%H$"$?$jFbIt%^%7%s(B 1 $BBf$N$_$K@\B32DG=$H$$$&@)8B$,$"$j$^$9!#(B
+.It alias pptp Op Ar addr
 $B$9$Y$F$N(B
 .Em G Ns No eneral
 .Em R Ns No outing
diff -urNP man/man8/ypset.8 man/man8/ypset.8
--- man/man8/ypset.8	Wed Mar  3 23:46:58 1999
+++ man/man8/ypset.8	Fri Apr 30 15:55:58 1999
@@ -81,9 +81,9 @@
 .El
 .Sh $B4XO"9`L\(B
 .Xr domainname 1 ,
-.Xr yp 4
 .Xr ypcat 1 ,
 .Xr ypmatch 1 ,
+.Xr yp 4 ,
 .Xr ypbind 8 ,
 .Sh $B:n<T(B
 .An Theo De Raadt
