From owner-doc-jp-work@jp.FreeBSD.org Fri Jan 28 18:20:17 2005
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) id j0S9KHf15322;
	Fri, 28 Jan 2005 18:20:17 +0900 (JST)
	(envelope-from owner-doc-jp-work@jp.FreeBSD.org)
Received: from mail.smalltown.ne.jp (jr.smalltown.ne.jp [202.222.20.60])
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) with ESMTP/inet id j0S9KG815317
	for <doc-jp-work@jp.FreeBSD.org>; Fri, 28 Jan 2005 18:20:16 +0900 (JST)
	(envelope-from usata@smalltown.ne.jp)
Received: by mail.smalltown.ne.jp (Postfix, from userid 6001)
	id 453DF631F60; Fri, 28 Jan 2005 18:20:15 +0900 (JST)
X-IMAP-Sender: usata
X-Sieve: cmu-sieve 2.0
Received: from is2.ecc.u-tokyo.ac.jp (is2.ecc.u-tokyo.ac.jp [133.11.171.236])
	by mh.sodan.ecc.u-tokyo.ac.jp (Postfix) with ESMTP id EAE8D615BF
	for <usata@sodan.ecc.u-tokyo.ac.jp>; Thu, 27 Jun 2002 19:21:01 +0900 (JST)
Received: from is2.ecc.u-tokyo.ac.jp (localhost.localdomain [127.0.0.1])
	by is2.ecc.u-tokyo.ac.jp (Postfix) with ESMTP id BD5D417B573
	for <usata@sodan.ecc.u-tokyo.ac.jp>; Thu, 27 Jun 2002 19:21:01 +0900 (JST)
Received: from m.ecc.u-tokyo.ac.jp (mail.ecc.u-tokyo.ac.jp [133.11.171.196])
	by is2.ecc.u-tokyo.ac.jp (8.11.6/8.11.3) with ESMTP id g5RAL1e23190;
	Thu, 27 Jun 2002 19:21:01 +0900
Received: from is1.ecc.u-tokyo.ac.jp by m.ecc.u-tokyo.ac.jp
 (Sun Internet Mail Server sims.3.5.2000.03.23.18.03.p10)
 with ESMTP id <0GYD005A10R0IL@m.ecc.u-tokyo.ac.jp>; Thu,
 27 Jun 2002 19:21:01 +0900 (JST)
Received: from is1.ecc.u-tokyo.ac.jp (is1.ecc.u-tokyo.ac.jp [127.0.0.1])
 by is1.ecc.u-tokyo.ac.jp (Postfix) with ESMTP id C49192A2BE4 for
 <c10344@mail.ecc.u-tokyo.ac.jp>; Thu, 27 Jun 2002 19:21:00 +0900 (JST)
Received: from lorica.ucc.usyd.edu.au (lorica.ucc.usyd.edu.au [129.78.64.15])
 by is1.ecc.u-tokyo.ac.jp (8.11.6/8.11.3) with ESMTP id g5RAKx303922 for
 <c10344@mail.ecc.u-tokyo.ac.jp>; Thu, 27 Jun 2002 19:20:59 +0900
Received: from extro.ucc.usyd.edu.au
 (mkom6251@extro.ucc.usyd.edu.au [129.78.64.1]) by lorica.ucc.usyd.edu.au
 (8.9.3/8.9.3) with ESMTP id UAA02302; Thu, 27 Jun 2002 20:20:57 +1000 (EST)
Received: (from mkom6251@localhost) by extro.ucc.usyd.edu.au (8.10.2+Sun/8.9.3)
 id g5RAKsb24252; Thu, 27 Jun 2002 20:20:55 +1000 (EST)
From: KOMACHI Mamoru <c10344@mail.ecc.u-tokyo.ac.jp>
In-reply-to: <20020626.191408.104026161.rushani@bl.mmtr.or.jp>; from
 rushani@bl.mmtr.or.jp on Wed, Jun 26, 2002 at 07:14:08PM +0900
To: doc-jp-work@jp.FreeBSD.org
Message-id: <20020627202054.A23925@extro.usyd.edu.au>
Organization: University of Sydney
MIME-version: 1.0
Content-type: multipart/mixed; boundary="ikeVEW9yuYc//A+q"
Content-disposition: inline
Content-transfer-encoding: 7bit
User-Agent: Mutt/1.2.5.1i-jp0
References: <20020626172614.A18084@extro.usyd.edu.au>
 <20020626.191408.104026161.rushani@bl.mmtr.or.jp>
Reply-To: doc-jp-work@jp.FreeBSD.org
Precedence: list
Date: Thu, 27 Jun 2002 20:20:54 +1000
X-Sequence: doc-jp-work 1057
Subject: [doc-jp-work 1057] Re: =?ISO-2022-JP?B?GyRCJCo0KyRhJE8bKEI=?= 
Sender: owner-doc-jp-work@jp.FreeBSD.org
X-Originator: c10344@mail.ecc.u-tokyo.ac.jp
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+041223




--ikeVEW9yuYc//A+q
Content-Type: text/plain; charset=iso-2022-jp
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

$B>.D.$G$9!%(B

On Wed, Jun 26, 2002 at 07:14:08PM +0900, Hideyuki KURASHINA wrote:

> FreeBSD Handbook, 2nd Edition $B$,=P$?$N$K$H$b$J$$(B, $B$3$A$i$r=EE@E*$K$7$?J}(B
> $B$,$$$$$N$G$O$J$$$+$H;W$$$^$9(B. $B$J$+$G$b(B releases/4.6R/announce.sgml $B$+$i(B
> $BD>@\%j%s%/$5$l$F$$$k(B
> 
>   books/handbook/x11/chapter.sgml	1.75  ->  1.82
>   books/handbook/install/chapter.sgml	1.65  -> 1.202
>   books/handbook/mirrors/chapter.sgml	1.168 -> 1.222
> 
> $B$,M%@h=g0L$,9b$=$&$G$9(B.
> # books/handbook/install/chapter.sgml $B$OLZB<$5$s$,$7$F$/$@$5$C$F$^$9(B.

$B$H$N$3$H$J$N$G!$(Bbooks/handbook/x11/chapter.sgml $B$H(B
books/handbook/mirrors/chapter.sgml $B$r$=$l$>$l(B 1.82 $B$H(B 1.222 $B$K$7$F$_$^$7$?!%(B
$B$*<j?t$G$9$,!$::FI$r$*4j$$$7$^$9!%(B

$B9TF,(B8$B$D6uGr$,$"$k$H$3$m$O%?%V$KCV$-49$($F$$$k$_$?$$$J$N$G$9$,!$$3$l$OA4ItCV(B
$B$-49$($k$b$N$J$N$G$7$g$&$+!)(B $B$H$j$"$($:1Q8lHG(B diff $B$GJ,$+$C$F$$$kItJ,$OCV49(B
$B$7$^$7$?$,!$F|K\8lHG$O$I$&$bA4It6uGr$N$^$^$K$J$C$F$$$k$h$&$J$N$G!$6uGr$K$9$k(B
$B$b$N$J$N$G$"$l$P85$KLa$7$^$9!%(B

> $B>\$7$$F14|>pJs$O(B
> 
>   http://www.jp.freebsd.org/doc-jp/syncstat/
> 
> $B$+$i$?$I$l$k$N$G;29M$K$7$F$/$@$5$$$^$7(B.

$B$\$A$\$A(B1$BF|(B1$B$D$+(B2$B$D$/$i$$$:$D$d$C$F$_$^$9!%(B

$B$=$l$G$O!%(B

-- 
KOMACHI Mamoru <c10344@mail.ecc.u-tokyo.ac.jp>
http://www.sodan.ecc.u-tokyo.ac.jp/~usata/

--ikeVEW9yuYc//A+q
Content-Type: text/plain; charset=iso-2022-jp
Content-Disposition: attachment; filename="handbook_x11_chapter.sgml.diff"
Content-Transfer-Encoding: 7bit

--- books/handbook/x11/chapter.sgml.ORIG	Thu Jun 27 17:59:27 2002
+++ books/handbook/x11/chapter.sgml	Thu Jun 27 18:25:33 2002
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.75
+     Original revision: 1.82
      $FreeBSD: doc/ja_JP.eucJP/books/handbook/x11/chapter.sgml,v 1.13 2002/06/22 13:01:39 hrs Exp $
 -->
 
@@ -230,30 +230,37 @@
 
       <para>$B<!$O(B <filename>XF86Config.new</filename> $B$r9%$_$K9g$&$h$&$KD4@0$7$^$9(B.
 	&man.emacs.1; $B$d(B &man.ee.1; $B$N$h$&$J%F%-%9%H%(%G%#%?!<$G%U%!%$%k$r3+$$$F$/$@$5$$(B.
-	$B$^$:$d$k$3$H$O%b%K%?!<$N<~GH?t$r2C$($k$3$H$G$9(B. $B$3$l$i$O?eJ?$H?bD>$NF14|<~GH?t$HI=8=$5$l$k$N$,IaDL$G$9(B.
+	$B$^$:%b%K%?!<$N<~GH?t$r2C$($^$9(B. $B$3$l$i$O?eJ?$H?bD>$NF14|<~GH?t$HI=8=$5$l$k$N$,IaDL$G$9(B.
 	$B$3$l$i$NCM$O(B <filename>XF86Config.new</filename> $B$N(B "Monitor" $B$N%;%/%7%g%s$K<!$N$h$&$K2C$($^$9(B.</para>
       <programlisting>
 	Section "Monitor"
         Identifier   "Monitor0"
         VendorName   "Monitor Vendor"
         ModelName    "Monitor Model"
-        Horizsync    30-107
+        HorizSync    30-107
         VertRefresh  48-120
 	EndSection
       </programlisting>
 
-      <para><varname>Horizsync</varname> $B$H(B <varname>VertRefresh</varname>
+      <para><varname>HorizSync</varname> $B$H(B <varname>VertRefresh</varname>
 	$B$H$$$&%-!<%o!<%I$,@_Dj%U%!%$%kCf$K$J$$>l9g$,$"$j$^$9(B. $B$=$N>l9g$K$O(B,
 	<varname>Horizsync</varname> $B%-!<%o!<%I$N8e$K$O?eJ?Av::<~GH?t$N(B,
 	<varname>VertRefresh</varname> $B%-!<%o!<%I$N8e$K$O?bD>F14|<~GH?t$N@5$7$$CM$r2C$($F$/$@$5$$(B.
 	$B>e$NNc$G$OBP>]$H$J$k%b%K%?!<$N<~GH?t$,=q$+$l$F$$$^$9(B.</para>
 
+      <para>X $B$O%b%K%?!<$,BP1~$7$F$$$l$P(B DPMS (Energy Star) $B5!G=$r;H$&$3$H$,$G$-$^$9(B.
+        'xset' $B%W%m%0%i%`$G%?%$%`%"%&%H$r%3%s%H%m!<%k$7$?$j(B, $B6/@)E*$K%9%?%s%P%$(B, $B%5%9%Z%s%I$dEE8;%*%U$K$9$k$3$H$,$G$-$^$9(B.
+        $B%b%K%?!<$N(B DPMS $B5!G=$rM-8z$K$7$?$$>l9g$O(B, "Monitor" $B$N%;%/%7%g%s$K<!$N9T$r2C$($F$/$@$5$$(B.</para>
+
+      <programlisting>
+        Option       "DPMS"</programlisting>
+ 
       <indexterm>
         <primary><command>XF86Config</command></primary>
       </indexterm>
       
       <para><filename>XF86Config.new</filename> $B$O%(%G%#%?!<$G3+$$$?$^$^$K$7$F$*$-(B,
-	$B:#EY$O%G%U%)%k%H$N2rA|EY$H?'?t$r9%$_$GA*$S$^$7$g$&(B.
+	$B%G%U%)%k%H$N2rA|EY$H?'?t$r9%$_$GA*$S$^$7$g$&(B.
 	<literal>Screen</literal> $B%;%/%7%g%s$K0J2<$N$h$&$K=q$-$^$9(B.</para>
       
       <programlisting>
@@ -271,11 +278,11 @@
 
       <para><varname>DefaultDepth</varname> $B$H$$$&%-!<%o!<%I$O%G%U%)%k%H$GF0$/?'?t$K$D$$$F5-=R$9$k$?$a$N$b$N$G$9(B.
 	&man.XFree86.1; $B$N%3%^%s%I%i%$%s%9%$%C%A(B <command>-bpp</command> $B$,;HMQ$5$l$?>l9g$O$3$A$i$,M%@h$5$l$^$9(B.
-	Modes $B$H$$$&%-!<%o!<%I$OM?$($i$l$??'?t$K$*$1$k%G%U%)%k%H$N2rA|EY$r5-=R$7$F$*$/$?$a$N$b$N$G$9(B.
+	<varname>Modes</varname> $B$H$$$&%-!<%o!<%I$OM?$($i$l$??'?t$K$*$1$k%G%U%)%k%H$N2rA|EY$r5-=R$7$F$*$/$?$a$N$b$N$G$9(B.
 	$B>e$NNc$G$O%G%U%)%k%H$N?'?t$O%T%/%;%k$"$?$j(B24$B%S%C%H$G$"$j(B, $B$3$N?'?t$G$N2rA|EY$O(B1024$B%T%/%;%k!_(B768$B%T%/%;%k$G$9(B.</para>
 
       <para>1024x768$B$N2rA|EY$GF0$+$9$?$a$K$O(B <varname>DefaultDepth</varname> $B$H$$$&%-!<%o!<%I$K(B 24 $B$H$$$&CM$rM?$($F=q$-2C$($*$-(B,
-	<varname>"Display"</varname> $B%5%V%;%/%7%g%s$K5a$a$k(B Depth $B$H(B Modes $B$N%-!<%o!<%I$r=q$$$F$*$-$^$9(B.
+	<varname>"Display"</varname> $B%5%V%;%/%7%g%s$K5a$a$k(B <varname>Depth</varname> $B$H(B <varname>Modes</varname> $B$N%-!<%o!<%I$r=q$$$F$*$-$^$9(B.
 	$B%?!<%2%C%H$N%7%9%F%`$N%U%i%U%#%C%/%O!<%I%&%'%"$K$h$C$FDj5A$5$l$F$$$k$h$&$K(B, VESA$B%9%?%s%@!<%I%b!<%I$N$_$,%5%]!<%H$5$l$F$$$k$3$H$KCm0U$7$F$/$@$5$$(B.</para>
 
       <para>$B:G8e$K(B, $B@_Dj%U%!%$%k$rJ]B8$7(B, $B>e$NNc$K$"$k$h$&$K%F%9%H$7$F$_$F$/$@$5$$(B. $BA4$F$&$^$/$$$C$?$J$i(B, &man.XFree86.1;
@@ -723,7 +730,7 @@
 	app-defaults $B%U%!%$%k$K$*$1$k%3%a%s%H$O(B <quote>!</quote>
 	$B$G$"$C$F$$$D$b$N$h$&$J(B <quote>#</quote> $B$G$O$J$$$3$H$KCm0U$7$F$/$@$5$$(B.
 	$B%"%/%;%9@)8B$O$b$C$H87$7$/$7$?$$$+$b$7$l$^$;$s(B.
-	<filename>Xaccess</filename> $B%U%!%$%k$K$"$kNc$r;29M$K$7$?$j(B, $B%*%s%i%$%s%^%K%e%"%k(B
+	<filename>Xaccess</filename> $B$K$"$kNc$r;29M$K$7$?$j(B, $B%*%s%i%$%s%^%K%e%"%k(B
 	&man.xdm.1; $B$r;2>H$7$?$j$7$F$/$@$5$$(B.</para>
     </sect2>
 
@@ -967,7 +974,7 @@
 	  $B$3$l$i$O$?$@$N%i%Y%k$G$9$N$G(B <application>startkde</application> $B$d(B
 	  <application>gnome-session</application> $B$G$O$J$/(B <application>KDE</application>
 	  $B$d(B <application>GNOME</application> $B$H$G$-$^$9(B.
-	  <literal>failsage</literal> $B$H$$$&%i%Y%k$bF~$l$F$/$@$5$$(B.</para>
+	  <literal>failsafe</literal> $B$H$$$&%i%Y%k$bF~$l$F$/$@$5$$(B.</para>
 
 	<para>$BB>$N%a%K%e!<$G$bM7$s$G$_$F$/$@$5$$(B. $B$=$l$i$O$@$$$?$$8+$?L\$K4X$9$k$b$N$G(B,
 	  $B8+$l$P$o$+$j$^$9(B. $B=*$o$C$?$i2<$N$[$&$K$"$k(B

--ikeVEW9yuYc//A+q
Content-Type: text/plain; charset=iso-2022-jp
Content-Disposition: attachment; filename="handbook_mirrors_chapter.sgml.diff"
Content-Transfer-Encoding: 7bit

--- books/handbook/mirrors/chapter.sgml.ORIG	Thu Jun 27 18:30:58 2002
+++ books/handbook/mirrors/chapter.sgml	Thu Jun 27 20:09:34 2002
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: 1.168
+     Original revision: 1.222
      $FreeBSD: doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml,v 1.52 2002/02/28 02:16:46 kuriyama Exp $
 -->
 
@@ -36,8 +36,8 @@
 
 	<listitem>
 	  <address>
-	    <otheraddr>Micro Center</otheraddr>
-	    WWW: <otheraddr><ulink url="http://www.microcenter.com/">http://www.microcenter.com/</ulink></otheraddr>
+	    <otheraddr>Staples</otheraddr>
+	    WWW: <otheraddr><ulink url="http://www.staples.com/">http://www.staples.com/</ulink></otheraddr>
 	  </address>
 	</listitem>
       </itemizedlist>
@@ -55,21 +55,36 @@
 	  <street>2672 Bayshore Parkway, Suite 307</street>
 	  <city>Mountain View</city>, <state>CA</state> <postcode>94043</postcode>
 	  <country>USA</country>
-	  $BEEOC(B: <phone>+1 650 694-4949</phone>
+	  $BEEOC(B: <phone>+1 800 407-5170</phone>
 	  Email: <email>sales@daemonnews.org</email>
-	  WWW: <otheraddr><ulink url="http://www.bsdmall.com/">http://www.bsdmall.com/</ulink></otheraddr>
+	  WWW: <otheraddr><ulink url="http://www.bsdmall.com/freebsd1.html">http://www.bsdmall.com/</ulink></otheraddr>
 	</address>
       </listitem>
 
       <listitem>
 	<address>
-	  <otheraddr>Wind River Systems</otheraddr>
-	  <street>500 Wind River Way</street>
-	  <city>Alameda</city>, <state>CA</state>  <postcode>94501</postcode>
+	  <otheraddr>FreeBSD Mall, Inc.</otheraddr>
+	  <street>3623 Sanford Street</street>
+	  <city>Concord</city>, <state>CA</state>  <postcode>94520-1405</postcode>
 	  <country>USA</country>
+	  $BEEOC(B: <phone>+1 925 674-0783</phone>
+	  Fax: <fax>+1 925 674-0821</fax>
+	  Email: <email>info@freebsdmall.com</email>
 	  WWW: <otheraddr><ulink url="http://www.freebsdmall.com/">http://www.freebsdmall.com/</ulink></otheraddr>
 	</address>
       </listitem>
+
+      <listitem>
+	<address>
+	  <otheraddr>Hinner EDV</otheraddr>
+	  <street>St. Augustinus-Str. 10</street>
+	  <postcode>D-81825</postcode> <city>Mnchen</city>
+	  <country>Germany</country>
+	  $BEEOC(B: <phone>(089) 428 419</phone>
+	  WWW: <otheraddr><ulink url="http://www.hinner.de/linux/freebsd.html">http://www.hinner.de/linux/freebsd.html</ulink></otheraddr>
+	</address>
+      </listitem>
+
     </itemizedlist>
     </sect2>
 
@@ -95,19 +110,25 @@
 
 	<listitem>
 	  <address>
-	    <otheraddr>Ingram Micro</otheraddr>
-	    WWW: <otheraddr>
-	      <ulink url="http://www.ingrammicro.com/">http://www.ingrammicro.com/</ulink>
-	    </otheraddr>
+	    <otheraddr>Kudzu, LLC</otheraddr>
+	    <street>7375 Washington Ave. S.</street>
+	    <city>Edina</city>, <state>MN</state> <postcode>55439</postcode>
+	    <country>USA</country>
+	    $BEEOC(B: <phone>+1 952 947-0822</phone>
+	    Fax: <fax>+1 952 947-0876</fax>
+	    Email: <email>sales@kudzuenterprises.com</email>
 	  </address>
 	</listitem>
 
 	<listitem>
 	  <address>
-	    <otheraddr>Navarre</otheraddr>
-	    WWW: <otheraddr>
-	      <ulink url="http://www.navarre.com/">http://www.navarre.com/</ulink>
-	    </otheraddr>
+	    <otheraddr>Navarre Corp</otheraddr>
+	    <street>7400 49th Ave South</street>
+	    <city>New Hope</city>, <state>MN</state> <postcode>55428</postcode>
+	    <country>USA</country>
+	    $BEEOC(B: <phone>+1 763 535-8333</phone>
+	    Fax: <fax>+1 763 535-0341</fax>
+	    WWW: <otheraddr><ulink url="http://www.navarre.com/">http://www.navarre.com/</ulink></otheraddr>
 	  </address>
 	</listitem>
       </itemizedlist>
@@ -164,6 +185,7 @@
       <link linkend="mirrors-de">Germany</link>,
       <link linkend="mirrors-hk">Hong Kong</link>,
       <link linkend="mirrors-hu">Hungary</link>,
+      <link linkend="mirrors-is">Iceland</link>,
       <link linkend="mirrors-ie">Ireland</link>,
       <link linkend="mirrors-il">Israel</link>,
       <link linkend="mirrors-jp">Japan</link>,
@@ -303,10 +325,10 @@
 	    $B$KO"Mm$7$F$/$@$5$$(B.</para>
 
 	  <itemizedlist>
-            <listitem>
-              <para><ulink url="ftp://ftp.cz.FreeBSD.org/pub/FreeBSD/">ftp://ftp.cz.FreeBSD.org/pub/FreeBSD/</ulink>
-                $BO"Mm@h(B: <email>calda@dzungle.ms.mff.cuni.cz</email></para>
-            </listitem>
+	    <listitem>
+	      <para><ulink url="ftp://ftp.cz.FreeBSD.org/pub/FreeBSD/">ftp://ftp.cz.FreeBSD.org/pub/FreeBSD/</ulink>
+	        $BO"Mm@h(B: <email>calda@dzungle.ms.mff.cuni.cz</email></para>
+	    </listitem>
 	  </itemizedlist>
 	</listitem>
       </varlistentry>
@@ -390,6 +412,15 @@
 	    <listitem>
 	      <para><ulink url="ftp://ftp6.fr.FreeBSD.org/pub/FreeBSD/">ftp://ftp6.fr.FreeBSD.org/pub/FreeBSD/</ulink></para>
 	    </listitem>
+
+	    <listitem>
+	      <para><ulink url="ftp://ftp7.fr.FreeBSD.org/pub/FreeBSD/">ftp://ftp7.fr.FreeBSD.org/pub/FreeBSD/</ulink></para>
+	    </listitem>
+
+	    <listitem>
+	      <para><ulink url="ftp://ftp8.fr.FreeBSD.org/pub/FreeBSD/">ftp://ftp8.fr.FreeBSD.org/pub/FreeBSD/</ulink></para>
+	    </listitem>
+
 	  </itemizedlist>
 	</listitem>
       </varlistentry>
@@ -444,7 +475,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><anchor id="mirrors-hu">$B%O%s%,%j!<(B</term>
+	<term><anchor id="mirrors-hu">$B%O%s%,%j!<(B</term>
 	<listitem>
 	  <para>$B2?$+LdBj$,$"$k>l9g$O(B, $B$3$N%I%a%$%s$N(B hostmaster
 	    <email>mohacsi@ik.bme.hu</email>
@@ -458,6 +489,20 @@
        </listitem>
       </varlistentry>
 
+      <varlistentry><term><anchor id="mirrors-is">$B%"%$%9%i%s%I(B</term>
+	<listitem>
+	  <para>$B2?$+LdBj$,$"$k>l9g$O(B, $B$3$N%I%a%$%s$N(B hostmaster
+	    <email>hostmaster@is.FreeBSD.org</email>
+	    $B$KO"Mm$7$F$/$@$5$$(B.</para>
+
+	  <itemizedlist>
+	    <listitem>
+	      <para><ulink url="ftp://ftp.is.FreeBSD.org/pub/FreeBSD/">ftp://ftp.is.FreeBSD.org/pub/FreeBSD/</ulink></para>
+	    </listitem>
+	  </itemizedlist>
+	</listitem>
+      </varlistentry>
+
       <varlistentry><term><anchor id="mirrors-ie">$B%"%$%k%i%s%I(B</term>
 	<listitem>
 	  <para>$B2?$+LdBj$,$"$k>l9g$O(B, $B$3$N%I%a%$%s$N(B hostmaster
@@ -584,6 +629,10 @@
 	    <listitem>
 	      <para><ulink url="ftp://ftp.nl.FreeBSD.org/pub/FreeBSD/">ftp://ftp.nl.FreeBSD.org/pub/FreeBSD/</ulink></para>
 	    </listitem>
+
+	    <listitem>
+	      <para><ulink url="ftp://ftp2.nl.freebsd.org/pub/FreeBSD/">ftp://ftp2.nl.freebsd.org/pub/FreeBSD/</ulink></para>
+	      </listitem>
 	  </itemizedlist>
 	</listitem>
       </varlistentry>
@@ -680,17 +729,17 @@
       </varlistentry>
 
       <varlistentry><term><anchor id="mirrors-sa">$B%5%&%8%"%i%S%"(B</term>
-        <listitem> 
+	<listitem> 
 	  <para>$B2?$+LdBj$,$"$k>l9g$O(B,
 	    <email>ftpadmin@isu.net.sa</email>
 	    $B$KO"Mm$7$F$/$@$5$$(B.</para>
 
-          <itemizedlist>
-            <listitem>
-              <para><ulink url="ftp://ftp.isu.net.sa/pub/mirrors/ftp.freebsd.org/">ftp://ftp.isu.net.sa/pub/mirrors/ftp.freebsd.org/</ulink></para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
+	  <itemizedlist>
+	    <listitem>
+	      <para><ulink url="ftp://ftp.isu.net.sa/pub/mirrors/ftp.freebsd.org/">ftp://ftp.isu.net.sa/pub/mirrors/ftp.freebsd.org/</ulink></para>
+	    </listitem>
+	  </itemizedlist>
+	</listitem>
       </varlistentry>
 
       <varlistentry><term><anchor id="mirrors-za">$BFn%"%U%j%+(B</term>
@@ -709,7 +758,7 @@
 	    </listitem>
 
 	    <listitem>
-	      <para><ulink url="ftp://ftp3.za.FreeBSD.org/FreeBSD/">ftp://ftp3.za.FreeBSD.org/pub/FreeBSD/</ulink></para>
+	      <para><ulink url="ftp://ftp3.za.FreeBSD.org/pub/FreeBSD/">ftp://ftp3.za.FreeBSD.org/pub/FreeBSD/</ulink></para>
 	    </listitem>
 	  </itemizedlist>
 	</listitem>
@@ -942,6 +991,15 @@
         $B%Q%9%o!<%I(B <quote>anoncvs</quote> $B$rF~NO$7$F$/$@$5$$(B.
         $B$=$7$F<!$K(B &man.cvs.1; $B%3%^%s%I$r;H$&$3$H$G(B, 
         $B<j85$K$"$k%j%]%8%H%j$HF1$8$h$&$K%"%/%;%9$G$-$k$h$&$K$J$j$^$9(B.</para>
+
+      <note>
+	<para><command>cvs login</command> $B%3%^%s%I$O(B, CVS
+	  $B%5!<%P$NG'>Z$K;H$o$l$k%Q%9%o!<%I$r(B <literal>HOME</literal>
+	  $B%G%#%l%/%H%j$N(B <filename>.cvspass</filename> $B$H$$$&%U%!%$%k$KJ]B8$7$^$9(B.
+	  $B$3$N%U%!%$%k$,B8:_$7$J$1$l$P(B, $B:G=i$K(B <command>cvs login</command> 
+	  $B$r;H$*$&$H$7$?$H$-$K%(%i!<$,=P$k$G$7$g$&(B. $B6u$N(B <filename>.cvspass</filename>
+	  $B%U%!%$%k$r:n@.$7$F:FEY%m%0%$%s$KD)@o$7$F$/$@$5$$(B.</para>
+      </note>
       
       <para><link linkend="cvsup">CVSup</link> $B$H(B
         <emphasis>anoncvs</emphasis>
@@ -988,6 +1046,26 @@
             $B%W%m%s%W%H$,I=<($5$l$?$i%Q%9%o!<%I(B
             <quote>anoncvs</quote> $B$rF~NO$7$F$/$@$5$$(B)</para>
         </listitem>
+	<listitem>
+	  <para><emphasis>$B%I%$%D(B</emphasis>:
+	    :pserver:anoncvs@anoncvs.de.FreeBSD.org:/home/ncvs
+            (<command>cvs login</command> $B%3%^%s%I$r;H$$(B, 
+            $B%W%m%s%W%H$,I=<($5$l$?$i%Q%9%o!<%I(B
+            <quote>anoncvs</quote> $B$rF~NO$7$F$/$@$5$$(B)</para>
+	</listitem>
+	<listitem>
+	  <para><emphasis>$B%I%$%D(B</emphasis>:
+	    :pserver:anoncvs@anoncvs2.de.FreeBSD.org:/home/ncvs
+	    (rsh, pserver, ssh, ssh/2022 $B$,;H$($^$9(B)
+	    </para>
+	  </listitem>
+	  <listitem>
+	    <para><emphasis>$BF|K\(B</emphasis>:
+	      :pserver:anoncvs@anoncvs.jp.FreeBSD.org:/home/ncvs
+            (<command>cvs login</command> $B%3%^%s%I$r;H$$(B, 
+            $B%W%m%s%W%H$,I=<($5$l$?$i%Q%9%o!<%I(B
+            <quote>anoncvs</quote> $B$rF~NO$7$F$/$@$5$$(B)</para>
+	  </listitem>
       </itemizedlist>
       
       <para>CVS $B$O$+$D$FB8:_$7$?(B ($B$b$7$/$O$3$l$+$iB8:_$9$k$b$N$b(B)
@@ -1089,8 +1167,8 @@
         </listitem>
         
         <listitem>
-          <para><ulink url="http://www.cyclic.com/">Cyclic
-              Software</ulink>, $B>&MQ$H$7$F(B CVS $B$rJ]<i$7$F$$$^$9(B.</para>
+          <para><ulink url="http://www.cvshome.org/">CVS Home</ulink>,
+	    CVS $B$N3+H/$H%5%]!<%H$r$7$F$$$k%3%_%e%K%F%#$G$9(B.</para>
         </listitem>
         
         <listitem>
@@ -1552,13 +1630,22 @@
 	Modula-3 $B%7%9%F%`$K0MB8$7$F$$$F(B, $B9=C[$K$+$+$k;~4V(B, 
 	$B%G%#%9%/%9%Z!<%9$OHf3SE*Bg$-$/$J$j$^$9(B.</para>
 
+	<note>
+	  <para>$B$?$H$($P%5!<%P$N$h$&$J(B <application>XFree86</application>
+	  $B$,%$%s%9%H!<%k$5$l$F$$$J$$7W;;5!$G(B <application>CVSup</application>
+	  $B$r;H$*$&$H$7$F$$$k$N$G$"$l$P(B, $BI,$:(B <application>CVSup</application>
+	  <acronym>GUI</acronym> $B$,4^$^$l$F$$$J$$(B
+	  <filename role="package">net/cvsup-without-gui</filename>
+	  $B$r;H$C$F$/$@$5$$(B.</para>
+	</note>
+       
       <para>$B$b$7(B, $B$"$J$?$K(B <application>CVSup</application>
         $B$K4X$7$FA4$/CN<1$,$J$/(B, 
 	$B<+F0$G@_Dj%U%!%$%k$r%;%C%H%"%C%W$7$F(B, 
 	$B%/%j%C%/$9$k$@$1$GE>Aw$r9T$J$($k%$%s%?!<%U%'%$%9$rDs6!$7$F$/$l$k$h$&$J(B, 
 	$BC10l$N%Q%C%1!<%8$r%$%s%9%H!<%k$7$?$$$H9M$($F$$$k$J$i(B, 
-	<ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/CVSup/cvsupit.tgz">
-	  cvsupit</ulink> $B%Q%C%1!<%8$rMxMQ$7$F2<$5$$(B.  
+	<filename role="package">net/cvsupit</filename>
+	$B%Q%C%1!<%8$rMxMQ$7$F2<$5$$(B.  
 	$B$3$l$O(B &man.pkg.add.1; $B$9$k$@$1$GNI$/(B, 
 	$B@_Dj$O(B, $B$=$N:]$K%a%K%e!<7A<0$G9T$J$&$3$H$,$G$-$k$h$&$K$J$C$F$$$^$9(B.  
       </para>
@@ -1670,11 +1757,11 @@
 	    $B$3$3$G$O(B, FreeBSD $B%7%9%F%`$N%a%$%s$N%=!<%9%D%j!<A4BN(B
 	    $B$r<u$1<h$k$?$a$N@_DjNc$r>R2p$7$^$9(B.
 	    $B$9$Y$F$r4^$`(B <literal>src-all</literal>
-            $B$H$$$&C10l$NBg$-$J%3%l%/%7%g%s$,$"$j$^$9(B.
+	    $B$H$$$&C10l$NBg$-$J%3%l%/%7%g%s$,$"$j$^$9(B.
 	    <filename>supfile</filename>
 	    $B$rAH$_N)$F$k:G=i$N%9%F%C%W$H$7$F(B,
 	    $B$3$l$i$N%3%l%/%7%g%s$r0l9T$K0l$D$:$D5-=R$7$^$9(B
-            ($B$3$N>l9g$O0l9T$@$1$G$9(B).</para>
+	    ($B$3$N>l9g$O0l9T$@$1$G$9(B).</para>
 
 	  <programlisting>src-all</programlisting>
 	</listitem>
@@ -1940,19 +2027,34 @@
         <para>$B5qH]%U%!%$%k$N=q<0$O(B, $BC1$K%@%&%s%m!<%I$7$?$/$J$$%U%!%$%k$d(B
           $B%G%#%l%/%H%j$NL>A0$,=q$$$F$"$k$@$1$NHs>o$K%7%s%W%k$J$b$N$G$9(B.
           $B$?$H$($P(B, $B1Q8l0J30$K$O%I%$%D8l$r>/$7OC$;$k$@$1$N?M$G(B,
-          $B%I%$%D8l$N%"%W%j%1!<%7%g%s$rI,MW$H46$8$J$1$l$P(B
+          $B%I%$%D8l$N%"%W%j%1!<%7%g%s(B ($B$d$=$NB>1Q8l0J30$N8@8l$N$?$a$N%"%W%j%1!<%7%g%s(B)
+          $B$rI,MW$H46$8$J$1$l$P(B
           $B0J2<$N$h$&$J(B<emphasis>$B5qH]%U%!%$%k(B</emphasis>$B$,9M$($i$l$^$9(B.</para>
 
         <screen>ports/chinese
+ports/french
 ports/german
+ports/hebrew
 ports/japanese
 ports/korean
 ports/russian
+ports/ukrainian
 ports/vietnamese
+doc/de_DE.ISO8859-1
+doc/el_GR.ISO8859-7
 doc/es_ES.ISO8859-1
-doc/ja_JP.eucJP</screen>
-
-        <para>$BB>$N8@8l$K$D$$$F$bF1MM$G$9(B.  
+doc/fr_FR.ISO8859-1
+doc/it_IT.ISO8859-15
+doc/ja_JP.eucJP
+doc/nl_NL.ISO8859-1
+doc/pt_BR.ISO8859-1
+doc/ru_RU.KOI8-R
+doc/sr_YU.ISO8859-2
+doc/zh_TW.Big5</screen>
+
+        <para>$BB>$N8@8l$K$D$$$F$bF1MM$G$9(B ($BA4%j%9%H$O(B <ulink
+          URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/">FreeBSD
+          FTP $B%5!<%P(B</ulink> $B$r$4Mw$K$J$C$F$/$@$5$$(B). 
           <emphasis>$B5qH]%U%!%$%k(B</emphasis>$B$NCf$G$O%j%]%8%H%j$NL>A0$,(B
           <quote>$B%G%#%l%/%H%j(B</quote>$B$N@hF,ItJ,$KBP1~$9$k$3$H$KCm0U$7$F$/$@$5$$(B.</para>
 
@@ -2009,7 +2111,7 @@
         $B$3$l$i$N%U%!%$%k$N?7$7$$%P!<%8%g%s$O;XDj$5$l$?%G%#%l%/%H%j(B
         $B$K=q$-9~$^$l$^$9(B. <filename>/usr/src</filename>
         $B$NFI$_<h$j5v2D$,$"$k8B$j(B, $B$3$N$h$&$J;n$7<B9T$N$?$a$K%f!<%6(B
-        root $B$K$J$kI,MW$O$"$j$^$;$s(B.</para>
+        <username>root</username> $B$K$J$kI,MW$O$"$j$^$;$s(B.</para>
 
       <para>X11 $B$rMxMQ$7$F$$$J$$$H$+C1$K(B GUI $B$,5$$KF~$i$J$$>l9g$O(B,
         cvsup $B5/F0;~$K%3%^%s%I%i%$%s$K(B
@@ -2342,7 +2444,7 @@
                       <term><literal>ports-palm release=cvs</literal></term>
 
                       <listitem>
-                        <para>3Com Palm(tm) $B%7%j!<%:MQ%=%U%H%&%'%"(B.</para>
+                        <para><trademark class="trade">3Com Palm</trademark> $B%7%j!<%:MQ%=%U%H%&%'%"(B.</para>
                       </listitem>
                     </varlistentry>
 
@@ -2508,25 +2610,25 @@
                       </listitem>
                     </varlistentry>
 
-                    <varlistentry>
-                      <term><literal>src-crypto release=cvs</literal></term>
+		    <varlistentry>
+		      <term><literal>src-crypto release=cvs</literal></term>
 
-                      <listitem>
-                        <para>FreeBSD $B%W%m%8%'%/%H$N30It$G3+H/$5$l$?0E9f%f!<%F%#%j%F%#$H%i%$%V%i%j(B.
-                          $B$[$H$s$I$=$N$^$^$N7A$G;H$o$l$^$9(B.
-                          (<filename>/usr/src/crypto</filename>).</para>
-                          </listitem>
-                    </varlistentry>
+		      <listitem>
+		        <para>FreeBSD $B%W%m%8%'%/%H$N30It$G3+H/$5$l$?0E9f%f!<%F%#%j%F%#$H%i%$%V%i%j(B.
+		          $B$[$H$s$I$=$N$^$^$N7A$G;H$o$l$^$9(B.
+		          (<filename>/usr/src/crypto</filename>).</para>
+		          </listitem>
+		    </varlistentry>
 
-                    <varlistentry>
-                      <term><literal>src-eBones release=cvs</literal></term>
+		    <varlistentry>
+		      <term><literal>src-eBones release=cvs</literal></term>
 		
-                      <listitem>
-                        <para>Kerberos $B$H(B DES
-                          (<filename>/usr/src/eBones</filename>).
-                          $B8=:_$N(B FreeBSD $B%j%j!<%9$G$O;H$o$l$F$$$^$;$s(B.</para>
-                      </listitem>
-                    </varlistentry>
+		      <listitem>
+		        <para>Kerberos $B$H(B DES
+		          (<filename>/usr/src/eBones</filename>).
+		          $B8=:_$N(B FreeBSD $B%j%j!<%9$G$O;H$o$l$F$$$^$;$s(B.</para>
+		      </listitem>
+		    </varlistentry>
 
                     <varlistentry>
                       <term><literal>src-etc release=cvs</literal></term>
@@ -2614,14 +2716,6 @@
                     </varlistentry>
 
                     <varlistentry>
-                      <term><literal>src-secure release=cvs</literal></term>
-
-                      <listitem>
-                        <para>DES (<filename>/usr/src/secure</filename>).</para>
-                      </listitem>
-                    </varlistentry>
-
-                    <varlistentry>
                       <term><literal>src-sbin release=cvs</literal></term>
 
                       <listitem>
@@ -2631,6 +2725,16 @@
                       </listitem>
                     </varlistentry>
 
+ 		    <varlistentry>
+		      <term><literal>src-secure
+ 			  release=cvs</literal></term>
+ 
+ 		      <listitem>
+			<para>$B0E9f2=%i%$%V%i%j$H%3%^%s%I(B
+			  (<filename>/usr/src/secure</filename>).</para>
+ 		      </listitem>
+ 		    </varlistentry>
+
                     <varlistentry>
                       <term><literal>src-share release=cvs</literal></term>
 
@@ -2649,15 +2753,15 @@
                       </listitem>
                     </varlistentry>
 
-                    <varlistentry>
-                      <term><literal>src-sys-crypto
-                        release=cvs</literal></term>
+		    <varlistentry>
+		      <term><literal>src-sys-crypto
+		        release=cvs</literal></term>
 		
-                      <listitem>
-                        <para>$B%+!<%M%kMQ$N0E9f%3!<%I(B
-                          (<filename>/usr/src/sys/crypto</filename>).</para>
-                      </listitem>
-                    </varlistentry>
+		      <listitem>
+		        <para>$B%+!<%M%kMQ$N0E9f%3!<%I(B
+		          (<filename>/usr/src/sys/crypto</filename>).</para>
+		      </listitem>
+		    </varlistentry>
 
                     <varlistentry>
                       <term><literal>src-tools release=cvs</literal></term>
@@ -2693,7 +2797,7 @@
                 <term><literal>www release=cvs</literal></term>
 
                 <listitem>
-                  <para>FreeBSD WWW $B%5%$%H$N%=!<%9$G$9(B.</para>
+		  <para>FreeBSD WWW $B%5%$%H$N%=!<%9$G$9(B.</para>
                 </listitem>
               </varlistentry>
             </variablelist>
@@ -2861,28 +2965,28 @@
         </varlistentry>
 
         <varlistentry>
-          <term>$B%A%'%3(B</term>
+	  <term>$B%A%'%3(B</term>
 
-          <listitem>
-            <itemizedlist>
-              <listitem>
-                <para>cvsup.cz.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>cejkar@dcse.fee.vutbr.cz</email>)</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
+	  <listitem>
+	    <itemizedlist>
+	      <listitem>
+	        <para>cvsup.cz.FreeBSD.org
+	          ($BJ]<iC4Ev(B <email>cejkar@dcse.fee.vutbr.cz</email>)</para>
+	      </listitem>
+	    </itemizedlist>
+	  </listitem>
         </varlistentry>
 
         <varlistentry>
           <term>$B%G%s%^!<%/(B</term>
 
           <listitem>
-            <itemizedlist>
-              <listitem>
+	    <itemizedlist>
+	      <listitem>
                 <para>cvsup.dk.FreeBSD.org
                   ($BJ]<iC4Ev(B <email>jesper@skriver.dk</email>)</para>
-              </listitem>
-            </itemizedlist>
+	      </listitem>
+	    </itemizedlist>
           </listitem>
         </varlistentry>
 
@@ -2909,10 +3013,10 @@
                   ($BJ]<iC4Ev(B <email>count@key.sms.fi</email>)</para>
               </listitem>
 
-              <listitem>
-                <para>cvsup2.fi.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>count@key.sms.fi</email>)</para>
-              </listitem>
+	      <listitem>
+	        <para>cvsup2.fi.FreeBSD.org
+	          ($BJ]<iC4Ev(B <email>count@key.sms.fi</email>)</para>
+	      </listitem>
             </itemizedlist>
           </listitem>
         </varlistentry>
@@ -2931,7 +3035,27 @@
 		<para>cvsup2.fr.FreeBSD.org
 		  ($BJ]<iC4Ev(B <email>ftpmaint@uvsq.fr</email>)</para>
 	      </listitem>
-            </itemizedlist>
+  
+	      <listitem>
+	        <para>cvsup3.fr.FreeBSD.org
+		  ($BJ]<iC4Ev(B <email>ftpmaint@enst.fr</email>)</para>
+	      </listitem>
+
+	      <listitem>
+	        <para>cvsup4.fr.FreeBSD.org
+		  ($BJ]<iC4Ev(B <email>ftpmaster@t-online.fr</email>)</para>
+	      </listitem>
+
+	      <listitem>
+	        <para>cvsup5.fr.FreeBSD.org
+		  ($BJ]<iC4Ev(B <email>freebsdcvsup@teaser.net</email>)</para>
+	      </listitem>
+
+	      <listitem>
+	        <para>cvsup8.fr.FreeBSD.org
+		  ($BJ]<iC4Ev(B <email>ftpmaint@crc.u-strasbg.fr</email>)</para>
+	      </listitem>
+	    </itemizedlist>
           </listitem>
         </varlistentry>
 
@@ -2946,11 +3070,6 @@
 	    </listitem>
 
 	    <listitem>
-	      <para>cvsup1.de.FreeBSD.org (maintainer
-                  ($BJ]<iC4Ev(B <email>wosch@FreeBSD.org</email>)</para>
-              </listitem>
-
-              <listitem>
                 <para>cvsup2.de.FreeBSD.org
                   ($BJ]<iC4Ev(B <email>cvsup@nikoma.de</email>)</para>
               </listitem>
@@ -2967,8 +3086,21 @@
 
               <listitem>
                 <para>cvsup5.de.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>rse@FreeBSD.org</email>)</para>
+                  ($BJ]<iC4Ev(B
+		  &a.rse;)</para>
+	      </listitem>
+
+	      <listitem>
+	        <para>cvsup6.de.FreeBSD.org
+		  ($BJ]<iC4Ev(B <email>adminmail@heitec.net</email>)</para>
+	      </listitem>
+
+	      <listitem>
+	        <para>cvsup7.de.FreeBSD.org
+		  ($BJ]<iC4Ev(B <email>karsten@rohrbach.de</email>)</para>
               </listitem>
+
+
             </itemizedlist>
           </listitem>
         </varlistentry>
@@ -2977,16 +3109,16 @@
           <term>$B%.%j%7%c(B</term>
           
           <listitem>
-            <itemizedlist>
-              <listitem>
-                <para>cvsup.gr.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>ftpadm@duth.gr</email>)</para>
-              </listitem>
+	    <itemizedlist>
+	      <listitem>
+	        <para>cvsup.gr.FreeBSD.org
+	          ($BJ]<iC4Ev(B <email>ftpadm@duth.gr</email>)</para>
+	      </listitem>
 	      <listitem>
 	        <para>cvsup2.gr.FreeBSD.org
 		  ($BJ]<iC4Ev(B <email>paschos@cs.uoi.gr</email>)</para>
 	      </listitem>
-            </itemizedlist>
+	    </itemizedlist>
           </listitem>
         </varlistentry>
         
@@ -2994,26 +3126,26 @@
           <term>$B%"%$%9%i%s%I(B</term>
           
           <listitem>
-            <itemizedlist>
-              <listitem>
-                <para>cvsup.is.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>cvsup@cvsup1.is.FreeBSD.org</email>)</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
+	    <itemizedlist>
+	      <listitem>
+	        <para>cvsup.is.FreeBSD.org
+		  ($BJ]<iC4Ev(B <email>hostmaster@is.FreeBSD.org</email>)</para>
+	      </listitem>
+	    </itemizedlist>
+	  </listitem>
         </varlistentry>
 
         <varlistentry>
 	  <term>$B%"%$%k%i%s%I(B</term>
           
   	  <listitem>
-            <itemizedlist>
-              <listitem>
+	    <itemizedlist>
+	      <listitem>
 	        <para>cvsup.ie.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>dwmalone@maths.tcd.ie</email>),
-                  $B%H%j%K%F%#Bg3X(B, $B%@%V%j%s(B</para>
-              </listitem>
-            </itemizedlist>
+		  ($BJ]<iC4Ev(B <email>dwmalone@maths.tcd.ie</email>),
+		  $B%H%j%K%F%#Bg3X(B, $B%@%V%j%s(B</para>
+	      </listitem>
+	    </itemizedlist>
           </listitem>
         </varlistentry>
         
@@ -3029,7 +3161,7 @@
 
               <listitem>
                 <para>cvsup2.jp.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>max@FreeBSD.org</email>)</para>
+                  ($BJ]<iC4Ev(B &a.max;)</para>
               </listitem>
 
               <listitem>
@@ -3073,6 +3205,19 @@
           </listitem>
         </varlistentry>
 
+        <varlistentry>
+	  <term>$B%i%H%S%"(B</term>
+
+	  <listitem>
+	    <itemizedlist>
+	      <listitem>
+	        <para>cvsup.lv.FreeBSD.org
+		  ($BJ]<iC4Ev(B <email>system@soft.lv</email>)</para>
+	      </listitem>
+	    </itemizedlist>
+	  </listitem>
+        </varlistentry>
+
       <varlistentry>
 	<term>$B%j%H%"%K%"(B</term>
 
@@ -3082,21 +3227,26 @@
 	      <para>cvsup.lt.FreeBSD.org
                 ($BJ]<iC4Ev(B <email>domas.mituzas@delfi.lt</email>)</para>
 	    </listitem>
+
+	    <listitem>
+	      <para>cvsup2.lt.FreeBSD.org
+		($BJ]<iC4Ev(B <email>vaidas.damosevicius@sampo.lt</email>)</para>
+	    </listitem>
 	  </itemizedlist>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-        <term>$B%K%e!<%8!<%i%s%I(B</term>
+	<term>$B%K%e!<%8!<%i%s%I(B</term>
 
-        <listitem>
-          <itemizedlist>
-            <listitem>
-              <para>cvsup.nz.FreeBSD.org ($BJ]<iC4Ev(B
-                <email>cvsup@langille.org</email>)</para>
-            </listitem>
+	<listitem>
+	  <itemizedlist>
+	    <listitem>
+	      <para>cvsup.nz.FreeBSD.org
+		($BJ]<iC4Ev(B <email>cvsup@langille.org</email>)</para>
+	    </listitem>
 	  </itemizedlist>
-        </listitem>
+	</listitem>
       </varlistentry>
 
         <varlistentry>
@@ -3113,6 +3263,11 @@
                 <para>cvsup2.nl.FreeBSD.org
                   ($BJ]<iC4Ev(B <email>cvsup@nl.uu.net</email>)</para>
               </listitem>
+
+	      <listitem>
+		<para>cvsup3.nl.FreeBSD.org
+		  ($BJ]<iC4Ev(B <email>cvsup@vuurwerk.nl</email>)</para>
+	      </listitem>
             </itemizedlist>
           </listitem>
         </varlistentry>
@@ -3157,6 +3312,19 @@
         </varlistentry>
 
         <varlistentry>
+	  <term>$B%k!<%^%K%"(B</term>
+
+	  <listitem>
+	    <itemizedlist>
+	      <listitem>
+	        <para>cvsup.ro.FreeBSD.org
+		  ($BJ]<iC4Ev(B <email>razor@ldc.ro</email>)</para>
+	      </listitem>
+	    </itemizedlist>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
           <term>$B%m%7%"(B</term>
 
           <listitem>
@@ -3195,6 +3363,19 @@
         </varlistentry>
 
         <varlistentry>
+	  <term>$B%5%s%^%j%N(B</term>
+
+	  <listitem>
+	    <itemizedlist>
+	      <listitem>
+	        <para>cvsup.sm.FreeBSD.org
+		  ($BJ]<iC4Ev(B <email>sysadmin@alexdupre.com</email>)</para>
+	      </listitem>
+	    </itemizedlist>
+	  </listitem>
+        </varlistentry>
+
+        <varlistentry>
           <term>$B%9%m%t%!%-%"6&OB9q(B</term>
 
           <listitem>
@@ -3213,16 +3394,16 @@
         </varlistentry>
 
         <varlistentry>
-          <term>$B%9%m%Y%K%"(B</term>
+	  <term>$B%9%m%Y%K%"(B</term>
 
-          <listitem>
-            <itemizedlist>
-              <listitem>
-                <para>cvsup.si.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>blaz@si.FreeBSD.org</email>)</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
+	  <listitem>
+	    <itemizedlist>
+	      <listitem>
+	        <para>cvsup.si.FreeBSD.org
+		  ($BJ]<iC4Ev(B <email>blaz@si.FreeBSD.org</email>)</para>
+	      </listitem>
+	    </itemizedlist>
+	  </listitem>
         </varlistentry>
 
         <varlistentry>
@@ -3232,12 +3413,12 @@
             <itemizedlist>
               <listitem>
                 <para>cvsup.za.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>markm@FreeBSD.org</email>)</para>
+                  ($BJ]<iC4Ev(B &a.markm;)</para>
               </listitem>
 
               <listitem>
                 <para>cvsup2.za.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>markm@FreeBSD.org</email>)</para>
+                  ($BJ]<iC4Ev(B &a.markm;)</para>
               </listitem>
             </itemizedlist>
           </listitem>
@@ -3245,43 +3426,43 @@
 
 
         <varlistentry>
-          <term>$B%9%Z%$%s(B</term>
+	  <term>$B%9%Z%$%s(B</term>
 
           <listitem>
             <itemizedlist>
-              <listitem>
-                <para>cvsup.es.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>jesusr@FreeBSD.org</email>)</para>
-              </listitem>
+	      <listitem>
+	        <para>cvsup.es.FreeBSD.org
+	          ($BJ]<iC4Ev(B &a.jesusr;)</para>
+	      </listitem>
 
-              <listitem>
-                <para>cvsup2.es.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>jesusr@FreeBSD.org</email>)</para>
-              </listitem>
+	      <listitem>
+	        <para>cvsup2.es.FreeBSD.org
+	          ($BJ]<iC4Ev(B &a.jesusr;)</para>
+	      </listitem>
               
-              <listitem>
-                <para>cvsup3.es.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>jose@we.lc.ehu.es</email>)</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
+	      <listitem>
+	        <para>cvsup3.es.FreeBSD.org
+	          ($BJ]<iC4Ev(B <email>jose@we.lc.ehu.es</email>)</para>
+	      </listitem>
+	    </itemizedlist>
+	  </listitem>
         </varlistentry>
 
         <varlistentry>
           <term>$B%9%&%'!<%G%s(B</term>
 
           <listitem>
-            <itemizedlist>
-              <listitem>
+	    <itemizedlist>
+	      <listitem>
                 <para>cvsup.se.FreeBSD.org
                   ($BJ]<iC4Ev(B <email>pantzer@ludd.luth.se</email>)</para>
-              </listitem>
+	      </listitem>
 
-              <listitem>
+	      <listitem>
 	        <para>cvsup2.se.FreeBSD.org
 	          ($BJ]<iC4Ev(B <email>cvsup@dataphone.net</email>)</para>
-              </listitem>
-            </itemizedlist>
+	      </listitem>
+	    </itemizedlist>
           </listitem>
         </varlistentry>
 
@@ -3302,7 +3483,7 @@
 
               <listitem>
                 <para>cvsup3.tw.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>foxfair@FreeBSD.org</email>)</para>
+                  ($BJ]<iC4Ev(B <email>tjs@cdpa.nsysu.edu.tw</email>)</para>
               </listitem>
             </itemizedlist>
           </listitem>
@@ -3327,6 +3508,11 @@
                 <para>cvsup4.ua.FreeBSD.org
                   ($BJ]<iC4Ev(B <email>phantom@cris.net</email>)</para>
               </listitem>
+
+	      <listitem>
+	        <para>cvsup5.ua.FreeBSD.org
+		  ($BJ]<iC4Ev(B <email>never@nevermind.kiev.ua</email>)</para>
+	      </listitem>
             </itemizedlist>
           </listitem>
         </varlistentry>
@@ -3343,13 +3529,23 @@
 
               <listitem>
                 <para>cvsup2.uk.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>brian@FreeBSD.org</email>)</para>
+                  ($BJ]<iC4Ev(B &a.brian;)</para>
               </listitem>
 
               <listitem>
                 <para>cvsup3.uk.FreeBSD.org
                   ($BJ]<iC4Ev(B <email>ben.hughes@uk.easynet.net</email>)</para>
               </listitem>
+
+	      <listitem>
+	        <para>cvsup4.uk.FreeBSD.org
+		  ($BJ]<iC4Ev(B <email>ejb@leguin.org.uk</email>)</para>
+	      </listitem>
+
+	      <listitem>
+	        <para>cvsup5.uk.FreeBSD.org
+		  ($BJ]<iC4Ev(B <email>mirror@teleglobe.net</email>)</para>
+	      </listitem>
             </itemizedlist>
           </listitem>
         </varlistentry>
@@ -3367,13 +3563,13 @@
 
               <listitem>
                 <para>cvsup2.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>jdp@FreeBSD.org</email>),
-                  $B%+%j%U%)%k%K%"=#(B</para>
+                  ($BJ]<iC4Ev(B <email>djs@secure.net</email> $B$H(B &a.nectar;),
+                  $B%P!<%8%K%"=#(B</para>
               </listitem>
 
               <listitem>
                 <para>cvsup3.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>wollman@FreeBSD.org</email>),
+                  ($BJ]<iC4Ev(B &a.wollman),
                   $B%^%5%A%e!<%;%C%D=#(B</para>
               </listitem>
 
@@ -3391,7 +3587,7 @@
 
               <listitem>
                 <para>cvsup7.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>jdp@FreeBSD.org</email>),
+                  ($BJ]<iC4Ev(B &a.jdp;),
                   $B%o%7%s%H%s=#(B</para>
               </listitem>
 
@@ -3403,13 +3599,13 @@
 
 	      <listitem>
 	        <para>cvsup9.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>qbsd@uswest.net</email>),
+                  ($BJ]<iC4Ev(B &a.jdp;),
                   $B%_%M%=%?=#(B</para>
 	      </listitem>
 
               <listitem>
                 <para>cvsup10.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>jdp@FreeBSD.org</email>),
+                  ($BJ]<iC4Ev(B &a.jdp;),
                   $B%+%j%U%)%k%K%"=#(B</para>
               </listitem>
 
@@ -3421,7 +3617,7 @@
 
 	      <listitem>
 	        <para>cvsup12.FreeBSD.org
-                  ($BJ]<iC4Ev(B <email>will@FreeBSD.org</email>),
+                  ($BJ]<iC4Ev(B &a.will;),
                   $B%$%s%G%#%"%J=#(B</para>
 	      </listitem>
 
@@ -3512,6 +3708,24 @@
       </varlistentry>
 
       <varlistentry>
+	<term>RELENG_4_6</term>
+
+	<listitem>
+	  <para>FreeBSD-4.6 $BMQ$N%j%j!<%9%V%i%s%A$G$9(B. 
+            $B$3$l$O%;%-%e%j%F%#4+9p$d=EMW$J=$@5$,9T$J$o$l$k>l9g$K$N$_;H$o$l$^$9(B.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>RELENG_4_5</term>
+
+	<listitem>
+	  <para>FreeBSD-4.5 $BMQ$N%j%j!<%9%V%i%s%A$G$9(B. 
+            $B$3$l$O%;%-%e%j%F%#4+9p$d=EMW$J=$@5$,9T$J$o$l$k>l9g$K$N$_;H$o$l$^$9(B.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
 	<term>RELENG_4_4</term>
 
 	<listitem>
@@ -3551,6 +3765,22 @@
     <para>$B;XDj2DG=$J$3$NB>$N%j%S%8%g%s%?%0$O0J2<$N$H$*$j$G$9(B.</para>
 
     <variablelist>
+      <varlistentry>
+	<term>RELENG_4_6_0_RELEASE</term>
+
+	<listitem>
+	  <para>FreeBSD 4.6 $B$G$9(B.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>RELENG_4_5_0_RELEASE</term>
+
+	<listitem>
+	  <para>FreeBSD 4.5 $B$G$9(B.</para>
+	</listitem>
+      </varlistentry>
+
       <varlistentry>
 	<term>RELENG_4_4_0_RELEASE</term>
 

--ikeVEW9yuYc//A+q--
