svn commit: r46680 - in head/ru_RU.KOI8-R/articles: cups explaining-bsd fonts freebsd-questions geom-class hubs ipsec-must mailing-list-faq new-users releng

Taras Korenko taras at FreeBSD.org
Tue May 12 08:03:26 UTC 2015


Author: taras
Date: Tue May 12 08:03:23 2015
New Revision: 46680
URL: https://svnweb.freebsd.org/changeset/doc/46680

Log:
  MFen:
  + cups/article.xml                              r43184  --> r46469
  + explaining-bsd/article.xml                    r43184  --> r46457
  + fonts/article.xml                             r43184  --> r46439
  + freebsd-questions/article.xml                 r43184  --> r46431
  + hubs/article.xml                              r43184  --> r46284
  + mailing-list-faq/article.xml                  r43184  --> r46073
  + new-users/article.xml                         r43184  --> r46448

Modified:
  head/ru_RU.KOI8-R/articles/cups/article.xml
  head/ru_RU.KOI8-R/articles/explaining-bsd/article.xml
  head/ru_RU.KOI8-R/articles/fonts/article.xml
  head/ru_RU.KOI8-R/articles/freebsd-questions/article.xml
  head/ru_RU.KOI8-R/articles/geom-class/article.xml
  head/ru_RU.KOI8-R/articles/hubs/article.xml
  head/ru_RU.KOI8-R/articles/ipsec-must/article.xml
  head/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml
  head/ru_RU.KOI8-R/articles/new-users/article.xml
  head/ru_RU.KOI8-R/articles/releng/Makefile

Modified: head/ru_RU.KOI8-R/articles/cups/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/cups/article.xml	Mon May 11 12:51:56 2015	(r46679)
+++ head/ru_RU.KOI8-R/articles/cups/article.xml	Tue May 12 08:03:23 2015	(r46680)
@@ -6,7 +6,7 @@
 
      $FreeBSD$
 
-     Original revision: r43184
+     Original revision: r46469
 -->
 <!--
 Translation:	Taras Korenko,
@@ -70,20 +70,12 @@ Translation:	Taras Korenko,
   <sect1 xml:id="printing-cups-install">
     <title>õÓÔÁÎÏ×ËÁ ÓÅÒ×ÅÒÁ ÐÅÞÁÔÉ CUPS</title>
 
-    <para><application>CUPS</application> ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎÁ
-      ÉÚ ÐÏÒÔÏ× ÉÌÉ ÕÖÅ ÓÏÂÒÁÎÎÙÈ ÐÁËÅÔÏ×.  þÔÏÂÙ ÕÓÔÁÎÏ×ÉÔØ
-      <application>CUPS</application> ÉÚ ËÏÌÌÅËÃÉÉ ÐÏÒÔÏ×, ×ÙÐÏÌÎÉÔÅ
-      Ó ÐÒÉ×ÉÌÅÇÉÑÍÉ ÐÏÌØÚÏ×ÁÔÅÌÑ <systemitem class="username">root</systemitem> ÓÌÅÄÕÀÝÕÀ
-      ËÏÍÁÎÄÕ:</para>
-
-    <screen>&prompt.root; <userinput>cd /usr/ports/print/cups && make install clean</userinput></screen>
-
     <para>äÌÑ ÕÓÔÁÎÏ×ËÉ <application>CUPS</application> ÉÓÐÏÌØÚÕÑ ÐÁËÅÔ,
       ÚÁÐÕÓÔÉÔÅ ÎÁ ×ÙÐÏÌÎÅÎÉÅ ÔÁËÕÀ ËÏÍÁÎÄÕ:</para>
 
-    <screen>&prompt.root; <userinput>pkg_add -r cups</userinput></screen>
+    <screen>&prompt.root; <userinput>pkg install cups</userinput></screen>
 
-    <para>äÒÕÇÉÅ ÎÅÏÂÑÚÁÔÅÌØÎÙÅ, ÎÏ ÒÅËÏÍÅÎÄÕÅÍÙÅ Ë ÕÓÔÁÎÏ×ËÅ ÐÏÒÔÙ ÉÌÉ
+    <para>äÒÕÇÉÅ ÎÅÏÂÑÚÁÔÅÌØÎÙÅ, ÎÏ ÒÅËÏÍÅÎÄÕÅÍÙÅ Ë ÕÓÔÁÎÏ×ËÅ
       ÐÁËÅÔÙ ÜÔÏ <package>print/gutenprint-cups</package>
       É <package>print/hplip</package>, ËÁÖÄÙÊ ÉÚ ËÏÔÏÒÙÈ
       ÄÏÂÁ×ÌÑÅÔ ÄÒÁÊ×ÅÒÁ É ÕÔÉÌÉÔÙ ÄÌÑ ÒÁÚÎÏÏÂÒÁÚÎÙÈ ÐÒÉÎÔÅÒÏ×.  ðÏÓÌÅ
@@ -364,31 +356,5 @@ CUPS-Delete-Class CUPS-Accept-Jobs CUPS-
 </Policy></programlisting>
   </sect1>
 
-  <sect1 xml:id="printing-cups-ports-knobs">
-    <title>îÁÓÔÒÏÊËÁ ÐÏÒÔÏ× ÉÓÐÏÌØÚÕÀÝÉÈ CUPS</title>
-
-    <para>åÓÌÉ <application>CUPS</application> ÂÕÄÅÔ ÓÌÕÖÉÔØ × ËÁÞÅÓÔ×Å
-      ÏÓÎÏ×ÎÏÊ ÓÉÓÔÅÍÙ ÐÅÞÁÔÉ, ÔÏ ÍÏÖÎÏ ÐÏ ÖÅÌÁÎÉÀ ÄÏÂÁ×ÉÔØ ÎÅÓËÏÌØËÏ
-      ÚÁÐÉÓÅÊ × <filename>/etc/make.conf</filename>, ËÏÔÏÒÙÅ ×ÙÄÅÌÑÔ
-      <application>CUPS</application> ÓÒÅÄÉ ÄÒÕÇÉÈ ÓÉÓÔÅÍ.  ÷ÏÔ ÎÅËÏÔÏÒÙÅ
-      ÉÚ ÎÉÈ:</para>
-
-    <programlisting>WITH_CUPS=YES
-CUPS_OVERWRITE_BASE=YES
-WITHOUT_LPR=YES</programlisting>
-
-    <para>ðÅÒ×ÁÑ ÐÅÒÅÍÅÎÎÁÑ, <varname>WITH_CUPS</varname>, ÄÏÂÁ×ÌÑÅÔ ÐÏÄÄÅÒÖËÕ
-      <application>CUPS</application> Ë ÐÏÒÔÁÍ, × ËÏÔÏÒÙÈ ÐÒÅÄÕÓÍÏÔÒÅÎÁ ÔÁËÁÑ
-      ×ÏÚÍÏÖÎÏÓÔØ.  ÷ÔÏÒÁÑ ÚÁÐÉÓØ, <varname>CUPS_OVERWRITE_BASE</varname>,
-      ÉÓÐÒÁ×ÉÔ ÎÅËÏÔÏÒÙÅ ÓÉÍ×ÏÌÉÞÅÓËÉÅ ÓÓÙÌËÉ É ÐÕÔÉ, ËÏÔÏÒÙÅ ÉÎÁÞÅ
-      ÐÒÉ×ÏÄÉÌÉ-ÂÙ Ë ÓÉÓÔÅÍÅ ÐÅÞÁÔÉ &os; ÐÏ ÕÍÏÌÞÁÎÉÀ —
-      <application>LPR</application>.  ôÁËÖÅ ÏÎÁ ÐÒÅÄÏÔ×ÒÁÔÉÔ ÏÔËÁÔ
-      ÜÔÉÈ ÉÚÍÅÎÅÎÉÊ ×Ï ×ÒÅÍÑ ÓÌÅÄÕÀÝÅÇÏ ÏÂÎÏ×ÌÅÎÉÑ ÓÉÓÔÅÍÙ ÐÏÓÒÅÄÓÔ×ÏÍ
-      <buildtarget>buildworld</buildtarget>.  ôÒÅÔØÑ ÐÅÒÅÍÅÎÎÁÑ,
-      <varname>WITHOUT_LPR</varname>, ÐÒÅÄÏÔ×ÒÁÔÉÔ ×ËÌÀÞÅÎÉÅ ÐÏÄÄÅÒÖËÉ
-      <application>LPR</application> × ÐÏÒÔÁÈ, ÐÏÔÅÎÃÉÁÌØÎÏ ÅÅ
-      ÉÓÐÏÌØÚÕÀÝÉÈ.</para>
-  </sect1>
-
   <index/>
 </article>

Modified: head/ru_RU.KOI8-R/articles/explaining-bsd/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/explaining-bsd/article.xml	Mon May 11 12:51:56 2015	(r46679)
+++ head/ru_RU.KOI8-R/articles/explaining-bsd/article.xml	Tue May 12 08:03:23 2015	(r46680)
@@ -7,7 +7,7 @@
      $FreeBSD$
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/explaining-bsd/article.xml,v 1.11 2007/01/06 18:28:16 gad Exp $
 
-     Original revision: r43184
+     Original revision: r46457
 -->
 <article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
   <info><title>þÔÏ ÔÁËÏÅ BSD</title>
@@ -458,16 +458,13 @@
 
       <itemizedlist>
 	<listitem>
-	  <para>ÐÒÏÅËÔ FreeBSD ÎÁÃÅÌÅÎ ÎÁ ÐÏ×ÙÛÅÎÉÅ ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔÉ
+	  <para>ÐÒÏÅËÔ &os; ÎÁÃÅÌÅÎ ÎÁ ÐÏ×ÙÛÅÎÉÅ ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔÉ
 	    É ÐÒÏÓÔÏÔÕ × ÉÓÐÏÌØÚÏ×ÁÎÉÉ ËÏÎÅÞÎÙÍÉ ÐÏÌØÚÏ×ÁÔÅÌÑÍÉ.
-	    FreeBSD ÏÞÅÎØ ÃÅÎÑÔ × ÓÒÅÄÅ Web-ÈÏÓÔÅÒÏ×.  üÔÁ ïó ÒÁÂÏÔÁÅÔ
-	    ÎÁ ÎÅÓËÏÌØËÉÈ ÁÐÐÁÒÁÔÎÙÈ ÐÌÁÔÆÏÒÍÁÈ, × ÔÏÍ ÞÉÓÌÅ ÓÉÓÔÅÍÁÈ ÎÁ ÂÁÚÅ
-	    ÐÒÏÃÅÓÓÏÒÏ× &i386; (<quote>ðë</quote>), ÓÉÓÔÅÍÁÈ, ÐÏÓÔÒÏÅÎÎÙÈ ÎÁ
-	    64-ÒÁÚÒÑÄÎÙÈ ÐÒÏÃÅÓÓÏÒÁÈ AMD, ÓÉÓÔÅÍÁÈ &ultrasparc;, ÓÉÓÔÅÍÁÈ,
-	    ÒÁÂÏÔÁÀÝÉÅ ÎÁ ÂÁÚÅ ÐÒÏÃÅÓÓÏÒÏ× Alpha ËÏÍÐÁÎÉÉ Compaq, Á ÔÁËÖÅ
-	    ÓÉÓÔÅÍÁÈ, ÐÏÓÔÒÏÅÎÎÙÅ ÐÏ ÓÐÅÃÉÆÉËÁÃÉÑÍ NEC PC-98.  þÉÓÌÏ
-	    ÐÏÌØÚÏ×ÁÔÅÌÅÊ FreeBSD ÚÎÁÞÉÔÅÌØÎÏ ÐÒÅ×ÙÛÁÅÔ ÞÉÓÌÏ ÐÏÌØÚÏ×ÁÔÅÌÅÊ
-	    ÄÒÕÇÉÈ ÐÒÏÅËÔÏ×.</para>
+	    &os; ÏÞÅÎØ ÃÅÎÑÔ × ÓÒÅÄÅ web-ÈÏÓÔÅÒÏ×.  üÔÁ ïó ÒÁÂÏÔÁÅÔ
+	    ÎÁ <link xlink:href="&url.base;/platforms/">ÎÅÓËÏÌØËÉÈ
+	      ÁÐÐÁÒÁÔÎÙÈ ÐÌÁÔÆÏÒÍÁÈ</link>, ÞÉÓÌÏ ÐÏÌØÚÏ×ÁÔÅÌÅÊ &os;
+	    ÚÎÁÞÉÔÅÌØÎÏ ÐÒÅ×ÙÛÁÅÔ ÞÉÓÌÏ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÄÒÕÇÉÈ
+	    ÐÒÏÅËÔÏ×.</para>
 	</listitem>
 
 	<listitem>
@@ -521,7 +518,7 @@
 	<listitem>
 	  <para><link xlink:href="http://www.apple.com/macosx/server/">&macos;
 	    X</link> — ÜÔÏ ÓÁÍÁÑ ÐÏÓÌÅÄÎÑÑ ×ÅÒÓÉÑ ÏÐÅÒÁÃÉÏÎÎÏÊ
-	    ÓÉÓÔÅÍÙ ÄÌÑ ÌÉÎÅÊËÉ ËÏÍÐØÀÔÅÒÏ× &macintosh; ËÏÍÐÁÎÉÉ <link xlink:href="http://www.apple.com/">Apple Computer Inc</link>.
+	    ÓÉÓÔÅÍÙ ÄÌÑ ÌÉÎÅÊËÉ ËÏÍÐØÀÔÅÒÏ× &apple; &mac;.
 	    ñÄÒÏ ÜÔÏÊ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ, <link xlink:href="http://developer.apple.com/darwin/">Darwin</link>,
 	    ÐÏÓÔÒÏÅÎÎÏÅ ÎÁ ËÏÄÅ BSD, ÄÏÓÔÕÐÎÏ × ×ÉÄÅ ÐÏÌÎÏÓÔØÀ
 	    ÆÕÎËÃÉÏÎÁÌØÎÏÊ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ Ó ÏÔËÒÙÔÙÍ ËÏÄÏÍ ÄÌÑ

Modified: head/ru_RU.KOI8-R/articles/fonts/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/fonts/article.xml	Mon May 11 12:51:56 2015	(r46679)
+++ head/ru_RU.KOI8-R/articles/fonts/article.xml	Tue May 12 08:03:23 2015	(r46680)
@@ -7,7 +7,7 @@
      $FreeBSD$
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/fonts/article.xml,v 1.5 2005/12/06 17:56:24 gad Exp $
 
-     Original revision: r43184
+     Original revision: r46439
 -->
 <!-- Recently, I wanted to figure out how to use some additional fonts that
      I had accumulated.  I finally figured out *how to do it* from the various
@@ -164,6 +164,14 @@
 	<listitem>
 	  <variablelist>
 	    <varlistentry>
+	      <term>vt</term>
+
+	      <listitem>
+		<para><filename>.hex</filename></para>
+	      </listitem>
+	    </varlistentry>
+
+	    <varlistentry>
 	      <term>syscons</term>
 
 	      <listitem>
@@ -729,7 +737,7 @@ EOF</userinput>
 	  <para>÷ÁÍ ÍÏÖÅÔ ÔÁËÖÅ ÐÏÔÒÅÂÏ×ÁÔØÓÑ ÓËÏÐÉÒÏ×ÁÔØ
 	    <filename>/usr/contrib/groff/devps/generate/textmap</filename> ×
 	    <filename>/usr/share/groff_font/devps/generate</filename>, ÅÓÌÉ ÅÇÏ
-            ÔÏÌØËÏ ÕÖÅ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ.</para>
+              ÎÅ ÓÕÝÅÓÔ×ÕÅÔ.</para>
 	</listitem>
       </varlistentry>
     </variablelist>
@@ -740,8 +748,7 @@ EOF</userinput>
       <listitem>
 	<para>óÏÚÄÁÊÔÅ ÆÁÊÌ <filename>.afm</filename> ÐÏ ÔÁËÏÊ ËÏÍÁÎÄÅ:</para>
 
-	<screen>
-<prompt>%</prompt> <userinput>gs -dNODISPLAY -q -- ttf2pf.ps <replaceable>TTF_name</replaceable> <replaceable>PS_font_name</replaceable> <replaceable>AFM_name</replaceable></userinput>
+	<screen><prompt>%</prompt> <userinput>gs -dNODISPLAY -q -- ttf2pf.ps <replaceable>TTF_name</replaceable> <replaceable>PS_font_name</replaceable> <replaceable>AFM_name</replaceable></userinput>
 	</screen>
 
 	<para>úÄÅÓØ <replaceable>TTF_name</replaceable> ÏÂÏÚÎÁÞÁÅÔ ×ÁÛ ÆÁÊÌ ÓÏ
@@ -794,8 +801,7 @@ Converting 3of9.ttf to A.pfa and B.afm.
           <filename>DESC</filename>, <filename>text.enc</filename> É
 	  <filename>generate/textmap</filename> × ÜÔÏÍ ËÁÔÁÌÏÇÅ.)</para>
 
-	<screen>
-<prompt>%</prompt> <userinput>afmtodit -d DESC -e text.enc file.afm \
+	<screen><prompt>%</prompt> <userinput>afmtodit -d DESC -e text.enc file.afm \
 	    generate/textmap <replaceable>PS_font_name</replaceable></userinput>
 	</screen>
 
@@ -888,24 +894,9 @@ Converting 3of9.ttf to A.pfa and B.afm.
     <title>çÄÅ ÍÏÖÎÏ ÎÁÊÔÉ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÛÒÉÆÔÙ?</title>
 
     <para>íÎÏÇÏ ÛÒÉÆÔÏ× ÍÏÖÎÏ ÎÁÊÔÉ × ÓÅÔÉ éÎÔÅÒÎÅÔ.  ïÎÉ ÌÉÂÏ ÁÂÓÏÌÀÔÎÏ
-      ÂÅÓÐÌÁÔÎÙ, ÌÉÂÏ ÕÓÌÏ×ÎÏ-ÂÅÓÐÌÁÔÎÙ.  ëÒÏÍÅ ÔÏÇÏ, ÐÒÏÄÁÅÔÓÑ ÍÎÏÇÏ ÎÅÄÏÒÏÇÉÈ
-      ËÏÍÐÁËÔ-ÄÉÓËÏ×, ÓÏÄÅÒÖÁÝÉÈ ÍÎÏÇÏ ÛÒÉÆÔÏ×.  ÷ÏÔ ÎÅËÏÔÏÒÙÅ ÁÄÒÅÓÁ éÎÔÅÒÎÅÔ
-      (ÎÁ Á×ÇÕÓÔ 1996):</para>
-
-    <itemizedlist>
-      <listitem>
-	<para><uri xlink:href="http://www.simtel.net/">http://www.simtel.net/</uri></para>
-      </listitem>
-
-      <listitem>
-	<para><uri xlink:href="http://www.freshmeat.net">http://www.freshmeat.net</uri></para>
-      </listitem>
-
-      <listitem>
-	<para>óÇÒÕÚÉÔÅ ÛÒÉÆÔÙ, ÐÏÓÔÁ×ÌÑÅÍÙÅ Ó ëÏÌÌÅËÃÉÅÊ ðÏÒÔÏ× ×
-	  ËÁÔÁÌÏÇÅ <filename>x11-fonts/</filename></para>
-      </listitem>
-    </itemizedlist>
+      ÂÅÓÐÌÁÔÎÙ, ÌÉÂÏ ÕÓÌÏ×ÎÏ-ÂÅÓÐÌÁÔÎÙ.  ÷ ÄÏÂÁ×ÏË, ÍÎÏÖÅÓÔ×Ï ÛÒÉÆÔÏ×
+      ÎÁÈÏÄÉÔÓÑ × ËÁÔÅÇÏÒÉÉ <filename>x11-fonts/</filename> ëÏÌÌÅËÃÉÉ
+      ðÏÒÔÏ×.</para>
   </sect1>
 
   <sect1 xml:id="additional-questions">

Modified: head/ru_RU.KOI8-R/articles/freebsd-questions/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/freebsd-questions/article.xml	Mon May 11 12:51:56 2015	(r46679)
+++ head/ru_RU.KOI8-R/articles/freebsd-questions/article.xml	Tue May 12 08:03:23 2015	(r46680)
@@ -7,7 +7,7 @@
      $FreeBSD$
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/freebsd-questions/article.xml,v 1.10 2005/10/09 10:45:04 gad Exp $
 
-     Original revision: r43184
+     Original revision: r46431
 -->
 <article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
   <info><title>ëÁË ÒÁÂÏÔÁÔØ ÓÏ ÓÐÉÓËÏÍ ÒÁÓÓÙÌËÉ FreeBSD-questions c ÍÁËÓÉÍÁÌØÎÏÊ
@@ -208,14 +208,9 @@ your options page that will email your c
       </listitem>
     </orderedlist>
 
-    <para>éÍÅÅÔÓÑ ÔÁËÖÅ ÎÅËÏÔÏÒÏÅ ËÏÌÉÞÅÓÔ×Ï ÄÒÕÇÉÈ ÓÐÅÃÉÁÌÉÚÉÒÏ×ÁÎÎÙÈ ÓÐÉÓËÏ×
-      ÒÁÓÓÙÌËÉ, ÎÁÐÒÉÍÅÒ, <literal>FreeBSD-isp</literal>, ËÏÔÏÒÙÅ ÏÔÒÁÖÁÀÔ
-      ÉÎÔÅÒÅÓÙ ISP (ðÏÓÔÁ×ÝÉËÏ× õÓÌÕÇ éÎÔÅÒÎÅÔ), ÒÁÂÏÔÁÀÝÉÈ ÓÏ FreeBSD.  åÓÌÉ
-      ÓÌÕÞÉÌÏÓØ ÔÁË, ÞÔÏ ×Ù Ñ×ÌÑÅÔÅÓØ ISP, ÜÔÏ ×Ï×ÓÅ ÎÅ ÚÎÁÞÉÔ, ÞÔÏ ×Ù
-      ÄÏÌÖÎÙ Á×ÔÏÍÁÔÉÞÅÓËÉ ÐÏÓÙÌÁÔØ Ó×ÏÉ ×ÏÐÒÏÓÙ × ÓÐÉÓÏË ÒÁÓÓÙÌËÉ
-      <literal>FreeBSD-isp</literal>.  úÄÅÓØ ÔÁËÖÅ ÐÏÄÈÏÄÉÔ ËÒÉÔÅÒÉÊ,
-      ÕËÁÚÁÎÎÙÊ ×ÙÛÅ, É × ×ÁÛÉÈ ÉÎÔÅÒÅÓÁÈ ÓÌÅÄÏ×ÁÔØ ÅÍÕ, ÐÏÔÏÍÕ ÞÔÏ ÉÍÅÎÎÏ ÔÁË
-      ÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÒÅÚÕÌØÔÁÔ.</para>
+    <para>éÍÅÅÔÓÑ ÔÁËÖÅ ÎÅËÏÔÏÒÏÅ ËÏÌÉÞÅÓÔ×Ï ÄÒÕÇÉÈ <link xlink:href="&url.books.handbook;/eresources-mail.html">ÓÐÅÃÉÁÌÉÚÉÒÏ×ÁÎÎÙÈ ÓÐÉÓËÏ× ÒÁÓÓÙÌËÉ</link>.
+      úÄÅÓØ ÔÁËÖÅ ÐÏÄÈÏÄÉÔ ÕËÁÚÁÎÎÙÊ ×ÙÛÅ ËÒÉÔÅÒÉÊ, É × ×ÁÛÉÈ ÉÎÔÅÒÅÓÁÈ
+      ÓÌÅÄÏ×ÁÔØ ÅÍÕ, ÐÏÔÏÍÕ ÞÔÏ ÉÍÅÎÎÏ ÔÁË ÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÒÅÚÕÌØÔÁÔ.</para>
   </sect1>
 
   <sect1>

Modified: head/ru_RU.KOI8-R/articles/geom-class/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/geom-class/article.xml	Mon May 11 12:51:56 2015	(r46679)
+++ head/ru_RU.KOI8-R/articles/geom-class/article.xml	Tue May 12 08:03:23 2015	(r46680)
@@ -5,7 +5,7 @@
     The FreeBSD Russian Documentation Project
     $FreeBSD$
     $FreeBSDru$
-    Original revision: r43184
+    Original revision: r44964
 -->
 <!-- ðÅÒÅ×ÏÄ: ôÁÒÁÓ ëÏÒÅÎËÏ -->
 <article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">

Modified: head/ru_RU.KOI8-R/articles/hubs/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/hubs/article.xml	Mon May 11 12:51:56 2015	(r46679)
+++ head/ru_RU.KOI8-R/articles/hubs/article.xml	Tue May 12 08:03:23 2015	(r46680)
@@ -6,7 +6,7 @@
 
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/hubs/article.xml,v 1.21 2007/05/15 18:39:34 gad Exp $
 
-     Original revision: r43184
+     Original revision: r46284
 -->
 <article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
   <info><title>ðÏÄÄÅÒÖËÁ ÚÅÒËÁÌ FreeBSD</title>
@@ -34,7 +34,6 @@
 
     <legalnotice xml:id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
-      &tm-attrib.cvsup;
       &tm-attrib.general;
     </legalnotice>
 
@@ -71,7 +70,7 @@
 	÷ ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÎÁÂÏÒÁ ÒÅÌÉÚÏ×, ÁÒÈÉÔÅËÔÕÒ É ÓÔÅÐÅÎÉ ÐÏÌÎÏÔÙ ÚÅÒËÁÌÁ
 	×ÁÍ ÍÏÖÅÔ ÐÏÔÒÅÂÏ×ÁÔØÓÑ ÏÇÒÏÍÎÙÊ ÏÂßÅÍ ÄÉÓËÁ.  îÅ ÌÉÛÎÉÍ ÂÕÄÅÔ
 	ÐÏÍÎÉÔØ, ÞÔÏ <emphasis>ÏÆÉÃÉÁÌØÎÏÅ</emphasis> ÚÅÒËÁÌÏ, ÓËÏÒÅÅ ×ÓÅÇÏ,
-	ÄÏÌÖÎÏ ÂÙÔØ ÐÏÌÎÙÍ.  òÅÐÏÚÉÔÏÒÉÊ CVS É ×ÅÂ-ÓÔÒÁÎÉÃÙ ×ÓÅÇÄÁ ÄÏÌÖÎÙ
+	ÄÏÌÖÎÏ ÂÙÔØ ÐÏÌÎÙÍ.  ÷ÅÂ-ÓÔÒÁÎÉÃÙ ×ÓÅÇÄÁ ÄÏÌÖÎÙ
 	ÚÅÒËÁÌÉÒÏ×ÁÔØÓÑ ÐÏÌÎÏÓÔØÀ.  ëÒÏÍÅ ÔÏÇÏ, ÕÞÔÉÔÅ, ÞÔÏ ÐÒÉ×ÏÄÉÍÙÅ ÏÃÅÎËÉ
 	ÏÂßÅÍÁ ÏÔÎÏÓÑÔÓÑ Ë ÓÏÓÔÏÑÎÉÀ ÎÁ ÍÏÍÅÎÔ ÐÏÓÌÅÄÎÅÇÏ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ
 	ÄÁÎÎÏÊ ÓÔÁÔØÉ (&rel2.current;-RELEASE/&rel.current;-RELEASE).
@@ -82,19 +81,15 @@
 
       <itemizedlist>
 	<listitem>
-	  <para>ðÏÌÎÏÅ ÚÅÒËÁÌÏ FTP: 1.0 TB</para>
+	  <para>ðÏÌÎÏÅ ÚÅÒËÁÌÏ FTP: 1.4 TB</para>
 	</listitem>
 
 	<listitem>
-	  <para>òÅÐÏÚÉÔÏÒÉÊ CVS: 5.4 GB</para>
+	  <para>ëÏÍÐÌÅËÔ ÉÚÍÅÎÅÎÉÊ CTM: 10 GB</para>
 	</listitem>
 
 	<listitem>
-	  <para>ëÏÍÐÌÅËÔ ÉÚÍÅÎÅÎÉÊ CTM: 3.2 GB</para>
-	</listitem>
-
-	<listitem>
-	  <para>÷ÅÂ-ÓÔÒÁÎÉÃÙ: 463 MB</para>
+	  <para>÷ÅÂ-ÓÔÒÁÎÉÃÙ: 1 GB</para>
 	</listitem>
       </itemizedlist>
 
@@ -148,7 +143,7 @@
 	÷ÏÔ ÎÅËÏÔÏÒÙÅ ÓÏ×ÅÔÙ ÐÏ ËÏÎÆÉÇÕÒÁÃÉÉ ÁÐÐÁÒÁÔÎÏÊ ÞÁÓÔÉ ÓÅÒ×ÅÒÁ:</para>
 
       <para>äÌÑ ÕÍÅÒÅÎÎÏ ÐÏÓÅÝÁÅÍÏÇÏ ÓÁÊÔÁ, ÐÒÅÄÏÓÔÁ×ÌÑÀÝÅÇÏ
-	<application>Rsync</application>, ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÒÏÃÅÓÓÏÒ
+	<application>rsync</application>, ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÒÏÃÅÓÓÏÒ
 	Ó ÞÁÓÔÏÔÏÊ 800MHz - 1 GHz É ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ 512MB ÐÁÍÑÔÉ.
 	óËÏÒÅÅ ×ÓÅÇÏ, ÄÁÎÎÁÑ ËÏÎÆÉÇÕÒÁÃÉÑ ÍÏÖÅÔ ÓÞÉÔÁÔØÓÑ ÍÉÎÉÍÁÌØÎÏÊ ÄÌÑ
 	<emphasis>ÏÆÉÃÉÁÌØÎÏÇÏ</emphasis> ÚÅÒËÁÌÁ.</para>
@@ -158,7 +153,7 @@
 	ÏÚÎÁÞÁÔØ ÔÒÅÂÏ×ÁÎÉÅ ÍÎÏÇÏÐÒÏÃÅÓÓÏÒÎÏÊ (SMP) ÐÌÁÔÆÏÒÍÙ.</para>
 
       <para>ëÒÏÍÅ ÔÏÇÏ, ×ÁÍ ÐÏÔÒÅÂÕÅÔÓÑ ÂÙÓÔÒÁÑ ÄÉÓËÏ×ÁÑ ÐÏÄÓÉÓÔÅÍÁ, × ÐÅÒ×ÕÀ
-	ÏÞÅÒÅÄØ, ÄÌÑ ÒÁÂÏÔÙ Ó ÒÅÐÏÚÉÔÏÒÉÅÍ CVS (ËÒÁÊÎÅ ÒÅËÏÍÅÎÄÕÅÍ RAID).
+	ÏÞÅÒÅÄØ, ÄÌÑ ÒÁÂÏÔÙ Ó ÒÅÐÏÚÉÔÏÒÉÅÍ SVN (ËÒÁÊÎÅ ÒÅËÏÍÅÎÄÕÅÍ RAID).
 	ëÏÎÔÒÏÌÌÅÒ SCSI, ÏÂÏÒÕÄÏ×ÁÎÎÙÊ ÓÏÂÓÔ×ÅÎÎÏÊ ÐÁÍÑÔØÀ, ÔÁËÖÅ ÍÏÖÅÔ
 	ÏÝÕÔÉÍÏ ÕÓËÏÒÉÔØ ÐÒÏÃÅÓÓ, ÐÏÓËÏÌØËÕ ÂÏÌØÛÁÑ ÞÁÓÔØ ÓÅÒ×ÉÓÏ× Ó×ÑÚÁÎÁ
 	Ó ÂÏÌØÛÉÍ ËÏÌÉÞÅÓÔ×ÏÍ ÄÉÓËÏ×ÙÈ ÚÁÐÒÏÓÏ× ÎÅÂÏÌØÛÏÇÏ ÒÁÚÍÅÒÁ.</para>
@@ -226,20 +221,10 @@
 	      <quote>ÏÞÅÎØ ÚÁÝÉÝÅÎÎÙÊ</quote> (<quote>very secure</quote>)
 	      ftpd.</para>
 	  </listitem>
-
-	  <listitem>
-	    <para><package>ftp/wu-ftpd</package>:
-	      ftpd ÏÔ ÷ÁÛÉÎÇÔÏÎÓËÏÇÏ õÎÉ×ÅÒÓÉÔÅÔÁ (Washington
-	      University).  îÅÓËÏÌØËÏ ÐÏÔÅÒÑÌ ÐÏÐÕÌÑÒÎÏÓÔØ ÉÚ-ÚÁ ÂÏÌØÛÏÇÏ
-	      ËÏÌÉÞÅÓÔ×Á ÎÁÊÄÅÎÎÙÈ × ÐÒÏÛÌÏÍ ÏÛÉÂÏË ÚÁÝÉÔÙ.  åÓÌÉ ×Ù ÒÅÛÉÔÅ
-	      ÉÓÐÏÌØÚÏ×ÁÔØ ÅÇÏ, ÐÏÍÎÉÔÅ Ï ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÏÔÓÌÅÖÉ×ÁÎÉÑ
-	      ÏÂÎÏ×ÌÅÎÉÊ.</para>
-	  </listitem>
 	</itemizedlist>
 
 	<para><application>ftpd</application>,
-	  <application>proftpd</application>,
-	  <application>wu-ftpd</application> É, ×ÏÚÍÏÖÎÏ,
+	  <application>proftpd</application> É, ×ÏÚÍÏÖÎÏ,
 	  <application>ncftpd</application> Ñ×ÌÑÀÔÓÑ ÎÁÉÂÏÌÅÅ ÞÁÓÔÏ
 	  ×ÓÔÒÅÞÁÀÝÉÍÉÓÑ FTP ÓÅÒ×ÅÒÁÍÉ.
 	  ðÒÏÞÉÅ ÒÁÓÐÒÏÓÔÒÁÎÅÎÙ ÓÒÅÄÉ ÓÕÝÅÓÔ×ÕÀÝÉÈ ÚÅÒËÁÌ × ÓÕÝÅÓÔ×ÅÎÎÏ
@@ -316,114 +301,22 @@
 	      ÄÏËÕÍÅÎÔÁ, ×ÐÒÏÞÅÍ, ÏÎ ÎÅ ÔÁË ÈÏÒÏÛÏ ÏÐÔÉÍÉÚÉÒÏ×ÁÎ ÐÏÄ
 	      FreeBSD, ËÁË <application>thttpd</application>.</para>
 	  </listitem>
-	</itemizedlist>
-      </sect3>
-
-      <sect3 xml:id="mirror-serv-cvsup">
-	<title>CVSup (ÖÅÌÁÔÅÌÅÎ ÄÌÑ ÚÅÒËÁÌ ÒÅÐÏÚÉÔÏÒÉÑ CVS)</title>
-
-	<para><application>CVSup</application> ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÏÞÅÎØ ÜÆÆÅËÔÉ×ÎÙÊ
-	  ÍÅÈÁÎÉÚÍ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÆÁÊÌÏ×.  ïÎ ÒÁÂÏÔÁÅÔ ÐÏÄÏÂÎÏ
-	  <application>rsync</application> É ÂÙÌ ÒÁÚÒÁÂÏÔÁÎ ÓÐÅÃÉÁÌØÎÏ ÄÌÑ
-	  ÉÓÐÏÌØÚÏ×ÁÎÉÑ Ó ÒÅÐÏÚÉÔÏÒÉÑÍÉ CVS.  åÓÌÉ ×Ù ÐÌÁÎÉÒÕÅÔÅ ÐÒÅÄÏÓÔÁ×ÌÑÔØ
-	  ÄÏÓÔÕÐ Ë ÒÅÐÏÚÉÔÏÒÉÀ CVS FreeBSD, ÓÔÏÉÔ ÄÅÌÁÔØ ÜÔÏ ÐÏÓÒÅÄÓÔ×ÏÍ
-	  <application>CVSup</application>.  ðÏÍÉÍÏ ÜÔÏÇÏ, ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ
-	  <application>AnonCVS</application>, FTP,
-	  <application>rsync</application> ÉÌÉ HTTP, ÎÏ ÉÓÐÏÌØÚÏ×ÁÎÉÅ
-	  <application>CVSup</application> ÎÁÉÂÏÌÅÅ ÒÁÚÕÍÎÏ.
-	  á×ÔÏÒÏÍ <application>CVSup</application> Ñ×ÌÑÅÔÓÑ &a.jdp.email;.
-	  <application>CVSup</application> ÎÅÐÒÏÓÔÏ ÕÓÔÁÎÏ×ÉÔØ ÎÁ ÐÌÁÔÆÏÒÍÅ,
-	  ÏÔÌÉÞÎÏÊ ÏÔ FreeBSD, ÐÏÓËÏÌØËÕ ÏÎ ÎÁÐÉÓÁÎ ÎÁ ÑÚÙËÅ Modula-3 É ÔÒÅÂÕÅÔ
-	  ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÏËÒÕÖÅÎÉÑ.  &a.jdp; ÓÏÚÄÁÌ ÕÓÅÞÅÎÎÕÀ ×ÅÒÓÉÀ M3,
-	  ÄÏÓÔÁÔÏÞÎÕÀ ÄÌÑ ÒÁÂÏÔÙ <application>CVSup</application>, ËÏÔÏÒÕÀ
-	  ÎÁÍÎÏÇÏ ÐÒÏÝÅ ÕÓÔÁÎÏ×ÉÔØ.  ðÏÄÒÏÂÎÏÓÔÉ ÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÚÄÅÓØ: <link xlink:href="http://www.polstra.com/projects/freeware/ezm3/">Ezm3</link>.
-	  ïÔÎÏÓÑÝÉÅÓÑ Ë ÔÅÍÅ ÐÁËÅÔÙ:</para>
 
-	<itemizedlist>
 	  <listitem>
-	    <para><package>net/cvsup</package>:
-	      ðÏÒÔ CVSup (ËÌÉÅÎÔ É ÓÅÒ×ÅÒ), ÔÒÅÂÕÀÝÉÊ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔ
-	      <package>lang/ezm3</package>.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para><package>net/cvsup-mirror</package>:
-	      îÁÂÏÒ ÄÌÑ CVSup-ÚÅÒËÁÌÁ, ÔÒÅÂÕÀÝÉÊ
-	      <package>net/cvsup-without-gui</package>,
-	      É ËÏÎÆÉÇÕÒÉÒÕÀÝÉÊ ÅÇÏ × ÐÒÏÃÅÓÓÅ ÕÓÔÁÎÏ×ËÉ.  ÷ÏÚÍÏÖÎÏ, ÎÅËÏÔÏÒÙÍ
-	      ÁÄÍÉÎÉÓÔÒÁÔÏÒÁÍ ÐÏÔÒÅÂÕÅÔÓÑ ÄÒÕÇÏÊ ÎÁÂÏÒ ÕÓÔÁÎÏ×ÏË.</para>
+	    <para><package>www/nginx</package>:
+	      <application>Nginx</application> —
+	      ×ÙÓÏËÏÐÒÏÉÚ×ÏÄÉÔÅÌØÎÙÊ ×ÅÂ-ÓÅÒ×ÅÒ, ÏÔÌÉÞÁÀÝÉÊÓÑ ÎÉÚËÉÍÉ
+	      ÔÒÅÂÏ×ÁÎÉÑÍÉ Ë ÏÂßÅÍÕ ÏÐÅÒÁÔÉ×ÎÏÊ ÐÁÍÑÔÉ É ÏÂÌÁÄÁÀÝÉÊ
+	      ËÌÀÞÅ×ÙÍÉ ÆÕÎËÃÉÏÎÁÌØÎÙÍÉ ×ÏÚÍÏÖÎÏÓÔÑÍÉ ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ
+	      ÓÏ×ÒÅÍÅÎÎÏÊ ×ÅÂ-ÉÎÆÒÁÓÔÒÕËÔÕÒÙ.  æÕÎËÃÉÏÎÁÌØÎÙÅ
+	      ×ÏÚÍÏÖÎÏÓÔÉ ×ËÌÀÞÁÀÔ ÓÌÅÄÕÀÝÅÅ: HTTP-ÓÅÒ×ÅÒ, ÏÂÒÁÔÎÙÊ
+	      ÐÒÏËÓÉ ÄÌÑ HTTP, ÐÏÞÔÏ×ÙÊ ÐÒÏËÓÉ ÓÅÒ×ÅÒ, ËÅÛÉÒÏ×ÁÎÉÅ,
+	      ÂÁÌÁÎÓÉÒÏ×ËÁ ÎÁÇÒÕÚËÉ, ÓÖÁÔÉÅ, ÏÇÒÁÎÉÞÅÎÉÅ ËÏÌÉÞÅÓÔ×Á
+	      ÚÁÐÒÏÓÏ×, ÍÕÌØÔÉÐÌÅËÓÉÒÏ×ÁÎÉÅ É ÐÏ×ÔÏÒÎÏÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ
+	      ÓÏÅÄÉÎÅÎÉÊ, ÐÏÄÄÅÒÖËÁ ÒÁÚÇÒÕÚËÉ SSL (SSL offload) É
+	      ×ÅÝÁÎÉÑ ÍÅÄÉÁÐÏÔÏËÏ× (media streaming).</para>
 	  </listitem>
 	</itemizedlist>
-
-	<para>íÏÖÅÔ ÔÁËÖÅ ÏËÁÚÁÔØÓÑ ÐÏÌÅÚÎÙÍ ÐÁËÅÔ
-	  <package>net/cvsup-without-gui</package>.
-	  åÓÌÉ ×Ù ÐÒÅÄÐÏÞÉÔÁÅÔÅ ÐÁËÅÔ, ÓÏÂÒÁÎÎÙÊ ÓÔÁÔÉÞÅÓËÉ, ÚÁÇÌÑÎÉÔÅ ÐÏ
-	  <link xlink:href="http://people.FreeBSD.org/~jdp/s1g/">ÜÔÏÊ</link>
-	  ÓÓÙÌËÅ.  üÔÁ ÓÔÒÁÎÉÃÁ ×ÓÅ ÅÝÅ ÏÐÉÓÙ×ÁÅÔ ÏÛÉÂËÕ S1G.  ÷ÏÚÍÏÖÎÏ,
-	  × ÂÕÄÕÝÅÍ äÖÏÎ ÓÏÚÄÁÓÔ ÕÎÉ×ÅÒÓÁÌØÎÙÊ ÓÁÊÔ ÄÌÑ ÚÁÇÒÕÚËÉ ÓÔÁÔÉÞÅÓËÉ
-	  ÓÏÂÒÁÎÎÙÈ ×ÁÒÉÁÎÔÏ× CVSup ÄÌÑ ÒÁÚÌÉÞÎÙÈ ÐÌÁÔÆÏÒÍ.</para>
-
-	<para>ðÒÉ ÐÏÍÏÝÉ <application>CVSup</application> ÍÏÖÎÏ ÒÁÓÐÒÏÓÔÒÁÎÑÔØ
-	  ÌÀÂÙÅ ËÏÌÌÅËÃÉÉ ÆÁÊÌÏ× (ÎÅ ÔÏÌØËÏ ÒÅÐÏÚÉÔÏÒÉÉ CVS), ÏÄÎÁËÏ ÅÇÏ
-	  ËÏÎÆÉÇÕÒÁÃÉÑ ÍÏÖÅÔ ÂÙÔØ ÎÅÐÒÏÓÔÏÊ.  éÚ×ÅÓÔÎÏ, ÞÔÏ
-	  <application>CVSup</application> ÐÏÔÒÅÂÌÑÅÔ ÏÝÕÔÉÍÏÅ ËÏÌÉÞÅÓÔ×Ï
-	  ÐÒÏÃÅÓÓÏÒÎÏÇÏ ×ÒÅÍÅÎÉ ËÁË ÎÁ ÓÅÒ×ÅÒÅ, ÔÁË É ÎÁ ËÌÉÅÎÔÅ, ÐÏÓËÏÌØËÕ
-	  ÓÒÁ×ÎÉ×ÁÅÔ ÂÏÌØÛÏÅ ËÏÌÉÞÅÓÔ×Ï ÆÁÊÌÏ×.</para>
-      </sect3>
-
-      <sect3 xml:id="mirror-anoncvs">
-	<title>AnonCVS (ÄÏÐÏÌÎÉÔÅÌÅÎ ÄÌÑ ÚÅÒËÁÌ ÒÅÐÏÚÉÔÏÒÉÑ CVS)</title>
-
-	<para>åÓÌÉ ×Ù ËÏÐÉÒÕÅÔÅ ÒÅÐÏÚÉÔÏÒÉÊ CVS, ÍÏÖÎÏ ÄÏÐÏÌÎÉÔÅÌØÎÏ
-	  ÐÒÅÄÏÓÔÁ×ÉÔØ Ë ÎÅÍÕ ÁÎÏÎÉÍÎÙÊ ÄÏÓÔÕÐ.  äÌÑ ÎÁÞÁÌÁ, ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ:
-	  ÓÐÒÏÓ ÎÁ ÜÔÏÔ ÓÅÒ×ÉÓ ÎÅ ÔÁË ÕÖ ×ÅÌÉË, ÐÏÄÇÏÔÏ×ËÁ ÅÇÏ ÔÒÅÂÕÅÔ
-	  ÎÅËÏÔÏÒÏÇÏ ÏÐÙÔÁ, É, ÎÁËÏÎÅÃ, ×Ù ÄÏÌÖÎÙ ÚÎÁÔØ, ÞÔÏ ÄÅÌÁÅÔÅ.</para>
-
-	<para>óÕÝÅÓÔ×ÕÅÔ Ä×Á ÏÓÎÏ×ÎÙÈ ÓÐÏÓÏÂÁ ÕÄÁÌÅÎÎÏÇÏ ÄÏÓÔÕÐÁ Ë ÒÅÐÏÚÉÔÏÒÉÀ
-	  CVS: ÞÅÒÅÚ <emphasis>pserver</emphasis> É ÞÅÒÅÚ
-	  <command>ssh</command> (ÄÏÓÔÕÐ ÞÅÒÅÚ <command>rsh</command> ÍÙ
-	  ÒÁÓÓÍÁÔÒÉ×ÁÔØ ÎÅ ÂÕÄÅÍ).  äÌÑ ÁÎÏÎÉÍÎÏÇÏ ÄÏÓÔÕÐÁ ÎÁÉÂÏÌÅÅ ÐÏÄÈÏÄÉÔ
-	  <emphasis>pserver</emphasis>; ×ÐÒÏÞÅÍ, ÎÅËÏÔÏÒÙÅ ÓÁÊÔÙ ÄÁÀÔ ÄÏÓÔÕÐ
-	  É ÐÏÓÒÅÄÓÔ×ÏÍ <command>ssh</command>.  äÌÑ ÐÏÓÌÅÄÎÅÇÏ ÂÕÄÅÔ ÐÏÌÅÚÎÏÊ
-	  ÓÐÅÃÉÁÌØÎÁÑ
-	  <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/FreeBSD-CVS/anoncvs.shar">ÐÒÏÇÒÁÍÍÁ</link>,
-	  ÐÒÅÄÎÁÚÎÁÞÅÎÎÁÑ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ × ËÁÞÅÓÔ×Å ÛÅÌÌÁ ÄÌÑ ÕÞÅÔÎÏÊ
-	  ÚÁÐÉÓÉ ÁÎÏÎÉÍÎÏÇÏ ssh-ÄÏÓÔÕÐÁ.  ïÎÁ ÉÓÐÏÌØÚÕÅÔ ×ÙÚÏ× chroot,
-	  ÐÏÜÔÏÍÕ ÒÅÐÏÚÉÔÏÒÉÊ CVS ÄÏÌÖÅÎ ÒÁÓÐÏÌÁÇÁÔØÓÑ ×ÎÕÔÒÉ ÄÏÍÁÛÎÅÇÏ
-	  ËÁÔÁÌÏÇÁ ÁÎÏÎÉÍÎÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ, ÞÔÏ ÐÒÉÅÍÌÅÍÏ ÎÅ ÄÌÑ ×ÓÅÈ
-	  ÓÁÊÔÏ×.  äÁÎÎÏÅ ÏÇÒÁÎÉÞÅÎÉÅ ÎÅ ÒÁÓÐÒÏÓÔÒÁÎÑÅÔÓÑ ÎÁ ÄÏÓÔÕÐ ÞÅÒÅÚ
-	  <emphasis>pserver</emphasis>, ÏÄÎÁËÏ ÐÏÓÌÅÄÎÉÊ ×ÁÒÉÁÎÔ ÍÏÖÅÔ ÂÙÔØ
-	  Ó×ÑÚÁÎ Ó ÄÏÐÏÌÎÉÔÅÌØÎÙÍ ÒÉÓËÏÍ Ó ÔÏÞËÉ ÚÒÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ.
-	  îÉËÁËÉÈ ÄÏÐÏÌÎÉÔÅÌØÎÙÈ ÐÒÏÇÒÁÍÍ ÄÌÑ ÏÂÅÓÐÅÞÅÎÉÑ ÁÎÏÎÉÍÎÏÇÏ
-	  CVS-ÄÏÓÔÕÐÁ ÎÅ ÐÏÔÒÅÂÕÅÔÓÑ, ÐÏÓËÏÌØËÕ &man.cvs.1; ×ÈÏÄÉÔ × ÂÁÚÏ×ÕÀ
-	  ÐÏÓÔÁ×ËÕ FreeBSD.  ÷ÁÍ ÎÕÖÎÏ ÂÕÄÅÔ ÒÁÚÒÅÛÉÔØ ÚÁÐÕÓË
-	  <command>cvs</command> ÉÚ <command>inetd</command>, ÄÌÑ ÞÅÇÏ
-	  ÎÅÏÂÈÏÄÉÍÏ ÄÏÂÁ×ÉÔØ × ÆÁÊÌ <filename>/etc/inetd.conf</filename>
-	  ÓÔÒÏËÕ ×ÉÄÁ</para>
-
-	<programlisting>cvspserver stream tcp nowait root /usr/bin/cvs cvs -f -l -R -T /anoncvstmp --allow-root=/home/ncvs pserver</programlisting>
-
-	<para>ïÂÒÁÔÉÔÅÓØ Ë ÓÔÒÁÎÉÃÅ ÓÐÒÁ×ÏÞÎÉËÁ &man.cvs.1; ÚÁ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ
-	  ÉÎÆÏÒÍÁÃÉÅÊ ÐÏ ÏÐÃÉÑÍ.  ëÒÏÍÅ ÔÏÇÏ, ÓÔÒÁÎÉÃÙ
-	  <emphasis>info</emphasis> ÐÏ CVS ÏÐÉÓÙ×ÁÀÔ, ËÁË ÕÄÏÓÔÏ×ÅÒÉÔØÓÑ × ÔÏÍ,
-	  ÞÔÏ ×Ù ÐÒÅÄÏÓÔÁ×ÌÑÅÔÅ ÄÏÓÔÕÐ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ.  òÅËÏÍÅÎÄÕÅÔÓÑ
-	  ÓÏÚÄÁÔØ ÎÅÐÒÉ×ÉÌÅÇÉÒÏ×ÁÎÎÕÀ ÕÞÅÔÎÕÀ ÚÁÐÉÓØ, ÖÅÌÁÔÅÌØÎÏ Ó ÉÍÅÎÅÍ
-	  <systemitem class="username">anoncvs</systemitem>.  ðÏÔÒÅÂÕÅÔÓÑ ÔÁËÖÅ ÓÏÚÄÁÔØ ÆÁÊÌ
-	  <filename>passwd</filename> × ËÁÔÁÌÏÇÅ
-	  <filename>/home/ncvs/CVSROOT</filename> É ÕÓÔÁÎÏ×ÉÔØ ÐÁÒÏÌØ (ÐÕÓÔÏÊ
-	  ÉÌÉ <literal>anoncvs</literal>) ÄÌÑ ÐÏÌØÚÏ×ÁÔÅÌÑ
-	  <systemitem class="username">anoncvs</systemitem>.  óÏÚÄÁÎÉÅ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ
-	  <filename>/anoncvstmp</filename> × ÐÁÍÑÔÉ ÎÅ ÎÅÏÂÈÏÄÉÍÏ, ÎÏ
-	  ÒÅËÏÍÅÎÄÕÅÔÓÑ ÄÌÑ ÕÓËÏÒÅÎÉÑ ÒÁÂÏÔÙ: × ÎÅÊ &man.cvs.1; ÂÕÄÅÔ ÓÏÚÄÁ×ÁÔØ
-	  ×ÒÅÍÅÎÎÕÀ ÓÔÒÕËÔÕÒÕ ËÁÔÁÌÏÇÏ×, ËÏÔÏÒÁÑ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ ÐÏ ÚÁ×ÅÒÛÅÎÉÉ
-	  ÏÐÅÒÁÃÉÉ, ÎÏ ÓÉÌØÎÏ ÚÁÍÅÄÌÑÅÔ ÒÁÂÏÔÕ, ÅÓÌÉ ÔÒÅÂÕÀÔÓÑ ÏÐÅÒÁÃÉÉ ÚÁÐÉÓÉ
-	  ÎÁ ÒÅÁÌØÎÙÊ ÄÉÓË.  ðÒÉÍÅÒ ÏÐÉÓÁÎÉÑ ÔÁËÏÊ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ × ÆÁÊÌÅ
-	  <filename>/etc/fstab</filename>:</para>
-
-	<programlisting>/dev/da0s1b /anoncvstmp mfs rw,-s=786432,-b=4096,-f=512,-i=560,-c=3,-m=0,nosuid 0 0</programlisting>
-
-	<para>üÔÉ ÕÓÔÁÎÏ×ËÉ (ÒÁÚÕÍÅÅÔÓÑ, ÔÝÁÔÅÌØÎÏ ÐÏÄÏÂÒÁÎÎÙÅ) ÐÒÅÄÌÏÖÉÌ
-	  &a.jdp.email;.</para>
       </sect3>
    </sect2>
   </sect1>
@@ -438,8 +331,8 @@
       ÉÓÐÏÌØÚÏ×ÁÔØ É ËÁËÉÅ ÓÁÊÔÙ ×ÙÂÉÒÁÔØ × ËÁÞÅÓÔ×Å ÉÓÔÏÞÎÉËÏ× ÄÌÑ
       ÓÉÎÈÒÏÎÉÚÁÃÉÉ.</para>
 
-    <sect2 xml:id="mirror-ftp">
-      <title>FTP</title>
+    <sect2 xml:id="mirror-ftp-rsync">
+      <title>úÅÒËÁÌÉÒÏ×ÁÎÉÅ FTP-ÏÂÌÁÓÔÉ</title>
 
       <para>æÁÊÌÙ, ÄÏÓÔÕÐÎÙÅ ÐÏ FTP, ÓÏÓÔÁ×ÌÑÀÔ ÂÏÌØÛÕÀ ÞÁÓÔØ ÚÅÒËÁÌÁ.
 	ïÎÉ ×ËÌÀÞÁÀÔ <emphasis>ÄÉÓÔÒÉÂÕÔÉ×ÎÙÅ ÎÁÂÏÒÙ</emphasis>, ÎÅÏÂÈÏÄÉÍÙÅ
@@ -452,58 +345,7 @@
 	×ÙÛÅÏÐÉÓÁÎÎÏÅ — ÄÌÑ ÒÁÚÎÙÈ ×ÅÒÓÉÊ FreeBSD É ÒÁÚÌÉÞÎÙÈ
 	ÁÒÈÉÔÅËÔÕÒ.</para>
 
-      <sect3 xml:id="mirror-ftp-ftp">
-	<title>ðÒÉ ÐÏÍÏÝÉ ÐÒÏÇÒÁÍÍ ÄÌÑ FTP-ÚÅÒËÁÌÉÒÏ×ÁÎÉÑ</title>
-
-	<para>
-	  äÌÑ ×ÙËÁÞÉ×ÁÎÉÑ ÆÁÊÌÏ× ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÒÏÇÒÁÍÍÕ
-	  <application>FTP-ÚÅÒËÁÌÉÒÏ×ÁÎÉÑ</application>.
-	  ÷ÏÔ ÎÅËÏÔÏÒÙÅ ÉÚ ÎÁÉÂÏÌÅÅ ÞÁÓÔÏ ÉÓÐÏÌØÚÕÀÝÉÈÓÑ:</para>
-
-	<itemizedlist>
-	  <listitem>
-	    <para><package>ftp/mirror</package></para>
-	  </listitem>
-
-	  <listitem>
-	    <para><package>ftp/ftpmirror</package></para>
-	  </listitem>
-
-	  <listitem>
-	    <para><package>ftp/emirror</package></para>
-	  </listitem>
-
-	  <listitem>
-	    <para><package>ftp/spegla</package></para>
-	  </listitem>
-
-	  <listitem>
-	    <para><package>ftp/omi</package></para>
-	  </listitem>
-
-	  <listitem>
-	    <para><package>ftp/wget</package></para>
-	  </listitem>
-	</itemizedlist>
-
-	<para>òÁÎÅÅ ÎÁÉÂÏÌÅÅ ÐÏÐÕÌÑÒÎÙÍ ×ÁÒÉÁÎÔÏÍ ÂÙÌ
-	  <package>ftp/mirror</package>, ÈÏÔÑ ÉÚ-ÚÁ ÔÏÇÏ, ÞÔÏ
-	  ÜÔÁ ÐÒÏÇÒÁÍÍÁ ÎÁÐÉÓÁÎÁ ÎÁ &man.perl.1;, ÓÕÝÅÓÔ×ÕÀÔ ÒÁÚÌÉÞÎÙÅ
-	  ÏÇÒÁÎÉÞÅÎÉÑ, × ÏÓÏÂÅÎÎÏÓÔÉ ÐÒÉ ÚÅÒËÁÌÉÒÏ×ÁÎÉÉ ÂÏÌØÛÉÈ ÆÁÊÌÏ×ÙÈ
-	  ÓÔÒÕËÔÕÒ, ÔÁËÉÈ ËÁË FreeBSD.  õÔ×ÅÒÖÄÁÅÔÓÑ, ×ÐÒÏÞÅÍ, ÞÔÏ × ÔÅËÕÝÅÊ
-	  ×ÅÒÓÉÉ ÐÏÓÌÅÄÎÑÑ ÐÒÏÂÌÅÍÁ ÉÓÐÒÁ×ÌÅÎÁ ÚÁ ÓÞÅÔ ÄÏÐÏÌÎÉÔÅÌØÎÏÇÏ
-	  ÁÌÇÏÒÉÔÍÁ ÓÒÁ×ÎÅÎÉÑ ÓÔÒÕËÔÕÒÙ ËÁÔÁÌÏÇÏ×.</para>
-
-	<para>÷ÏÏÂÝÅ ÇÏ×ÏÒÑ, ÐÒÏÔÏËÏÌ FTP ÎÅ ÌÕÞÛÉÍ ÏÂÒÁÚÏÍ ÐÏÄÈÏÄÉÔ ÄÌÑ
-	  ÐÏÄÄÅÒÖËÉ ÚÅÒËÁÌÁ.  éÚÍÅÎÅÎÎÙÊ ÆÁÊÌ ÐÅÒÅÄÁÅÔÓÑ ÃÅÌÉËÏÍ; ËÒÏÍÅ ÔÏÇÏ,
-	  ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÎÉÅ ÅÄÉÎÏÇÏ ÐÏÔÏËÁ ÄÁÎÎÙÈ, ËÏÔÏÒÙÊ ÍÏÇ ÂÙ ÐÏ×ÙÓÉÔØ
-	  ÜÆÆÅËÔÉ×ÎÏÓÔØ ÐÅÒÅÄÁÞÉ ÚÁ ÓÞÅÔ ÂÏÌØÛÏÇÏ TCP-ÏËÎÁ.</para>
-      </sect3>
-
-      <sect3 xml:id="mirror-ftp-rsync">
-	<title>ðÒÉ ÐÏÍÏÝÉ rsync</title>
-
-	<para>âÏÌÅÅ ÜÆÆÅËÔÉ×ÎÙÍ ÂÕÄÅÔ ÓÉÎÈÒÏÎÉÚÁÃÉÑ FTP-ÏÂÌÁÓÔÉ ÐÒÉ ÐÏÍÏÝÉ
+      <para>îÁÉÂÏÌÅÅ ÜÆÆÅËÔÉ×ÎÙÍ ÂÕÄÅÔ ÓÉÎÈÒÏÎÉÚÁÃÉÑ FTP-ÏÂÌÁÓÔÉ ÐÒÉ ÐÏÍÏÝÉ
 	  <application>rsync</application>.  äÌÑ ÜÔÏÇÏ ÓÌÅÄÕÅÔ ÕÓÔÁÎÏ×ÉÔØ
 	  ÐÁËÅÔ <package>net/rsync</package>, ËÏÔÏÒÙÊ ÂÙÌ
 	  ÏÐÉÓÁÎ × ÒÁÚÄÅÌÅ <xref linkend="mirror-serv-rsync"/>.
@@ -526,7 +368,7 @@
 	<para>óÔÒÏËÁ ÄÌÑ ÓÉÎÈÒÏÎÉÚÁÃÉÉ FreeBSD ÐÏ rsync ×ÙÇÌÑÄÉÔ ÐÒÉÍÅÒÎÏ
 	  ÔÁË:</para>
 
-	<screen>&prompt.user; <userinput>rsync -vaz --delete ftp4.de.FreeBSD.org::FreeBSD/ /pub/FreeBSD/</userinput></screen>
+	<screen>&prompt.user; <userinput>rsync -vaHz --delete rsync://ftp4.de.FreeBSD.org/FreeBSD/ /pub/FreeBSD/</userinput></screen>
 
 	<para>úÁÇÌÑÎÉÔÅ × ÄÏËÕÍÅÎÔÁÃÉÀ ÐÏ <application>rsync</application>,
 	  ÔÁËÖÅ ÄÏÓÔÕÐÎÕÀ ÐÏ ÁÄÒÅÓÕ
@@ -537,203 +379,18 @@
 	  ÐÏÔÏÍÕ ÞÔÏ ËÁÔÁÌÏÇ Ó ÉÍÅÎÅÍ ÍÏÄÕÌÑ (× ÄÁÎÎÏÍ ÓÌÕÞÁÅ "FreeBSD")
 	  ÎÅ ÓÏÚÄÁÅÔÓÑ.  äÌÑ ÐÏÄÄÅÒÖÁÎÉÑ ÁËÔÕÁÌØÎÏÓÔÉ ×ÁÍ ÐÏÔÒÅÂÕÅÔÓÑ
 	  ÓÏÚÄÁÔØ ÓËÒÉÐÔ ÄÌÑ ÚÁÐÕÓËÁ ÐÏÄÏÂÎÏÊ ËÏÍÁÎÄÙ ÉÚ &man.cron.8;.</para>
-      </sect3>
-
-      <sect3 xml:id="mirror-ftp-cvsup">
-	<title>ðÒÉ ÐÏÍÏÝÉ CVSup</title>
-
-	<para>îÅÍÎÏÇÉÅ ÓÁÊÔÙ, × ÐÅÒ×ÕÀ ÏÞÅÒÅÄØ ÃÅÎÔÒÁÌØÎÙÊ
-	  <systemitem class="fqdomainname">ftp-master.FreeBSD.org</systemitem> ÐÒÅÄÏÓÔÁ×ÌÑÀÔ
-	  ÄÌÑ ÓÉÎÈÒÏÎÉÚÁÃÉÉ FTP-ÏÂÌÁÓÔÉ ÄÏÓÔÕÐ ÐÏ ÐÒÏÔÏËÏÌÕ
-	  <application>CVSup</application>.  ÷ÁÍ ÐÏÔÒÅÂÕÅÔÓÑ ËÌÉÅÎÔ
-	  <application>CVSup</application>, ÐÒÅÄÐÏÞÔÉÔÅÌØÎÏ ÉÚ ÐÁËÅÔÁ
-	  <package>net/cvsup</package> (ÓÍ. ÔÁËÖÅ
-	  <xref linkend="mirror-serv-cvsup"/>).
-	  ðÒÉÍÅÒ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÇÏ ÆÁÊÌÁ (<filename>supfile</filename>) ÄÌÑ
-	  ÓÉÎÈÒÏÎÉÚÁÃÉÉ Ó
-	  <systemitem class="fqdomainname">ftp-master.FreeBSD.org</systemitem>:</para>
-
-	<programlisting>#
-# FreeBSD archive supfile from master server
-#
-*default host=ftp-master.FreeBSD.org
-*default base=/usr
-*default prefix=/pub
-#*default release=all
-*default delete use-rel-suffix
-*default umask=002
-
-# If your network link is a T1 or faster, comment out the following line.
-#*default compress
-
-FreeBSD-archive release=all preserve</programlisting>
-
-	<para>óÕÄÑ ÐÏ ×ÓÅÍÕ, ÓÉÎÈÒÏÎÉÚÁÃÉÑ ÐÒÉ ÐÏÍÏÝÉ
-	  <application>CVSup</application> — ÌÕÞÛÉÊ ÐÏ ÜÆÆÅËÔÉ×ÎÏÓÔÉ
-	  ÓÐÏÓÏÂ ÐÏÄÄÅÒÖËÉ ÚÅÒËÁÌÁ, ÏÄÎÁËÏ ÏÎ ÄÏÓÔÕÐÅÎ ÌÉÛØ Ó ÎÅÂÏÌØÛÏÇÏ ÞÉÓÌÁ
-	  ÓÁÊÔÏ×.</para>
-
-	<note xml:id="mirror-cvsup-s-option">
-	  <para>ðÒÏÞÔÉÔÅ ÄÏËÕÍÅÎÔÁÃÉÀ ÐÏ <application>CVSup</application>,
-	    ÎÁÐÒÉÍÅÒ, &man.cvsup.1;, É ÏÂÒÁÔÉÔÅ ×ÎÉÍÁÎÉÅ ÎÁ ÏÐÃÉÀ
-	    <option>-s</option>.  ïÎÁ ÍÏÖÅÔ ÕÍÅÎØÛÉÔØ ÏÂßÅÍ ÏÐÅÒÁÃÉÊ
-	    ××ÏÄÁ-×Ù×ÏÄÁ, ÐÒÅÄÐÏÌÁÇÁÑ, ÞÔÏ ÚÁÐÉÓÁÎÎÁÑ ÉÎÆÏÒÍÁÃÉÑ Ï
-	    ËÁÖÄÏÍ ÆÁÊÌÅ ËÏÒÒÅËÔÎÁ.</para>
-	</note>
-      </sect3>
-    </sect2>
-
-    <sect2 xml:id="mirror-cvs">
-      <title>úÅÒËÁÌÉÒÏ×ÁÎÉÅ CVS ÒÅÐÏÚÉÔÏÒÉÑ</title>
-
-      <para>óÕÝÅÓÔ×ÕÅÔ ÎÅÓËÏÌØËÏ ÓÐÏÓÏÂÏ× ÓÉÎÈÒÏÎÉÚÁÃÉÉ
-	CVS ÒÅÐÏÚÉÔÏÒÉÑ.  <application>CVSup</application> ÎÁÉÂÏÌÅÅ
-	ÏÂÝÉÊ ÍÅÔÏÄ.</para>
-
-      <sect3 xml:id="mirror-cvs-cvsup">
-	<title>éÓÐÏÌØÚÏ×ÁÎÉÅ CVSup</title>
-
-	<para>ðÒÏÇÒÁÍÍÁ <application>CVSup</application> ÎÅÍÎÏÇÏ ÏÐÉÓÁÎÁ
-	  × (<xref linkend="mirror-serv-cvsup"/> É
-	  <xref linkend="mirror-ftp-cvsup"/>).</para>
-
-	<para>îÁÓÔÒÏÉÔØ <application>CVSup</application> ÚÅÒËÁÌÏ ÏÞÅÎØ ÐÒÏÓÔÏ.
-	  õÓÔÁÎÏ×ËÁ <package>net/cvsup-mirror</package>
-	  ÐÒÏ×ÅÒÉÔ, ÞÔÏ ×ÓÅ ÎÕÖÎÙÅ ÐÒÏÇÒÁÍÍÙ ÕÓÔÁÎÏ×ÌÅÎÙ É ÚÁÔÅÍ ÓÏÂÅÒÅÔ ×ÓÀ
-	  ÎÅÏÂÈÏÄÉÍÕÀ ÉÎÆÏÒÍÁÃÉÀ ÄÌÑ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÑ ÚÅÒËÁÌÁ.</para>
-
-	<note>
-	  <para>îÅ ÚÁÂÕÄØÔÅ ÐÏÞÉÔÁÔØ ÐÏÌÅÚÎÕÀ ÐÏÄÓËÁÚËÕ
-	    <link linkend="mirror-cvsup-s-option">ÚÄÅÓØ</link>.</para>
-	</note>
-      </sect3>
-
-      <sect3 xml:id="mirror-cvs-other">
-	<title>äÒÕÇÉÅ ÍÅÔÏÄÙ</title>
-
-	<para>éÓÐÏÌØÚÏ×ÁÎÉÅ ÍÅÔÏÄÏ×, ÏÔÌÉÞÎÙÈ ÏÔ
-	  <application>CVSup</application>, ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ.  ôÅÍ ÎÅ ÍÅÎÅÅ,
-	  ÍÙ ËÒÁÔËÏ ÕÐÏÍÑÎÅÍ ÉÈ.  ðÏÓËÏÌØËÕ ÂÏÌØÛÁÑ ÞÁÓÔØ ÚÅÒËÁÌ ÄÁÅÔ ÄÏÓÔÕÐ Ë
-	  ÒÅÐÏÚÉÔÏÒÉÀ CVS × ÞÉÓÌÅ ÐÒÏÞÉÈ ÆÁÊÌÏ×, ÄÏÓÔÕÐÎÙÈ ÐÏ FTP, ÐÏ ÐÕÔÉ
-	  <filename>/pub/FreeBSD/development/FreeBSD-CVS</filename>,
-	  ÍÏÇÕÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÙ:</para>
-
-	<itemizedlist>
-	  <listitem>
-	    <para><application>FTP</application></para>
-	  </listitem>
-
-	  <listitem>
-	    <para><application>Rsync</application></para>
-	  </listitem>
-
-	  <listitem>
-	    <para><application>HTTP</application></para>
-	  </listitem>
-	</itemizedlist>
-
-	<important>
-	  <para>AnonCVS ÎÅ ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÄÌÑ ÚÅÒËÁÌÉÒÏ×ÁÎÉÑ CVS
-	    ÒÅÐÏÚÉÔÏÒÉÑ, ÔÁË ËÁË CVS ÎÅ ÒÁÚÒÅÛÁÅÔ ÓÁÍ ÄÏÓÔÕÐ Ë ÒÅÐÏÚÉÔÏÒÉÀ,
-	    Á ÔÏÌØËÏ Ë ÉÚ×ÌÅÞ£ÎÎÙÍ ×ÅÒÓÉÑÍ ÍÏÄÕÌÅÊ.</para>
-	</important>
-      </sect3>
     </sect2>
 
     <sect2 xml:id="mirror-www">
       <title>úÅÒËÁÌÉÒÏ×ÁÎÉÅ ÓÔÒÁÎÉà WWW</title>
 
-      <para>ìÕÞÛÉÍ ÓÐÏÓÏÂÏÍ ÂÕÄÅÔ ÉÚ×ÌÅÞÅÎÉÅ (check out) ÉÚ ÒÅÐÏÚÉÔÏÒÉÑ CVS
-	ÍÏÄÕÌÑ <emphasis>www</emphasis>.  ðÒÉ ÕÓÌÏ×ÉÉ ÎÁÌÉÞÉÑ Õ ×ÁÓ ËÏÐÉÉ
-	ÒÅÐÏÚÉÔÏÒÉÑ, ×ÓÅ, ÞÔÏ ÄÌÑ ÜÔÏÇÏ ÐÏÔÒÅÂÕÅÔÓÑ — ×ÙÐÏÌÎÉÔØ
-	ËÏÍÁÎÄÕ</para>
-
-      <screen>&prompt.user; <userinput>cvs -d /home/ncvs co www</userinput></screen>
-
-      <para>É ÓÆÏÒÍÉÒÏ×ÁÔØ ÚÁÄÁÎÉÅ ÄÌÑ <emphasis>cron</emphasis>, ËÏÔÏÒÏÅ ÂÕÄÅÔ
-	ÒÅÇÕÌÑÒÎÏ ×ÙÐÏÌÎÑÔØ ÏÐÅÒÁÃÉÀ <command>cvs up -d -P</command>,
-	ÎÁÐÒÉÍÅÒ, ËÁÖÄÙÊ ÒÁÚ ÐÏÓÌÅ ÏÂÎÏ×ÌÅÎÉÑ ËÏÐÉÉ ÒÅÐÏÚÉÔÏÒÉÑ.
-	òÁÚÕÍÅÅÔÓÑ, ÆÁÊÌÙ ÄÏÌÖÎÙ ÎÁÈÏÄÉÔØÓÑ × ÉÅÒÁÒÈÉÉ, ÄÏÓÔÕÐÎÏÊ ÄÌÑ
-	ÐÕÂÌÉÞÎÏÇÏ ×ÅÂ-ÄÏÓÔÕÐÁ.  íÙ ÓÏÚÎÁÔÅÌØÎÏ ÎÅ ÂÕÄÅÍ ÏÂÓÕÖÄÁÔØ ÚÄÅÓØ
-	ÐÒÏÃÅÓÓ ÕÓÔÁÎÏ×ËÉ É ËÏÎÆÉÇÕÒÁÃÉÉ ×ÅÂ-ÓÅÒ×ÅÒÁ ÄÌÑ ÜÔÉÈ ÃÅÌÅÊ.</para>
-
-      <para>åÓÌÉ Õ ×ÁÓ ÎÅÔ ÌÏËÁÌØÎÏÊ ËÏÐÉÉ ÒÅÐÏÚÉÔÏÒÉÑ, ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ
-	<application>CVSup</application> ÄÌÑ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ËÏÐÉÉ ×ÅÂ-ÓÔÒÁÎÉÃ.
-	ðÒÉÍÅÒ ËÏÎÆÉÇÕÒÁÃÉÉ ÍÏÖÎÏ ÎÁÊÔÉ × ÆÁÊÌÅ
-	<filename>/usr/share/examples/cvsup/www-supfile</filename>.
-	ðÒÉ×ÅÄÅÍ ÅÇÏ ÚÄÅÓØ:</para>
-
-      <programlisting>#
-# WWW module supfile for FreeBSD
-#
-*default host=cvsup3.de.FreeBSD.org
-*default base=/usr
-*default prefix=/usr/local
-*default release=cvs tag=.
-*default delete use-rel-suffix
-
-# If your network link is a T1 or faster, comment out the following line.
-*default compress
-
-# This collection retrieves the www/ tree of the FreeBSD repository
-www</programlisting>
+      <para>÷ÅÂ-ÓÁÊÔ &os; ÓÌÅÄÕÅÔ ÚÅÒËÁÌÉÒÏ×ÁÔØ ÉÓËÌÀÞÉÔÅÌØÎÏ ÐÒÉ
+	ÐÏÍÏÝÉ <application>rsync</application>.</para>
 
-      <para>éÓÐÏÌØÚÏ×ÁÎÉÅ ÐÁËÅÔÁ <package>ftp/wget</package>
-	ÉÌÉ ÉÎÙÈ ÉÎÓÔÒÕÍÅÎÔÏ× ÄÌÑ ÓÏÚÄÁÎÉÑ ×ÅÂ-ÚÅÒËÁÌ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ.</para>
+      <para>ëÏÍÁÎÄÎÁÑ ÓÔÒÏËÁ ÄÌÑ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ×ÅÂ-ÓÁÊÔÁ &os;
+	×ÙÇÌÑÄÉÔ ÐÒÉÍÅÒÎÏ ÔÁË:</para>
 
-      <sect3 xml:id="mirror-www-doc">
-	<title>úÅÒËÁÌÁ ÄÏËÕÍÅÎÔÁÃÉÉ FreeBSD</title>
-
-	<para>
-	  ðÏÓËÏÌØËÕ ÍÎÏÇÉÅ ×ÅÂ-ÓÔÒÁÎÉÃÙ ÓÓÙÌÁÀÔÓÑ ÎÁ ÄÏËÕÍÅÎÔÁÃÉÀ, ÈÏÒÏÛÅÊ
-	  ÉÄÅÅÊ Ñ×ÌÑÅÔÓÑ ÐÏÄÄÅÒÖËÁ ÚÅÒËÁÌÁ ÄÏËÕÍÅÎÔÁÃÉÉ FreeBSD ÓÏ×ÍÅÓÔÎÏ
-	  Ó ÐÒÏÞÉÍÉ ÚÅÒËÁÌÁÍÉ.  îÁÄÏ ÏÔÍÅÔÉÔØ, ÞÔÏ ÜÔÏÔ ÐÒÏÃÅÓÓ ÎÅ ÓÔÏÌØ
-	  ÔÒÉ×ÉÁÌÅÎ, ËÁË ÐÏÄÄÅÒÖËÁ ÚÅÒËÁÌÁ ×ÅÂ-ÓÔÒÁÎÉà ÓÁÍÉÈ ÐÏ ÓÅÂÅ.</para>
-
-	<para>äÌÑ ÎÁÞÁÌÁ ×Ù ÄÏÌÖÎÙ ÓÏÚÄÁÔØ ËÏÐÉÀ ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ× ÄÏËÕÍÅÎÔÁÃÉÉ
-	  (ËÁË É ×Ï ÍÎÏÇÉÈ ÄÒÕÇÉÈ ÓÌÕÞÁÑÈ, ÄÌÑ ÜÔÏÇÏ ÐÒÅÄÐÏÞÔÉÔÅÌÅÎ
-	  <application>CVSup</application>).  ÷ÏÔ ÐÒÉÍÅÒ ÆÁÊÌÁ
-	  ËÏÎÆÉÇÕÒÁÃÉÉ:</para>
-
-	<programlisting>#
-# FreeBSD documentation supfile
-#
-*default host=cvsup3.de.FreeBSD.org
-*default base=/usr
-*default prefix=/usr/share
-*default release=cvs tag=.
-*default delete use-rel-suffix
-
-# If your network link is a T1 or faster, comment out the following line.
-#*default compress
-
-# This will retrieve the entire doc branch of the FreeBSD repository.
-# This includes the handbook, FAQ, and translations thereof.
-doc-all</programlisting>
-
-	<para>úÁÔÅÍ, ×ÁÍ ÐÏÔÒÅÂÕÅÔÓÑ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ×.  ë ÓÞÁÓÔØÀ,
-	  ÓÐÅÃÉÁÌØÎÏ ÄÌÑ ÜÔÏÇÏ ÓÕÝÅÓÔ×ÕÅÔ ÍÅÔÁ-ÐÏÒÔ
-	  <package>textproc/docproj</package>.
-	  ôÁËÖÅ, ÎÅÏÂÈÏÄÉÍÏ ÕÓÔÁÎÏ×ÉÔØ ÎÅËÏÔÏÒÙÅ ÐÅÒÅÍÅÎÎÙÅ ÏËÒÕÖÅÎÉÑ,
-	  ÎÁÐÒÉÍÅÒ <literal>SGML_CATALOG_FILES</literal>, É ÐÅÒÅÍÅÎÎÙÅ
-	  × ÆÁÊÌÅ <filename>/etc/make.conf</filename>, ÇÌÁ×ÎÙÍ ÏÂÒÁÚÏÍ
-	  ÐÅÒÅÍÅÎÎÕÀ <literal>DOC_LANG</literal> (ÉÓÐÏÌØÚÕÊÔÅ ÆÁÊÌ
-	  <filename>/usr/share/examples/make.conf</filename> ËÁË ÛÁÂÌÏÎ).
-	  ðÏÓÌÅ ÜÔÏÇÏ ÍÏÖÎÏ ×ÙÄÁÔØ ËÏÍÁÎÄÕ <command>make</command>
-	  × ÇÌÁ×ÎÏÍ ËÁÔÁÌÏÇÅ ÄÏËÕÍÅÎÔÁÃÉÉ (ÐÏ ÕÍÏÌÞÁÎÉÀ ÜÔÏ
-	  <filename>/usr/share/doc</filename>).  ëÁË É ÐÒÅÖÄÅ, ÜÔÉ ËÁÔÁÌÏÇÉ
-	  ÄÏÌÖÎÙ ÂÙÔØ ÄÏÓÔÕÐÎÙ ÄÌÑ ×ÁÛÅÇÏ ×ÅÂ-ÓÅÒ×ÅÒÁ (ÐÒÏ×ÅÒØÔÅ, ÞÔÏ ÓÓÙÌËÉ
-	  ×ÅÄÕÔ × ÎÕÖÎÙÅ ÍÅÓÔÁ).</para>
-
-	<important>
-	  <para>ðÒÏÃÅÓÓ ÐÏÄÇÏÔÏ×ËÉ É ÐÏÓÔÒÏÅÎÉÑ ÄÏËÕÍÅÎÔÁÃÉÉ, Á ÔÁËÖÅ
-	    ÍÎÏÇÉÅ ÓÏÐÕÔÓÔ×ÕÀÝÉÅ ×ÏÐÒÏÓÙ, ÐÏÄÒÏÂÎÏ ÏÐÉÓÁÎ × ÄÏËÕÍÅÎÔÅ
-	    <link xlink:href="&url.books.fdp-primer;">õÞÅÂÎÉË ÐÏ ðÒÏÅËÔÕ
-	    äÏËÕÍÅÎÔÉÒÏ×ÁÎÉÑ &os;</link>.  ðÒÏÞÔÉÔÅ ÜÔÏÔ ÄÏËÕÍÅÎÔ,
-	    × ÏÓÏÂÅÎÎÏÓÔÉ ÅÓÌÉ Õ ×ÁÓ ×ÏÚÎÉËÌÉ ÐÒÏÂÌÅÍÙ ÓÏ ÓÂÏÒËÏÊ
-	    ÓÔÁÎÄÁÒÔÎÏÇÏ ËÏÍÐÌÅËÔÁ ÄÏËÕÍÅÎÔÁÃÉÉ.  </para>
-	</important>
-      </sect3>
+      <screen>&prompt.user; <userinput>rsync -vaHz --delete rsync://bit0.us-west.freebsd.org/FreeBSD-www-data/ /usr/local/www/</userinput></screen>
     </sect2>
 
     <sect2 xml:id="mirror-how-often">
@@ -782,10 +439,6 @@ doc-all</programlisting>
 	</listitem>
 
 	<listitem>
-	  <para>ÒÅÐÏÚÉÔÏÒÉÊ CVS: ÒÁÚ × ÞÁÓ</para>
-	</listitem>
-
-	<listitem>
 	  <para>WWW-ÓÔÒÁÎÉÃÙ: ÒÁÚ × ÓÕÔËÉ</para>
 	</listitem>
       </itemizedlist>
@@ -810,7 +463,6 @@ doc-all</programlisting>
 	×ÅÒÈÎÅÇÏ ÕÒÏ×ÎÑ ÓÔÒÁÎÙ, ÇÄÅ ÒÁÓÐÏÌÏÖÅÎÏ ÚÅÒËÁÌÏ,
 	<emphasis>N</emphasis> — ÎÏÍÅÒ ÚÅÒËÁÌÁ × ÄÁÎÎÏÊ ÓÔÒÁÎÅ.
 	üÔÏÔ ÖÅ ÐÒÉÎÃÉÐ ÐÒÉÍÅÎÉÍ Ë ÉÍÅÎÁÍ ÈÏÓÔÏ×
-	<systemitem>cvsupN.CC.FreeBSD.org</systemitem>,
 	<systemitem>wwwN.CC.FreeBSD.org</systemitem> É Ô.Ð.
 	ëÒÏÍÅ ÔÏÇÏ, ÅÓÔØ ÚÅÒËÁÌÁ ÂÅÚ ÄÏÍÅÎÎÏÊ ÞÁÓÔÉ, ÏÂÏÚÎÁÞÁÀÝÅÊ ÓÔÒÁÎÕ.
 	÷ÓÅ ÏÎÉ ÉÍÅÀÔ ÏÞÅÎØ ÈÏÒÏÛÉÅ ×ÎÅÛÎÉÅ ËÁÎÁÌÙ É ÏÂÓÌÕÖÉ×ÁÀÔ ÂÏÌØÛÏÅ ÞÉÓÌÏ
@@ -861,8 +513,7 @@ doc-all</programlisting>
 	    <para>÷ÙÂÅÒÉÔÅ ÔÅ ÉÚ ÎÉÈ, Ó ËÏÔÏÒÙÍÉ ×ÁÍ ÒÁÂÏÔÁÔØ ÂÙÓÔÒÅÅ ×ÓÅÇÏ
 	      (ÍÅÎØÛÅÅ ÞÉÓÌÏ ÐÒÏÍÅÖÕÔÏÞÎÙÈ ÕÚÌÏ× É ×ÒÅÍÑ ÏÔËÌÉËÁ), É ËÏÔÏÒÙÅ
 	      ÐÒÅÄÏÓÔÁ×ÌÑÀÔ ÎÕÖÎÙÅ ×ÁÍ ÓÅÒ×ÉÓÙ (ÔÁËÉÅ ËÁË
-	      <application>rsync</application> ÉÌÉ
-	      <application>CVSup</application>).</para>
+	      <application>rsync</application>).</para>
 	  </step>
 
 	  <step>
@@ -906,48 +557,23 @@ doc-all</programlisting>
 	  Ó×ÑÖÉÔÅÓØ Ó <email>mirror-admin at FreeBSD.org</email> É ÐÏÐÒÏÓÉÔÅ
 	  ÐÏÍÏÝÉ Õ ÎÉÈ.</para>
 
-	<para>óÕÝÅÓÔ×ÕÅÔ ÔÒÉ ÏÓÎÏ×ÎÙÈ ÓÁÊÔÁ ÄÌÑ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ÎÁÂÏÒÁ ÆÁÊÌÏ× FTP
-	  É ÏÄÉÎ ÄÌÑ ÒÅÐÏÚÉÔÏÒÉÑ CVS.  ÷ÅÂ-ÓÔÒÁÎÉÃÙ É ÄÏËÕÍÅÎÔÁÃÉÑ ÈÒÁÎÑÔÓÑ
-	  × CVS, ÐÏÜÔÏÍÕ ÎÅ ÉÍÅÀÔ ÏÔÄÅÌØÎÙÈ ÏÓÎÏ×ÎÙÈ ÓÁÊÔÏ×.</para>
+	<para>óÕÝÅÓÔ×ÕÅÔ ÏÄÉÎ ÏÓÎÏ×ÎÏÊ ÓÁÊÔ ÄÌÑ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ÎÁÂÏÒÁ ÆÁÊÌÏ×
+	  FTP.</para>
 
 	<sect4 xml:id="mirror-where-master-ftp">
 	  <title>ftp-master.FreeBSD.org</title>
 
 	  <para>üÔÏ ÏÓÎÏ×ÎÏÊ ÓÅÒ×ÅÒ ÄÌÑ ÓÉÎÈÒÏÎÉÚÁÃÉÉ FTP ÎÁÂÏÒÁ.</para>
 
-	  <para><systemitem>ftp-master.FreeBSD.org</systemitem> ÐÏÄÄÅÒÖÉ×ÁÅÔ ÄÏÓÔÕÐ ÐÏ
-	    <application>rsync</application> É
-	    <application>CVSup</application>, × ÄÏÐÏÌÎÅÎÉÅ Ë FTP.
-	    éÓÐÏÌØÚÏ×ÁÎÉÅ ÜÔÉÈ ÐÒÏÔÏËÏÌÏ× ÏÐÉÓÁÎÏ × ÒÁÚÄÅÌÁÈ
-	    <xref linkend="mirror-ftp-rsync"/> É
-	    <xref linkend="mirror-ftp-cvsup"/>.</para>
+	  <para>÷ ÄÏÐÏÌÎÅÎÉÅ Ë FTP, <systemitem>ftp-master.FreeBSD.org</systemitem>
+	    ÐÏÄÄÅÒÖÉ×ÁÅÔ ÄÏÓÔÕÐ ÐÏ <application>rsync</application>.
+	    éÓÐÏÌØÚÏ×ÁÎÉÅ ÜÔÉÈ ÐÒÏÔÏËÏÌÏ× ÏÐÉÓÁÎÏ ×
+	    <xref linkend="mirror-ftp-rsync"/>.</para>
 
 	  <para>ðÒÉ×ÅÔÓÔ×ÕÅÔÓÑ ÐÒÅÄÏÓÔÁ×ÌÅÎÉÅ ÚÅÒËÁÌÁÍÉ
 	    <emphasis>1 ÕÒÏ×ÎÑ</emphasis> ÄÏÓÔÕÐÁ Ë FTP-ÏÂÌÁÓÔÉ ÐÏ ÐÒÏÔÏËÏÌÕ
 	    <application>rsync</application>.</para>
 	</sect4>
-
-	<sect4 xml:id="mirror-where-master-cvsup">
-	  <title>cvsup-master.FreeBSD.org</title>
-
-	  <para>üÔÏ ÏÓÎÏ×ÎÏÊ ÓÅÒ×ÅÒ ÄÌÑ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ÒÅÐÏÚÉÔÏÒÉÑ CVS.</para>
-
-	  <para><systemitem>cvsup-master.FreeBSD.org</systemitem> ÏÂÅÓÐÅÞÉ×ÁÅÔ ÄÏÓÔÕÐ
-	    ÔÏÌØËÏ ÐÏ ÐÒÏÔÏËÏÌÕ <application>CVSup</application>.
-	    äÅÔÁÌÉ ÓÍ. × <xref linkend="mirror-cvs-cvsup"/>.</para>
-
-	  <para>äÌÑ ÐÏÌÕÞÅÎÉÑ ÄÏÓÔÕÐÁ Ë ÜÔÏÍÕ ÓÅÒ×ÅÒÕ ×ÁÍ ÎÕÖÎÏ Ó×ÑÚÁÔØÓÑ Ó
-	    &a.cvsup-master;.  îÅ ÚÁÂÕÄØÔÅ ÓÎÁÞÁÌÁ ÐÒÏÞÉÔÁÔØ
-	    <link xlink:href="http://people.FreeBSD.org/~jdp/cvsup-access/">ðÒÁ×ÉÌÁ
-	    ÄÏÓÔÕÐÁ Ë ÃÅÎÔÒÁÌØÎÏÍÕ CVSup ÓÅÒ×ÅÒÕ FreeBSD</link>!</para>
-
-	  <para>ðÏÄÇÏÔÏ×ØÔÅ ÐÁÒÁÍÅÔÒÙ Á×ÔÏÒÉÚÁÃÉÉ, ËÁË ÏÐÉÓÁÎÏ <link xlink:href="http://people.FreeBSD.org/~jdp/cvpasswd/">ÚÄÅÓØ</link>.
-	    îÅ ÚÁÂÕÄØÔÅ, ÞÔÏ × ËÁÞÅÓÔ×Å ÉÍÅÎÉ ÓÅÒ×ÅÒÁ ËÏÍÁÎÄÅ
-	    <command>cvpasswd</command> ÎÕÖÎÏ ÕËÁÚÁÔØ
-	    <systemitem>freefall.FreeBSD.org</systemitem>, ÎÅÓÍÏÔÒÑ ÎÁ ÔÏ, ÞÔÏ
-	    ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÓÏÅÄÉÎÅÎÉÅ ×Ù ÂÕÄÅÔÅ Ó
-	    <systemitem>cvsup-master.FreeBSD.org</systemitem>.</para>
-	</sect4>
       </sect3>
     </sect2>
   </sect1>
@@ -984,12 +610,6 @@ doc-all</programlisting>
 	ÒÁÓÓÍÁÔÒÉ×ÁÔØ ÜÔÏÔ ÓÐÉÓÏË ËÁË <emphasis>ÎÁÓÔÏÊÞÉ×ÙÅ
 	ÐÏÖÅÌÁÎÉÑ</emphasis>.</para>
 
-      <note>
-	<para>óÌÅÄÕÀÝÅÅ ÏÔÎÏÓÉÔÓÑ × ÏÓÎÏ×ÎÏÍ Ë ÎÁÂÏÒÕ ÆÁÊÌÏ× FTP, ÐÏÓËÏÌØËÕ
-	  ÒÅÐÏÚÉÔÏÒÉÊ CVS ×ÓÅÇÄÁ ÄÏÌÖÅÎ ÚÅÒËÁÌÉÒÏ×ÁÔØÓÑ ÐÏÌÎÏÓÔØÀ,
-	  Á ×ÅÂ-ÓÔÒÁÎÉÃÙ ÐÒÅÄÓÔÁ×ÌÑÀÔ ÓÏÂÏÊ ÎÅÓËÏÌØËÏ ÏÓÏÂÙÊ ÓÌÕÞÁÊ.</para>
-      </note>
-
       <para>úÅÒËÁÌÁ 1 ÕÒÏ×ÎÑ ÄÏÌÖÎÙ:</para>
 
       <itemizedlist>
@@ -1121,25 +741,5 @@ doc-all</programlisting>
 	</listitem>
       </itemizedlist>
     </sect2>
-
-    <sect2 xml:id="mirror-statpagescvsup">
-      <title>óÔÁÔÉÓÔÉËÁ CVSup ÓÁÊÔÏ×</title>
-
-      <itemizedlist>
-	<listitem>
-	  <para>cvsup[23456].jp.FreeBSD.org - <email>kuriyama at FreeBSD.org</email> - <link xlink:href="http://home.jp.FreeBSD.org/stats/mrtg/cvsup/index.en.html">(CVSup ÐÒÏÃÅÓÓÙ)</link></para>
-	</listitem>
-
-	<listitem>
-	  <para>cvsup.cz.FreeBSD.org - <email>cejkar at fit.vutbr.cz</email> -
-	    <link xlink:href="http://www.freebsd.cz/stats/mrtg/cvsupd.html">(CVSup ÐÒÏÃÅÓÓÙ)</link></para>
-	</listitem>
-
-	<listitem>
-	  <para>cvsup4.ru.FreeBSD.org - <email>maxim at FreeBSD.org</email> -
-	    <link xlink:href="http://ftp.mtu.ru/mrtg/ftp.mtu.ru_proc2.html">(CVSup ÐÒÏÃÅÓÓÙ)</link></para>
-	</listitem>
-      </itemizedlist>
-    </sect2>
   </sect1>
 </article>

Modified: head/ru_RU.KOI8-R/articles/ipsec-must/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/ipsec-must/article.xml	Mon May 11 12:51:56 2015	(r46679)
+++ head/ru_RU.KOI8-R/articles/ipsec-must/article.xml	Tue May 12 08:03:23 2015	(r46680)
@@ -7,7 +7,7 @@
      $FreeBSD$
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/ipsec-must/article.xml,v 1.7 2004/07/16 12:06:05 den Exp $
 
-     Original revision: r43184
+     Original revision: r44703
 -->
 <article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
   <info><title>îÅÚÁ×ÉÓÉÍÏÅ ÉÓÓÌÅÄÏ×ÁÎÉÅ ÒÁÂÏÔÙ IPsec ×Ï FreeBSD</title>

Modified: head/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml	Mon May 11 12:51:56 2015	(r46679)
+++ head/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml	Tue May 12 08:03:23 2015	(r46680)
@@ -6,7 +6,7 @@
 
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml,v 1.4 2006/02/09 14:56:28 marck Exp $
 
-     Original revision: r43184
+     Original revision: r46073
 -->
 <article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
   <info><title>þÁÓÔÏ ÚÁÄÁ×ÁÅÍÙÅ ×ÏÐÒÏÓÙ ÐÏ ÓÐÉÓËÁÍ ÒÁÓÓÙÌËÉ &os;</title>
@@ -291,7 +291,7 @@
 	      <para>ðÏÖÁÌÕÊÓÔÁ, ÉÓÐÏÌØÚÕÊÔÅ ÓÏ×ÍÅÓÔÉÍÙÊ ÓÏ ÓÔÁÎÄÁÒÔÁÍÉ
 		ÐÏÞÔÏ×ÙÊ ËÌÉÅÎÔ (MUA). íÎÏÇÏ ÐÌÏÈÏ ÏÔÆÏÒÍÁÔÉÒÏ×ÁÎÎÙÈ
 		ÓÏÏÂÝÅÎÉÊ ÉÓÈÏÄÑÔ ÏÔ
-		<link xlink:href="http://www.lemis.com/email.html">ÎÅÐÒÁ×ÉÌØÎÏ
+		<link xlink:href="http://www.lemis.com/grog/email/email.php">ÎÅÐÒÁ×ÉÌØÎÏ
 		ÒÁÂÏÔÁÀÝÉÈ ÉÌÉ ÐÌÏÈÏ ÓËÏÎÆÉÇÕÒÉÒÏ×ÁÎÎÙÈ ÐÏÞÔÏ×ÙÈ ËÌÉÅÎÔÏ×</link>.
 		éÚ×ÅÓÔÎÏ, ÞÔÏ ÓÌÅÄÕÀÝÉÅ ÐÏÞÔÏ×ÙÅ ÐÒÏÇÒÁÍÍÙ ÍÏÇÕÔ ÐÏÓÙÌÁÔØ
 		ÎÅÐÒÁ×ÉÌØÎÏ ÏÔÆÏÒÍÁÔÉÒÏ×ÁÎÎÙÅ ÓÏÏÂÝÅÎÉÑ ÂÅÚ ×ÁÛÅÇÏ ×ÅÄÏÍÁ:</para>
@@ -352,8 +352,8 @@
 		ÓÏÄÅÒÖÉÍÏÇÏ ÆÁÊÌÏ× <filename>Makefile</filename>, ÇÄÅ
 		<literal>tab</literal> Ñ×ÌÑÅÔÓÑ ×ÁÖÎÙÍ ÓÉÍ×ÏÌÏÍ.  üÔÏ
 		ÄÏ×ÏÌØÎÏ ÞÁÓÔÏ ×ÓÔÒÅÞÁÀÝÁÑÓÑ ÐÒÏÂÌÅÍÁ
-		× <link xlink:href="&url.base;/support.html#gnats">
-		ÂÁÚÅ ÄÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ ÏÂ ÏÛÉÂËÁÈ GNATS</link>.
+		× <link xlink:href="&url.base;/support.html">
+		ÂÁÚÅ ÄÁÎÎÙÈ ÓÏÏÂÝÅÎÉÊ ÏÂ ÏÛÉÂËÁÈ</link>.
 		÷ <filename>Makefile</filename> ÓÉÍ×ÏÌÙ tab ÍÅÎÑÀÔÓÑ
 		ÎÁ ÐÒÏÂÅÌÙ, ÉÌÉ ÒÁÚÄÒÁÖÁÀÝÉÅ <literal>=3B</literal>
 		escape ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÉ.</para>

Modified: head/ru_RU.KOI8-R/articles/new-users/article.xml
==============================================================================
--- head/ru_RU.KOI8-R/articles/new-users/article.xml	Mon May 11 12:51:56 2015	(r46679)
+++ head/ru_RU.KOI8-R/articles/new-users/article.xml	Tue May 12 08:03:23 2015	(r46680)
@@ -7,7 +7,7 @@
      $FreeBSD$
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/articles/new-users/article.xml,v 1.6 2007/05/15 18:28:39 gad Exp $
 
-     Original revision: r43184
+     Original revision: r46448
 -->
 <article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
   <info><title>ðÏÓÏÂÉÅ ÄÌÑ ÎÏ×ÉÞËÏ× ×Ï FreeBSD É &unix;</title>
@@ -34,11 +34,8 @@
     <abstract>
       <para>ðÏÚÄÒÁ×ÌÑÅÍ ×ÁÓ Ó ÕÓÔÁÎÏ×ËÏÊ FreeBSD!  üÔÏ ××ÏÄÎÏÅ ÐÏÓÏÂÉÅ
 	ÐÒÅÄÎÁÚÎÁÞÅÎÏ ÄÌÑ ÔÅÈ, ËÔÏ Ñ×ÌÑÅÔÓÑ ÎÏ×ÉÞËÏÍ × ÍÉÒÅ FreeBSD
-	<emphasis>É</emphasis> &unix;—ÔÁË ÞÔÏ ÏÎÏ ÎÁÞΣÔÓÑ Ó ÏÓÎÏ×.
-	ðÒÅÄÐÏÌÁÇÁÅÔÓÑ, ÞÔÏ ×Ù ÉÓÐÏÌØÚÕÅÔÅ ÄÉÓÔÒÉÂÕÔÉ× &os; ×ÅÒÓÉÉ 2.0.5
-	ÉÌÉ ÂÏÌÅÅ ÐÏÚÄÎÅÊ, ÒÁÓÐÒÏÓÔÒÁÎÑÅÍÙÊ &os;.org, É × ×ÁÛÅÊ ÓÉÓÔÅÍÅ (ÎÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ) ÉÍÅÅÔÓÑ ÏÄÉÎ
-	ÐÏÌØÚÏ×ÁÔÅÌØ (ÜÔÏ ×Ù)—É ×Ù ÈÏÒÏÛÏ ÏÒÉÅÎÔÉÒÕÅÔÅÓØ × DOS/&windows;
-	ÉÌÉ &os2;.</para>
+	<emphasis>É</emphasis> &unix;—ÔÁË ÞÔÏ ÏÎÏ ÎÁÞΣÔÓÑ Ó
+	ÏÓÎÏ×.</para>
     </abstract>
   </info>
 
@@ -246,15 +243,15 @@
       </varlistentry>
 
       <varlistentry>
-	<term><command>view
+	<term><command>less
 	  <replaceable>filename</replaceable></command></term>
 
 	<listitem>
 	  <para>ðÏÚ×ÏÌÑÅÔ ×ÁÍ ÐÒÏÓÍÏÔÒÅÔØ ÆÁÊÌ (Ó ÉÍÅÎÅÍ
 	    <replaceable>filename</replaceable>) ÂÅÚ ×ÎÅÓÅÎÉÑ × ÎÅÇÏ ÉÚÍÅÎÅÎÉÊ.
-	    ðÏÐÒÏÂÕÊÔÅ ×ÙÐÏÌÎÉÔØ ËÏÍÁÎÄÕ <command>view
+	    ðÏÐÒÏÂÕÊÔÅ ×ÙÐÏÌÎÉÔØ ËÏÍÁÎÄÕ <command>less
 	    /etc/fstab</command>.  äÌÑ ×ÙÈÏÄÁ
-	    ÎÁÂÅÒÉÔÅ <command>:q</command>.</para>
+	    ÎÁÂÅÒÉÔÅ <command>q</command>.</para>
 	</listitem>
       </varlistentry>
 
@@ -545,7 +542,7 @@
 
 	<listitem>
 	  <para>ÄÌÑ ÐÅÒÅÍÅÝÅÎÉÑ ËÕÒÓÏÒÁ ÎÁ <replaceable>text</replaceable>;
-	    <command>/Enter</command> (ËÌÁ×ÉÛÁ ××ÏÄÁ) ÄÌÑ
+	    <command>/</command><keycap>Enter</keycap> (ËÌÁ×ÉÛÁ ××ÏÄÁ) ÄÌÑ
 	    ÐÏÉÓËÁ ÓÌÅÄÕÀÝÅÇÏ ÜËÚÅÍÐÌÑÒÁ
 	    <replaceable>text</replaceable>.</para>
 	</listitem>
@@ -614,92 +611,6 @@
       ÚÁÐÑÔÏÊ, ×ÅÄØ ÔÁË?)</para>
   </sect1>
 
-  <sect1 xml:id="printing-files-from-dos">
-    <title>ðÅÞÁÔØ ÆÁÊÌÏ× ÉÚ DOS</title>
-
-    <para>îÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ, ÓËÏÒÅÅ ×ÓÅÇÏ, ÐÒÉÎÔÅÒ Õ ×ÁÓ ÎÅ ÒÁÂÏÔÁÅÔ, ÔÁË ÞÔÏ
-      ×ÏÔ ÓÐÏÓÏ ÓÏÚÄÁÎÉÑ ÆÁÊÌÁ ÉÚ ÓÐÒÁ×ÏÞÎÏÊ ÓÔÒÁÎÉÃÙ, ÐÅÒÅÍÅÝÅÎÉÑ Å£ ÎÁ
-      ÄÉÓËÅÔÕ, Á ÚÁÔÅÍ ÐÅÞÁÔØ ÉÚ DOS.  ðÏÌÏÖÉÍ, ÞÔÏ ×Ù ÈÏÔÉÔÅ ×ÎÉÍÁÔÅÌØÎÏ
-      ÐÒÏÞÅÓÔØ Ï ÉÚÍÅÎÅÎÉÉ ÐÒÁ× ÄÏÓÔÕÐÁ ÎÁ ÆÁÊÌÙ (×ÅÓØÍÁ ×ÁÖÎÏ).  ÷Ù ÍÏÖÅÔÅ
-      ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ËÏÍÁÎÄÏÊ <command>man chmod</command> ÄÌÑ ÔÏÇÏ, ÞÔÏÂÙ
-      ÐÒÏÞÅÓÔØ Ï ÜÔÏÍ.  ëÏÍÁÎÄÁ</para>
-
-    <informalexample>
-      <screen>&prompt.user; <userinput>man chmod | col -b > chmod.txt</userinput></screen>
-    </informalexample>
-
-    <para>ÕÄÁÌÉÔ ËÏÄÙ ÆÏÒÍÁÔÉÒÏ×ÁÎÉÑ É ÐÅÒÅÎÁÐÒÁ×ÉÔ ÓÔÒÁÎÉÃÕ ÓÐÒÁ×ËÉ × ÆÁÊÌ
-      <filename>chmod.txt</filename>, ÎÅ ×ÙÄÁ×ÁÑ Å£ ÎÁ ÜËÒÁÎ.  ôÅÐÅÒØ ÐÏÍÅÓÔÉÔÅ
-      ÏÔÆÏÒÍÁÔÉÒÏ×ÁÎÎÕÀ dos-ÄÉÓËÅÔÕ × ÄÉÓËÏ×ÏÄ <filename>a</filename>, ×ÙÐÏÌÎÉÔÅ
-      <command>su</command>, ÐÅÒÅÊÄÑ Ë ÐÏÌØÚÏ×ÁÔÅÌÀ <systemitem class="username">root</systemitem>, É ÎÁÂÅÒÉÔÅ</para>
-
-    <informalexample>
-      <screen>&prompt.root; <userinput>/sbin/mount -t msdosfs /dev/fd0 /mnt</userinput></screen>
-    </informalexample>
-
-    <para>ÄÌÑ ÍÏÎÔÉÒÏ×ÁÎÉÑ ÄÉÓËÅÔÙ × ËÁÔÁÌÏÇ <filename>/mnt</filename>.</para>
-
-    <para>ôÅÐÅÒØ (É ×ÁÍ ÂÏÌØÛÅ ÎÅ ÎÕÖÎÏ ÂÙÔØ ÐÏÌØÚÏ×ÁÔÅÌÅÍ <systemitem class="username">root</systemitem>, ÔÁË ÞÔÏ ÍÏÖÅÔÅ
-      ÎÁÂÒÁÔØ <command>exit</command> ÄÌÑ ×ÏÚ×ÒÁÔÁ Ë ÐÏÌØÚÏ×ÁÔÅÌÀ jack) ×Ù
-      ÍÏÖÅÔÅ ÐÅÒÅÊÔÉ × ËÁÔÁÌÏÇ, ÇÄÅ ÓÏÚÄÁÌÉ <filename>chmod.txt</filename> É
-      ÓËÏÐÉÒÏ×ÁÔØ ÆÁÊÌ ÎÁ ÄÉÓËÅÔÕ ÓÌÅÄÕÀÝÅÊ ËÏÍÁÎÄÏÊ:</para>
-
-    <informalexample>
-      <screen>&prompt.user; <userinput>cp chmod.txt /mnt</userinput></screen>
-    </informalexample>
-
-    <para>É ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ËÏÍÁÎÄÏÊ <command>ls /mnt</command> ÄÌÑ ÐÏÌÕÞÅÎÉÑ
-      ÓÐÉÓËÁ ÆÁÊÌÏ× ËÁÔÁÌÏÇÁ <filename>/mnt</filename>, ËÏÔÏÒÁÑ ÔÅÐÅÒØ ÄÏÌÖÎÁ
-      ÐÏËÁÚÁÔØ ÆÁÊÌ <filename>chmod.txt</filename>.</para>
-
-    <para>÷Ù ÔÁËÖÅ ÍÏÖÅÔÅ ÚÁÈÏÔÅÔØ ÓÏÚÄÁÔØ ÆÁÊÌ ÉÚ

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-doc-all mailing list