svn commit: r40344 - in head/ru_RU.KOI8-R/books/handbook: cutting-edge kernelconfig preface serialcomms
Sergey Kandaurov
pluknet at FreeBSD.org
Tue Dec 11 16:19:41 UTC 2012
Author: pluknet
Date: Tue Dec 11 16:19:40 2012
New Revision: 40344
URL: http://svnweb.freebsd.org/changeset/doc/40344
Log:
Sync the cutting-edge chapter, update associated xrefs.
MFen:
handbook/cutting-edge/chapter.xml r28061 -> r33528
Modified:
head/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
head/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml
head/ru_RU.KOI8-R/books/handbook/preface/preface.xml
head/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml
Modified: head/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml Tue Dec 11 13:39:57 2012 (r40343)
+++ head/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml Tue Dec 11 16:19:40 2012 (r40344)
@@ -5,10 +5,10 @@
$FreeBSD$
$FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml,v 1.52 2006/06/20 18:02:32 marck Exp $
- Original revision: r28061
+ Original revision: r33528
-->
-<chapter id="cutting-edge">
+<chapter id="updating-upgrading">
<chapterinfo>
<authorgroup>
<author>
@@ -26,7 +26,7 @@
<author>
<firstname>Jordan</firstname>
<surname>Hubbard</surname>
- <contrib>ïÒÉÇÉÎÁÌØÎÙÊ ÔÅËÓÔ ÎÁÐÉÓÁÌ </contrib>
+ <contrib>ïÒÉÇÉÎÁÌØÎÙÊ ÔÅËÓÔ ÎÁÐÉÓÁÌÉ </contrib>
</author>
<author>
@@ -54,30 +54,47 @@
</authorgroup>
</chapterinfo>
- <title>îÁ ÐÅÒÅÄÎÅÍ ËÒÁÅ ÒÁÚÒÁÂÏÔÏË</title>
+ <title>ïÂÎÏ×ÌÅÎÉÅ ÓÉÓÔÅÍÙ É ÓÍÅÎÁ ×ÅÒÓÉÉ</title>
- <sect1 id="cutting-edge-synopsis">
+ <sect1 id="updating-upgrading-synopsis">
<title>ëÒÁÔËÉÊ ÏÂÚÏÒ</title>
- <para>íÅÖÄÕ ÒÅÌÉÚÁÍÉ ÎÁÄ &os; ×ÅÄÅÔÓÑ ÐÏÓÔÏÑÎÎÁÑ ÒÁÂÏÔÁ. äÌÑ ÔÅÈ,
- ËÔÏ ÈÏÞÅÔ ÂÙÔØ ÎÁ ÐÅÒÅÄÎÅÍ ËÒÁÅ, ÅÓÔØ ÎÅÓËÏÌØËÏ ÐÒÏÓÔÙÈ ÍÅÔÏÄÏ× ÄÌÑ
- ÐÏÄÄÅÒÖÁÎÉÑ Ó×ÏÅÊ ÓÉÓÔÅÍÙ × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÐÏÓÌÅÄÎÉÍÉ ÒÁÚÒÁÂÏÔËÁÍÉ.
- âÕÄØÔÅ ÏÓÔÏÒÏÖÎÙ — ÐÅÒÅÄÎÉÊ ËÒÁÊ ÎÅ ÄÌÑ ×ÓÅÈ! üÔÁ ÇÌÁ×Á ÐÏÍÏÖÅÔ
+ <para>íÅÖÄÕ ÒÅÌÉÚÁÍÉ ÎÁÄ &os; ×ÅÄÅÔÓÑ ÐÏÓÔÏÑÎÎÁÑ ÒÁÂÏÔÁ. îÅËÏÔÏÒÙÅ
+ ÏÔÄÁÀÔ ÐÒÅÄÐÏÞÔÅÎÉÅ ÏÆÉÃÉÁÌØÎÏ ×ÙÐÕÝÅÎÎÙÍ ×ÅÒÓÉÑÍ, × ÔÏ ×ÒÅÍÑ ËÁË
+ ÏÓÔÁÌØÎÙÅ ÐÒÅÄÐÏÞÉÔÁÀÔ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÏÓÌÅÄÎÉÅ ÒÁÚÒÁÂÏÔËÉ. ôÅÍ ÎÅ
+ ÍÅÎÅÅ, ÄÁÖÅ ÄÌÑ ÏÆÉÃÉÁÌØÎÙÈ ×ÅÒÓÉÊ ÞÁÓÔÏ ×ÙÈÏÄÑÔ ÏÂÎÏ×ÌÅÎÉÑ,
+ Ó×ÑÚÁÎÎÙÅ Ó ÂÅÚÏÐÁÓÎÏÓÔØÀ É ÄÒÕÇÉÍÉ ËÒÉÔÉÞÅÓËÉÍÉ ÉÓÐÒÁ×ÌÅÎÉÑÍÉ.
+ îÅÚÁ×ÉÓÉÍÏ ÏÔ ÉÓÐÏÌØÚÕÅÍÏÊ ×ÅÒÓÉÉ &os; ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ×ÓÅ ÎÅÏÂÈÏÄÉÍÙÅ
+ ÉÎÓÔÒÕÍÅÎÔÙ ÄÌÑ ÐÏÄÄÅÒÖÁÎÉÑ ÓÉÓÔÅÍÙ × ÁËÔÕÁÌØÎÏÍ ÓÏÓÔÏÑÎÉÉ, Á ÔÁËÖÅ
+ ÐÏÚ×ÏÌÑÅÔ ÌÅÇËÏ ÐÅÒÅÊÔÉ ÎÁ ÄÒÕÇÕÀ ×ÅÒÓÉÀ. üÔÁ ÇÌÁ×Á ÐÏÍÏÖÅÔ
×ÁÍ ÒÅÛÉÔØ, ÈÏÔÉÔÅ ÌÉ ×Ù ÏÔÓÌÅÖÉ×ÁÔØ ÓÉÓÔÅÍÕ × ÐÒÏÃÅÓÓÅ ÒÁÂÏÔÙ ÎÁÄ ÎÅÊ
- ÉÌÉ ÏÓÔÁÎÅÔÅÓØ ×ÅÒÎÙÍ ÏÄÎÏÍÕ ÉÚ ×ÙÐÕÝÅÎÎÙÈ ÒÅÌÉÚÏ×.</para>
+ ÉÌÉ ÏÓÔÁÎÅÔÅÓØ ×ÅÒÎÙÍ ÏÄÎÏÍÕ ÉÚ ×ÙÐÕÝÅÎÎÙÈ ÒÅÌÉÚÏ×. ôÁËÖÅ ÉÍÅÀÔÓÑ
+ ÐÒÏÓÔÅÊÛÉÅ ÉÎÓÔÒÕÍÅÎÔÙ ÄÌÑ ÐÏÄÄÅÒÖÁÎÉÑ ×ÁÛÅÊ ÓÉÓÔÅÍÙ × ÁËÔÕÁÌØÎÏÍ
+ ÓÏÓÔÏÑÎÉÉ.</para>
<para>ðÏÓÌÅ ÞÔÅÎÉÑ ÜÔÏÊ ÇÌÁ×Ù ×Ù ÂÕÄÅÔÅ ÚÎÁÔØ:</para>
<itemizedlist>
<listitem>
- <para>òÁÚÎÉÃÕ ÍÅÖÄÕ Ä×ÕÍÑ ×ÅÔ×ÑÍÉ ÒÁÚÒÁÂÏÔËÉ: &os.stable; É
- &os.current;.</para>
+ <para>ëÁËÉÅ ÐÒÏÇÒÁÍÍÙ ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÌÑ ÏÂÎÏ×ÌÅÎÉÑ ÓÉÓÔÅÍÙ É
+ ëÏÌÌÅËÃÉÉ ðÏÒÔÏ×.</para>
+ </listitem>
+
+ <listitem>
+ <para>ëÁË ÐÏÄÄÅÒÖÉ×ÁÔØ ×ÁÛÕ ÓÉÓÔÅÍÕ × ÁËÔÕÁÌØÎÏÍ ÓÏÓÔÏÑÎÉÉ ÐÒÉ
+ ÐÏÍÏÝÉ <application>freebsd-update</application>,
+ <application>CVSup</application>, <application>CVS</application>
+ ÉÌÉ <application>CTM</application>.</para>
+ </listitem>
+
+ <listitem>
+ <para>ëÁË ÕÚÎÁÔØ ÓÏÓÔÏÑÎÉÅ ÕÓÔÁÎÏ×ÌÅÎÎÏÊ ÓÉÓÔÅÍÙ ÐÏ ÏÔÎÏÛÅÎÉÀ Ë
+ ÉÚ×ÅÓÔÎÏÊ ÎÅÔÒÏÎÕÔÏÊ ËÏÐÉÉ.</para>
</listitem>
<listitem>
- <para>ëÁË ÐÏÄÄÅÒÖÉ×ÁÔØ ×ÁÛÕ ÓÉÓÔÅÍÕ × ÁËÔÕÁÌØÎÏÍ ÓÏÓÔÏÑÎÉÉ ÐÒÉ ÐÏÍÏÝÉ
- <application>CVSup</application>, <application>CVS</application> ÉÌÉ
- <application>CTM</application>.</para>
+ <para>òÁÚÎÉÃÕ ÍÅÖÄÕ Ä×ÕÍÑ ×ÅÔ×ÑÍÉ ÒÁÚÒÁÂÏÔËÉ: &os.stable; É
+ &os.current;.</para>
</listitem>
<listitem>
@@ -99,10 +116,483 @@
ÄÒÕÇÉÈ ÒÁÚÒÁÂÏÔÞÉËÏ× (<xref linkend="ports"/>).</para>
</listitem>
</itemizedlist>
+
+ <note>
+ <para>÷ ÜÔÏÊ ÇÌÁ×Å ÄÌÑ ÐÏÌÕÞÅÎÉÑ É ÏÂÎÏ×ÌÅÎÉÑ ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ× &os;
+ ÉÓÐÏÌØÚÕÅÔÓÑ ËÏÍÁÎÄÁ <command>cvsup</command>. äÌÑ ÜÔÏÇÏ ×ÁÍ
+ ÎÕÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÐÏÒÔ ÉÌÉ ÐÁËÅÔ <filename
+ role="package">net/cvsup-without-gui</filename>. îÁÞÉÎÁÑ Ó ×ÅÒÓÉÉ
+ &os; 6.2-RELEASE ÄÌÑ ÜÔÉÈ ÃÅÌÅÊ ÍÏÖÎÏ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ËÏÍÁÎÄÏÊ
+ &man.csup.1;, ËÏÔÏÒÁÑ ×ÈÏÄÉÔ × ÓÏÓÔÁ× ÓÉÓÔÅÍÙ.</para>
+ </note>
+ </sect1>
+
+ <sect1 id="updating-upgrading-freebsdupdate">
+ <sect1info>
+ <authorgroup>
+ <author>
+ <firstname>Tom</firstname>
+ <surname>Rhodes</surname>
+ <contrib>ïÒÉÇÉÎÁÌØÎÙÊ ÔÅËÓÔ ÎÁÐÉÓÁÌ </contrib>
+ </author>
+ </authorgroup>
+ <authorgroup>
+ <author>
+ <firstname>Colin</firstname>
+ <surname>Percival</surname>
+ <contrib>îÁ ÏÓÎÏ×Å ÚÁÍÅÔÏË, ËÏÔÏÒÙÅ ÐÒÅÄÏÓÔÁ×ÉÌ </contrib>
+ </author>
+ </authorgroup>
+ </sect1info>
+ <title>ïÂÎÏ×ÌÅÎÉÅ FreeBSD</title>
+
+ <indexterm><primary>ÏÂÎÏ×ÌÅÎÉÅ É ÓÍÅÎÁ ×ÅÒÓÉÉ</primary></indexterm>
+ <indexterm>
+ <primary>freebsd-update</primary>
+ <see>ÏÂÎÏ×ÌÅÎÉÅ É ÓÍÅÎÁ ×ÅÒÓÉÉ</see>
+ </indexterm>
+
+ <para>ðÒÉÍÅÎÅÎÉÅ ÏÂÎÏ×ÌÅÎÉÊ ÂÅÚÏÐÁÓÎÏÓÔÉ — ×ÁÖÎÙÊ ÍÏÍÅÎÔ ×
+ ÓÏÐÒÏ×ÏÖÄÅÎÉÉ ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ, ÏÓÏÂÅÎÎÏ ÔÁËÏÇÏ ËÁË
+ ÏÐÅÒÁÃÉÏÎÎÁÑ ÓÉÓÔÅÍÁ. äÌÑ &os; ÜÔÏÔ ÐÒÏÃÅÓÓ ÎÅ ÂÙÌ ÐÒÏÓÔÙÍ ×
+ ÔÅÞÅÎÉÅ ÄÏÌÇÏÇÏ ×ÒÅÍÅÎÉ. îÁ ÉÓÈÏÄÎÙÊ ËÏÄ ÎÕÖÎÏ ÂÙÌÏ ÎÁËÌÁÄÙ×ÁÔØ
+ ÐÁÔÞÉ, ÐÅÒÅÓÔÒÁÉ×ÁÔØ ËÏÄ × Ä×ÏÉÞÎÙÅ ÆÁÊÌÙ, Á ÚÁÔÅÍ ÜÔÉ Ä×ÏÉÞÎÙÅ ÆÁÊÌÙ
+ ÔÒÅÂÏ×ÁÌÏÓØ ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ. </para>
+
+ <para>ôÅÐÅÒØ ÜÔÏ ÄÁ×ÎÏ ÎÅ ÔÁË, É &os; ×ËÌÀÞÁÅÔ ÐÒÏÇÒÁÍÍÕ Ó ÐÒÏÓÔÙÍ
+ ÎÁÚ×ÁÎÉÅÍ <command>freebsd-update</command>. üÔÁ ÐÒÏÇÒÁÍÍÁ
+ ÐÒÅÄÏÓÔÁ×ÌÑÅÔ Ä×Å ÒÁÚÌÉÞÎÙÅ ÆÕÎËÃÉÉ. ÷Ï-ÐÅÒ×ÙÈ, ÏÎÁ ÐÏÚ×ÏÌÑÅÔ
+ ÐÒÉÍÅÎÉÔØ Ë ÂÁÚÏ×ÏÊ ÓÉÓÔÅÍÅ &os; ÏÂÎÏ×ÌÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ É ËÒÉÔÉÞÅÓËÉÅ
+ ÉÓÐÒÁ×ÌÅÎÉÑ × Ä×ÏÉÞÎÏÍ ×ÉÄÅ, ÂÅÚ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÓÂÏÒËÉ É ÕÓÔÁÎÏ×ËÉ.
+ ÷Ï-×ÔÏÒÙÈ, ÐÒÏÇÒÁÍÍÁ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÏÂÎÏ×ÌÅÎÉÅ ÓÉÓÔÅÍÙ ÓÏ ÓÍÅÎÏÊ
+ ÓÔÁÒÛÅÇÏ ÉÌÉ ÍÌÁÄÛÅÇÏ ÎÏÍÅÒÁ ×ÅÒÓÉÉ.</para>
+
+ <note>
+ <para>ä×ÏÉÞÎÙÅ ÏÂÎÏ×ÌÅÎÉÑ ÄÏÓÔÕÐÎÙ ÄÌÑ ×ÓÅÈ ÁÒÈÉÔÅËÔÕÒ É ×ÅÒÓÉÊ,
+ ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ÇÒÕÐÐÏÊ ÂÅÚÏÐÁÓÎÏÓÔÉ; ÔÅÍ ÎÅ ÍÅÎÅÅ, ÄÌÑ ÒÁÂÏÔÙ
+ ÎÅËÏÔÏÒÙÈ ÉÚ ×ÏÚÍÏÖÎÏÓÔÅÊ, ÔÁËÉÈ ËÁË ÓÍÅÎÁ ×ÅÒÓÉÉ ÏÐÅÒÁÃÉÏÎÎÏÊ
+ ÓÉÓÔÅÍÙ &os;, ÔÒÅÂÕÅÔÓÑ ÐÏÓÌÅÄÎÑÑ ×ÅÒÓÉÑ &man.freebsd-update.8;
+ É ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ &os; 6.3. ðÅÒÅÄ ÏÂÎÏ×ÌÅÎÉÅÍ ÄÏ ÎÏ×ÏÊ ×ÅÒÓÉÉ
+ ÓÌÅÄÕÅÔ ÏÚÎÁËÏÍÉÔØÓÑ Ó ÏÂßÑ×ÌÅÎÉÅÍ Ï ×ÙÐÕÓËÅ ÔÅËÕÝÅÊ ×ÅÒÓÉÉ, ÔÁË
+ ËÁË ÔÁÍ ÍÏÖÅÔ ÓÏÄÅÒÖÁÔØÓÑ ×ÁÖÎÁÑ ÉÎÆÏÒÍÁÃÉÑ, ÐÒÉÍÅÎÉÍÁÑ Ë ×ÅÒÓÉÉ,
+ ÎÁ ËÏÔÏÒÕÀ ÎÁÍÅÞÅÎ ÐÅÒÅÈÏÄ. ó ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÍÉ ÏÂßÑ×ÌÅÎÉÑÍÉ ÍÏÖÎÏ
+ ÏÚÎÁËÏÍÉÔØÓÑ, ÐÅÒÅÊÄÑ ÐÏ ÓÌÅÄÕÀÝÅÊ ÓÓÙÌËÅ: <ulink
+ url="http://www.FreeBSD.org/releases/"></ulink>.</para>
+ </note>
+
+ <para>åÓÌÉ ÉÍÅÅÔÓÑ ÚÁÄÁÎÉÅ <command>crontab</command>, ÚÁÐÕÓËÁÀÝÅÅ
+ <command>freebsd-update</command>, ÔÏ ÐÅÒÅÄ ÎÁÞÁÌÏÍ ×ÙÐÏÌÎÅÎÉÑ
+ ÓÌÅÄÕÀÝÉÈ ÄÅÊÓÔ×ÉÊ ÅÇÏ ÏÂÑÚÁÔÅÌØÎÏ ÎÕÖÎÏ ×ÙËÌÀÞÉÔØ.</para>
+
+ <sect2>
+ <title>ëÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ</title>
+
+ <para>îÅËÏÔÏÒÙÅ ÐÏÌØÚÏ×ÁÔÅÌÉ ÍÏÇÕÔ ÐÏÖÅÌÁÔØ ÉÚÍÅÎÉÔØ
+ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ ÄÌÑ ÌÕÞÛÅÇÏ ËÏÎÔÒÏÌÑ ÎÁÄ ÐÒÏÃÅÓÓÏÍ
+ ÏÂÎÏ×ÌÅÎÉÑ. ÷ÓÅ ÐÁÒÁÍÅÔÒÙ ÐÏÄÒÏÂÎÏ ÚÁÄÏËÕÍÅÎÔÉÒÏ×ÁÎÙ, ÎÏ
+ ÄÌÑ ÎÅËÏÔÏÒÙÈ ÉÚ ÎÉÈ ÍÏÖÅÔ ÐÏÎÁÄÏÂÉÔØÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÅ
+ ÒÁÚßÑÓÎÅÎÉÅ:</para>
+
+ <programlisting># Components of the base system which should be kept updated.
+Components src world kernel</programlisting>
+
+ <para>äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÏÐÒÅÄÅÌÑÅÔ, ËÁËÉÅ ÞÁÓÔÉ &os; ÂÕÄÕÔ ÏÂÎÏ×ÌÅÎÙ.
+ ðÏ ÕÍÏÌÞÁÎÉÀ ÏÂÎÏ×ÌÑÅÔÓÑ ÉÓÈÏÄÎÙÊ ËÏÄ (src), ×ÓÑ ÂÁÚÏ×ÁÑ ÓÉÓÔÅÍÁ
+ (world) É ÑÄÒÏ (kernel). ëÏÍÐÏÎÅÎÔÙ ÔÅ ÖÅ ÓÁÍÙÅ, ÞÔÏ É ×Ï ×ÒÅÍÑ
+ ÕÓÔÁÎÏ×ËÉ; × ÞÁÓÔÎÏÓÔÉ, ÄÏÂÁ×ÌÅÎÉÅ "world/games" ÐÏÚ×ÏÌÑÅÔ
+ ÏÂÎÏ×ÉÔØ ÉÇÒÙ. éÓÐÏÌØÚÏ×ÁÎÉÅ "src/bin" ÐÏÚ×ÏÌÑÅÔ ÏÂÎÏ×ÉÔØ
+ ÉÓÈÏÄÎÙÊ ËÏÄ × <filename
+ class="directory">src/bin</filename>.</para>
+
+ <para>ìÕÞÛÉÍ ×ÁÒÉÁÎÔÏÍ ÂÕÄÅÔ ÏÓÔÁ×ÉÔØ ×Ó£ ËÁË ÅÓÔØ, ÐÏÓËÏÌØËÕ
+ ÉÚÍÅÎÅÎÉÅ ÜÔÏÇÏ ÐÅÒÅÞÎÑ Ó ÃÅÌØÀ ÄÏÂÁ×ÌÅÎÉÑ ÏÓÏÂÙÈ ÐÕÎËÔÏ×
+ ÐÏÔÒÅÂÕÅÔ ÏÔ ÐÏÌØÚÏ×ÁÔÅÌÑ ÕËÁÚÁÎÉÑ ÐÏÄÒÑÄ ×ÓÅÈ ÐÕÎËÔÏ×, ËÏÔÏÒÙÅ
+ ÐÏÌØÚÏ×ÁÔÅÌØ ÚÁÈÏÞÅÔ ÏÂÎÏ×ÉÔØ. üÔÏ ÍÏÖÅÔ ÐÒÉ×ÅÓÔÉ Ë ÎÅÇÁÔÉ×ÎÙÍ
+ ÐÏÓÌÅÄÓÔ×ÉÑÍ ÉÚ-ÚÁ ×ÏÚÍÏÖÎÏÊ ÒÁÓÓÉÎÈÒÏÎÉÚÁÃÉÉ ÍÅÖÄÕ ÉÓÈÏÄÎÙÍÉ
+ ÔÅËÓÔÁÍÉ É Ä×ÏÉÞÎÙÍÉ ÆÁÊÌÁÍÉ.</para>
+
+ <programlisting># Paths which start with anything matching an entry in an IgnorePaths
+# statement will be ignored.
+IgnorePaths</programlisting>
+
+ <para>äÏÂÁ×ØÔÅ ÓÀÄÁ ÐÕÔÉ Ë ËÁÔÁÌÏÇÁÍ (ÎÁÐÒÉÍÅÒ, <filename
+ class="directory">/bin</filename> ÉÌÉ <filename
+ class="directory">/sbin</filename>), ËÏÔÏÒÙÅ ×Ù ÈÏÔÅÌÉ ÂÙ
+ ÏÓÔÁ×ÉÔØ ÎÅÔÒÏÎÕÔÙÍÉ × ÐÒÏÃÅÓÓÅ ÏÂÎÏ×ÌÅÎÉÑ. üÔÏÔ ÐÁÒÁÍÅÔÒ ÍÏÖÎÏ
+ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÌÑ ÐÒÅÄÏÔ×ÒÁÝÅÎÉÑ ÐÅÒÅÚÁÐÉÓÙ×ÁÎÉÑ ÌÏËÁÌØÎÙÈ
+ ÉÚÍÅÎÅÎÉÊ ÐÒÏÇÒÁÍÍÏÊ <command>freebsd-update</command>.</para>
+
+ <programlisting># Paths which start with anything matching an entry in an UpdateIfUnmodified
+# statement will only be updated if the contents of the file have not been
+# modified by the user (unless changes are merged; see below).
+UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile</programlisting>
+
+ <para>ïÂÎÏ×ÌÑÔØ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ ÆÁÊÌÙ × ÕËÁÚÁÎÎÙÈ ËÁÔÁÌÏÇÁÈ, ÔÏÌØËÏ
+ ÅÓÌÉ ÏÎÉ ÎÅ ÓÏÄÅÒÖÁÔ ÉÚÍÅÎÅÎÉÊ. ðÒÉ ÎÁÌÉÞÉÉ ËÁËÉÈ-ÌÉÂÏ ÉÚÍÅÎÅÎÉÊ
+ ÓÏ ÓÔÏÒÏÎÙ ÐÏÌØÚÏ×ÁÔÅÌÑ Á×ÔÏÍÁÔÉÞÅÓËÏÅ ÏÂÎÏ×ÌÅÎÉÅ ÔÁËÉÈ ÆÁÊÌÏ×
+ ÏÔÍÅÎÑÅÔÓÑ. åÓÔØ ÄÒÕÇÏÊ ÐÁÒÁÍÅÔÒ
+ <literal>KeepModifiedMetadata</literal>, ËÏÔÏÒÙÊ ÐÒÅÄÐÉÓÙ×ÁÅÔ
+ ËÏÍÁÎÄÅ <command>freebsd-update</command> ÓÏÈÒÁÎÑÔØ ÉÚÍÅÎÅÎÉÑ ×Ï
+ ×ÒÅÍÑ ÐÒÏÃÅÓÓÁ ÓÌÉÑÎÉÑ.</para>
+
+ <programlisting># When upgrading to a new &os; release, files which match MergeChanges
+# will have any local changes merged into the version from the new release.
+MergeChanges /etc/ /var/named/etc/</programlisting>
+
+ <para>óÐÉÓÏË ËÁÔÁÌÏÇÏ× Ó ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÍÉ ÆÁÊÌÁÍÉ, ÄÌÑ ËÏÔÏÒÙÈ
+ <command>freebsd-update</command> ÐÏÐÙÔÁÅÔÓÑ ×ÙÐÏÌÎÉÔØ ÓÌÉÑÎÉÅ.
+ ðÒÏÃÅÓÓ ÓÌÉÑÎÉÑ ÆÁÊÌÁ ÐÒÅÄÓÔÁ×ÌÑÅÔ ÓÏÂÏÊ ÎÁÂÏÒ ÉÚÍÅÎÅÎÉÊ
+ × ÆÏÒÍÁÔÅ &man.diff.1;, ÐÏÈÏÖ ÎÁ &man.mergemaster.8;, ÎÏ Ó
+ ÍÅÎØÛÉÍ ËÏÌÉÞÅÓÔ×ÏÍ ÐÁÒÁÍÅÔÒÏ×: ÒÅÚÕÌØÔÁÔ ÓÌÉÑÎÉÑ ÐÒÉÎÉÍÁÅÔÓÑ,
+ ÏÔËÒÙ×ÁÅÔÓÑ ÒÅÄÁËÔÏÒ ÉÌÉ <command>freebsd-update</command>
+ ÐÒÅËÒÁÝÁÅÔ Ó×ÏÀ ÒÁÂÏÔÕ. ÷ ÓÌÕÞÁÅ ÓÏÍÎÅÎÉÊ ÓÄÅÌÁÊÔÅ ÒÅÚÅÒ×ÎÕÀ
+ ËÏÐÉÀ <filename class="directory">/etc</filename> É ÐÒÏÓÔÏ
+ ÓÏÇÌÁÓÉÔÅÓØ ÓÏ ×ÓÅÍÉ ÉÚÍÅÎÅÎÉÑÍÉ. äÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÄÒÏÂÎÏÊ
+ ÉÎÆÏÒÍÁÃÉÉ ÐÏ ËÏÍÁÎÄÅ <command>mergemaster</command> ÓÍÏÔÒÉÔÅ
+ <xref linkend="mergemaster"/>.</para>
+
+ <programlisting># Directory in which to store downloaded updates and temporary
+# files used by &os; Update.
+# WorkDir /var/db/freebsd-update</programlisting>
+
+ <para>üÔÏÔ ËÁÔÁÌÏÇ ÐÒÅÄÎÁÚÎÁÞÅÎ ÄÌÑ ÒÁÚÍÅÝÅÎÉÑ ÐÁÔÞÅÊ É ×ÒÅÍÅÎÎÙÈ
+ ÆÁÊÌÏ×. ÷ ÓÌÕÞÁÅ, ËÏÇÄÁ ÐÏÌØÚÏ×ÁÔÅÌØ ×ÙÐÏÌÎÑÅÔ ÏÂÎÏ×ÌÅÎÉÅ ÓÏ ÓÍÅÎÏÊ
+ ×ÅÒÓÉÉ, × ÜÔÏÍ ÍÅÓÔÅ ÄÏÌÖÅÎ ÉÍÅÔØ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ ÇÉÇÁÂÁÊÔ ÄÉÓËÏ×ÏÇÏ
+ ÐÒÏÓÔÒÁÎÓÔ×Á.</para>
+
+ <programlisting># When upgrading between releases, should the list of Components be
+# read strictly (StrictComponents yes) or merely as a list of components
+# which *might* be installed of which &os; Update should figure out
+# which actually are installed and upgrade those (StrictComponents no)?
+# StrictComponents no</programlisting>
+
+ <para>åÓÌÉ ×ÙÓÔÁ×ÌÅÎÏ ÚÎÁÞÅÎÉÅ <literal>yes</literal>, ÔÏ
+ <command>freebsd-update</command> ÂÕÄÅÔ ÉÓÈÏÄÉÔØ ÉÚ ÔÏÇÏ, ÞÔÏ
+ ÓÐÉÓÏË <literal>Components</literal> Ñ×ÌÑÅÔÓÑ ÐÏÌÎÙÍ, É ÎÅ ÂÕÄÅÔ
+ ÐÙÔÁÔØÓÑ ×ÙÐÏÌÎÉÔØ ÉÚÍÅÎÅÎÉÑ ÚÁ ÐÒÅÄÅÌÁÍÉ ÜÔÏÇÏ ÓÐÉÓËÁ.
+ ÷ ÄÅÊÓÔ×ÉÔÅÌØÎÏÓÔÉ <command>freebsd-update</command> ÐÏÐÙÔÁÅÔÓÑ
+ ÏÂÎÏ×ÉÔØ ×ÓÅ ÆÁÊÌÙ, ËÏÔÏÒÙÅ ÐÒÉÎÁÄÌÅÖÁÔ ÓÐÉÓËÕ
+ <literal>Components</literal>.</para>
+ </sect2>
+
+ <sect2>
+ <title>ïÂÎÏ×ÌÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ</title>
+
+ <para>ïÂÎÏ×ÌÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ ÈÒÁÎÑÔÓÑ ÎÁ ÕÄÁÌ£ÎÎÏÊ ÍÁÛÉÎÅ É ÍÏÇÕÔ
+ ÂÙÔØ ÚÁÇÒÕÖÅÎÙ É ÕÓÔÁÎÏ×ÌÅÎÙ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÓÌÅÄÕÀÝÅÊ
+ ËÏÍÁÎÄÙ:</para>
+
+ <screen>&prompt.root; <userinput>freebsd-update fetch</userinput>
+&prompt.root; <userinput>freebsd-update install</userinput></screen>
+
+ <para>åÓÌÉ ÂÙÌÉ ÕÓÔÁÎÏ×ÌÅÎÙ ÏÂÎÏ×ÌÅÎÉÑ ÑÄÒÁ, ÔÏ ÐÏÓÌÅ ÜÔÏÇÏ
+ ÎÕÖÎÏ ÐÅÒÅÚÁÇÒÕÚÉÔØ ÓÉÓÔÅÍÕ. åÓÌÉ ×ÓÅ ÐÏÛÌÏ ÈÏÒÏÛÏ, ÓÉÓÔÅÍÁ
+ ÄÏÌÖÎÁ ÂÙÔØ Ó ÕÓÔÁÎÏ×ÌÅÎÎÙÍÉ ÉÓÐÒÁ×ÌÅÎÉÑÍÉ, É
+ <command>freebsd-update</command> ÍÏÖÎÏ ÚÁÐÕÓËÁÔØ × ËÁÞÅÓÔ×Å ÎÏÞÎÏÇÏ
+ ÚÁÄÁÎÉÑ &man.cron.8;. äÌÑ ÜÔÏÇÏ ÄÏÓÔÁÔÏÞÎÏ ÄÏÂÁ×ÉÔØ ÓÌÅÄÕÀÝÕÀ
+ ÚÁÐÉÓØ × <filename>/etc/crontab</filename>:</para>
+
+ <programlisting>@daily root freebsd-update cron</programlisting>
+
+ <para>üÔÁ ÚÁÐÉÓØ ÏÚÎÁÞÁÅÔ, ÞÔÏ <command>freebsd-update</command> ÂÕÄÅÔ
+ ÚÁÐÕÓËÁÔØÓÑ ÅÖÅÄÎÅ×ÎÏ. ÷ ÄÁÎÎÏÍ ÓÌÕÞÁÅ, × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÁÒÇÕÍÅÎÔÏÍ
+ <option>cron</option> <command>freebsd-update</command> ÏÇÒÁÎÉÞÉÔÓÑ
+ ÐÒÏ×ÅÒËÏÊ ÄÏÓÔÕÐÎÙÈ ÏÂÎÏ×ÌÅÎÉÊ. ÷ ÓÌÕÞÁÅ ÎÁÌÉÞÉÑ ÏÂÎÏ×ÌÅÎÉÊ ÏÎÉ
+ ÂÕÄÕÔ Á×ÔÏÍÁÔÉÞÅÓËÉ ÚÁÇÒÕÖÅÎÙ É ÓÏÈÒÁÎÅÎÙ ÎÁ ÌÏËÁÌØÎÏÍ ÄÉÓËÅ.
+ ðÏÌØÚÏ×ÁÔÅÌÀ <username>root</username> ÂÕÄÅÔ ÏÔÐÒÁ×ÌÅÎÏ
+ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÅ ÐÉÓØÍÏ, ÔÁË ÞÔÏ ÜÔÉ ÏÂÎÏ×ÌÅÎÉÑ ÍÏÖÎÏ ÂÕÄÅÔ
+ ÕÓÔÁÎÏ×ÉÔØ ÓÁÍÏÓÔÏÑÔÅÌØÎÏ.</para>
+
+ <para>îÁ ÓÌÕÞÁÊ, ÅÓÌÉ ÞÔÏ-ÔÏ ÐÏÛÌÏ ÎÅ ÔÁË, ×
+ <command>freebsd-update</command> ÐÒÅÄÕÓÍÏÔÒÅÎ ÍÅÈÁÎÉÚÍ ×ÏÚ×ÒÁÔÁ
+ ÐÏÓÌÅÄÎÅÇÏ ÎÁÂÏÒÁ ÉÚÍÅÎÅÎÉÊ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÓÌÅÄÕÀÝÅÊ ËÏÍÁÎÄÙ:</para>
+
+ <screen>&prompt.root; <userinput>freebsd-update rollback</userinput></screen>
+
+ <para>åÓÌÉ ÐÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ×ÓÅÈ ÄÅÊÓÔ×ÉÊ ÂÙÌÏ ÉÚÍÅÎÅÎÏ ÑÄÒÏ ÉÌÉ
+ ËÁËÏÊ-ÌÉÂÏ ÉÚ ÅÇÏ ÍÏÄÕÌÅÊ, ÓÉÓÔÅÍÁ ÄÏÌÖÎÁ ÂÙÔØ ÐÅÒÅÚÁÇÒÕÖÅÎÁ.
+ üÔÏ ÐÏÚ×ÏÌÉÔ &os; ÚÁÇÒÕÚÉÔØ ÎÏ×ÙÅ Ä×ÏÉÞÎÙÅ ÆÁÊÌÙ × ÐÁÍÑÔØ.</para>
+
+ <note>
+ <para>ëÏÍÁÎÄÁ <command>freebsd-update</command> ÒÁÂÏÔÁÅÔ ÔÏÌØËÏ
+ Ó ÑÄÒÏÍ <filename>GENERIC</filename>. åÓÌÉ ×
+ <filename>GENERIC</filename> ÐÒÉÓÕÔÓÔ×ÕÀÔ ÉÚÍÅÎÅÎÉÑ ÉÌÉ
+ ÉÓÐÏÌØÚÕÅÔÓÑ ÓÏÂÓÔ×ÅÎÎÁÑ ËÏÎÆÉÇÕÒÁÃÉÑ ÑÄÒÁ,
+ <command>freebsd-update</command> ÚÁ×ÅÒÛÉÔÓÑ ÎÅÕÄÁÞÎÏ.</para>
+ </note>
+ </sect2>
+
+ <sect2>
+ <title>ïÂÎÏ×ÌÅÎÉÑ ÓÏ ÓÍÅÎÏÊ ÓÔÁÒÛÅÊ É ÍÌÁÄÛÅÊ ×ÅÒÓÉÊ</title>
+
+ <para>üÔÏÔ ÐÒÏÃÅÓÓ ÕÄÁÌÑÅÔ ÓÔÁÒÙÅ ÏÂßÅËÔÎÙÅ ÆÁÊÌÙ É ÂÉÂÌÉÏÔÅËÉ, ÞÔÏ
+ ÍÏÖÅÔ ÎÁÒÕÛÉÔØ ÒÁÂÏÔÕ ÂÏÌØÛÉÎÓÔ×Á ÓÔÏÒÏÎÎÉÈ ÐÒÉÌÏÖÅÎÉÊ. ÷ÓÅ
+ ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÐÏÒÔÙ ÒÅËÏÍÅÎÄÕÅÔÓÑ ÌÉÂÏ ÕÄÁÌÉÔØ É ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ
+ ÚÁÎÏ×Ï, ÌÉÂÏ ÏÂÎÏ×ÉÔØ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÏÇÒÁÍÍÙ <filename
+ role="package">ports-mgmt/portupgrade</filename>. âÏÌØÛÉÎÓÔ×Ï
+ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÐÒÅÄÐÏÞÔÕÔ ×ÙÐÏÌÎÉÔØ ÔÅÓÔÏ×ÏÅ ÐÏÓÔÒÏÅÎÉÅ, ÚÁÐÕÓÔÉ× ÄÌÑ
+ ÜÔÏÇÏ ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ:</para>
+
+ <screen>&prompt.root; <userinput>portupgrade -af</userinput></screen>
+
+ <para>üÔÏ ÐÏÚ×ÏÌÉÔ ÕÂÅÄÉÔØÓÑ × ÔÏÍ, ÞÔÏ ×Ó£ ÂÕÄÅÔ ÐÅÒÅÕÓÔÁÎÏ×ÌÅÎÏ
+ ÐÒÁ×ÉÌØÎÏ. ïÂÒÁÔÉÔÅ ×ÎÉÍÁÎÉÅ, ÞÔÏ ÅÓÌÉ ÐÅÒÅÍÅÎÎÏÊ ÏËÒÕÖÅÎÉÑ
+ <makevar>BATCH</makevar> ÐÒÉÓ×ÏÉÔØ ÚÎÁÞÅÎÉÅ <literal>yes</literal>,
+ ÔÏ ÎÁ ×ÓÅ ×ÏÐÒÏÓÙ × ÔÅÞÅÎÉÅ ÜÔÏÇÏ ÐÒÏÃÅÓÓÁ ÂÕÄÅÔ ×ÏÚ×ÒÁÝÁÔØÓÑ
+ ÏÔ×ÅÔ <literal>yes</literal>, ÞÔÏ ÐÏÚ×ÏÌÉÔ ÉÓËÌÀÞÉÔØ ÎÅÏÂÈÏÄÉÍÏÓÔØ
+ ÒÕÞÎÏÇÏ ×ÍÅÛÁÔÅÌØÓÔ×Á × ÐÒÏÃÅÓÓ ÐÏÓÔÒÏÅÎÉÑ.</para>
+
+ <para>ïÂÎÏ×ÌÅÎÉÑ ÓÏ ÓÍÅÎÏÊ ÓÔÁÒÛÅÊ É ÍÌÁÄÛÅÊ ×ÅÒÓÉÊ ÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ,
+ ÕËÁÚÁ× ÚÎÁÞÅÎÉÅ ×ÅÒÓÉÉ, ÎÁ ËÏÔÏÒÕÀ ÂÕÄÅÔ ÐÒÏÉÚ×ÅÄÅÎ ÐÅÒÅÈÏÄ, ×
+ ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ ËÏÍÁÎÄÙ <command>freebsd-update</command>.
+ ôÁË, ÎÁÐÒÉÍÅÒ, ÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ ÏÂÎÏ×ÌÅÎÉÅ ÄÏ ×ÅÒÓÉÉ
+ &os; 6.3:</para>
+
+ <screen>&prompt.root; <userinput>freebsd-update -r 6.3-RELEASE upgrade</userinput></screen>
+
+ <para>ðÏÓÌÅ Ó×ÏÅÇÏ ÚÁÐÕÓËÁ <command>freebsd-update</command>
+ ÁÎÁÌÉÚÉÒÕÅÔ ÓÏÄÅÒÖÉÍÏÅ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÇÏ ÆÁÊÌÁ É ÓÏÂÉÒÁÅÔ
+ ÎÅÏÂÈÏÄÉÍÕÀ ÄÌÑ ÐÒÏ×ÅÄÅÎÉÑ ÏÂÎÏ×ÌÅÎÉÑ ÉÎÆÏÒÍÁÃÉÀ Ï ÔÅËÕÝÅÊ
+ ÕÓÔÁÎÏ×ÌÅÎÎÏÊ ÓÉÓÔÅÍÅ. îÁ ÜËÒÁÎ ÂÕÄÅÔ ×ÙÄÁÎ ÐÅÒÅÞÅÎØ ËÏÍÐÏÎÅÎÔÏ×,
+ ËÏÔÏÒÙÅ ÕÄÁÌÏÓØ É ÎÅ ÕÄÁÌÏÓØ ÏÂÎÁÒÕÖÉÔØ ÕÓÔÁÎÏ×ÌÅÎÎÙÍÉ.
+ îÁÐÒÉÍÅÒ:</para>
+
+ <screen>Looking up update.FreeBSD.org mirrors... 1 mirrors found.
+Fetching metadata signature for 6.3-BETA1 from update1.FreeBSD.org... done.
+Fetching metadata index... done.
+Inspecting system... done.
+
+The following components of FreeBSD seem to be installed:
+kernel/smp src/base src/bin src/contrib src/crypto src/etc src/games
+src/gnu src/include src/krb5 src/lib src/libexec src/release src/rescue
+src/sbin src/secure src/share src/sys src/tools src/ubin src/usbin
+world/base world/info world/lib32 world/manpages
+
+The following components of FreeBSD do not seem to be installed:
+kernel/generic world/catpages world/dict world/doc world/games
+world/proflibs
+
+Does this look reasonable (y/n)? y</screen>
+
+ <para>óÌÅÄÕÀÝÉÍ ÛÁÇÏÍ <command>freebsd-update</command> ÐÏÐÙÔÁÅÔÓÑ
+ ÚÁÇÒÕÚÉÔØ ÐÏ ÓÅÔÉ ÆÁÊÌÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ×ÙÐÏÌÎÅÎÉÑ ÏÂÎÏ×ÌÅÎÉÑ.
+ ÷ ÎÅËÏÔÏÒÙÈ ÓÌÕÞÁÑÈ ÍÏÖÅÔ ÐÏÔÒÅÂÏ×ÁÔØÓÑ ÏÔ×ÅÔÉÔØ ÎÁ ×ÏÐÒÏÓÙ
+ ÏÔÎÏÓÉÔÅÌØÎÏ ÔÏÇÏ, ÞÔÏ É ËÁË ÕÓÔÁÎÁ×ÌÉ×ÁÔØ.</para>
+
+ <para>ðÏÓÌÅ ÔÏÇÏ, ËÁË ×ÓÅ ÉÚÍÅÎÅÎÉÑ ÂÙÌÉ ÚÁÇÒÕÖÅÎÙ, ÏÎÉ ÂÕÄÕÔ
+ ÐÒÉÍÅÎÅÎÙ. üÔÏÔ ÐÒÏÃÅÓÓ ÍÏÖÅÔ ÚÁÎÑÔØ ÏÐÒÅÄÅÌ£ÎÎÏÅ ×ÒÅÍÑ, ×
+ ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔÉ É ÔÅËÕÝÅÊ ÚÁÇÒÕÖÅÎÎÏÓÔÉ
+ ËÏÍÐØÀÔÅÒÁ. úÁÔÅÍ ÂÕÄÅÔ ×ÙÐÏÌÎÅÎÏ ÓÌÉÑÎÉÅ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÈ ÆÁÊÌÏ×
+ — ÜÔÁ ÞÁÓÔØ ÐÒÏÃÅÓÓÁ ÔÒÅÂÕÅÔ ÏÔ ÐÏÌØÚÏ×ÁÔÅÌÑ ÏÐÒÅÄÅÌ£ÎÎÏÇÏ
+ ×ÍÅÛÁÔÅÌØÓÔ×Á, ÔÁË ËÁË ÄÌÑ ÆÁÊÌÁ ÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ ÓÌÉÑÎÉÅ
+ Á×ÔÏÍÁÔÉÞÅÓËÉ, Á ÍÏÖÎÏ ÏÔËÒÙÔØ ÔÅËÓÔÏ×ÙÊ ÒÅÄÁËÔÏÒ ÄÌÑ ÓÌÉÑÎÉÑ
+ ×ÒÕÞÎÕÀ. òÅÚÕÌØÔÁÔ ÕÓÐÅÛÎÏÇÏ ÓÌÉÑÎÉÑ ÂÕÄÅÔ ÐÏËÁÚÁÎ ÎÁ ÜËÒÁÎÅ.
+ îÅÕÄÁÞÎÏÅ ÉÌÉ ÐÒÏÐÕÝÅÎÎÏÅ ÓÌÉÑÎÉÅ ×ÙÚÏ×ÅÔ ÐÒÅÖÄÅ×ÒÅÍÅÎÎÏÅ ÚÁ×ÅÒÛÅÎÉÅ
+ ÐÒÏÇÒÁÍÍÙ. íÏÖÎÏ ÐÏÄÇÏÔÏ×ÉÔØ ÒÅÚÅÒ×ÎÕÀ ËÏÐÉÀ ËÁÔÁÌÏÇÁ <filename
+ class="directory">/etc</filename> ÄÌÑ ÔÁËÉÈ ×ÁÖÎÙÈ ÆÁÊÌÏ× ËÁË
+ <filename>master.passwd</filename> É <filename>group</filename> É
+ ×ÙÐÏÌÎÉÔØ ÉÈ ÓÌÉÑÎÉÅ ×ÒÕÞÎÕÀ ÐÏÚÄÎÅÅ.</para>
+
+ <note>
+ <para>îÁ ÄÁÎÎÏÍ ÜÔÁÐÅ ÓÉÓÔÅÍÁ ÅÝÅ ÎÅ ÍÏÄÉÆÉÃÉÒÏ×ÁÎÁ, É ×ÓÅ ÉÚÍÅÎÅÎÉÑ
+ É ÓÌÉÑÎÉÑ ÐÒÏÉÓÈÏÄÑÔ × ÏÔÄÅÌØÎÏÍ ËÁÔÁÌÏÇÅ. ôÅÐÅÒØ, ËÏÇÄÁ ×ÓÅ
+ ÉÚÍÅÎÅÎÉÑ ÕÓÐÅÛÎÏ ÐÒÉÍÅÎÅÎÙ, ×ÓÅ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ ÆÁÊÌÙ ÓÌÉÔÙ É
+ ËÁÖÅÔÓÑ, ÞÔÏ ÐÒÏÃÅÓÓ ÄÏÌÖÅÎ ÐÒÏÊÔÉ ÐÌÁ×ÎÏ, ÐÏÌØÚÏ×ÁÔÅÌØ ÄÏÌÖÅÎ
+ ÕÓÔÁÎÏ×ÉÔØ ÉÚÍÅÎÅÎÉÑ.</para>
+ </note>
+
+ <para>ðÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÜÔÏÇÏ ÐÒÏÃÅÓÓÁ, ÉÚÍÅÎÅÎÉÑ ÍÏÇÕÔ ÂÙÔØ
+ ÕÓÔÁÎÏ×ÌÅÎÙ ÎÁ ÄÉÓË Ó ÐÏÍÏÝØÀ ÓÌÅÄÕÀÝÅÊ ËÏÍÁÎÄÙ.</para>
+
+ <screen>&prompt.root; <userinput>freebsd-update install</userinput></screen>
+
+ <para>÷ ÐÅÒ×ÕÀ ÏÞÅÒÅÄØ ÉÚÍÅÎÅÎÉÑ ÂÕÄÕÔ ÐÒÉÍÅÎÅÎÙ Ë ÑÄÒÕ É ÅÇÏ ÍÏÄÕÌÑÍ.
+ ðÏÓÌÅ ÜÔÏÇÏ ËÏÍÐØÀÔÅÒ ÄÏÌÖÅÎ ÂÙÔØ ÐÅÒÅÚÁÇÒÕÖÅÎ. óÌÅÄÕÀÝÁÑ ËÏÍÁÎÄÁ
+ ×ÙÐÏÌÎÉÔ ÐÅÒÅÚÁÇÒÕÚËÕ ËÏÍÐØÀÔÅÒÁ, ÐÏÓÌÅ ÞÅÇÏ ÂÕÄÅÔ ÚÁÇÒÕÖÅÎÏ ÎÏ×ÏÅ
+ ÑÄÒÏ:</para>
+
+ <screen>&prompt.root; <userinput>shutdown -r now</userinput></screen>
+
+ <para>ðÏÓÌÅ ÐÅÒÅÚÁÇÒÕÚËÉ ÎÕÖÎÏ ÐÏ×ÔÏÒÎÏ ÚÁÐÕÓÔÉÔØ ËÏÍÁÎÄÕ
+ <command>freebsd-update</command>. ëÏÍÁÎÄÁ ÐÒÏÞÉÔÁÅÔ, ÎÁ ËÁËÏÍ
+ ÜÔÁÐÅ ÏÎÁ ÎÁÈÏÄÉÔÓÑ, É ÐÅÒÅÊÄ£Ô Ë ÕÄÁÌÅÎÉÀ ÓÔÁÒÙÈ ÏÂßÅËÔÎÙÈ ÆÁÊÌÏ×
+ É ÓÏ×ÍÅÓÔÎÏ ÉÓÐÏÌØÚÕÅÍÙÈ ÂÉÂÌÉÏÔÅË. þÔÏÂÙ ÐÅÒÅÊÔÉ Ë ÜÔÏÍÕ ÜÔÁÐÕ,
+ ×ÙÐÏÌÎÉÔÅ ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ:</para>
+
+ <screen>&prompt.root; <userinput>freebsd-update install</userinput></screen>
+
+ <note>
+ <para>ëÏÌÉÞÅÓÔ×Ï ÜÔÁÐÏ× ÕÓÔÁÎÏ×ËÉ ÏÂÎÏ×ÌÅÎÉÊ ÍÏÖÅÔ ÂÙÔØ Ä×Á ×ÍÅÓÔÏ
+ ÔÒ£È É ÚÁ×ÉÓÉÔ ÏÔ ÔÏÇÏ, ÂÙÌÉ ÌÉ ÉÚÍÅÎÅÎÙ ÎÏÍÅÒÁ ×ÅÒÓÉÊ ËÁËÉÈ-ÌÉÂÏ
+ ÓÏ×ÍÅÓÔÎÏ ÉÓÐÏÌØÚÕÅÍÙÈ ÂÉÂÌÉÏÔÅË.</para>
+ </note>
+
+ <para>ôÅÐÅÒØ ÐÏÎÁÄÏÂÉÔÓÑ ÐÅÒÅÓÏÂÒÁÔØ É ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ ×Ó£ ÓÔÏÒÏÎÎÅÅ
+ ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ. üÔÏ ÎÅÏÂÈÏÄÉÍÁÑ ÏÐÅÒÁÃÉÑ, ÔÁË ËÁË
+ ÕÓÔÁÎÏ×ÌÅÎÎÏÅ ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ ÍÏÖÅÔ ÚÁ×ÉÓÅÔØ ÏÔ ÂÉÂÌÉÏÔÅË,
+ ËÏÔÏÒÙÅ ÂÙÌÉ ÕÄÁÌÅÎÙ × ÐÒÏÃÅÓÓÅ ÓÍÅÎÙ ×ÅÒÓÉÉ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ.
+ äÌÑ Á×ÔÏÍÁÔÉÚÁÃÉÉ ÜÔÏÇÏ ÐÒÏÃÅÓÓÁ ÍÏÖÎÏ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ËÏÍÁÎÄÏÊ
+ <filename role="package">ports-mgmt/portupgrade</filename>.
+ îÁÞÁÔØ ÍÏÖÎÏ ÓÏ ÓÌÅÄÕÀÝÉÈ ËÏÍÁÎÄ:</para>
+
+ <screen>&prompt.root; <userinput>portupgrade -f ruby</userinput>
+&prompt.root; <userinput>rm /var/db/pkg/pkgdb.db</userinput>
+&prompt.root; <userinput>portupgrade -f ruby18-bdb</userinput>
+&prompt.root; <userinput>rm /var/db/pkg/pkgdb.db /usr/ports/INDEX-*.db</userinput>
+&prompt.root; <userinput>portupgrade -af</userinput></screen>
+
+ <para>ðÏÓÌÅ ÜÔÏÇÏ ÚÁ×ÅÒÛÉÔÅ ÐÒÏÃÅÓÓ ÏÂÎÏ×ÌÅÎÉÑ ÐÏÓÌÅÄÎÉÍ ÚÁÐÕÓËÏÍ
+ <command>freebsd-update</command>. ÷ÙÐÏÌÎÉÔÅ ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ,
+ ÞÔÏÂÙ ÕÂÅÄÉÔØÓÑ, ÞÔÏ ÎÉÞÅÇÏ ÎÅ ÚÁÂÙÔÏ × ÐÒÏÃÅÓÓÅ ÏÂÎÏ×ÌÅÎÉÑ:</para>
+
+ <screen>&prompt.root; <userinput>freebsd-update install</userinput></screen>
+
+ <para>ðÅÒÅÚÁÇÒÕÚÉÔÅ ËÏÍÐØÀÔÅÒ Ó ÎÏ×ÏÊ ×ÅÒÓÉÅÊ &os;. îÁ ÜÔÏÍ ÐÒÏÃÅÓÓ
+ ÚÁ×ÅÒÛ£Î.</para>
+ </sect2>
+
+ <sect2>
+ <title>óÒÁ×ÎÅÎÉÅ ÓÏÓÔÏÑÎÉÑ ÓÉÓÔÅÍÙ</title>
+
+ <para>õÔÉÌÉÔÁ <command>freebsd-update</command> ÍÏÖÅÔ ÂÙÔØ
+ ÉÓÐÏÌØÚÏ×ÁÎÁ ÄÌÑ ÐÒÏ×ÅÒËÉ ÓÏÓÔÏÑÎÉÑ ÕÓÔÁÎÏ×ÌÅÎÎÏÊ ×ÅÒÓÉÉ &os;
+ ÏÔÎÏÓÉÔÅÌØÎÏ ÉÚ×ÅÓÔÎÏÊ ÈÏÒÏÛÅÊ ËÏÐÉÉ. ïÃÅÎÉ×ÁÅÔÓÑ ÔÅËÕÝÁÑ ×ÅÒÓÉÑ
+ ÓÉÓÔÅÍÎÙÈ ÕÔÉÌÉÔ, ÂÉÂÌÉÏÔÅË É ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÈ ÆÁÊÌÏ×. äÌÑ ÔÏÇÏ,
+ ÞÔÏÂÙ ÎÁÞÁÔØ ÓÒÁ×ÎÅÎÉÅ, ×ÙÐÏÌÎÉÔÅ ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ:</para>
+
+ <screen>&prompt.root; <userinput>freebsd-update IDS >> outfile.ids</userinput></screen>
+
+ <warning>
+ <para>îÅ ÓÍÏÔÒÑ ÎÁ ÔÏ, ÞÔÏ ËÏÍÁÎÄÁ ÎÁÚÙ×ÁÅÔÓÑ
+ <acronym>IDS</acronym>, ÜÔÏ ÎÉ × ËÏÅÊ ÍÅÒÅ ÎÅ ÄÏÌÖÎÏ Ñ×ÌÑÔØÓÑ
+ ÚÁÍÅÎÏÊ ÓÉÓÔÅÍÅ ÏÂÎÁÒÕÖÅÎÉÑ ×ÔÏÒÖÅÎÉÊ, ÔÁËÏÊ ËÁË <filename
+ role="package">security/snort</filename>. ðÏÓËÏÌØËÕ
+ <command>freebsd-update</command> ÓÏÈÒÁÎÁÅÔ Ó×ÏÉ ÄÁÎÎÙÅ ÎÁ
+ ÄÉÓËÅ, ×ÏÚÍÏÖÎÏÓÔØ ÐÏÄÍÅÎÙ ÓÔÁÎÏ×ÉÔÓÑ ÏÞÅ×ÉÄÎÏÊ. é ÈÏÔÑ ÜÔÁ
+ ×ÏÚÍÏÖÎÏÓÔØ ÍÏÖÅÔ ÂÙÔØ ÕÍÅÎØÛÅÎÁ ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÎÁÓÔÒÏÊËÉ
+ <varname>kern.securelevel</varname>, Á ÔÁËÖÅ ÉÓÐÏÌØÚÕÑ ÄÌÑ
+ ÚÁÐÉÓÉ ÄÁÎÎÙÈ <command>freebsd-update</command> ÆÁÊÌÏ×ÕÀ
+ ÓÉÓÔÅÍÕ, ËÏÔÏÒÁÑ × ÏÓÔÁÌØÎÏÅ ×ÒÅÍÑ ÓÍÏÎÔÉÒÏ×ÁÎÁ ÔÏÌØËÏ ÎÁ
+ ÞÔÅÎÉÅ, ÌÕÞÛÉÍ ÒÅÛÅÎÉÅÍ ÂÕÄÅÔ ÓÒÁ×ÎÉÔØ ÓÉÓÔÅÍÕ ÏÔÎÏÓÉÔÅÌØÎÏ
+ ÜÔÁÌÏÎÁ ÎÁ ÆÉÚÉÞÅÓËÉ ÚÁÝÉÝÅÎÎÏÍ ÎÏÓÉÔÅÌÅ, ÔÁËÏÍ ËÁË
+ <acronym>DVD</acronym> ÉÌÉ ×ÎÅÛÎÉÊ <acronym>USB</acronym> ÄÉÓË
+ Ó ×ËÌÀÞ£ÎÎÏÊ ÚÁÝÉÔÏÊ ÏÔ ÚÁÐÉÓÉ.</para>
+ </warning>
+
+ <para>ôÅÐÅÒØ ÚÁÐÕÓÔÉÔÓÑ ÐÒÏ×ÅÒËÁ ÓÉÓÔÅÍÙ, × ÒÅÚÕÌØÔÁÔÅ ËÏÔÏÒÏÊ ÂÕÄÅÔ
+ ×Ù×ÅÄÅÎ ÓÐÉÓÏË ÆÁÊÌÏ× Ó ÉÈ ËÏÎÔÒÏÌØÎÙÍÉ ÓÕÍÍÁÍÉ × &man.sha256.1; Ó
+ ÉÚ×ÅÓÔÎÙÍ ÚÎÁÞÅÎÉÅÍ ÄÌÑ ÆÁÊÌÁ ÉÚ ÒÅÌÉÚÁ É ÚÎÁÞÅÎÉÅÍ ÄÌÑ ÔÅËÕÝÅÇÏ
+ × ÓÉÓÔÅÍÅ. òÅÚÕÌØÔÁÔ ×Ù×ÏÄÉÔÓÑ ÓÌÉÛËÏÍ ÂÙÓÔÒÏ ÄÌÑ ÎÁÇÌÑÄÎÏÇÏ
+ ÓÒÁ×ÎÅÎÉÑ É ×ÓËÏÒÅ ÚÁÐÏÌÎÑÅÔ ËÏÎÓÏÌØÎÙÊ ÂÕÆÅÒ. ðÏ ÜÔÏÊ ÐÒÉÞÉÎÅ ×
+ ÄÁÎÎÏÍ ÐÒÉÍÅÒÅ ×Ù×ÏÄ ÐÅÒÅÎÁÐÒÁ×ÌÅÎ × ÆÁÊÌ
+ <filename>outfile.ids</filename>.</para>
+
+ <para>üÔÉ ÓÔÒÏËÉ ÔÁËÖÅ ÏÞÅÎØ ÄÌÉÎÎÙÅ, ÎÏ ÚÁÔÏ ÔÁËÏÊ ÆÏÒÍÁÔ ×Ù×ÏÄÁ
+ ÕÄÏÂÅÎ ÄÌÑ ÒÁÚÂÏÒÁ. ôÁË, ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÓÐÉÓËÁ ×ÓÅÈ ÏÔÌÉÞÁÀÝÉÈÓÑ
+ ÏÔ ÒÅÌÉÚÁ ÆÁÊÌÏ× ÄÏÓÔÁÔÏÞÎÏ ×ÙÐÏÌÎÉÔØ ÔÁËÕÀ ËÏÍÁÎÄÕ:</para>
+
+ <screen>&prompt.root; <userinput>cat outfile.ids | awk '{ print $1 }' | more</userinput>
+/etc/master.passwd
+/etc/motd
+/etc/passwd
+/etc/pf.conf</screen>
+
+ <para>÷Ù×ÏÄ ÓÐÅÃÉÁÌØÎÏ ÏÂÒÅÚÁÎ, ÎÁ ÓÁÍÏÍ ÄÅÌÅ ÆÁÊÌÏ× ÎÁÍÎÏÇÏ ÂÏÌØÛÅ.
+ îÅËÏÔÏÒÙÅ ÉÚ ÎÉÈ ÉÚÍÅÎÅÎÙ × ÈÏÄÅ ÎÏÒÍÁÌØÎÏÊ ÒÁÂÏÔÙ: ÔÁË, ÆÁÊÌ
+ <filename>/etc/passwd</filename> ÂÙÌ ÉÚÍÅΣΠÐÏÓÌÅ ÚÁ×ÅÄÅÎÉÑ
+ ÐÏÌØÚÏ×ÁÔÅÌÅÊ × ÓÉÓÔÅÍÅ. ÷ ÎÅËÏÔÏÒÙÈ ÓÌÕÞÁÑÈ ÍÏÇÕÔ ÂÙÔØ É ÄÒÕÇÉÅ
+ ÆÁÊÌÙ, ÔÁËÉÅ ËÁË ÍÏÄÕÌÉ ÑÄÒÁ, ËÏÔÏÒÙÅ ÍÏÇÌÉ ÉÚÍÅÎÉÔØÓÑ ×ÓÌÅÄÓÔ×ÉÅ
+ ÏÂÎÏ×ÌÅÎÉÑ ÞÅÒÅÚ <command>freebsd-update</command>. äÌÑ
+ ÉÓËÌÀÞÅÎÉÑ ÉÚ ÐÒÏ×ÅÒËÉ ËÏÎËÒÅÔÎÙÈ ÆÁÊÌÏ× É ËÁÔÁÌÏÇÏ× ÕËÁÖÉÔÅ ÉÈ
+ × ËÁÞÅÓÔ×Å ÚÎÁÞÅÎÉÑ ÐÁÒÁÍÅÔÒÁ <literal>IDSIgnorePaths</literal>
+ × <filename>/etc/freebsd-update.conf</filename>.</para>
+
+ <para>üÔÁ ÓÉÓÔÅÍÁ ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ËÁË ÞÁÓÔØ ÂÏÌÅÅ ÓÌÏÖÎÏÊ
+ ÐÒÏÃÅÄÕÒÙ ÏÂÎÏ×ÌÅÎÉÑ, × ÏÔÌÉÞÉÅ ÏÔ ÏÐÉÓÁÎÎÏÇÏ ×ÙÛÅ ÓÐÏÓÏÂÁ.</para>
+ </sect2>
</sect1>
+ <sect1 id="updating-upgrading-portsnap">
+ <sect1info>
+ <authorgroup>
+ <author>
+ <firstname>Tom</firstname>
+ <surname>Rhodes</surname>
+ <contrib>ðÒÅÄÏÓÔÁ×ÉÌ </contrib>
+ </author>
+ </authorgroup>
+ <authorgroup>
+ <author>
+ <firstname>Colin</firstname>
+ <surname>Percival</surname>
+ <contrib>îÁ ÏÓÎÏ×Å ÚÁÍÅÔÏË, ËÏÔÏÒÙÅ ÐÒÅÄÏÓÔÁ×ÉÌ </contrib>
+ </author>
+ </authorgroup>
+ </sect1info>
+ <title>Portsnap: ÓÒÅÄÓÔ×Ï ÏÂÎÏ×ÌÅÎÉÑ ëÏÌÌÅËÃÉÉ ðÏÒÔÏ×</title>
+
+ <indexterm><primary>ÏÂÎÏ×ÌÅÎÉÅ É ÓÍÅÎÁ ×ÅÒÓÉÉ</primary></indexterm>
+ <indexterm>
+ <primary>Portsnap</primary>
+ <see>ÏÂÎÏ×ÌÅÎÉÅ É ÓÍÅÎÁ ×ÅÒÓÉÉ</see>
+ </indexterm>
+
+ <para>äÌÑ ÏÂÎÏ×ÌÅÎÉÑ ëÏÌÌÅËÃÉÉ ðÏÒÔÏ× × ÂÁÚÏ×ÕÀ ÐÏÓÔÁ×ËÕ &os;
+ ×ËÌÀÞÅÎÁ ÕÔÉÌÉÔÁ &man.portsnap.8;. ÷Ï ×ÒÅÍÑ Å£ ×ÙÐÏÌÎÅÎÉÑ
+ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÓÏÅÄÉÎÅÎÉÅ Ó ÕÄÁÌ£ÎÎÙÍ ÓÅÒ×ÅÒÏÍ, ÐÒÏ×ÅÒÑÅÔÓÑ
+ ÐÒÁ×ÉÌØÎÏÓÔØ ËÌÀÞÁ É ÚÁÇÒÕÖÁÅÔÓÑ ÎÏ×ÁÑ ËÏÐÉÑ ëÏÌÌÅËÃÉÉ ðÏÒÔÏ×.
+ ëÌÀÞ ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÐÒÏ×ÅÒËÉ ÃÅÌÏÓÔÎÏÓÔÉ ÚÁÇÒÕÖÅÎÎÙÈ ÆÁÊÌÏ×
+ ÄÌÑ ÉÓËÌÀÞÅÎÉÑ ×ÏÚÍÏÖÎÏÓÔÉ ÐÏÄÍÅÎÙ ÎÁ ÜÔÁÐÅ ÐÅÒÅÄÁÞÉ ÆÁÊÌÏ×.
+ äÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÓÌÅÄÎÅÊ ×ÅÒÓÉÉ ÆÁÊÌÏ× ëÏÌÌÅËÃÉÉ ðÏÒÔÏ× ×ÙÐÏÌÎÉÔÅ
+ ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ:</para>
+
+ <screen>&prompt.root; <userinput>portsnap fetch</userinput>
+Looking up portsnap.FreeBSD.org mirrors... 3 mirrors found.
+Fetching snapshot tag from portsnap1.FreeBSD.org... done.
+Fetching snapshot metadata... done.
+Updating from Wed Aug 6 18:00:22 EDT 2008 to Sat Aug 30 20:24:11 EDT 2008.
+Fetching 3 metadata patches.. done.
+Applying metadata patches... done.
+Fetching 3 metadata files... done.
+Fetching 90 patches.....10....20....30....40....50....60....70....80....90. done.
+Applying patches... done.
+Fetching 133 new ports or files... done.</screen>
+
+ <para>÷ ÄÁÎÎÏÍ ÐÒÉÍÅÒÅ ÐÏËÁÚÁÎÏ, ÞÔÏ &man.portsnap.8; ÏÂÎÁÒÕÖÉÌÁ
+ É ×ÅÒÉÆÉÃÉÒÏ×ÁÌÁ ÎÅÓËÏÌØËÏ ÐÁÔÞÅÊ ÏÔÎÏÓÉÔÅÌØÎÏ ÔÅËÕÝÅÇÏ ÓÏÄÅÒÖÉÍÏÇÏ
+ ÐÏÒÔÏ×. úÄÅÓØ ÔÁËÖÅ ×ÉÄÎÏ, ÞÔÏ ÕÔÉÌÉÔÁ ÕÖÅ ÚÁÐÕÓËÁÌÁÓØ ÒÁÎÅÅ,
+ ÉÎÁÞÅ ÐÒÉ ÐÅÒ×ÏÍ ÚÁÐÕÓËÅ ÂÙÌÁ ÂÙ ÚÁÇÒÕÖÅÎÁ ×ÓÑ ËÏÌÌÅËÃÉÑ.</para>
+
+ <para>ðÏÓÌÅ ÔÏÇÏ ËÁË &man.portsnap.8; ÕÓÐÅÛÎÏ ÚÁ×ÅÒÛÉÌÁ ÏÐÅÒÁÃÉÀ
+ <command>fetch</command>, ëÏÌÌÅËÃÉÑ ðÏÒÔÏ× É ÓÏÐÕÔÓÔ×ÕÀÝÉÅ ÐÁÔÞÉ
+ ÎÁÈÏÄÑÔÓÑ ÎÁ ÌÏËÁÌØÎÏÊ ÓÉÓÔÅÍÅ É ÐÒÏÛÌÉ ÐÒÏ×ÅÒËÕ ÃÅÌÏÓÔÎÏÓÔÉ.
+ ïÂÎÏ×Ì£ÎÎÙÅ ÆÁÊÌÙ ÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ËÏÍÁÎÄÏÊ:</para>
+
+ <screen>&prompt.root; <userinput>portsnap extract</userinput>
+/usr/ports/.cvsignore
+/usr/ports/CHANGES
+/usr/ports/COPYRIGHT
+/usr/ports/GIDs
+/usr/ports/KNOBS
+/usr/ports/LEGAL
+/usr/ports/MOVED
+/usr/ports/Makefile
+/usr/ports/Mk/bsd.apache.mk
+/usr/ports/Mk/bsd.autotools.mk
+/usr/ports/Mk/bsd.cmake.mk
+<replaceable>...</replaceable></screen>
+
+ <para>îÁ ÜÔÏÍ ÐÒÏÃÅÓÓ ÚÁ×ÅÒÛ£Î, É ÔÅÐÅÒØ ÐÒÉÌÏÖÅÎÉÑ ÍÏÖÎÏ
+ ÕÓÔÁÎÏ×ÉÔØ ÉÌÉ ÏÂÎÏ×ÉÔØ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ëÏÌÌÅËÃÉÉ ðÏÒÔÏ×.</para>
+
+ <para>äÌÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÇÏ ÚÁÐÕÓËÁ ÏÂÏÉÈ ÐÒÏÃÅÓÓÏ× ×ÙÐÏÌÎÉÔÅ
+ ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ:</para>
+
+ <screen>&prompt.root; <userinput>portsnap fetch update</userinput></screen>
+ </sect1>
+
<sect1 id="current-stable">
- <title>&os.current; ÐÒÏÔÉ× &os.stable;</title>
+ <title>éÓÐÏÌØÚÏ×ÁÎÉÅ ×ÅÔ×É ÒÁÚÒÁÂÏÔËÉ</title>
<indexterm><primary>-CURRENT</primary></indexterm>
<indexterm><primary>-STABLE</primary></indexterm>
@@ -220,7 +710,7 @@
<orderedlist>
<listitem>
<para>ðÏÄÐÉÛÉÔÅÓØ ÎÁ ÓÐÉÓËÉ ÒÁÓÓÙÌËÉ &a.current.name; É
- &a.cvsall.name;. üÔÏ ÎÅ ÐÒÏÓÔÏ ÈÏÒÏÛÁÑ ÉÄÅÑ, ÜÔÏ
+ &a.svn-src-head.name;. üÔÏ ÎÅ ÐÒÏÓÔÏ ÈÏÒÏÛÁÑ ÉÄÅÑ, ÜÔÏ
<emphasis>ÎÅÏÂÈÏÄÉÍÏÓÔØ</emphasis>. åÓÌÉ ×Ù ÎÅ Ñ×ÌÑÅÔÅÓØ
ÕÞÁÓÔÎÉËÏÍ ÓÐÉÓËÁ ÒÁÓÓÙÌËÉ <emphasis>&a.current.name;</emphasis>,
ÔÏ ×Ù ÎÅ Õ×ÉÄÉÔÅ ÚÁÍÅÞÁÎÉÊ,
@@ -229,15 +719,17 @@
ÒÅÛÅÎÙ ÄÒÕÇÉÍÉ. åÝ£ ÈÕÖÅ, ÅÓÌÉ ×Ù ÐÒÏÐÕÓÔÉÔÅ ×ÁÖÎÙÅ ÓÏÏÂÝÅÎÉÑ,
ËÁÓÁÀÝÉÅÓÑ ÖÉÚÎÅÓÐÏÓÏÂÎÏÓÔÉ ×ÁÛÅÊ ÓÉÓÔÅÍÙ.</para>
- <para>óÐÉÓÏË ÒÁÓÓÙÌËÉ &a.cvsall.name; ÐÏÚ×ÏÌÉÔ ×ÁÍ ÄÌÑ ËÁÖÄÏÇÏ
+ <para>óÐÉÓÏË ÒÁÓÓÙÌËÉ &a.svn-src-head.name; ÐÏÚ×ÏÌÉÔ ×ÁÍ ÄÌÑ ËÁÖÄÏÇÏ
ÉÚÍÅÎÅÎÉÑ Õ×ÉÄÅÔØ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÕÀ ÚÁÐÉÓØ × ÖÕÒÎÁÌÅ ËÏÍÍÉÔÏ×,
Á ÏÎÉ ÐÏÒÏÊ ÓÏÄÅÒÖÁÔ ÏÔÎÏÓÑÝÕÀÓÑ Ë ÄÅÌÕ
ÉÎÆÏÒÍÁÃÉÀ Ï ×ÏÚÍÏÖÎÙÈ ÐÏÂÏÞÎÙÈ ÜÆÆÅËÔÁÈ.</para>
- <para>þÔÏÂÙ ÐÏÄËÌÀÞÉÔØÓÑ Ë ÜÔÉÍ É ÄÒÕÇÉÍ ÄÏÓÔÕÐÎÙÍ ÓÐÉÓËÁÍ
+ <para>þÔÏÂÙ ÐÏÄÐÉÓÁÔØÓÑ ÎÁ ÜÔÉ É ÄÒÕÇÉÅ ÄÏÓÔÕÐÎÙÅ ÓÐÉÓËÉ
ÒÁÓÓÙÌËÉ, ÐÅÒÅÊÄÉÔÅ ÐÏ ÓÓÙÌËÅ &a.mailman.lists.link; É Ý£ÌËÎÉÔÅ
ÎÁ ÓÐÉÓËÅ, Ë ËÏÔÏÒÏÍÕ ×Ù ÈÏÔÉÔÅ ÐÏÄËÌÀÞÉÔØÓÑ. éÎÓÔÒÕËÃÉÉ ÐÏ
- ÄÁÌØÎÅÊÛÉÍ ÄÅÊÓÔ×ÉÑÍ ÒÁÚÍÅÝÅÎÙ ÔÁÍ ÖÅ.</para>
+ ÄÁÌØÎÅÊÛÉÍ ÄÅÊÓÔ×ÉÑÍ ÒÁÚÍÅÝÅÎÙ ÔÁÍ ÖÅ. åÓÌÉ ×Ù ÚÁÉÎÔÅÒÅÓÏ×ÁÎÙ
+ × ÏÔÓÌÅÖÉ×ÁÎÉÉ ÉÚÍÅÎÅÎÉÊ ×ÓÅÇÏ ÄÅÒÅ×Á ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ×, ÔÏ ÍÙ
+ ÒÅËÏÍÅÎÄÕÅÍ ×ÁÍ ÐÏÄÐÉÓÁÔØÓÑ ÎÁ &a.svn-src-all.name;.</para>
</listitem>
<listitem>
@@ -275,6 +767,23 @@
ÔÅËÓÔÙ Á×ÔÏÍÁÔÉÞÅÓËÉ. éÚÍÅÎÉÔÅ ÐÒÉÍÅÒÎÙÊ ÆÁÊÌ
<filename>supfile</filename> ×ÙÛÅ É ÏÔËÏÎÆÉÇÕÒÉÒÕÊÔÅ <link
linkend="cvsup">cvsup</link> ÄÌÑ ×ÁÛÅÇÏ ÏËÒÕÖÅÎÉÑ.</para>
+ <note>
+ <para>ðÒÉÍÅÒÎÙÊ ÆÁÊÌ <filename>standard-supfile</filename>
+ ÐÒÅÄÎÁÚÎÁÞÅÎ ÄÌÑ ÏÔÓÌÅÖÉ×ÁÎÉÑ ÓÐÅÃÉÁÌØÎÏÊ ×ÅÔËÉ
+ ÂÅÚÏÐÁÓÎÏÓÔÉ &os;, Á ÎÅ &os.current;. ÷ÁÍ ÎÕÖÎÏ
+ ÏÔËÒÙÔØ ÜÔÏÔ ÆÁÊÌ ÎÁ ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ É ÚÁÍÅÎÉÔØ × Î£Í
+ ÓÔÒÏËÕ:</para>
+
+ <programlisting>*default release=cvs tag=RELENG_<replaceable>X</replaceable>_<replaceable>Y</replaceable></programlisting>
+
+ <para>ÎÁ ÓÌÅÄÕÀÝÕÀ:</para>
+
+ <programlisting>*default release=cvs tag=.</programlisting>
+
+ <para>äÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ ÐÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ
+ ÔÅÇÏ× ÏÂÒÁÔÉÔÅÓØ Ë ÒÁÚÄÅÌÕ òÕËÏ×ÏÄÓÔ×Á <link
+ linkend="cvs-tags">ôÅÇÉ CVS</link>.</para>
+ </note>
</listitem>
<listitem>
@@ -416,15 +925,20 @@
ÄÁ×ÁÑ ÐÏÌØÚÏ×ÁÔÅÌÑÍ ×ÏÚÍÏÖÎÏÓÔØ ×ÙÓËÁÚÁÔØ Ó×ÏÅ ÍÎÅÎÉÅ Ï
×ÏÚÍÏÖÎÙÈ ÔÏÎËÉÈ ÍÏÍÅÎÔÁÈ.</para>
- <para>óÐÉÓÏË ÒÁÓÓÙÌËÉ &a.cvsall.name; ÐÏÚ×ÏÌÉÔ ×ÁÍ ÄÌÑ ËÁÖÄÏÇÏ
- ÉÚÍÅÎÅÎÉÑ Õ×ÉÄÅÔØ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÕÀ ÚÁÐÉÓØ × ÖÕÒÎÁÌÅ ËÏÍÍÉÔÏ×,
- Á ÏÎÉ ÐÏÒÏÊ ÓÏÄÅÒÖÁÔ ÏÔÎÏÓÑÝÕÀÓÑ Ë ÄÅÌÕ
+ <para>ðÒÉÓÏÅÄÉÎÑÊÔÅÓØ Ë ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÍÕ ÓÐÉÓËÕ ÒÁÓÓÙÌËÉ
+ <application>SVN</application> ÄÌÑ ÔÏÊ ×ÅÔ×É, ËÏÔÏÒÕÀ ×Ù
+ ÉÓÐÏÌØÚÕÅÔÅ. îÁÐÒÉÍÅÒ, ÅÓÌÉ ×Ù ÉÓÐÏÌØÚÕÅÔÅ ×ÅÔ×Ø 7-STABLE, ÔÏ
+ ÐÒÉÓÏÅÄÉÎÑÊÔÅÓØ Ë ÓÐÉÓËÕ &a.svn-src-stable-7.name;. üÔÏ
+ ÐÏÚ×ÏÌÉÔ ×ÁÍ ÐÒÏÓÍÁÔÒÉ×ÁÔØ ÚÁÐÉÓÉ × ÖÕÒÎÁÌÅ ËÏÍÍÉÔÏ× ÄÌÑ
+ ËÁÖÄÏÇÏ ÉÚÍÅÎÅÎÉÑ, Á ÏÎÉ ÐÏÒÏÊ ÓÏÄÅÒÖÁÔ ÏÔÎÏÓÑÝÕÀÓÑ Ë ÄÅÌÕ
ÉÎÆÏÒÍÁÃÉÀ Ï ×ÏÚÍÏÖÎÙÈ ÐÏÂÏÞÎÙÈ ÜÆÆÅËÔÁÈ.</para>
<para>þÔÏÂÙ ÐÏÄËÌÀÞÉÔØÓÑ Ë ÜÔÉÍ É ÄÒÕÇÉÍ ÄÏÓÔÕÐÎÙÍ ÓÐÉÓËÁÍ
ÒÁÓÓÙÌËÉ, ÐÅÒÅÊÄÉÔÅ ÐÏ ÓÓÙÌËÅ &a.mailman.lists.link; É Ý£ÌËÎÉÔÅ
ÎÁ ÓÐÉÓËÅ, Ë ËÏÔÏÒÏÍÕ ×Ù ÈÏÔÉÔÅ ÐÏÄËÌÀÞÉÔØÓÑ. éÎÓÔÒÕËÃÉÉ ÐÏ
- ÄÁÌØÎÅÊÛÉÍ ÄÅÊÓÔ×ÉÑÍ ÒÁÚÍÅÝÅÎÙ ÔÁÍ ÖÅ.</para>
+ ÄÁÌØÎÅÊÛÉÍ ÄÅÊÓÔ×ÉÑÍ ÒÁÚÍÅÝÅÎÙ ÔÁÍ ÖÅ. åÓÌÉ ×Ù ÚÁÉÎÔÅÒÅÓÏ×ÁÎÙ
+ × ÏÔÓÌÅÖÉ×ÁÎÉÉ ÉÚÍÅÎÅÎÉÊ ×ÓÅÇÏ ÄÅÒÅ×Á ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ×, ÔÏ ÍÙ
+ ÒÅËÏÍÅÎÄÕÅÍ ×ÁÍ ÐÏÄÐÉÓÁÔØÓÑ ÎÁ &a.svn-src-all.name;.</para>
</listitem>
<listitem>
@@ -674,10 +1188,11 @@
ÔÅËÓÔÏ×, Á ÚÁÔÅÍ ×ÙÐÏÌÎÉÔØ ÓÌÅÄÕÀÝÕÀ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ
ÄÅÊÓÔ×ÉÊ:</para>
- <screen>&prompt.root; <userinput>make buildworld</userinput>
+ <screen>&prompt.root; <userinput>cd /usr/src</userinput>
+&prompt.root; <userinput>make buildworld</userinput>
&prompt.root; <userinput>make buildkernel</userinput>
&prompt.root; <userinput>make installkernel</userinput>
-&prompt.root; <userinput>reboot</userinput></screen>
+&prompt.root; <userinput>shutdown -r now</userinput></screen>
<note>
<para>åÓÔØ ÎÅÓËÏÌØËÏ ÒÅÄËÉÈ ÓÌÕÞÁÅ×, ËÏÇÄÁ ÐÅÒÅÄ ×ÙÐÏÌÎÅÎÉÅÍ
@@ -693,7 +1208,9 @@
ÅÓÔØ ÐÏÓÒÅÄÓÔ×ÏÍ ËÏÍÁÎÄÙ <command>boot -s</command>, ÚÁÄÁÎÎÏÊ ×
ÐÒÉÇÌÁÛÅÎÉÉ ÚÁÇÒÕÚÞÉËÁ). ðÏÓÌÅ ÜÔÏÇÏ ×ÙÐÏÌÎÉÔÅ:</para>
- <screen>&prompt.root; <userinput>mergemaster -p</userinput>
+ <screen>&prompt.root; <userinput>mount -a -t ufs</userinput>
+&prompt.root; <userinput>mergemaster -p</userinput>
+&prompt.root; <userinput>cd /usr/src</userinput>
&prompt.root; <userinput>make installworld</userinput>
&prompt.root; <userinput>mergemaster</userinput>
&prompt.root; <userinput>reboot</userinput></screen>
@@ -885,7 +1402,7 @@
</screen>
</sect2>
- <sect2 id="cutting-edge-compilebase">
+ <sect2 id="updating-upgrading-compilebase">
<title>ðÅÒÅËÏÍÐÉÌÉÒÕÊÔÅ ÉÓÈÏÄÎÙÅ ÔÅËÓÔÙ ÂÁÚÏ×ÏÊ ÓÉÓÔÅÍÙ</title>
<sect3>
@@ -1265,7 +1782,8 @@ Script done, …
ÎÅÔ × <filename>/usr/src/etc</filename>.</para>
<para>åÓÌÉ ×Ù ÉÓÐÏÌØÚÕÅÔÅ &man.mergemaster.8; (ËÁË ÜÔÏ ÒÅËÏÍÅÎÄÕÅÔÓÑ),
- ÔÏ ×Ù ÍÏÖÅÔÅ ÐÅÒÅÊÔÉ ÓÒÁÚÕ Ë <link linkend="cutting-edge-rebooting">ÓÌÅÄÕÀÝÅÍÕ
+ ÔÏ ×Ù ÍÏÖÅÔÅ ÐÅÒÅÊÔÉ ÓÒÁÚÕ Ë <link
+ linkend="updating-upgrading-rebooting">ÓÌÅÄÕÀÝÅÍÕ
ÒÁÚÄÅÌÕ</link>.</para>
<para>÷ÒÕÞÎÕÀ ÐÒÏÝÅ ×ÓÅÇÏ ÓÄÅÌÁÔØ ÜÔÏ, ÕÓÔÁÎÏ×É× ÆÁÊÌÙ × ÎÏ×ÙÊ ËÁÔÁÌÏÇ,
@@ -1417,7 +1935,7 @@ Script done, …
</sect3>
</sect2>
- <sect2 id="cutting-edge-rebooting">
+ <sect2 id="updating-upgrading-rebooting">
<title>ðÅÒÅÚÁÇÒÕÚËÁ</title>
<para>ôÅÐÅÒØ ×Ù ÓÄÅÌÁÌÉ ×Ó£. ðÏÓÌÅ ÔÏÇÏ, ËÁË ×Ù ÐÒÏ×ÅÒÉÌÉ, ÞÔÏ ×Ó£
@@ -1786,9 +2304,10 @@ Building everything..
ËÁÔÁÌÏÇ <filename>/usr/src</filename> ÄÏÌÖÅÎ ÂÙÔØ ÎÁ ÍÁÛÉÎÅ ÐÏÓÔÒÏÅÎÉÑ,
Á ÐÏ NFS ÏÎ ÄÏÌÖÅÎ ÂÙÔØ ÓÍÏÎÔÉÒÏ×ÁÎ ÎÁ ÏÓÔÁÌØÎÙÈ.</para>
- <para>îÁËÏÎÅÃ, ÕÄÏÓÔÏ×ÅÒØÔÅÓØ × ÔÏÍ, ÞÔÏ ÆÁÊÌ
- <filename>/etc/make.conf</filename> ÎÁ ×ÓÅÈ ÍÁÛÉÎÁÈ ÎÁÂÏÒÁ ÄÌÑ
- ÐÏÓÔÒÏÅÎÉÑ ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÍÁÛÉÎÅ ÐÏÓÔÒÏÅÎÉÑ. üÔÏ ÏÚÎÁÞÁÅÔ, ÞÔÏ ÍÁÛÉÎÁ
+ <para>îÁËÏÎÅÃ, ÕÄÏÓÔÏ×ÅÒØÔÅÓØ × ÔÏÍ, ÞÔÏ ÆÁÊÌÙ
+ <filename>/etc/make.conf</filename> É
+ <filename>/etc/src.conf</filename> ÎÁ ×ÓÅÈ ÍÁÛÉÎÁÈ ÎÁÂÏÒÁ ÄÌÑ
+ ÐÏÓÔÒÏÅÎÉÑ ÓÏÏÔ×ÅÔÓÔ×ÕÀÔ ÍÁÛÉÎÅ ÐÏÓÔÒÏÅÎÉÑ. üÔÏ ÏÚÎÁÞÁÅÔ, ÞÔÏ ÍÁÛÉÎÁ
ÐÏÓÔÒÏÅÎÉÑ ÄÏÌÖÎÁ ÓÔÒÏÉÔØ ×ÓÅ ÞÁÓÔÉ ÏÓÎÏ×ÎÏÇÏ ÓÉÓÔÅÍÎÏÇÏ ÎÁÂÏÒÁ,
ËÏÔÏÒÙÅ ÂÕÄÕÔ ÕÓÔÁÎÁ×ÌÉ×ÁÔØÓÑ ÎÁ ËÁÖÄÏÊ ÍÁÛÉÎÅ ÉÚ ÎÁÂÏÒÁ ÄÌÑ
ÐÏÓÔÒÏÅÎÉÑ. ëÒÏÍÅ ÔÏÇÏ, Õ ËÁÖÄÏÊ ÍÁÛÉÎÙ ÐÏÓÔÒÏÅÎÉÑ ÄÏÌÖÎÏ ÂÙÔØ ÚÁÄÁÎÏ
Modified: head/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml Tue Dec 11 13:39:57 2012 (r40343)
+++ head/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml Tue Dec 11 16:19:40 2012 (r40344)
@@ -348,7 +348,7 @@ following line in &man.loader.conf.5;:
ÐÏÎÑÔØ, ÞÔÏ ×Ù ÕÄÁÌÉÌÉ ÓÏÂÓÔ×ÅÎÎÙÊ ÆÁÊÌ ÎÁÓÔÒÏÊËÉ ÑÄÒÁ. îÅ
ÒÅÄÁËÔÉÒÕÊÔÅ ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ <filename>GENERIC</filename>, ÏÎ ÍÏÖÅÔ
ÂÙÔØ ÔÁËÖÅ ÐÅÒÅÚÁÐÉÓÁÎ É ÐÒÉ ÓÌÅÄÕÀÝÅÍ <link
- linkend="cutting-edge">ÏÂÎÏ×ÌÅÎÉÉ ÄÅÒÅ×Á ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ×</link>,
+ linkend="updating-upgrading">ÏÂÎÏ×ÌÅÎÉÉ ÄÅÒÅ×Á ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ×</link>,
É ÉÚÍÅÎÅÎÉÑ ÑÄÒÁ ÂÕÄÕÔ ÐÏÔÅÒÑÎÙ.</para>
<para>÷Ù ÍÏÖÅÔÅ ÓÏÈÒÁÎÉÔØ ÆÁÊÌ ËÏÎÆÉÇÕÒÁÃÉÉ ÑÄÒÁ × ÄÒÕÇÏÍ ÍÅÓÔÅ,
@@ -387,7 +387,7 @@ following line in &man.loader.conf.5;:
<note>
<para>åÓÌÉ ×Ù <link
- linkend="cutting-edge">ÓÉÎÈÒÏÎÉÚÉÒÕÅÔÅ ÄÅÒÅ×Ï ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ×</link>
+ linkend="updating-upgrading">ÓÉÎÈÒÏÎÉÚÉÒÕÅÔÅ ÄÅÒÅ×Ï ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ×</link>
Ó ÄÅÒÅ×ÏÍ ÐÒÏÅËÔÁ &os;, ÎÅ ÚÁÂÕÄØÔÅ Ó×ÅÒÉÔØÓÑ Ó ÆÁÊÌÏÍ
<filename>/usr/src/UPDATING</filename> ÐÅÒÅÄ ÏÂÎÏ×ÌÅÎÉÅÍ. ÷ ÜÔÏÍ
ÆÁÊÌÅ ÏÐÉÓÁÎÙ ×ÓÅ ×ÁÖÎÙÅ ×ÏÐÒÏÓÙ É ÏÂÌÁÓÔÉ ÉÓÈÏÄÎÏÇÏ ËÏÄÁ, ÔÒÅÂÕÀÝÉÅ
Modified: head/ru_RU.KOI8-R/books/handbook/preface/preface.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/preface/preface.xml Tue Dec 11 13:39:57 2012 (r40343)
+++ head/ru_RU.KOI8-R/books/handbook/preface/preface.xml Tue Dec 11 16:19:40 2012 (r40344)
@@ -450,7 +450,8 @@
</varlistentry>
<varlistentry>
- <term><emphasis><xref linkend="cutting-edge"/>, îÁ ÐÅÒÅÄÎÅÍ ËÒÁÅ ÒÁÚÒÁÂÏÔÏË</emphasis></term>
+ <term><emphasis><xref linkend="updating-upgrading"/>, ïÂÎÏ×ÌÅÎÉÅ
+ ÓÉÓÔÅÍÙ É ÓÍÅÎÁ ×ÅÒÓÉÉ</emphasis></term>
<listitem>
<para>ïÂßÑÓÎÑÅÔ ÒÁÚÌÉÞÉÑ ÍÅÖÄÕ FreeBSD-STABLE, FreeBSD-CURRENT É
FreeBSD-RELEASE. òÁÓÓËÁÚÙ×ÁÅÔ, ËÏÍÕ ÉÚ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÂÕÄÅÔ ÐÏÌÅÚÎÏ
Modified: head/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml Tue Dec 11 13:39:57 2012 (r40343)
+++ head/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml Tue Dec 11 16:19:40 2012 (r40344)
@@ -2699,7 +2699,7 @@ boot:</screen>
<procedure>
<step>
<para>ðÏÌÕÞÉÔÅ ÉÓÈÏÄÎÙÅ ÔÅËÓÔÙ ÑÄÒÁ (ÇÌÁ×Á
- <xref linkend="cutting-edge"/>)</para>
+ <xref linkend="updating-upgrading"/>)</para>
</step>
<step>
More information about the svn-doc-all
mailing list