svn commit: r47964 - in head/ru_RU.KOI8-R: books/handbook/cutting-edge books/handbook/ports share/xml

Sergey Kandaurov pluknet at FreeBSD.org
Sat Jan 9 00:48:01 UTC 2016


Author: pluknet
Date: Sat Jan  9 00:47:59 2016
New Revision: 47964
URL: https://svnweb.freebsd.org/changeset/doc/47964

Log:
  Sync the cutting-edge chapter, update associated xrefs.
  MFen:
  	handbook/cutting-edge/chapter.xml	r33528 -> r47724

Modified:
  head/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
  head/ru_RU.KOI8-R/books/handbook/ports/chapter.xml
  head/ru_RU.KOI8-R/share/xml/mailing-lists.ent

Modified: head/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml	Fri Jan  8 23:33:56 2016	(r47963)
+++ head/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml	Sat Jan  9 00:47:59 2016	(r47964)
@@ -5,33 +5,69 @@
      $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: r33528
+     Original revision: r47724
 -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="updating-upgrading">
-  <info><title>ïÂÎÏ×ÌÅÎÉÅ ÓÉÓÔÅÍÙ É ÓÍÅÎÁ ×ÅÒÓÉÉ</title>
+<chapter xmlns="http://docbook.org/ns/docbook"
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:id="updating-upgrading">
+
+  <info>
+    <title>ïÂÎÏ×ÌÅÎÉÅ ÓÉÓÔÅÍÙ É ÓÍÅÎÁ ×ÅÒÓÉÉ &os;</title>
+
     <authorgroup>
-      <author><personname><firstname>Jim</firstname><surname>Mock</surname></personname><contrib>òÅÓÔÒÕËÔÕÒÉÒÏ×ÁÎÉÅ, ÒÅÏÒÇÁÎÉÚÁÃÉÀ É ÞÁÓÔÉÞÎÏÅ ÏÂÎÏ×ÌÅÎÉÅ
-	  ×ÙÐÏÌÎÉÌ </contrib></author>
+      <author>
+	<personname>
+	  <firstname>Jim</firstname>
+	  <surname>Mock</surname>
+	</personname>
+	<contrib>òÅÓÔÒÕËÔÕÒÉÒÏ×ÁÎÉÅ, ÒÅÏÒÇÁÎÉÚÁÃÉÀ É ÞÁÓÔÉÞÎÏÅ
+	  ÏÂÎÏ×ÌÅÎÉÅ ×ÙÐÏÌÎÉÌ </contrib>
+      </author>
       <!-- íÁÒÔ 2000 -->
     </authorgroup>
 
     <authorgroup>
-      <author><personname><firstname>Jordan</firstname><surname>Hubbard</surname></personname><contrib>ïÒÉÇÉÎÁÌØÎÙÊ ÔÅËÓÔ ÎÁÐÉÓÁÌÉ </contrib></author>
-
-      <author><personname><firstname>Poul-Henning</firstname><surname>Kamp</surname></personname></author>
-
-      <author><personname><firstname>John</firstname><surname>Polstra</surname></personname></author>
-
-      <author><personname><firstname>Nik</firstname><surname>Clayton</surname></personname></author>
+      <author>
+	<personname>
+	  <firstname>Jordan</firstname>
+	  <surname>Hubbard</surname>
+	</personname>
+	<contrib>ïÒÉÇÉÎÁÌØÎÙÊ ÔÅËÓÔ ÎÁÐÉÓÁÌÉ </contrib>
+      </author>
+
+      <author>
+	<personname>
+	  <firstname>Poul-Henning</firstname>
+	  <surname>Kamp</surname>
+	</personname>
+      </author>
+
+      <author>
+	<personname>
+	  <firstname>John</firstname>
+	  <surname>Polstra</surname>
+	</personname>
+      </author>
+
+      <author>
+	<personname>
+	  <firstname>Nik</firstname>
+	  <surname>Clayton</surname>
+	</personname>
+      </author>
     </authorgroup>
     
     <authorgroup>
-      <author><personname><firstname>áÎÄÒÅÊ</firstname><surname>úÁÈ×ÁÔÏ×</surname></personname><contrib>ðÅÒÅ×ÏÄ ÎÁ ÒÕÓÓËÉÊ ÑÚÙË: </contrib></author>
+      <author>
+	<personname>
+	  <firstname>áÎÄÒÅÊ</firstname>
+	  <surname>úÁÈ×ÁÔÏ×</surname>
+	</personname>
+	<contrib>ðÅÒÅ×ÏÄ ÎÁ ÒÕÓÓËÉÊ ÑÚÙË: </contrib>
+      </author>
     </authorgroup>
   </info>
 
-  
-
   <sect1 xml:id="updating-upgrading-synopsis">
     <title>ëÒÁÔËÉÊ ÏÂÚÏÒ</title>
 
@@ -42,24 +78,18 @@
       Ó×ÑÚÁÎÎÙÅ Ó ÂÅÚÏÐÁÓÎÏÓÔØÀ É ÄÒÕÇÉÍÉ ËÒÉÔÉÞÅÓËÉÍÉ ÉÓÐÒÁ×ÌÅÎÉÑÍÉ.
       îÅÚÁ×ÉÓÉÍÏ ÏÔ ÉÓÐÏÌØÚÕÅÍÏÊ ×ÅÒÓÉÉ &os; ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ×ÓÅ ÎÅÏÂÈÏÄÉÍÙÅ
       ÉÎÓÔÒÕÍÅÎÔÙ ÄÌÑ ÐÏÄÄÅÒÖÁÎÉÑ ÓÉÓÔÅÍÙ × ÁËÔÕÁÌØÎÏÍ ÓÏÓÔÏÑÎÉÉ, Á ÔÁËÖÅ
-      ÐÏÚ×ÏÌÑÅÔ ÌÅÇËÏ ÐÅÒÅÊÔÉ ÎÁ ÄÒÕÇÕÀ ×ÅÒÓÉÀ.  üÔÁ ÇÌÁ×Á ÐÏÍÏÖÅÔ
-      ×ÁÍ ÒÅÛÉÔØ, ÈÏÔÉÔÅ ÌÉ ×Ù ÏÔÓÌÅÖÉ×ÁÔØ ÓÉÓÔÅÍÕ × ÐÒÏÃÅÓÓÅ ÒÁÂÏÔÙ ÎÁÄ ÎÅÊ
-      ÉÌÉ ÏÓÔÁÎÅÔÅÓØ ×ÅÒÎÙÍ ÏÄÎÏÍÕ ÉÚ ×ÙÐÕÝÅÎÎÙÈ ÒÅÌÉÚÏ×.  ôÁËÖÅ ÉÍÅÀÔÓÑ
-      ÐÒÏÓÔÅÊÛÉÅ ÉÎÓÔÒÕÍÅÎÔÙ ÄÌÑ ÐÏÄÄÅÒÖÁÎÉÑ ×ÁÛÅÊ ÓÉÓÔÅÍÙ × ÁËÔÕÁÌØÎÏÍ
+      ÐÏÚ×ÏÌÑÅÔ ÌÅÇËÏ ÐÅÒÅÊÔÉ ÎÁ ÄÒÕÇÕÀ ×ÅÒÓÉÀ.  üÔÁ ÇÌÁ×Á ÏÐÉÓÙ×ÁÅÔ,
+      ËÁË ÏÔÓÌÅÖÉ×ÁÔØ ÓÉÓÔÅÍÕ × ÐÒÏÃÅÓÓŠţ ÒÁÚÒÁÂÏÔËÉ, Á ÔÁËÖÅ
+      ÏÓÎÏ×ÎÙÅ ÉÎÓÔÒÕÍÅÎÔÙ ÄÌÑ ÐÏÄÄÅÒÖÁÎÉÑ ÓÉÓÔÅÍÙ &os; × ÁËÔÕÁÌØÎÏÍ
       ÓÏÓÔÏÑÎÉÉ.</para>
 
     <para>ðÏÓÌÅ ÞÔÅÎÉÑ ÜÔÏÊ ÇÌÁ×Ù ×Ù ÂÕÄÅÔÅ ÚÎÁÔØ:</para>
 
     <itemizedlist>
       <listitem>
-	<para>ëÁËÉÅ ÐÒÏÇÒÁÍÍÙ ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÌÑ ÏÂÎÏ×ÌÅÎÉÑ ÓÉÓÔÅÍÙ É
-	ëÏÌÌÅËÃÉÉ ðÏÒÔÏ×.</para>
-      </listitem>
-
-      <listitem>
-	<para>ëÁË ÐÏÄÄÅÒÖÉ×ÁÔØ ×ÁÛÕ ÓÉÓÔÅÍÕ × ÁËÔÕÁÌØÎÏÍ ÓÏÓÔÏÑÎÉÉ ÐÒÉ
+	<para>ëÁË ÐÏÄÄÅÒÖÉ×ÁÔØ ÓÉÓÔÅÍÕ &os; × ÁËÔÕÁÌØÎÏÍ ÓÏÓÔÏÑÎÉÉ ÐÒÉ
 	  ÐÏÍÏÝÉ <application>freebsd-update</application>,
-	  <application>CVSup</application>, <application>CVS</application>
+	  <application>Subversion</application>
 	  ÉÌÉ <application>CTM</application>.</para>
       </listitem>
 
@@ -69,13 +99,19 @@
       </listitem>
 
       <listitem>
+	<para>ëÁË ÐÏÄÄÅÒÖÉ×ÁÔØ ÕÓÔÁÎÏ×ÌÅÎÎÕÀ ÄÏËÕÍÅÎÔÁÃÉÀ × ÁËÔÕÁÌØÎÏÍ
+	  ÓÏÓÔÏÑÎÉÉ ÐÒÉ ÐÏÍÏÝÉ <application>Subversion</application>
+	  ÉÌÉ ÐÏÒÔÏ× ÄÏËÕÍÅÎÔÁÃÉÉ.</para>
+      </listitem>
+
+      <listitem>
 	<para>òÁÚÎÉÃÕ ÍÅÖÄÕ Ä×ÕÍÑ ×ÅÔ×ÑÍÉ ÒÁÚÒÁÂÏÔËÉ: &os.stable; É
 	  &os.current;.</para>
       </listitem>
 
       <listitem>
-	<para>ëÁË ÐÅÒÅÓÔÒÁÉ×ÁÔØ É ÐÅÒÅÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÂÁÚÏ×ÕÀ ÓÉÓÔÅÍÕ ÐÏÌÎÏÓÔØÀ
-	  ÐÒÉ ÐÏÍÏÝÉ <command>make buildworld</command> (É ÄÒÕÇÉÈ).</para>
+	<para>ëÁË ÐÅÒÅÓÔÒÁÉ×ÁÔØ É ÐÅÒÅÕÓÔÁÎÁ×ÌÉ×ÁÔØ ×ÓÀ ÂÁÚÏ×ÕÀ
+	  ÓÉÓÔÅÍÕ.</para>
       </listitem>
     </itemizedlist>
 
@@ -83,134 +119,157 @@
 
     <itemizedlist>
       <listitem>
-	<para>ðÏÌÎÏÓÔØÀ ÎÁÓÔÒÏÉÔØ Ó×Ï£ ÐÏÄËÌÀÞÅÎÉÅ Ë ÓÅÔÉ (<xref linkend="advanced-networking"/>).</para>
+	<para>ðÒÁ×ÉÌØÎÏ ÎÁÓÔÒÏÉÔØ ÓÅÔÅ×ÏÅ ÐÏÄËÌÀÞÅÎÉÅ
+	  (<xref linkend="advanced-networking"/>).</para>
       </listitem>
 
       <listitem>
-	<para>úÎÁÔØ, ËÁË ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÄÏÐÏÌÎÉÔÅÌØÎÏÅ ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ
-	  ÄÒÕÇÉÈ ÒÁÚÒÁÂÏÔÞÉËÏ× (<xref linkend="ports"/>).</para>
+	<para>úÎÁÔØ, ËÁË ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÄÏÐÏÌÎÉÔÅÌØÎÏÅ ÓÔÏÒÏÎÎÅÅ
+	  ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ (<xref linkend="ports"/>).</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>÷ ÜÔÏÊ ÇÌÁ×Å ÄÌÑ ÐÏÌÕÞÅÎÉÑ É ÏÂÎÏ×ÌÅÎÉÑ ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ× &os;
-	ÉÓÐÏÌØÚÕÅÔÓÑ ËÏÍÁÎÄÁ <command>cvsup</command>.  äÌÑ ÜÔÏÇÏ ×ÁÍ
-	ÎÕÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÐÏÒÔ ÉÌÉ ÐÁËÅÔ <package>net/cvsup-without-gui</package>.  îÁÞÉÎÁÑ Ó ×ÅÒÓÉÉ
-	&os; 6.2-RELEASE ÄÌÑ ÜÔÉÈ ÃÅÌÅÊ ÍÏÖÎÏ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ËÏÍÁÎÄÏÊ
-	&man.csup.1;, ËÏÔÏÒÁÑ ×ÈÏÄÉÔ × ÓÏÓÔÁ× ÓÉÓÔÅÍÙ.</para>
+      <para>÷ ÜÔÏÊ ÇÌÁ×Å ÄÌÑ ÐÏÌÕÞÅÎÉÑ É ÏÂÎÏ×ÌÅÎÉÑ ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ×
+	&os; ÉÓÐÏÌØÚÕÅÔÓÑ ËÏÍÁÎÄÁ <command>svn</command>.  äÌÑ ÜÔÏÇÏ
+	ÎÕÖÎÏ ÓÐÅÒ×Á ÕÓÔÁÎÏ×ÉÔØ ÐÏÒÔ ÉÌÉ ÐÁËÅÔ
+	<package>devel/subversion</package>.</para>
     </note>
   </sect1>
-  
+
   <sect1 xml:id="updating-upgrading-freebsdupdate">
-    <info><title>ïÂÎÏ×ÌÅÎÉÅ FreeBSD</title>
+    <info>
+      <title>ïÂÎÏ×ÌÅÎÉÅ &os;</title>
+
       <authorgroup>
-	<author><personname><firstname>Tom</firstname><surname>Rhodes</surname></personname><contrib>ïÒÉÇÉÎÁÌØÎÙÊ ÔÅËÓÔ ÎÁÐÉÓÁÌ </contrib></author>
+	<author>
+	  <personname>
+	    <firstname>Tom</firstname>
+	    <surname>Rhodes</surname>
+	  </personname>
+	  <contrib>ïÒÉÇÉÎÁÌØÎÙÊ ÔÅËÓÔ ÎÁÐÉÓÁÌ </contrib>
+	</author>
       </authorgroup>
+
       <authorgroup>
-	<author><personname><firstname>Colin</firstname><surname>Percival</surname></personname><contrib>îÁ ÏÓÎÏ×Å ÚÁÍÅÔÏË, ËÏÔÏÒÙÅ ÐÒÅÄÏÓÔÁ×ÉÌ  </contrib></author>
+	<author>
+	  <personname>
+	    <firstname>Colin</firstname>
+	    <surname>Percival</surname>
+	  </personname>
+	  <contrib>îÁ ÏÓÎÏ×Å ÚÁÍÅÔÏË, ËÏÔÏÒÙÅ ÐÒÅÄÏÓÔÁ×ÉÌ </contrib>
+	</author>
       </authorgroup>
     </info>
     
-
-    <indexterm><primary>ÏÂÎÏ×ÌÅÎÉÅ É ÓÍÅÎÁ ×ÅÒÓÉÉ</primary></indexterm>
+    <indexterm>
+      <primary>ÏÂÎÏ×ÌÅÎÉÅ É ÓÍÅÎÁ ×ÅÒÓÉÉ</primary>
+    </indexterm>
     <indexterm>
       <primary>freebsd-update</primary>
       <see>ÏÂÎÏ×ÌÅÎÉÅ É ÓÍÅÎÁ ×ÅÒÓÉÉ</see>
     </indexterm>
 
-    <para>ðÒÉÍÅÎÅÎÉÅ ÏÂÎÏ×ÌÅÎÉÊ ÂÅÚÏÐÁÓÎÏÓÔÉ — ×ÁÖÎÙÊ ÍÏÍÅÎÔ ×
-      ÓÏÐÒÏ×ÏÖÄÅÎÉÉ ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ, ÏÓÏÂÅÎÎÏ ÔÁËÏÇÏ ËÁË
-      ÏÐÅÒÁÃÉÏÎÎÁÑ ÓÉÓÔÅÍÁ.  äÌÑ &os; ÜÔÏÔ ÐÒÏÃÅÓÓ ÎÅ ÂÙÌ ÐÒÏÓÔÙÍ ×
-      ÔÅÞÅÎÉÅ ÄÏÌÇÏÇÏ ×ÒÅÍÅÎÉ.  îÁ ÉÓÈÏÄÎÙÊ ËÏÄ ÎÕÖÎÏ ÂÙÌÏ ÎÁËÌÁÄÙ×ÁÔØ
-      ÐÁÔÞÉ, ÐÅÒÅÓÔÒÁÉ×ÁÔØ ËÏÄ × Ä×ÏÉÞÎÙÅ ÆÁÊÌÙ, Á ÚÁÔÅÍ ÜÔÉ Ä×ÏÉÞÎÙÅ ÆÁÊÌÙ
-      ÔÒÅÂÏ×ÁÌÏÓØ ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ. </para>
-
-    <para>ôÅÐÅÒØ ÜÔÏ ÄÁ×ÎÏ ÎÅ ÔÁË, É &os; ×ËÌÀÞÁÅÔ ÐÒÏÇÒÁÍÍÕ Ó ÐÒÏÓÔÙÍ
-      ÎÁÚ×ÁÎÉÅÍ <command>freebsd-update</command>.  üÔÁ ÐÒÏÇÒÁÍÍÁ
-      ÐÒÅÄÏÓÔÁ×ÌÑÅÔ Ä×Å ÒÁÚÌÉÞÎÙÅ ÆÕÎËÃÉÉ.  ÷Ï-ÐÅÒ×ÙÈ, ÏÎÁ ÐÏÚ×ÏÌÑÅÔ
-      ÐÒÉÍÅÎÉÔØ Ë ÂÁÚÏ×ÏÊ ÓÉÓÔÅÍÅ &os; ÏÂÎÏ×ÌÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ É ËÒÉÔÉÞÅÓËÉÅ
-      ÉÓÐÒÁ×ÌÅÎÉÑ × Ä×ÏÉÞÎÏÍ ×ÉÄÅ, ÂÅÚ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÓÂÏÒËÉ É ÕÓÔÁÎÏ×ËÉ.
-      ÷Ï-×ÔÏÒÙÈ, ÐÒÏÇÒÁÍÍÁ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÏÂÎÏ×ÌÅÎÉÅ ÓÉÓÔÅÍÙ ÓÏ ÓÍÅÎÏÊ
-      ÓÔÁÒÛÅÇÏ ÉÌÉ ÍÌÁÄÛÅÇÏ ÎÏÍÅÒÁ ×ÅÒÓÉÉ.</para>
+    <para>ó×ÏÅ×ÒÅÍÅÎÎÏÅ ÐÒÉÍÅÎÅÎÉÅ ÏÂÎÏ×ÌÅÎÉÊ ÂÅÚÏÐÁÓÎÏÓÔÉ É ÐÅÒÅÈÏÄ
+      ÎÁ ÂÏÌÅÅ ÎÏ×ÕÀ ×ÅÒÓÉÀ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ — ×ÁÖÎÙÅ
+      ÁÓÐÅËÔÙ ÓÉÓÔÅÍÎÏÇÏ ÁÄÍÉÎÉÓÔÒÉÒÏ×ÁÎÉÑ.  &os; ×ËÌÀÞÁÅÔ × ÓÅÂÑ
+      ÐÒÏÇÒÁÍÍÕ <command>freebsd-update</command>, ËÏÔÏÒÕÀ ÍÏÖÎÏ
+      ÉÓÐÏÌØÚÏ×ÁÔØ ÄÌÑ ÒÅÛÅÎÉÑ ÏÂÅÉÈ ÚÁÄÁÞ.</para>
+
+    <para>üÔÁ ÐÒÏÇÒÁÍÍÁ ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÒÁÓÐÒÏÓÔÒÁÎÑÅÍÙÈ ×
+      Ä×ÏÉÞÎÏÍ ×ÉÄÅ ÏÂÎÏ×ÌÅÎÉÊ ÂÅÚÏÐÁÓÎÏÓÔÉ É ÉÓÐÒÁ×ÌÅÎÉÊ ÄÌÑ &os;
+      ÂÅÚ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÒÕÞÎÏÊ ËÏÍÐÉÌÑÃÉÉ É ÕÓÔÁÎÏ×ËÉ ÐÁÔÞÅÊ ÉÌÉ
+      ÎÏ×ÏÇÏ ÑÄÒÁ.  ä×ÏÉÞÎÙÅ ÏÂÎÏ×ÌÅÎÉÑ ÄÏÓÔÕÐÎÙ ÄÌÑ ×ÓÅÈ ÁÒÈÉÔÅËÔÕÒ
+      É ×ÅÒÓÉÊ, ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ÇÒÕÐÐÏÊ ÂÅÚÏÐÁÓÎÏÓÔÉ.  ðÅÒÅÞÅÎØ
+      ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ×ÅÒÓÉÊ É ÉÈ ÏÖÉÄÁÅÍÙÅ ÄÁÔÙ ÏËÏÎÞÁÎÉÑ ÐÏÄÄÅÒÖËÉ
+      ÕËÁÚÁÎÙ ÎÁ ÓÔÒÁÎÉÃÅ <uri
+	xlink:href="http://www.FreeBSD.org/security/">http://www.FreeBSD.org/security/</uri>.</para>
+
+    <para>üÔÁ ÐÒÏÇÒÁÍÍÁ ÔÁËÖÅ ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÎÅÚÎÁÞÉÔÅÌØÎÙÈ
+      ÏÂÎÏ×ÌÅÎÉÊ ×ÅÒÓÉÉ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ, Á ÔÁËÖÅ ÄÌÑ ÐÅÒÅÈÏÄÁ ÎÁ
+      ÄÒÕÇÕÀ ×ÅÔ×Ø ×ÙÐÕÓËÁ ÒÅÌÉÚÏ×.  ðÅÒÅÄ ÏÂÎÏ×ÌÅÎÉÅÍ ÓÌÅÄÕÅÔ
+      ÏÚÎÁËÏÍÉÔØÓÑ Ó ÏÂßÑ×ÌÅÎÉÅÍ Ï ×ÙÐÕÓËÅ ÎÏ×ÏÊ ×ÅÒÓÉÉ, ÔÁË ËÁË ÔÁÍ
+      ÍÏÖÅÔ ÓÏÄÅÒÖÁÔØÓÑ ×ÁÖÎÁÑ ÉÎÆÏÒÍÁÃÉÑ, ÐÒÉÍÅÎÉÍÁÑ Ë ×ÅÒÓÉÉ, ÎÁ
+      ËÏÔÏÒÕÀ ÎÁÍÅÞÅÎ ÐÅÒÅÈÏÄ.  ó ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÍÉ ÏÂßÑ×ÌÅÎÉÑÍÉ ÍÏÖÎÏ
+      ÏÚÎÁËÏÍÉÔØÓÑ ÐÏ ÓÓÙÌËÅ <uri
+	xlink:href="http://www.FreeBSD.org/releases/">http://www.FreeBSD.org/releases/</uri>.</para>
 
     <note>
-      <para>ä×ÏÉÞÎÙÅ ÏÂÎÏ×ÌÅÎÉÑ ÄÏÓÔÕÐÎÙ ÄÌÑ ×ÓÅÈ ÁÒÈÉÔÅËÔÕÒ É ×ÅÒÓÉÊ,
-	ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ ÇÒÕÐÐÏÊ ÂÅÚÏÐÁÓÎÏÓÔÉ; ÔÅÍ ÎÅ ÍÅÎÅÅ, ÄÌÑ ÒÁÂÏÔÙ
-	ÎÅËÏÔÏÒÙÈ ÉÚ ×ÏÚÍÏÖÎÏÓÔÅÊ, ÔÁËÉÈ ËÁË ÓÍÅÎÁ ×ÅÒÓÉÉ ÏÐÅÒÁÃÉÏÎÎÏÊ
-	ÓÉÓÔÅÍÙ &os;, ÔÒÅÂÕÅÔÓÑ ÐÏÓÌÅÄÎÑÑ ×ÅÒÓÉÑ &man.freebsd-update.8;
-	É ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ &os; 6.3.  ðÅÒÅÄ ÏÂÎÏ×ÌÅÎÉÅÍ ÄÏ ÎÏ×ÏÊ ×ÅÒÓÉÉ
-	ÓÌÅÄÕÅÔ ÏÚÎÁËÏÍÉÔØÓÑ Ó ÏÂßÑ×ÌÅÎÉÅÍ Ï ×ÙÐÕÓËÅ ÔÅËÕÝÅÊ ×ÅÒÓÉÉ, ÔÁË
-	ËÁË ÔÁÍ ÍÏÖÅÔ ÓÏÄÅÒÖÁÔØÓÑ ×ÁÖÎÁÑ ÉÎÆÏÒÍÁÃÉÑ, ÐÒÉÍÅÎÉÍÁÑ Ë ×ÅÒÓÉÉ,
-	ÎÁ ËÏÔÏÒÕÀ ÎÁÍÅÞÅÎ ÐÅÒÅÈÏÄ.  ó ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÍÉ ÏÂßÑ×ÌÅÎÉÑÍÉ ÍÏÖÎÏ
-	ÏÚÎÁËÏÍÉÔØÓÑ, ÐÅÒÅÊÄÑ ÐÏ ÓÌÅÄÕÀÝÅÊ ÓÓÙÌËÅ: <uri xlink:href="http://www.FreeBSD.org/releases/">http://www.FreeBSD.org/releases/</uri>.</para>
+      <para>åÓÌÉ ÉÍÅÅÔÓÑ ÚÁÄÁÎÉÅ <command>crontab</command>,
+	ÚÁÐÕÓËÁÀÝÅÅ &man.freebsd-update.8;, ÔÏ ÐÅÒÅÄ ÓÍÅÎÏÊ ×ÅÒÓÉÉ
+	ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ ÅÇÏ ÏÂÑÚÁÔÅÌØÎÏ ÎÕÖÎÏ ×ÙËÌÀÞÉÔØ.</para>
     </note>
 
-    <para>åÓÌÉ ÉÍÅÅÔÓÑ ÚÁÄÁÎÉÅ <command>crontab</command>, ÚÁÐÕÓËÁÀÝÅÅ
-      <command>freebsd-update</command>, ÔÏ ÐÅÒÅÄ ÎÁÞÁÌÏÍ ×ÙÐÏÌÎÅÎÉÑ
-      ÓÌÅÄÕÀÝÉÈ ÄÅÊÓÔ×ÉÊ ÅÇÏ ÏÂÑÚÁÔÅÌØÎÏ ÎÕÖÎÏ ×ÙËÌÀÞÉÔØ.</para>
+    <para>÷ ÜÔÏÍ ÒÁÚÄÅÌÅ ÏÐÉÓÙ×ÁÅÔÓÑ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ
+      <command>freebsd-update</command>, ÄÅÍÏÎÓÔÒÉÒÕÅÔÓÑ ÐÒÉÍÅÎÅÎÉÅ
+      ÉÓÐÒÁ×ÌÅÎÉÊ ÂÅÚÏÐÁÓÎÏÓÔÉ É ÏÂÎÏ×ÌÅÎÉÅ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ ÓÏ
+      ÓÍÅÎÏÊ ÍÌÁÄÛÅÊ ÉÌÉ ÓÔÁÒÛÅÊ ×ÅÒÓÉÉ, Á ÔÁËÖÅ ÏÂÓÕÖÄÁÀÔÓÑ ÎÅËÏÔÏÒÙÅ
+      ÓÏÏÂÒÁÖÅÎÉÑ ËÁÓÁÅÍÏ ÓÍÅÎÙ ×ÅÒÓÉÉ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ.</para>
 
-    <sect2>
+    <sect2 xml:id="freebsdupdate-config-file">
       <title>ëÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ</title>
 
-      <para>îÅËÏÔÏÒÙÅ ÐÏÌØÚÏ×ÁÔÅÌÉ ÍÏÇÕÔ ÐÏÖÅÌÁÔØ ÉÚÍÅÎÉÔØ
-	ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ ÄÌÑ ÌÕÞÛÅÇÏ ËÏÎÔÒÏÌÑ ÎÁÄ ÐÒÏÃÅÓÓÏÍ
-	ÏÂÎÏ×ÌÅÎÉÑ.  ÷ÓÅ ÐÁÒÁÍÅÔÒÙ ÐÏÄÒÏÂÎÏ ÚÁÄÏËÕÍÅÎÔÉÒÏ×ÁÎÙ, ÎÏ
-	ÄÌÑ ÎÅËÏÔÏÒÙÈ ÉÚ ÎÉÈ ÍÏÖÅÔ ÐÏÎÁÄÏÂÉÔØÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÅ
-	ÒÁÚßÑÓÎÅÎÉÅ:</para>
+      <para>ëÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ <command>freebsd-update</command>
+	ÓÁÍÏÄÏÓÔÁÔÏÞÅÎ É ÒÁÂÏÔÁÅÔ ÐÏ ÕÍÏÌÞÁÎÉÀ.  îÅËÏÔÏÒÙÅ ÐÏÌØÚÏ×ÁÔÅÌÉ
+	ÍÏÇÕÔ ÐÏÖÅÌÁÔØ ÏÔÒÅÄÁËÔÉÒÏ×ÁÔØ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ
+	<filename>/etc/freebsd-update.conf</filename> ÄÌÑ ÌÕÞÛÅÇÏ
+	ËÏÎÔÒÏÌÑ ÎÁÄ ÐÒÏÃÅÓÓÏÍ ÏÂÎÏ×ÌÅÎÉÑ.  ÷ ËÏÍÍÅÎÔÁÒÉÑÈ ÏÐÉÓÙ×ÁÀÔÓÑ
+	ÄÏÓÔÕÐÎÙÅ × ÜÔÏÍ ÆÁÊÌÅ ÐÁÒÁÍÅÔÒÙ, ÎÏ ÄÌÑ ÓÌÅÄÕÀÝÉÈ ÉÚ ÎÉÈ ÍÏÖÅÔ
+	ÐÏÔÒÅÂÏ×ÁÔØÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÅ ÒÁÚßÑÓÎÅÎÉÅ:</para>
 
       <programlisting># Components of the base system which should be kept updated.
-Components src world kernel</programlisting>
+Components world kernel</programlisting>
 
-      <para>äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÏÐÒÅÄÅÌÑÅÔ, ËÁËÉÅ ÞÁÓÔÉ &os; ÂÕÄÕÔ ÏÂÎÏ×ÌÅÎÙ.
-	ðÏ ÕÍÏÌÞÁÎÉÀ ÏÂÎÏ×ÌÑÅÔÓÑ ÉÓÈÏÄÎÙÊ ËÏÄ (src), ×ÓÑ ÂÁÚÏ×ÁÑ ÓÉÓÔÅÍÁ
-	(world) É ÑÄÒÏ (kernel).  ëÏÍÐÏÎÅÎÔÙ ÔÅ ÖÅ ÓÁÍÙÅ, ÞÔÏ É ×Ï ×ÒÅÍÑ
-	ÕÓÔÁÎÏ×ËÉ; × ÞÁÓÔÎÏÓÔÉ, ÄÏÂÁ×ÌÅÎÉÅ "world/games" ÐÏÚ×ÏÌÑÅÔ
-	ÏÂÎÏ×ÉÔØ ÉÇÒÙ.  éÓÐÏÌØÚÏ×ÁÎÉÅ "src/bin" ÐÏÚ×ÏÌÑÅÔ ÏÂÎÏ×ÉÔØ
-	ÉÓÈÏÄÎÙÊ ËÏÄ × <filename>src/bin</filename>.</para>
-
-      <para>ìÕÞÛÉÍ ×ÁÒÉÁÎÔÏÍ ÂÕÄÅÔ ÏÓÔÁ×ÉÔØ ×Ó£ ËÁË ÅÓÔØ, ÐÏÓËÏÌØËÕ
-	ÉÚÍÅÎÅÎÉÅ ÜÔÏÇÏ ÐÅÒÅÞÎÑ Ó ÃÅÌØÀ ÄÏÂÁ×ÌÅÎÉÑ ÏÓÏÂÙÈ ÐÕÎËÔÏ×
-	ÐÏÔÒÅÂÕÅÔ ÏÔ ÐÏÌØÚÏ×ÁÔÅÌÑ ÕËÁÚÁÎÉÑ ÐÏÄÒÑÄ ×ÓÅÈ ÐÕÎËÔÏ×, ËÏÔÏÒÙÅ
-	ÐÏÌØÚÏ×ÁÔÅÌØ ÚÁÈÏÞÅÔ ÏÂÎÏ×ÉÔØ.  üÔÏ ÍÏÖÅÔ ÐÒÉ×ÅÓÔÉ Ë ÎÅÇÁÔÉ×ÎÙÍ
-	ÐÏÓÌÅÄÓÔ×ÉÑÍ ÉÚ-ÚÁ ×ÏÚÍÏÖÎÏÊ ÒÁÓÓÉÎÈÒÏÎÉÚÁÃÉÉ ÍÅÖÄÕ ÉÓÈÏÄÎÙÍÉ
-	ÔÅËÓÔÁÍÉ É Ä×ÏÉÞÎÙÍÉ ÆÁÊÌÁÍÉ.</para>
+      <para>äÁÎÎÙÊ ÐÁÒÁÍÅÔÒ ÏÐÒÅÄÅÌÑÅÔ, ËÁËÉÅ ÞÁÓÔÉ &os; ÂÕÄÕÔ
+	ÏÂÎÏ×ÌÅÎÙ.  ðÏ ÕÍÏÌÞÁÎÉÀ ÏÂÎÏ×ÌÑÅÔÓÑ ×ÓÑ ÂÁÚÏ×ÁÑ ÓÉÓÔÅÍÁ
+	(world) É ÑÄÒÏ (kernel).  ÷ÍÅÓÔÏ ÜÔÏÇÏ ÍÏÖÎÏ ÕËÁÚÁÔØ ÏÔÄÅÌØÎÙÅ
+	ËÏÍÐÏÎÅÎÔÙ, ÔÁËÉÅ ËÁË <literal>src/base</literal> ÉÌÉ
+	<literal>src/sys</literal>.  ôÅÍ ÎÅ ÍÅÎÅÅ, ÌÕÞÛÉÍ ×ÁÒÉÁÎÔÏÍ
+	ÂÕÄÅÔ ÏÓÔÁ×ÉÔØ ×Ó£ ËÁË ÅÓÔØ, ÐÏÓËÏÌØËÕ ÉÚÍÅÎÅÎÉÅ ÜÔÏÇÏ ÐÅÒÅÞÎÑ
+	Ó ÃÅÌØÀ ÄÏÂÁ×ÌÅÎÉÑ ÏÓÏÂÙÈ ÐÕÎËÔÏ× ÐÏÔÒÅÂÕÅÔ ÏÔ ÐÏÌØÚÏ×ÁÔÅÌÑ
+	ÕËÁÚÁÎÉÑ ÐÏÄÒÑÄ ×ÓÅÈ ÐÕÎËÔÏ×.  óÏ ×ÒÅÍÅÎÅÍ ÜÔÏ ÍÏÖÅÔ ÐÒÉ×ÅÓÔÉ
+	Ë ÎÅÇÁÔÉ×ÎÙÍ ÐÏÓÌÅÄÓÔ×ÉÑÍ ÉÚ-ÚÁ ×ÏÚÍÏÖÎÏÊ ÒÁÓÓÉÎÈÒÏÎÉÚÁÃÉÉ
+	ÍÅÖÄÕ ÉÓÈÏÄÎÙÍÉ ÔÅËÓÔÁÍÉ É Ä×ÏÉÞÎÙÍÉ ÆÁÊÌÁÍÉ.</para>
 
       <programlisting># Paths which start with anything matching an entry in an IgnorePaths
 # statement will be ignored.
-IgnorePaths</programlisting>
+IgnorePaths /boot/kernel/linker.hints</programlisting>
 
-      <para>äÏÂÁ×ØÔÅ ÓÀÄÁ ÐÕÔÉ Ë ËÁÔÁÌÏÇÁÍ (ÎÁÐÒÉÍÅÒ, <filename>/bin</filename> ÉÌÉ <filename>/sbin</filename>), ËÏÔÏÒÙÅ ×Ù ÈÏÔÅÌÉ ÂÙ
-	ÏÓÔÁ×ÉÔØ ÎÅÔÒÏÎÕÔÙÍÉ × ÐÒÏÃÅÓÓÅ ÏÂÎÏ×ÌÅÎÉÑ.  üÔÏÔ ÐÁÒÁÍÅÔÒ ÍÏÖÎÏ
-	ÉÓÐÏÌØÚÏ×ÁÔØ ÄÌÑ ÐÒÅÄÏÔ×ÒÁÝÅÎÉÑ ÐÅÒÅÚÁÐÉÓÙ×ÁÎÉÑ ÌÏËÁÌØÎÙÈ
-	ÉÚÍÅÎÅÎÉÊ ÐÒÏÇÒÁÍÍÏÊ <command>freebsd-update</command>.</para>
+      <para>äÏÂÁ×ØÔÅ ÓÀÄÁ ÐÕÔÉ Ë ËÁÔÁÌÏÇÁÍ (ÎÁÐÒÉÍÅÒ,
+	<filename>/bin</filename> ÉÌÉ <filename>/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>
+      <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>
+MergeChanges /etc/ /var/named/etc/ /boot/device.hints</programlisting>
 
       <para>óÐÉÓÏË ËÁÔÁÌÏÇÏ× Ó ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÍÉ ÆÁÊÌÁÍÉ, ÄÌÑ ËÏÔÏÒÙÈ
-	<command>freebsd-update</command> ÐÏÐÙÔÁÅÔÓÑ ×ÙÐÏÌÎÉÔØ ÓÌÉÑÎÉÅ.
-	ðÒÏÃÅÓÓ ÓÌÉÑÎÉÑ ÆÁÊÌÁ ÐÒÅÄÓÔÁ×ÌÑÅÔ ÓÏÂÏÊ ÎÁÂÏÒ ÉÚÍÅÎÅÎÉÊ
-	× ÆÏÒÍÁÔÅ &man.diff.1;, ÐÏÈÏÖ ÎÁ &man.mergemaster.8;, ÎÏ Ó
-	ÍÅÎØÛÉÍ ËÏÌÉÞÅÓÔ×ÏÍ ÐÁÒÁÍÅÔÒÏ×: ÒÅÚÕÌØÔÁÔ ÓÌÉÑÎÉÑ ÐÒÉÎÉÍÁÅÔÓÑ,
-	ÏÔËÒÙ×ÁÅÔÓÑ ÒÅÄÁËÔÏÒ ÉÌÉ <command>freebsd-update</command>
-	ÐÒÅËÒÁÝÁÅÔ Ó×ÏÀ ÒÁÂÏÔÕ.  ÷ ÓÌÕÞÁÅ ÓÏÍÎÅÎÉÊ ÓÄÅÌÁÊÔÅ ÒÅÚÅÒ×ÎÕÀ
-	ËÏÐÉÀ <filename>/etc</filename> É ÐÒÏÓÔÏ
-	ÓÏÇÌÁÓÉÔÅÓØ ÓÏ ×ÓÅÍÉ ÉÚÍÅÎÅÎÉÑÍÉ.  äÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÄÒÏÂÎÏÊ
-	ÉÎÆÏÒÍÁÃÉÉ ÐÏ ËÏÍÁÎÄÅ <command>mergemaster</command> ÓÍÏÔÒÉÔÅ
+	<command>freebsd-update</command> ÐÏÐÙÔÁÅÔÓÑ ×ÙÐÏÌÎÉÔØ
+	ÓÌÉÑÎÉÅ.  ðÒÏÃÅÓÓ ÓÌÉÑÎÉÑ ÆÁÊÌÁ ÐÒÅÄÓÔÁ×ÌÑÅÔ ÓÏÂÏÊ
+	ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÉÚÍÅÎÅÎÉÊ × ÆÏÒÍÁÔÅ &man.diff.1;, ÐÏÈÏÖÕÀ
+	ÎÁ &man.mergemaster.8;, ÎÏ Ó ÍÅÎØÛÉÍ ËÏÌÉÞÅÓÔ×ÏÍ ÐÁÒÁÍÅÔÒÏ×.
+	òÅÚÕÌØÔÁÔ ÓÌÉÑÎÉÑ ÐÒÉÎÉÍÁÅÔÓÑ, ÏÔËÒÙ×ÁÅÔÓÑ ÒÅÄÁËÔÏÒ ÉÌÉ
+	<command>freebsd-update</command> ÐÒÅËÒÁÝÁÅÔ ÒÁÂÏÔÕ.
+	÷ ÓÌÕÞÁÅ ÓÏÍÎÅÎÉÊ ÓÄÅÌÁÊÔÅ ÒÅÚÅÒ×ÎÕÀ ËÏÐÉÀ
+	<filename>/etc</filename> É ÐÒÏÓÔÏ ÓÏÇÌÁÓÉÔÅÓØ ÓÏ ×ÓÅÍÉ
+	ÉÚÍÅÎÅÎÉÑÍÉ.  äÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ ÐÏ ËÏÍÁÎÄÅ
+	<command>mergemaster</command> ÓÍÏÔÒÉÔÅ
 	<xref linkend="mergemaster"/>.</para>
 
       <programlisting># Directory in which to store downloaded updates and temporary
@@ -218,9 +277,9 @@ MergeChanges /etc/ /var/named/etc/</prog
 # WorkDir /var/db/freebsd-update</programlisting>
 
       <para>üÔÏÔ ËÁÔÁÌÏÇ ÐÒÅÄÎÁÚÎÁÞÅÎ ÄÌÑ ÒÁÚÍÅÝÅÎÉÑ ÐÁÔÞÅÊ É ×ÒÅÍÅÎÎÙÈ
-	ÆÁÊÌÏ×.  ÷ ÓÌÕÞÁÅ, ËÏÇÄÁ ÐÏÌØÚÏ×ÁÔÅÌØ ×ÙÐÏÌÎÑÅÔ ÏÂÎÏ×ÌÅÎÉÅ ÓÏ ÓÍÅÎÏÊ
-	×ÅÒÓÉÉ, × ÜÔÏÍ ÍÅÓÔÅ ÄÏÌÖÅÎ ÉÍÅÔØ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ ÇÉÇÁÂÁÊÔ ÄÉÓËÏ×ÏÇÏ
-	ÐÒÏÓÔÒÁÎÓÔ×Á.</para>
+	ÆÁÊÌÏ×.  ÷ ÓÌÕÞÁÅ, ËÏÇÄÁ ÐÏÌØÚÏ×ÁÔÅÌØ ×ÙÐÏÌÎÑÅÔ ÏÂÎÏ×ÌÅÎÉÅ ÓÏ
+	ÓÍÅÎÏÊ ×ÅÒÓÉÉ, × ÜÔÏÍ ÍÅÓÔÅ ÎÕÖÎÏ ÉÍÅÔØ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ ÇÉÇÁÂÁÊÔ
+	Ó×ÏÂÏÄÎÏÇÏ ÄÉÓËÏ×ÏÇÏ ÐÒÏÓÔÒÁÎÓÔ×Á.</para>
 
       <programlisting># When upgrading between releases, should the list of Components be
 # read strictly (StrictComponents yes) or merely as a list of components
@@ -237,89 +296,132 @@ MergeChanges /etc/ /var/named/etc/</prog
 	<literal>Components</literal>.</para>
     </sect2>
 
-    <sect2>
+    <sect2 xml:id="freebsdupdate-security-patches">
       <title>ïÂÎÏ×ÌÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ</title>
 
-      <para>ïÂÎÏ×ÌÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ ÈÒÁÎÑÔÓÑ ÎÁ ÕÄÁÌ£ÎÎÏÊ ÍÁÛÉÎÅ É ÍÏÇÕÔ
-	ÂÙÔØ ÚÁÇÒÕÖÅÎÙ É ÕÓÔÁÎÏ×ÌÅÎÙ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÓÌÅÄÕÀÝÅÊ
-	ËÏÍÁÎÄÙ:</para>
+      <para>ðÒÏÃÅÓÓ ÐÒÉÍÅÎÅÎÉÑ ÏÂÎÏ×ÌÅÎÉÊ ÂÅÚÏÐÁÓÎÏÓÔÉ &os; ÂÙÌ
+	ÕÐÒÏÝ£Î, ÞÔÏ ÐÏÚ×ÏÌÑÅÔ ÐÏÄÄÅÒÖÉ×ÁÔØ ÓÉÓÔÅÍÕ × ÁËÔÕÁÌØÎÏÍ
+	ÓÏÓÔÏÑÎÉÉ, ÉÓÐÏÌØÚÕÑ <command>freebsd-update</command>.
+	äÌÑ ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ ÐÏ ÂÀÌÌÅÔÅÎÑÍ
+	ÂÅÚÏÐÁÓÎÏÓÔÉ &os; ÓÍÏÔÒÉÔÅ <xref
+	  linkend="security-advisories"/>.</para>
+
+      <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>
+	ÎÕÖÎÏ ÐÅÒÅÚÁÇÒÕÚÉÔØ ÓÉÓÔÅÍÕ.  åÓÌÉ ÏÂÎÏ×ÌÅÎÉÅ ÕÓÔÁÎÏ×ÉÌÏÓØ
+	ÄÌÑ ËÁËÏÇÏ-ÌÉÂÏ ÒÁÂÏÔÁÀÝÅÇÏ × ÓÉÓÔÅÍÅ Ä×ÏÉÞÎÏÇÏ ÆÁÊÌÁ, ÔÏ
+	ÓÌÅÄÕÅÔ ÐÅÒÅÚÁÐÕÓÔÉÔØ ÚÁÔÒÏÎÕÔÙÅ ÐÒÉÌÏÖÅÎÉÑ, ÞÔÏÂÙ
+	ÉÓÐÏÌØÚÏ×ÁÌÁÓØ ÉÓÐÒÁ×ÌÅÎÎÁÑ ×ÅÒÓÉÑ Ä×ÏÉÞÎÏÇÏ ÆÁÊÌÁ.</para>
+
+      <para>íÏÖÎÏ ÎÁÓÔÒÏÉÔØ ÅÖÅÄÎÅ×ÎÕÀ Á×ÔÏÍÁÔÉÞÅÓËÕÀ ÐÒÏ×ÅÒËÕ
+	ÎÁÌÉÞÉÑ ÏÂÎÏ×ÌÅÎÉÊ, ÄÏÂÁ×É× ÓÌÅÄÕÀÝÕÀ ÚÁÐÉÓØ ×
+	<filename>/etc/crontab</filename>:</para>
 
       <programlisting>@daily                                  root    freebsd-update cron</programlisting>
 
-      <para>üÔÁ ÚÁÐÉÓØ ÏÚÎÁÞÁÅÔ, ÞÔÏ <command>freebsd-update</command> ÂÕÄÅÔ
-	ÚÁÐÕÓËÁÔØÓÑ ÅÖÅÄÎÅ×ÎÏ.  ÷ ÄÁÎÎÏÍ ÓÌÕÞÁÅ, × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÁÒÇÕÍÅÎÔÏÍ
-	<option>cron</option> <command>freebsd-update</command> ÏÇÒÁÎÉÞÉÔÓÑ
-	ÐÒÏ×ÅÒËÏÊ ÄÏÓÔÕÐÎÙÈ ÏÂÎÏ×ÌÅÎÉÊ.  ÷ ÓÌÕÞÁÅ ÎÁÌÉÞÉÑ ÏÂÎÏ×ÌÅÎÉÊ ÏÎÉ
-	ÂÕÄÕÔ Á×ÔÏÍÁÔÉÞÅÓËÉ ÚÁÇÒÕÖÅÎÙ É ÓÏÈÒÁÎÅÎÙ ÎÁ ÌÏËÁÌØÎÏÍ ÄÉÓËÅ. 
-	ðÏÌØÚÏ×ÁÔÅÌÀ <systemitem class="username">root</systemitem> ÂÕÄÅÔ ÏÔÐÒÁ×ÌÅÎÏ
-	ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÅ ÐÉÓØÍÏ, ÔÁË ÞÔÏ ÜÔÉ ÏÂÎÏ×ÌÅÎÉÑ ÍÏÖÎÏ ÂÕÄÅÔ
-	ÕÓÔÁÎÏ×ÉÔØ ÓÁÍÏÓÔÏÑÔÅÌØÎÏ.</para>
+      <para>ðÒÉ ÎÁÌÉÞÉÉ ÏÂÎÏ×ÌÅÎÉÊ ÏÎÉ ÂÕÄÕÔ Á×ÔÏÍÁÔÉÞÅÓËÉ ÚÁÇÒÕÖÅÎÙ.
+	ðÏÌØÚÏ×ÁÔÅÌÀ <systemitem class="username">root</systemitem>
+	ÂÕÄÅÔ ÏÔÐÒÁ×ÌÅÎÏ ÐÉÓØÍÏ, ÔÁË ÞÔÏ ÜÔÉ ÏÂÎÏ×ÌÅÎÉÑ ÍÏÖÎÏ ÂÕÄÅÔ
+	ÐÒÏÓÍÏÔÒÅÔØ É ÕÓÔÁÎÏ×ÉÔØ ÓÁÍÏÓÔÏÑÔÅÌØÎÏ ËÏÍÁÎÄÏÊ
+	<command>freebsd-update install</command>.</para>
 
       <para>îÁ ÓÌÕÞÁÊ, ÅÓÌÉ ÞÔÏ-ÔÏ ÐÏÛÌÏ ÎÅ ÔÁË, ×
 	<command>freebsd-update</command> ÐÒÅÄÕÓÍÏÔÒÅÎ ÍÅÈÁÎÉÚÍ ×ÏÚ×ÒÁÔÁ
 	ÐÏÓÌÅÄÎÅÇÏ ÎÁÂÏÒÁ ÉÚÍÅÎÅÎÉÊ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÓÌÅÄÕÀÝÅÊ ËÏÍÁÎÄÙ:</para>
 
-      <screen>&prompt.root; <userinput>freebsd-update rollback</userinput></screen>
+      <screen>&prompt.root; <userinput>freebsd-update rollback</userinput>
+Uninstalling updates... done.</screen>
 
       <para>åÓÌÉ ÐÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ×ÓÅÈ ÄÅÊÓÔ×ÉÊ ÂÙÌÏ ÉÚÍÅÎÅÎÏ ÑÄÒÏ ÉÌÉ
-	ËÁËÏÊ-ÌÉÂÏ ÉÚ ÅÇÏ ÍÏÄÕÌÅÊ, ÓÉÓÔÅÍÁ ÄÏÌÖÎÁ ÂÙÔØ ÐÅÒÅÚÁÇÒÕÖÅÎÁ. 
-	üÔÏ ÐÏÚ×ÏÌÉÔ &os; ÚÁÇÒÕÚÉÔØ ÎÏ×ÙÅ Ä×ÏÉÞÎÙÅ ÆÁÊÌÙ × ÐÁÍÑÔØ.</para>
+	ËÁËÏÊ-ÌÉÂÏ ÉÚ ÅÇÏ ÍÏÄÕÌÅÊ, ÓÉÓÔÅÍÁ ÄÏÌÖÎÁ ÂÙÔØ ÐÅÒÅÚÁÇÒÕÖÅÎÁ,
+	Á ×ÓÅ ÚÁÔÒÏÎÕÔÙÅ ÉÓÐÏÌÎÑÅÍÙÅ ÆÁÊÌÙ ÎÕÖÎÏ ÐÅÒÅÚÁÐÕÓÔÉÔØ.</para>
+
+      <para>ëÏÍÁÎÄÁ <command>freebsd-update</command> ÐÏÚ×ÏÌÑÅÔ
+	Á×ÔÏÍÁÔÉÞÅÓËÉ ÏÂÎÏ×ÌÑÔØ ÔÏÌØËÏ ÑÄÒÏ
+	<filename>GENERIC</filename>.  åÓÌÉ ÉÓÐÏÌØÚÕÅÔÓÑ ÑÄÒÏ Ó
+	ÓÏÂÓÔ×ÅÎÎÏÊ ËÏÎÆÉÇÕÒÁÃÉÅÊ, ÅÇÏ ÐÏÎÁÄÏÂÉÔÓÑ ÐÅÒÅÓÏÂÒÁÔØ É
+	ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ ÐÏÓÌÅ ÔÏÇÏ, ËÁË
+	<command>freebsd-update</command> ÚÁ×ÅÒÛÉÔ ÕÓÔÁÎÏ×ËÕ
+	ÏÂÎÏ×ÌÅÎÉÊ.  ôÅÍ ÎÅ ÍÅÎÅÅ, <command>freebsd-update</command>
+	ÏÂÎÁÒÕÖÉÔ É ÏÂÎÏ×ÉÔ ÑÄÒÏ <filename>GENERIC</filename> ÐÒÉ
+	ÎÁÌÉÞÉÉ <filename>/boot/GENERIC</filename>, ÄÁÖÅ ÅÓÌÉ ÏÎÏ ÎÅ
+	Ñ×ÌÑÅÔÓÑ ÔÅËÕÝÉÍ ÉÓÐÏÌØÚÕÅÍÙÍ ÑÄÒÏÍ × ÓÉÓÔÅÍÅ.</para>
 
       <note>
-	<para>ëÏÍÁÎÄÁ <command>freebsd-update</command> ÒÁÂÏÔÁÅÔ ÔÏÌØËÏ
-	  Ó ÑÄÒÏÍ <filename>GENERIC</filename>.  åÓÌÉ ×
-	  <filename>GENERIC</filename> ÐÒÉÓÕÔÓÔ×ÕÀÔ ÉÚÍÅÎÅÎÉÑ ÉÌÉ
-	  ÉÓÐÏÌØÚÕÅÔÓÑ ÓÏÂÓÔ×ÅÎÎÁÑ ËÏÎÆÉÇÕÒÁÃÉÑ ÑÄÒÁ,
-	  <command>freebsd-update</command> ÚÁ×ÅÒÛÉÔÓÑ ÎÅÕÄÁÞÎÏ.</para>
+	<para>÷ÓÅÇÄÁ ÈÒÁÎÉÔÅ ËÏÐÉÀ ÑÄÒÁ <filename>GENERIC</filename>
+	  × <filename>/boot/GENERIC</filename>.  ïÎÏ ÐÒÉÇÏÄÉÔÓÑ ÐÒÉ
+	  ÒÅÛÅÎÉÉ ÒÁÚÌÉÞÎÙÈ ÐÒÏÂÌÅÍ, Á ÔÁËÖÅ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ÏÂÎÏ×ÌÅÎÉÑ
+	  ÓÏ ÓÍÅÎÏÊ ×ÅÒÓÉÉ.  óÍÏÔÒÉÔÅ <xref
+	    linkend="freebsd-update-custom-kernel-9x"/> ÄÌÑ ÏÐÉÓÁÎÉÑ
+	  ÐÏÌÕÞÅÎÉÑ ËÏÐÉÉ ÑÄÒÁ <filename>GENERIC</filename>.</para>
       </note>
+
+      <para>åÓÌÉ ËÏÎÆÉÇÕÒÁÃÉÑ ×
+	<filename>/etc/freebsd-update.conf</filename> ÎÅ ÉÚÍÅÎÑÌÁÓØ,
+	<command>freebsd-update</command> ×ÍÅÓÔÅ Ó ÏÓÔÁÌØÎÙÍÉ
+	ÏÂÎÏ×ÌÅÎÉÑÍÉ ÕÓÔÁÎÏ×ÉÔ ÏÂÎÏ×Ì£ÎÎÙÅ ÉÓÈÏÄÎÙÅ ÔÅËÓÔÙ ÑÄÒÁ.
+	ðÏÓÌÅ ÜÔÏÇÏ ÍÏÖÎÏ ÏÂÙÞÎÙÍ ÓÐÏÓÏÂÏÍ ×ÙÐÏÌÎÉÔØ ÐÅÒÅÓÔÒÏÅÎÉÅ É
+	ÐÅÒÅÕÓÔÁÎÏ×ËÕ ÎÏ×ÏÇÏ ÑÄÒÁ Ó ÓÏÂÓÔ×ÅÎÎÏÊ ËÏÎÆÉÇÕÒÁÃÉÅÊ.</para>
+
+      <para>ïÂÎÏ×ÌÅÎÉÑ, ÐÏÌÕÞÁÅÍÙÅ Ó ÐÏÍÏÝØÀ
+	<command>freebsd-update</command>, ÎÅ ×ÓÅÇÄÁ ÚÁÔÒÁÇÉ×ÁÀÔ ÑÄÒÏ.
+	ðÅÒÅÓÔÒÏÅÎÉÅ ÓÏÂÓÔ×ÅÎÎÏÇÏ ÑÄÒÁ ÎÅ Ñ×ÌÑÅÔÓÑ ÏÂÑÚÁÔÅÌØÎÙÍ, ÅÓÌÉ
+	ÉÓÈÏÄÎÙÅ ÔÅËÓÔÙ ÑÄÒÁ ÎÅ ÂÙÌÉ ÉÚÍÅÎÅÎÙ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ
+	<command>freebsd-update install</command>.  ôÅÍ ÎÅ ÍÅÎÅÅ,
+	<command>freebsd-update</command> ×ÓÅÇÄÁ ÏÂÎÏ×ÌÑÅÔ
+	<filename>/usr/src/sys/conf/newvers.sh</filename>.  ôÅËÕÝÉÊ
+	ÎÁÂÏÒ ÉÚÍÅÎÅÎÉÊ, ËÁË ÕËÁÚÁÎÏ × ÎÏÍÅÒÅ <literal>-p</literal>
+	× ×Ù×ÏÄÅ <command>uname -r</command>, ÐÏÌÕÞÁÅÔÓÑ ÉÚ ÜÔÏÇÏ
+	ÆÁÊÌÁ.  ðÅÒÅÓÔÒÏÅÎÉÅ ÓÏÂÓÔ×ÅÎÎÏÇÏ ÑÄÒÁ, ÄÁÖÅ ÅÓÌÉ ÎÉÞÅÇÏ
+	ÂÏÌØÛÅ ÎÅ ÍÅÎÑÌÏÓØ, ÐÏÚ×ÏÌÑÅÔ <command>uname</command>
+	ÐÒÁ×ÉÌØÎÏ ÓÏÏÂÝÁÔØ ÔÅËÕÝÉÊ ÎÁÂÏÒ ÉÚÍÅÎÅÎÉÊ × ÓÉÓÔÅÍÅ.  üÔÏ
+	× ÞÁÓÔÎÏÓÔÉ ÍÏÖÅÔ ÐÏÍÏÞØ ÐÒÉ ÓÏÐÒÏ×ÏÖÄÅÎÉÉ ÍÎÏÖÅÓÔ×Á ÓÉÓÔÅÍ,
+	ÐÏÓËÏÌØËÕ ÐÏÚ×ÏÌÑÅÔ ÂÙÓÔÒÏ ÏÃÅÎÉÔØ ÎÁÌÉÞÉÅ ÕÓÔÁÎÏ×ÌÅÎÎÙÈ
+	ÏÂÎÏ×ÌÅÎÉÊ × ËÁÖÄÏÊ ÉÚ ÎÉÈ.</para>
     </sect2>
 
-    <sect2>
+    <sect2 xml:id="freebsdupdate-upgrade">
       <title>ïÂÎÏ×ÌÅÎÉÑ ÓÏ ÓÍÅÎÏÊ ÓÔÁÒÛÅÊ É ÍÌÁÄÛÅÊ ×ÅÒÓÉÊ</title>
 
-      <para>üÔÏÔ ÐÒÏÃÅÓÓ ÕÄÁÌÑÅÔ ÓÔÁÒÙÅ ÏÂßÅËÔÎÙÅ ÆÁÊÌÙ É ÂÉÂÌÉÏÔÅËÉ, ÞÔÏ
-	ÍÏÖÅÔ ÎÁÒÕÛÉÔØ ÒÁÂÏÔÕ ÂÏÌØÛÉÎÓÔ×Á ÓÔÏÒÏÎÎÉÈ ÐÒÉÌÏÖÅÎÉÊ.  ÷ÓÅ
-	ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÐÏÒÔÙ ÒÅËÏÍÅÎÄÕÅÔÓÑ ÌÉÂÏ ÕÄÁÌÉÔØ É ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ
-	ÚÁÎÏ×Ï, ÌÉÂÏ ÏÂÎÏ×ÉÔØ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÏÇÒÁÍÍÙ <package>ports-mgmt/portupgrade</package>.  âÏÌØÛÉÎÓÔ×Ï
-	ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÐÒÅÄÐÏÞÔÕÔ ×ÙÐÏÌÎÉÔØ ÔÅÓÔÏ×ÏÅ ÐÏÓÔÒÏÅÎÉÅ, ÚÁÐÕÓÔÉ× ÄÌÑ
-	ÜÔÏÇÏ ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ:</para>
-
-      <screen>&prompt.root; <userinput>portupgrade -af</userinput></screen>
-
-      <para>üÔÏ ÐÏÚ×ÏÌÉÔ ÕÂÅÄÉÔØÓÑ × ÔÏÍ, ÞÔÏ ×Ó£ ÂÕÄÅÔ ÐÅÒÅÕÓÔÁÎÏ×ÌÅÎÏ
-	ÐÒÁ×ÉÌØÎÏ.  ïÂÒÁÔÉÔÅ ×ÎÉÍÁÎÉÅ, ÞÔÏ ÅÓÌÉ ÐÅÒÅÍÅÎÎÏÊ ÏËÒÕÖÅÎÉÑ
-	<varname>BATCH</varname> ÐÒÉÓ×ÏÉÔØ ÚÎÁÞÅÎÉÅ <literal>yes</literal>,
-	ÔÏ ÎÁ ×ÓÅ ×ÏÐÒÏÓÙ × ÔÅÞÅÎÉÅ ÜÔÏÇÏ ÐÒÏÃÅÓÓÁ ÂÕÄÅÔ ×ÏÚ×ÒÁÝÁÔØÓÑ
-	ÏÔ×ÅÔ <literal>yes</literal>, ÞÔÏ ÐÏÚ×ÏÌÉÔ ÉÓËÌÀÞÉÔØ ÎÅÏÂÈÏÄÉÍÏÓÔØ
-	ÒÕÞÎÏÇÏ ×ÍÅÛÁÔÅÌØÓÔ×Á × ÐÒÏÃÅÓÓ ÐÏÓÔÒÏÅÎÉÑ.</para>
-
-      <para>ïÂÎÏ×ÌÅÎÉÑ ÓÏ ÓÍÅÎÏÊ ÓÔÁÒÛÅÊ É ÍÌÁÄÛÅÊ ×ÅÒÓÉÊ ÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ,
-	ÕËÁÚÁ× ÚÎÁÞÅÎÉÅ ×ÅÒÓÉÉ, ÎÁ ËÏÔÏÒÕÀ ÂÕÄÅÔ ÐÒÏÉÚ×ÅÄÅÎ ÐÅÒÅÈÏÄ, ×
-	ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ ËÏÍÁÎÄÙ <command>freebsd-update</command>.
-	ôÁË, ÎÁÐÒÉÍÅÒ, ÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ ÏÂÎÏ×ÌÅÎÉÅ ÄÏ ×ÅÒÓÉÉ
-	&os; 6.3:</para>
+      <para>ïÂÎÏ×ÌÅÎÉÅ Ó &os; 9.0 ÎÁ &os; 9.1, ÎÁÚÙ×ÁÅÔÓÑ
+	ÏÂÎÏ×ÌÅÎÉÅÍ ÓÏ ÓÍÅÎÏÊ ÍÌÁÄÛÅÇÏ ÎÏÍÅÒÁ ×ÅÒÓÉÉ.  óÍÅÎÁ ÓÔÁÒÛÅÇÏ
+	ÎÏÍÅÒÁ ×ÅÒÓÉÉ ÐÒÏÉÓÈÏÄÉÔ, ËÏÇÄÁ &os; ÐÅÒÅÈÏÄÉÔ Ó ÏÄÎÏÊ
+	ÚÎÁÞÉÔÅÌØÎÏÊ ×ÅÒÓÉÉ ÎÁ ÄÒÕÇÕÀ, ËÁË, ÎÁÐÒÉÍÅÒ, ÐÒÉ ÏÂÎÏ×ÌÅÎÉÉ
+	Ó &os; 9.X ÎÁ &os; 10.X.  ïÂÁ ÔÉÐÁ ÏÂÎÏ×ÌÅÎÉÊ ÍÏÖÎÏ
+	ÐÒÏÉÚ×ÅÓÔÉ, ÕËÁÚÁ× <command>freebsd-update</command> ×ÅÒÓÉÀ,
+	ÎÁ ËÏÔÏÒÕÀ ÎÕÖÎÏ ÐÅÒÅÊÔÉ.</para>
+
+      <note>
+	<para>åÓÌÉ × ÓÉÓÔÅÍÅ ÉÓÐÏÌØÚÕÅÔÓÑ ÑÄÒÏ Ó ÓÏÂÓÔ×ÅÎÎÏÊ
+	  ËÏÎÆÉÇÕÒÁÃÉÅÊ, ÕÂÅÄÉÔÅÓØ ÐÅÒÅÄ ÎÁÞÁÌÏÍ ÏÂÎÏ×ÌÅÎÉÑ × ÎÁÌÉÞÉÉ
+	  ËÏÐÉÉ ÑÄÒÁ <filename>GENERIC</filename> ×
+	  <filename>/boot/GENERIC</filename>.  óÍÏÔÒÉÔÅ <xref
+	    linkend="freebsd-update-custom-kernel-9x"/> ÄÌÑ ÏÐÉÓÁÎÉÑ
+	  ÐÏÌÕÞÅÎÉÑ ËÏÐÉÉ ÑÄÒÁ <filename>GENERIC</filename>.</para>
+      </note>
 
-      <screen>&prompt.root; <userinput>freebsd-update -r 6.3-RELEASE upgrade</userinput></screen>
+      <para>óÌÅÄÕÀÝÁÑ ËÏÍÁÎÄÁ, ÂÕÄÕÞÉ ÚÁÐÕÝÅÎÎÏÊ ÎÁ &os; 9.0,
+	×ÙÐÏÌÎÉÔ ÏÂÎÏ×ÌÅÎÉÅ ÄÏ ×ÅÒÓÉÉ &os; 9.1:</para>
+
+      <screen>&prompt.root; <userinput>freebsd-update -r 9.1-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 signature for 9.0-RELEASE from update1.FreeBSD.org... done.
 Fetching metadata index... done.
 Inspecting system... done.
 
@@ -333,51 +435,80 @@ The following components of FreeBSD do n
 kernel/generic world/catpages world/dict world/doc world/games
 world/proflibs
 
-Does this look reasonable (y/n)? y</screen>
+Does this look reasonable (y/n)? <userinput>y</userinput></screen>
 
       <para>óÌÅÄÕÀÝÉÍ ÛÁÇÏÍ <command>freebsd-update</command> ÐÏÐÙÔÁÅÔÓÑ
 	ÚÁÇÒÕÚÉÔØ ÐÏ ÓÅÔÉ ÆÁÊÌÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ×ÙÐÏÌÎÅÎÉÑ ÏÂÎÏ×ÌÅÎÉÑ.
 	÷ ÎÅËÏÔÏÒÙÈ ÓÌÕÞÁÑÈ ÍÏÖÅÔ ÐÏÔÒÅÂÏ×ÁÔØÓÑ ÏÔ×ÅÔÉÔØ ÎÁ ×ÏÐÒÏÓÙ
 	ÏÔÎÏÓÉÔÅÌØÎÏ ÔÏÇÏ, ÞÔÏ É ËÁË ÕÓÔÁÎÁ×ÌÉ×ÁÔØ.</para>
 
+      <para>åÓÌÉ ÉÓÐÏÌØÚÕÅÔÓÑ ÑÄÒÏ Ó ÓÏÂÓÔ×ÅÎÎÏÊ ËÏÎÆÉÇÕÒÁÃÉÅÊ, ÔÏ
+	× ÜÔÏÍ ÓÌÕÞÁÅ ÐÏÑ×ÉÔÓÑ ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ ÓÌÅÄÕÀÝÅÇÏ ×ÉÄÁ:</para>
+
+      <screen>WARNING: This system is running a "<replaceable>MYKERNEL</replaceable>" kernel, which is not a
+kernel configuration distributed as part of FreeBSD 9.0-RELEASE.
+This kernel will not be updated: you MUST update the kernel manually
+before running "/usr/sbin/freebsd-update install"</screen>
+
+      <para>îÁ ÜÔÏÍ ÜÔÁÐÅ ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ ÍÏÖÎÏ ÐÒÏÉÇÎÏÒÉÒÏ×ÁÔØ.
+	îÁ ÐÒÏÍÅÖÕÔÏÞÎÏÍ ÜÔÁÐÅ ÐÒÏÃÅÓÓÁ ÏÂÎÏ×ÌÅÎÉÑ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎÏ
+	ÏÂÎÏ×Ì£ÎÎÏÅ ÑÄÒÏ <filename>GENERIC</filename>.</para>
+
       <para>ðÏÓÌÅ ÔÏÇÏ, ËÁË ×ÓÅ ÉÚÍÅÎÅÎÉÑ ÂÙÌÉ ÚÁÇÒÕÖÅÎÙ, ÏÎÉ ÂÕÄÕÔ
 	ÐÒÉÍÅÎÅÎÙ.  üÔÏÔ ÐÒÏÃÅÓÓ ÍÏÖÅÔ ÚÁÎÑÔØ ÏÐÒÅÄÅÌ£ÎÎÏÅ ×ÒÅÍÑ, ×
 	ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔÉ É ÔÅËÕÝÅÊ ÚÁÇÒÕÖÅÎÎÏÓÔÉ
-	ËÏÍÐØÀÔÅÒÁ.  úÁÔÅÍ ÂÕÄÅÔ ×ÙÐÏÌÎÅÎÏ ÓÌÉÑÎÉÅ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÈ ÆÁÊÌÏ×
-	— ÜÔÁ ÞÁÓÔØ ÐÒÏÃÅÓÓÁ ÔÒÅÂÕÅÔ ÏÔ ÐÏÌØÚÏ×ÁÔÅÌÑ ÏÐÒÅÄÅÌ£ÎÎÏÇÏ
+	ËÏÍÐØÀÔÅÒÁ.  úÁÔÅÍ ÂÕÄÅÔ ×ÙÐÏÌÎÅÎÏ ÓÌÉÑÎÉÅ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÈ
+	ÆÁÊÌÏ×.  ðÒÏÃÅÓÓ ÓÌÉÑÎÉÑ ÔÒÅÂÕÅÔ ÏÔ ÐÏÌØÚÏ×ÁÔÅÌÑ ÏÐÒÅÄÅÌ£ÎÎÏÇÏ
 	×ÍÅÛÁÔÅÌØÓÔ×Á, ÔÁË ËÁË ÄÌÑ ÆÁÊÌÁ ÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ ÓÌÉÑÎÉÅ
 	Á×ÔÏÍÁÔÉÞÅÓËÉ, Á ÍÏÖÎÏ ÏÔËÒÙÔØ ÔÅËÓÔÏ×ÙÊ ÒÅÄÁËÔÏÒ ÄÌÑ ÓÌÉÑÎÉÑ
 	×ÒÕÞÎÕÀ.  òÅÚÕÌØÔÁÔ ÕÓÐÅÛÎÏÇÏ ÓÌÉÑÎÉÑ ÂÕÄÅÔ ÐÏËÁÚÁÎ ÎÁ ÜËÒÁÎÅ.
-	îÅÕÄÁÞÎÏÅ ÉÌÉ ÐÒÏÐÕÝÅÎÎÏÅ ÓÌÉÑÎÉÅ ×ÙÚÏ×ÅÔ ÐÒÅÖÄÅ×ÒÅÍÅÎÎÏÅ ÚÁ×ÅÒÛÅÎÉÅ
-	ÐÒÏÇÒÁÍÍÙ.  íÏÖÎÏ ÐÏÄÇÏÔÏ×ÉÔØ ÒÅÚÅÒ×ÎÕÀ ËÏÐÉÀ ËÁÔÁÌÏÇÁ <filename>/etc</filename> ÄÌÑ ÔÁËÉÈ ×ÁÖÎÙÈ ÆÁÊÌÏ× ËÁË
-	<filename>master.passwd</filename> É <filename>group</filename> É 
+	îÅÕÄÁÞÎÏÅ ÉÌÉ ÐÒÏÐÕÝÅÎÎÏÅ ÓÌÉÑÎÉÅ ×ÙÚÏ×ÅÔ ÐÒÅÖÄÅ×ÒÅÍÅÎÎÏÅ
+	ÚÁ×ÅÒÛÅÎÉÅ ÐÒÏÇÒÁÍÍÙ.  íÏÖÎÏ ÐÏÄÇÏÔÏ×ÉÔØ ÒÅÚÅÒ×ÎÕÀ ËÏÐÉÀ
+	ËÁÔÁÌÏÇÁ <filename>/etc</filename> ÄÌÑ ÔÁËÉÈ ×ÁÖÎÙÈ ÆÁÊÌÏ× ËÁË
+	<filename>master.passwd</filename> É <filename>group</filename> É
 	×ÙÐÏÌÎÉÔØ ÉÈ ÓÌÉÑÎÉÅ ×ÒÕÞÎÕÀ ÐÏÚÄÎÅÅ.</para>
 
       <note>
-	<para>îÁ ÄÁÎÎÏÍ ÜÔÁÐÅ ÓÉÓÔÅÍÁ ÅÝÅ ÎÅ ÍÏÄÉÆÉÃÉÒÏ×ÁÎÁ, É ×ÓÅ ÉÚÍÅÎÅÎÉÑ
-	  É ÓÌÉÑÎÉÑ ÐÒÏÉÓÈÏÄÑÔ × ÏÔÄÅÌØÎÏÍ ËÁÔÁÌÏÇÅ.  ôÅÐÅÒØ, ËÏÇÄÁ ×ÓÅ
-	  ÉÚÍÅÎÅÎÉÑ ÕÓÐÅÛÎÏ ÐÒÉÍÅÎÅÎÙ, ×ÓÅ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ ÆÁÊÌÙ ÓÌÉÔÙ É
-	  ËÁÖÅÔÓÑ, ÞÔÏ ÐÒÏÃÅÓÓ ÄÏÌÖÅÎ ÐÒÏÊÔÉ ÐÌÁ×ÎÏ, ÐÏÌØÚÏ×ÁÔÅÌØ ÄÏÌÖÅÎ
-	  ÕÓÔÁÎÏ×ÉÔØ ÉÚÍÅÎÅÎÉÑ.</para>
+	<para>îÁ ÄÁÎÎÏÍ ÜÔÁÐÅ ÓÉÓÔÅÍÁ ÅÝÅ ÎÅ ÍÏÄÉÆÉÃÉÒÏ×ÁÎÁ, É ×ÓÅ
+	  ÉÚÍÅÎÅÎÉÑ É ÓÌÉÑÎÉÑ ÐÒÏÉÓÈÏÄÑÔ × ÏÔÄÅÌØÎÏÍ ËÁÔÁÌÏÇÅ.
+	  ôÅÐÅÒØ, ËÏÇÄÁ ×ÓÅ ÉÚÍÅÎÅÎÉÑ ÕÓÐÅÛÎÏ ÐÒÉÍÅÎÅÎÙ, ×ÓÅ
+	  ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ ÆÁÊÌÙ ÏÂßÅÄÉÎÅÎÙ É ËÁÖÅÔÓÑ, ÞÔÏ ÐÒÏÃÅÓÓ
+	  ÄÏÌÖÅÎ ÐÒÏÊÔÉ ÐÌÁ×ÎÏ, ÉÚÍÅÎÅÎÉÑ ÍÏÇÕÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎÙ ÎÁ
+	  ÄÉÓË Ó ÐÏÍÏÝØÀ ÓÌÅÄÕÀÝÅÊ ËÏÍÁÎÄÙ:</para>
+
+	<screen>&prompt.root; <userinput>freebsd-update install</userinput></screen>
       </note>
 
-      <para>ðÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÜÔÏÇÏ ÐÒÏÃÅÓÓÁ, ÉÚÍÅÎÅÎÉÑ ÍÏÇÕÔ ÂÙÔØ
-	ÕÓÔÁÎÏ×ÌÅÎÙ ÎÁ ÄÉÓË Ó ÐÏÍÏÝØÀ ÓÌÅÄÕÀÝÅÊ ËÏÍÁÎÄÙ.</para>
+      <para>÷ ÐÅÒ×ÕÀ ÏÞÅÒÅÄØ ÉÚÍÅÎÅÎÉÑ ÂÕÄÕÔ ÐÒÉÍÅÎÅÎÙ Ë ÑÄÒÕ É ÅÇÏ
+	ÍÏÄÕÌÑÍ.  ðÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÑÄÒÁ Ó ÓÏÂÓÔ×ÅÎÎÏÊ ËÏÎÆÉÇÕÒÁÃÉÅÊ
+	ÕËÁÖÉÔÅ ÄÌÑ ÓÌÅÄÕÀÝÅÊ ÚÁÇÒÕÚËÉ ÏÂÎÏ×Ì£ÎÎÏÅ ÑÄÒÏ
+	<filename>/boot/GENERIC</filename> Ó ÐÏÍÏÝØÀ
+	&man.nextboot.8;:</para>
 
-      <screen>&prompt.root; <userinput>freebsd-update install</userinput></screen>
+      <screen>&prompt.root; <userinput>nextboot -k GENERIC</userinput></screen>
 
-      <para>÷ ÐÅÒ×ÕÀ ÏÞÅÒÅÄØ ÉÚÍÅÎÅÎÉÑ ÂÕÄÕÔ ÐÒÉÍÅÎÅÎÙ Ë ÑÄÒÕ É ÅÇÏ ÍÏÄÕÌÑÍ. 
-	ðÏÓÌÅ ÜÔÏÇÏ ËÏÍÐØÀÔÅÒ ÄÏÌÖÅÎ ÂÙÔØ ÐÅÒÅÚÁÇÒÕÖÅÎ.  óÌÅÄÕÀÝÁÑ ËÏÍÁÎÄÁ
-	×ÙÐÏÌÎÉÔ ÐÅÒÅÚÁÇÒÕÚËÕ ËÏÍÐØÀÔÅÒÁ, ÐÏÓÌÅ ÞÅÇÏ ÂÕÄÅÔ ÚÁÇÒÕÖÅÎÏ ÎÏ×ÏÅ
-	ÑÄÒÏ:</para>
+      <warning>
+	<para>ðÅÒÅÄ ÐÅÒÅÚÁÇÒÕÚËÏÊ Ó ÑÄÒÏÍ <filename>GENERIC</filename>
+	  ÕÂÅÄÉÔÅÓØ, ÞÔÏ ÏÎÏ ÓÏÄÅÒÖÉÔ ×ÓÅ ÎÅÏÂÈÏÄÉÍÙÅ ÄÒÁÊ×ÅÒÁ ÄÌÑ
+	  ÓÉÓÔÅÍÙ ÄÌÑ ËÏÒÒÅËÔÎÏÊ ÚÁÇÒÕÚËÉ É ÐÏÄËÌÀÞÅÎÉÑ Ë ÓÅÔÉ, ÅÓÌÉ
+	  ÍÁÛÉÎÁ ÏÂÎÏ×ÌÑÅÔÓÑ ÕÄÁÌ£ÎÎÏ.  ÷ ÞÁÓÔÎÏÓÔÉ, ÅÓÌÉ × ÑÄÒÅ
+	  ÓÏÄÅÒÖÉÔÓÑ ×ÓÔÒÏÅÎÎÁÑ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔØ, ËÏÔÏÒÁÑ ÏÂÙÞÎÏ
+	  ÏÂÅÓÐÅÞÉ×ÁÅÔÓÑ ÍÏÄÕÌÑÍÉ ÑÄÒÁ, ÚÁÇÒÕÚÉÔÅ ÜÔÉ ÄÒÁÊ×ÅÒÁ Ó ÑÄÒÏÍ
+	  <filename>GENERIC</filename>, ×ÒÅÍÅÎÎÏ ÕËÁÚÁ× ÉÈ ËÁË ÍÏÄÕÌÉ
+	  × <filename>/boot/loader.conf</filename>.  òÅËÏÍÅÎÄÕÅÔÓÑ
+	  ÏÔËÌÀÞÉÔØ ÎÅÓÕÝÅÓÔ×ÅÎÎÙÅ ÓÌÕÖÂÙ, Á ÔÁËÖÅ ÌÀÂÙÅ ÌÏËÁÌØÎÙÅ É
+	  ÓÅÔÅ×ÙÅ ÄÉÓËÉ ÄÏ ÚÁ×ÅÒÛÅÎÉÑ ÐÒÏÃÅÓÓÁ ÏÂÎÏ×ÌÅÎÉÑ.</para>
+      </warning>
+
+      <para>ôÅÐÅÒØ ËÏÍÐØÀÔÅÒ ÄÏÌÖÅÎ ÂÙÔØ ÐÅÒÅÚÁÇÒÕÖÅÎ Ó ÎÏ×ÙÍ
+	ÑÄÒÏÍ:</para>
 
       <screen>&prompt.root; <userinput>shutdown -r now</userinput></screen>
 
       <para>ðÏÓÌÅ ÐÅÒÅÚÁÇÒÕÚËÉ ÎÕÖÎÏ ÐÏ×ÔÏÒÎÏ ÚÁÐÕÓÔÉÔØ ËÏÍÁÎÄÕ
 	<command>freebsd-update</command>.  ëÏÍÁÎÄÁ ÐÒÏÞÉÔÁÅÔ, ÎÁ ËÁËÏÍ
 	ÜÔÁÐÅ ÏÎÁ ÎÁÈÏÄÉÔÓÑ, É ÐÅÒÅÊÄ£Ô Ë ÕÄÁÌÅÎÉÀ ÓÔÁÒÙÈ ÏÂßÅËÔÎÙÈ ÆÁÊÌÏ×
-	É ÓÏ×ÍÅÓÔÎÏ ÉÓÐÏÌØÚÕÅÍÙÈ ÂÉÂÌÉÏÔÅË.  þÔÏÂÙ ÐÅÒÅÊÔÉ Ë ÜÔÏÍÕ ÜÔÁÐÕ,
-	×ÙÐÏÌÎÉÔÅ ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ:</para>
+	É ÓÏ×ÍÅÓÔÎÏ ÉÓÐÏÌØÚÕÅÍÙÈ ÂÉÂÌÉÏÔÅË.</para>
 
       <screen>&prompt.root; <userinput>freebsd-update install</userinput></screen>
 
@@ -387,45 +518,121 @@ Does this look reasonable (y/n)? y</scre
 	  ÓÏ×ÍÅÓÔÎÏ ÉÓÐÏÌØÚÕÅÍÙÈ ÂÉÂÌÉÏÔÅË.</para>
       </note>
 
-      <para>ôÅÐÅÒØ ÐÏÎÁÄÏÂÉÔÓÑ ÐÅÒÅÓÏÂÒÁÔØ É ÐÅÒÅÕÓÔÁÎÏ×ÉÔØ ×Ó£ ÓÔÏÒÏÎÎÅÅ
-	ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ.  üÔÏ ÎÅÏÂÈÏÄÉÍÁÑ ÏÐÅÒÁÃÉÑ, ÔÁË ËÁË
-	ÕÓÔÁÎÏ×ÌÅÎÎÏÅ ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ ÍÏÖÅÔ ÚÁ×ÉÓÅÔØ ÏÔ ÂÉÂÌÉÏÔÅË,
-	ËÏÔÏÒÙÅ ÂÙÌÉ ÕÄÁÌÅÎÙ × ÐÒÏÃÅÓÓÅ ÓÍÅÎÙ ×ÅÒÓÉÉ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ.
-	äÌÑ Á×ÔÏÍÁÔÉÚÁÃÉÉ ÜÔÏÇÏ ÐÒÏÃÅÓÓÁ ÍÏÖÎÏ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ËÏÍÁÎÄÏÊ
-	<package>ports-mgmt/portupgrade</package>.
-	îÁÞÁÔØ ÍÏÖÎÏ ÓÏ ÓÌÅÄÕÀÝÉÈ ËÏÍÁÎÄ:</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>
+      <para>îÁ ÜÔÏÍ ÐÒÏÃÅÓÓ ÚÁ×ÅÒÛ£Î.  åÓÌÉ ÂÙÌÏ ×ÙÐÏÌÎÅÎÏ ÏÂÎÏ×ÌÅÎÉÅ
+	ÓÏ ÓÍÅÎÏÊ ÓÔÁÒÛÅÇÏ ÎÏÍÅÒÁ ×ÅÒÓÉÉ, ÐÅÒÅÕÓÔÁÎÏ×ÉÔÅ ×ÓÅ ÐÏÒÔÙ É
+	ÐÁËÅÔÙ × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÏÐÉÓÁÎÉÅÍ, ËÏÔÏÒÏÅ ÐÒÅÄÏÓÔÁ×ÌÑÅÔ <xref
+	  linkend="freebsdupdate-portsrebuild"/>.</para>
+
+      <sect3 xml:id="freebsd-update-custom-kernel-9x">
+	<title>óÏÂÓÔ×ÅÎÎÁÑ ËÏÎÆÉÇÕÒÁÃÉÑ ÑÄÒÁ × &os; 9.X É ÂÏÌÅÅ
+	  ÐÏÚÄÎÉÈ ×ÅÒÓÉÑÈ</title>
+
+	<para>ðÅÒÅÄ ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ <command>freebsd-update</command>
+	  ÕÂÅÄÉÔÅÓØ × ÎÁÌÉÞÉÉ ËÏÐÉÉ ÑÄÒÁ <filename>GENERIC</filename>
+	  × <filename>/boot/GENERIC</filename>.  åÓÌÉ ÑÄÒÏ Ó
+	  ÓÏÂÓÔ×ÅÎÎÏÊ ËÏÎÆÉÇÕÒÁÃÉÅÊ ÂÙÌÏ ÓÏÂÒÁÎÏ ÅÄÉÎÏÖÄÙ, ÔÏ ×
+	  <filename>/boot/kernel.old</filename> ÂÕÄÅÔ ÎÁÈÏÄÉÔØÓÑ ÑÄÒÏ
+	  <literal>GENERIC</literal>.  ðÒÏÓÔÏ ÐÅÒÅÉÍÅÎÕÊÔÅ ÜÔÏÔ
+	  ËÁÔÁÌÏÇ × <filename>/boot/kernel</filename>.</para>
+
+	<para>åÓÌÉ ÑÄÒÏ Ó ÓÏÂÓÔ×ÅÎÎÏÊ ËÏÎÆÉÇÕÒÁÃÉÅÊ ÂÙÌÏ ÓÏÂÒÁÎÏ ÂÏÌÅÅ
+	  ÏÄÎÏÇÏ ÒÁÚÁ, ÐÏÌÕÞÉÔÅ ËÏÐÉÀ ÑÄÒÁ <literal>GENERIC</literal>,
+	  ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÕÀ ÔÅËÕÝÅÊ ×ÅÒÓÉÉ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ.  ðÒÉ
+	  ÎÁÌÉÞÉÉ ÆÉÚÉÞÅÓËÏÇÏ ÄÏÓÔÕÐÁ ËÏÐÉÀ ÑÄÒÁ
+	  <literal>GENERIC</literal> ÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ Ó ÕÓÔÁÎÏ×ÏÞÎÏÇÏ
+	  ÎÏÓÉÔÅÌÑ:</para>
+
+	<screen>&prompt.root; <userinput>mount /cdrom</userinput>
+&prompt.root; <userinput>cd /cdrom/usr/freebsd-dist</userinput>
+&prompt.root; <userinput>tar -C/ -xvf kernel.txz boot/kernel/kernel</userinput></screen>
 
-      <screen>&prompt.root; <userinput>freebsd-update install</userinput></screen>
+	<para>éÎÁÞÅ, ÑÄÒÏ <literal>GENERIC</literal> ÍÏÖÎÏ ÓÏÂÒÁÔØ É
+	  ÕÓÔÁÎÏ×ÉÔØ ÉÚ ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ×:</para>
+
+	<screen>&prompt.root; <userinput>cd /usr/src</userinput>
+&prompt.root; <userinput>make kernel __MAKE_CONF=/dev/null SRCCONF=/dev/null</userinput></screen>
 
-      <para>ðÅÒÅÚÁÇÒÕÚÉÔÅ ËÏÍÐØÀÔÅÒ Ó ÎÏ×ÏÊ ×ÅÒÓÉÅÊ &os;.  îÁ ÜÔÏÍ ÐÒÏÃÅÓÓ
-	ÚÁ×ÅÒÛ£Î.</para>
+	<para>þÔÏÂÙ ÔÁËÏÅ ÑÄÒÏ ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ ËÁË ÑÄÒÏ
+	  <literal>GENERIC</literal> ÐÒÏÇÒÁÍÍÏÊ
+	  <command>freebsd-update</command>, × ÆÁÊÌÅ ËÏÎÆÉÇÕÒÁÃÉÉ
+	  <filename>GENERIC</filename> ÄÏÌÖÎÙ ÏÔÓÕÔÓÔ×Ï×ÁÔØ ÉÚÍÅÎÅÎÉÑ.
+	  ôÁËÖÅ ÐÒÅÄÌÁÇÁÅÔÓÑ, ÞÔÏ ÑÄÒÏ ÂÙÌÏ ÓÏÂÒÁÎÏ ÂÅÚ ÉÓÐÏÌØÚÏ×ÁÎÉÑ
+	  ËÁËÉÈ-ÌÉÂÏ ÓÐÅÃÉÁÌØÎÙÈ ÐÁÒÁÍÅÔÒÏ×.</para>
+
+	<para>úÁÇÒÕÚËÁ Ó <filename>GENERIC</filename> ÎÅ ÔÒÅÂÕÅÔÓÑ,
+	  ÐÏÓËÏÌØËÕ ÄÌÑ <command>freebsd-update</command> ÄÏÓÔÁÔÏÞÎÏ
+	  ÓÕÝÅÓÔ×Ï×ÁÎÉÑ <filename>/boot/GENERIC</filename>.</para>
+      </sect3>
+
+      <sect3 xml:id="freebsdupdate-portsrebuild">
+	<title>ïÂÎÏ×ÌÅÎÉÅ ÐÁËÅÔÏ× ÐÏÓÌÅ ÓÍÅÎÙ ÓÔÁÒÛÅÊ ×ÅÒÓÉÉ
+	  ÓÉÓÔÅÍÙ</title>
+
+	<para>ðÏÓÌÅ ÏÂÎÏ×ÌÅÎÉÑ ÓÉÓÔÅÍÙ ÓÏ ÓÍÅÎÏÊ ÍÌÁÄÛÅÊ ×ÅÒÓÉÉ
+	  ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÐÒÉÌÏÖÅÎÉÑ, × ÃÅÌÏÍ, ÐÒÏÄÏÌÖÁÀÔ ÒÁÂÏÔÁÔØ ÂÅÚ
+	  ËÁËÉÈ-ÌÉÂÏ ÐÒÏÂÌÅÍ.  òÁÚÌÉÞÎÙÅ ÓÔÁÒÛÉÅ ×ÅÒÓÉÉ ÉÓÐÏÌØÚÕÀÔ
+	  ÒÁÚÌÉÞÁÀÝÉÅÓÑ Ä×ÏÉÞÎÙÅ ÉÎÔÅÒÆÅÊÓÙ ÐÒÉÌÏÖÅÎÉÊ (Application
+	  Binary Interface, <acronym>ABI</acronym>), ÉÚ-ÚÁ ÞÅÇÏ
+	  ÐÅÒÅÓÔÁ£Ô ÒÁÂÏÔÁÔØ ÂÏÌØÛÉÎÓÔ×Ï ÓÔÏÒÏÎÎÉÈ ÐÒÉÌÏÖÅÎÉÊ.
+	  ðÏÓÌÅ ÏÂÎÏ×ÌÅÎÉÑ ÓÉÓÔÅÍÙ ÓÏ ÓÍÅÎÏÊ ÓÔÁÒÛÅÊ ×ÅÒÓÉÉ ×ÓÅ
+	  ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÐÁËÅÔÙ É ÐÏÒÔÙ ÔÁËÖÅ ÎÕÖÄÁÀÔÓÑ × ÏÂÎÏ×ÌÅÎÉÉ.
+	  ðÁËÅÔÙ ÍÏÖÎÏ ÏÂÎÏ×ÉÔØ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ <command>pkg
+	    upgrade</command>.  äÌÑ ÏÂÎÏ×ÌÅÎÉÑ ÕÓÔÁÎÏ×ÌÅÎÎÙÈ ÐÏÒÔÏ×
+	  ÉÓÐÏÌØÚÕÅÔÓÑ <package>ports-mgmt/portmaster</package>.</para>
+
+	<para>ðÒÉÎÕÄÉÔÅÌØÎÏÅ ÏÂÎÏ×ÌÅÎÉÅ ×ÓÅ ÕÓÔÁÎÏ×ÌÅÎÎÙÈ ÐÁËÅÔÏ×
+	  ÐÒÉ×ÅÄ£Ô Ë ÉÈ ÚÁÍÅÎÅ ÎÁ ÐÏÓÌÅÄÎÉÅ ×ÅÒÓÉÉ ÉÚ ÒÅÐÏÚÉÔÏÒÉÑ,
+	  ÄÁÖÅ ÅÓÌÉ ÎÏÍÅÒ ×ÅÒÓÉÉ ÐÒÉ ÜÔÏÍ ÎÅ Õ×ÅÌÉÞÉ×ÁÌÓÑ.  üÔÏ
+	  ÔÒÅÂÕÅÔÓÑ ÉÚ-ÚÁ ÓÍÅÎÙ ×ÅÒÓÉÉ ABI ÐÒÉ ÏÂÎÏ×ÌÅÎÉÉ ÎÁ ÄÒÕÇÕÀ
+	  ÓÔÁÒÛÕÀ ×ÅÒÓÉÀ &os;.  ðÒÉÎÕÄÉÔÅÌØÎÏÅ ÏÂÎÏ×ÌÅÎÉÅ ÍÏÖÎÏ
+	  ×ÙÐÏÌÎÉÔØ ÔÁË:</para>
+
+	<screen>&prompt.root; <userinput>pkg-static upgrade -f</userinput></screen>
+
+	<para>ðÅÒÅÓÔÒÏÅÎÉÅ ×ÓÅÈ ÕÓÔÁÎÏ×ÌÅÎÎÙÈ ÐÒÉÌÏÖÅÎÉÊ ÍÏÖÎÏ
+	  ×ÙÐÏÌÎÉÔØ ÜÔÏÊ ËÏÍÁÎÄÏÊ:</para>
+
+	<screen>&prompt.root; <userinput>portmaster -af</userinput></screen>
+
+	<para>üÔÁ ËÏÍÁÎÄÁ ÂÕÄÅÔ ÏÔÏÂÒÁÖÁÔØ ÜËÒÁÎ ×ÙÂÏÒÁ ËÏÎÆÉÇÕÒÁÃÉÉ
+	  ÄÌÑ ËÁÖÄÏÇÏ ÐÒÉÌÏÖÅÎÉÑ, × ËÏÔÏÒÏÍ ÄÏÓÔÕÐÎÙ ÐÁÒÁÍÅÔÒÙ
+	  ËÏÎÆÉÇÕÒÁÃÉÉ, Ó ÏÖÉÄÁÎÉÅÍ ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÇÏ ××ÏÄÁ.  þÔÏÂÙ
+	  ÎÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÁËÏÅ ÐÏ×ÅÄÅÎÉÅ É ×ÓÅÇÄÁ ×ÙÂÉÒÁÔØ ÐÁÒÁÍÅÔÒÙ
+	  ÐÏ ÕÍÏÌÞÁÎÉÀ, ÄÏÂÁ×ØÔÅ ËÌÀÞ <option>-G</option> ×
+	  ×ÙÛÅÐÒÉ×ÅÄ£ÎÎÕÀ ËÏÍÁÎÄÕ.</para>
+
+	<para>ðÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÐÒÏÃÅÓÓÁ ÏÂÎÏ×ÌÅÎÉÑ ÐÒÏÇÒÁÍÍÎÏÇÏ
+	  ÏÂÅÓÐÅÞÅÎÉÑ ÚÁËÏÎÞÉÔÅ ÐÒÏÃÅÓÓ ÏÂÎÏ×ÌÅÎÉÑ ÐÏÓÌÅÄÎÉÍ ÚÁÐÕÓËÏÍ
+	  <command>freebsd-update</command>, ÄÌÑ ÔÏÇÏ ÞÔÏÂÙ ÕÂÅÄÉÔØÓÑ,
+	  ÞÔÏ ÎÉÞÔÏ ÎÅ ÂÙÌÏ ÐÒÏÐÕÝÅÎÏ × ÐÒÏÃÅÓÓÅ ÏÂÎÏ×ÌÅÎÉÑ:</para>
+
+	<screen>&prompt.root; <userinput>freebsd-update install</userinput></screen>
+
+	<para>åÓÌÉ × ËÁÞÅÓÔ×Å ×ÒÅÍÅÎÎÏÊ ÍÅÒÙ ÉÓÐÏÌØÚÏ×ÁÌÏÓØ ÑÄÒÏ
+	  <filename>GENERIC</filename>, ÔÏ ÜÔÏ ÐÏÄÈÏÄÑÝÅÅ ×ÒÅÍÑ ÄÌÑ
+	  ÐÏÓÔÒÏÅÎÉÑ É ÕÓÔÁÎÏ×ËÉ ÎÏ×ÏÇÏ ÑÄÒÁ Ó ÓÏÂÓÔ×ÅÎÎÏÊ
+	  ËÏÎÆÉÇÕÒÁÃÉÅÊ × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÉÎÓÔÒÕËÃÉÑÍÉ ×  <xref
+	    linkend="kernelconfig"/>.</para>
+
+	<para>ðÅÒÅÚÁÇÒÕÚÉÔÅ ÍÁÛÉÎÕ Ó ÎÏ×ÏÊ ×ÅÒÓÉÅÊ &os;.  îÁ ÜÔÏÍ
+	  ÐÒÏÃÅÓÓ ÏÂÎÏ×ÌÅÎÉÑ ÚÁ×ÅÒÛ£Î.</para>
+      </sect3>
     </sect2>
 
-    <sect2>
+    <sect2 xml:id="freebsdupdate-system-comparison">
       <title>óÒÁ×ÎÅÎÉÅ ÓÏÓÔÏÑÎÉÑ ÓÉÓÔÅÍÙ</title>
 
-      <para>õÔÉÌÉÔÁ <command>freebsd-update</command> ÍÏÖÅÔ ÂÙÔØ
-	ÉÓÐÏÌØÚÏ×ÁÎÁ ÄÌÑ ÐÒÏ×ÅÒËÉ ÓÏÓÔÏÑÎÉÑ ÕÓÔÁÎÏ×ÌÅÎÎÏÊ ×ÅÒÓÉÉ &os;
-	ÏÔÎÏÓÉÔÅÌØÎÏ ÉÚ×ÅÓÔÎÏÊ ÈÏÒÏÛÅÊ ËÏÐÉÉ.  ïÃÅÎÉ×ÁÅÔÓÑ ÔÅËÕÝÁÑ ×ÅÒÓÉÑ
-	ÓÉÓÔÅÍÎÙÈ ÕÔÉÌÉÔ, ÂÉÂÌÉÏÔÅË É ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÈ ÆÁÊÌÏ×.  äÌÑ ÔÏÇÏ,
-	ÞÔÏÂÙ ÎÁÞÁÔØ ÓÒÁ×ÎÅÎÉÅ, ×ÙÐÏÌÎÉÔÅ ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ:</para>
-
-      <screen>&prompt.root; <userinput>freebsd-update IDS >> outfile.ids</userinput></screen>
+      <para>ó ÐÏÍÏÝØÀ ËÏÍÁÎÄÙ <command>freebsd-update IDS</command>
+	ÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÓÏÓÔÏÑÎÉÅ ÕÓÔÁÎÏ×ÌÅÎÎÏÊ ×ÅÒÓÉÉ &os;
+	ÏÔÎÏÓÉÔÅÌØÎÏ ÉÚ×ÅÓÔÎÏÊ ÄÏ×ÅÒÅÎÎÏÊ ËÏÐÉÉ.  üÔÁ ËÏÍÁÎÄÁ
+	ÐÒÏ×ÅÒÑÅÔ ÔÅËÕÝÕÀ ×ÅÒÓÉÀ ÓÉÓÔÅÍÎÙÈ ÕÔÉÌÉÔ, ÂÉÂÌÉÏÔÅË É
+	ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÈ ÆÁÊÌÏ×, É Å£ ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ × ËÁÞÅÓÔ×Å
+	×ÓÔÒÏÅÎÎÏÊ ÓÉÓÔÅÍÙ ÏÂÎÁÒÕÖÅÎÉÑ ×ÔÏÒÖÅÎÉÊ (Intrusion Detection
+	System, <acronym>IDS</acronym>).</para>
 
       <warning>
-	<para>îÅ ÓÍÏÔÒÑ ÎÁ ÔÏ, ÞÔÏ ËÏÍÁÎÄÁ ÎÁÚÙ×ÁÅÔÓÑ
-	  <acronym>IDS</acronym>, ÜÔÏ ÎÉ × ËÏÅÊ ÍÅÒÅ ÎÅ ÄÏÌÖÎÏ Ñ×ÌÑÔØÓÑ
-	  ÚÁÍÅÎÏÊ ÓÉÓÔÅÍÅ ÏÂÎÁÒÕÖÅÎÉÑ ×ÔÏÒÖÅÎÉÊ, ÔÁËÏÊ ËÁË <package>security/snort</package>.  ðÏÓËÏÌØËÕ
+	<para>üÔÁ ËÏÍÁÎÄÁ ÎÅ Ñ×ÌÑÅÔÓÑ ÚÁÍÅÎÏÊ <acronym>IDS</acronym>,
+	  ÔÁËÏÊ ËÁË <package>security/snort</package>.  ðÏÓËÏÌØËÕ
 	  <command>freebsd-update</command> ÓÏÈÒÁÎÑÅÔ Ó×ÏÉ ÄÁÎÎÙÅ ÎÁ
 	  ÄÉÓËÅ, ×ÏÚÍÏÖÎÏÓÔØ ÐÏÄÍÅÎÙ ÓÔÁÎÏ×ÉÔÓÑ ÏÞÅ×ÉÄÎÏÊ.  é ÈÏÔÑ ÜÔÁ
 	  ×ÏÚÍÏÖÎÏÓÔØ ÍÏÖÅÔ ÂÙÔØ ÕÍÅÎØÛÅÎÁ ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÎÁÓÔÒÏÊËÉ
@@ -435,20 +642,27 @@ Does this look reasonable (y/n)? y</scre
 	  ÞÔÅÎÉÅ, ÌÕÞÛÉÍ ÒÅÛÅÎÉÅÍ ÂÕÄÅÔ ÓÒÁ×ÎÉÔØ ÓÉÓÔÅÍÕ ÏÔÎÏÓÉÔÅÌØÎÏ
 	  ÜÔÁÌÏÎÁ ÎÁ ÆÉÚÉÞÅÓËÉ ÚÁÝÉÝÅÎÎÏÍ ÎÏÓÉÔÅÌÅ, ÔÁËÏÍ ËÁË
 	  <acronym>DVD</acronym> ÉÌÉ ×ÎÅÛÎÉÊ <acronym>USB</acronym> ÄÉÓË
-	  Ó ×ËÌÀÞ£ÎÎÏÊ ÚÁÝÉÔÏÊ ÏÔ ÚÁÐÉÓÉ.</para>
+	  Ó ×ËÌÀÞ£ÎÎÏÊ ÚÁÝÉÔÏÊ ÏÔ ÚÁÐÉÓÉ.<!--  áÌØÔÅÒÎÁÔÉ×ÎÙÊ ÍÅÔÏÄ
+	  ÏÂÅÓÐÅÞÅÎÉÑ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔÉ <acronym>IDS</acronym> Ó
+	  ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ×ÓÔÒÏÅÎÎÙÈ ÕÔÉÌÉÔ ÏÐÉÓÁÎ × <xref
+	    linkend="security-ids"/>.--></para>
       </warning>
 
-      <para>ôÅÐÅÒØ ÚÁÐÕÓÔÉÔÓÑ ÐÒÏ×ÅÒËÁ ÓÉÓÔÅÍÙ, × ÒÅÚÕÌØÔÁÔÅ ËÏÔÏÒÏÊ ÂÕÄÅÔ
-	×Ù×ÅÄÅÎ ÓÐÉÓÏË ÆÁÊÌÏ× Ó ÉÈ ËÏÎÔÒÏÌØÎÙÍÉ ÓÕÍÍÁÍÉ × &man.sha256.1; Ó
-	ÉÚ×ÅÓÔÎÙÍ ÚÎÁÞÅÎÉÅÍ ÄÌÑ ÆÁÊÌÁ ÉÚ ÒÅÌÉÚÁ É ÚÎÁÞÅÎÉÅÍ ÄÌÑ ÔÅËÕÝÅÇÏ
-	× ÓÉÓÔÅÍÅ.  òÅÚÕÌØÔÁÔ ×Ù×ÏÄÉÔÓÑ ÓÌÉÛËÏÍ ÂÙÓÔÒÏ ÄÌÑ ÎÁÇÌÑÄÎÏÇÏ
-	ÓÒÁ×ÎÅÎÉÑ É ×ÓËÏÒÅ ÚÁÐÏÌÎÑÅÔ ËÏÎÓÏÌØÎÙÊ ÂÕÆÅÒ.  ðÏ ÜÔÏÊ ÐÒÉÞÉÎÅ ×
-	ÄÁÎÎÏÍ ÐÒÉÍÅÒÅ ×Ù×ÏÄ ÐÅÒÅÎÁÐÒÁ×ÌÅÎ × ÆÁÊÌ
-	<filename>outfile.ids</filename>.</para>
-
-      <para>üÔÉ ÓÔÒÏËÉ ÔÁËÖÅ ÏÞÅÎØ ÄÌÉÎÎÙÅ, ÎÏ ÚÁÔÏ ÔÁËÏÊ ÆÏÒÍÁÔ ×Ù×ÏÄÁ
-	ÕÄÏÂÅÎ ÄÌÑ ÒÁÚÂÏÒÁ.  ôÁË, ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÓÐÉÓËÁ ×ÓÅÈ ÏÔÌÉÞÁÀÝÉÈÓÑ
-	ÏÔ ÒÅÌÉÚÁ ÆÁÊÌÏ× ÄÏÓÔÁÔÏÞÎÏ ×ÙÐÏÌÎÉÔØ ÔÁËÕÀ ËÏÍÁÎÄÕ:</para>
+      <para>äÌÑ ÔÏÇÏ, ÞÔÏÂÙ ÎÁÞÁÔØ ÓÒÁ×ÎÅÎÉÅ, ÕËÁÖÉÔÅ ÆÁÊÌ ÄÌÑ
+	ÓÏÈÒÁÎÅÎÉÑ ÒÅÚÕÌØÔÁÔÏ×:</para>
+
+      <screen>&prompt.root; <userinput>freebsd-update IDS >> outfile.ids</userinput></screen>
+
+      <para>úÁÐÕÓÔÉÔÓÑ ÐÒÏ×ÅÒËÁ ÓÉÓÔÅÍÙ, ÒÅÚÕÌØÔÁÔ ËÏÔÏÒÏÊ ÂÕÄÅÔ
+	ÚÁÐÉÓÁÎ × ÕËÁÚÁÎÎÙÊ ÆÁÊÌ × ×ÉÄÅ ÓÐÉÓËÁ ÆÁÊÌÏ× ×ÍÅÓÔÅ Ó ÉÈ
+	ËÏÎÔÒÏÌØÎÙÍÉ ÓÕÍÍÁÍÉ × ÆÏÒÍÁÔÅ <acronym>SHA256</acronym>
+	— ÄÌÑ ÉÚ×ÅÓÔÎÙÈ ÆÁÊÌÏ× ÉÚ ÒÅÌÉÚÁ É ÔÅËÕÝÉÈ ×
+	ÓÉÓÔÅÍÅ.</para>
+
+      <para>óÔÒÏËÉ × ÓÐÉÓËÅ ÞÒÅÚÍÅÒÎÏ ÄÌÉÎÎÙÅ, ÎÏ ÚÁÔÏ ÔÁËÏÊ ÆÏÒÍÁÔ
+	×Ù×ÏÄÁ ÕÄÏÂÅÎ ÄÌÑ ÒÁÚÂÏÒÁ.  ôÁË, ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÓÐÉÓËÁ ×ÓÅÈ
+	ÏÔÌÉÞÁÀÝÉÈÓÑ ÏÔ ÒÅÌÉÚÁ ÆÁÊÌÏ× ÄÏÓÔÁÔÏÞÎÏ ×ÙÐÏÌÎÉÔØ ÔÁËÕÀ
+	ËÏÍÁÎÄÕ:</para>
 
       <screen>&prompt.root; <userinput>cat outfile.ids | awk '{ print $1 }' | more</userinput>
 /etc/master.passwd
@@ -459,1400 +673,1267 @@ Does this look reasonable (y/n)? y</scre
       <para>÷Ù×ÏÄ ÓÐÅÃÉÁÌØÎÏ ÏÂÒÅÚÁÎ, ÎÁ ÓÁÍÏÍ ÄÅÌÅ ÆÁÊÌÏ× ÎÁÍÎÏÇÏ ÂÏÌØÛÅ.
 	îÅËÏÔÏÒÙÅ ÉÚ ÎÉÈ ÉÚÍÅÎÅÎÙ × ÈÏÄÅ ÎÏÒÍÁÌØÎÏÊ ÒÁÂÏÔÙ: ÔÁË, ÆÁÊÌ
 	<filename>/etc/passwd</filename> ÂÙÌ ÉÚÍÅΣΠÐÏÓÌÅ ÚÁ×ÅÄÅÎÉÑ
-	ÐÏÌØÚÏ×ÁÔÅÌÅÊ × ÓÉÓÔÅÍÅ.  ÷ ÎÅËÏÔÏÒÙÈ ÓÌÕÞÁÑÈ ÍÏÇÕÔ ÂÙÔØ É ÄÒÕÇÉÅ
-	ÆÁÊÌÙ, ÔÁËÉÅ ËÁË ÍÏÄÕÌÉ ÑÄÒÁ, ËÏÔÏÒÙÅ ÍÏÇÌÉ ÉÚÍÅÎÉÔØÓÑ ×ÓÌÅÄÓÔ×ÉÅ
+	ÐÏÌØÚÏ×ÁÔÅÌÅÊ × ÓÉÓÔÅÍÅ.  íÏÄÕÌÉ ÑÄÒÁ ÍÏÇÌÉ ÉÚÍÅÎÉÔØÓÑ ×ÓÌÅÄÓÔ×ÉÅ
 	ÏÂÎÏ×ÌÅÎÉÑ ÞÅÒÅÚ <command>freebsd-update</command>.  äÌÑ
 	ÉÓËÌÀÞÅÎÉÑ ÉÚ ÐÒÏ×ÅÒËÉ ËÏÎËÒÅÔÎÙÈ ÆÁÊÌÏ× É ËÁÔÁÌÏÇÏ× ÕËÁÖÉÔÅ ÉÈ
 	× ËÁÞÅÓÔ×Å ÚÎÁÞÅÎÉÑ ÐÁÒÁÍÅÔÒÁ <literal>IDSIgnorePaths</literal>
 	× <filename>/etc/freebsd-update.conf</filename>.</para>
-
-      <para>üÔÁ ÓÉÓÔÅÍÁ ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ËÁË ÞÁÓÔØ ÂÏÌÅÅ ÓÌÏÖÎÏÊ
-	ÐÒÏÃÅÄÕÒÙ ÏÂÎÏ×ÌÅÎÉÑ, × ÏÔÌÉÞÉÅ ÏÔ ÏÐÉÓÁÎÎÏÇÏ ×ÙÛÅ ÓÐÏÓÏÂÁ.</para>
     </sect2>
   </sect1>
 
-  <sect1 xml:id="updating-upgrading-portsnap">
-    <info><title>Portsnap: ÓÒÅÄÓÔ×Ï ÏÂÎÏ×ÌÅÎÉÑ ëÏÌÌÅËÃÉÉ ðÏÒÔÏ×</title>
-      <authorgroup>
-        <author><personname><firstname>Tom</firstname><surname>Rhodes</surname></personname><contrib>ðÒÅÄÏÓÔÁ×ÉÌ </contrib></author>
-      </authorgroup>
-      <authorgroup>
-	<author><personname><firstname>Colin</firstname><surname>Percival</surname></personname><contrib>îÁ ÏÓÎÏ×Å ÚÁÍÅÔÏË, ËÏÔÏÒÙÅ ÐÒÅÄÏÓÔÁ×ÉÌ </contrib></author>
-      </authorgroup>
-    </info>
-    
+  <sect1 xml:id="updating-upgrading-documentation">
+    <title>ïÂÎÏ×ÌÅÎÉÅ ÄÏËÕÍÅÎÔÁÃÉÉ</title>
+
+    <indexterm>
+      <primary>ÏÂÎÏ×ÌÅÎÉÅ É ÓÍÅÎÁ ×ÅÒÓÉÉ</primary>
+    </indexterm>
 
-    <indexterm><primary>ÏÂÎÏ×ÌÅÎÉÅ É ÓÍÅÎÁ ×ÅÒÓÉÉ</primary></indexterm>
     <indexterm>
-      <primary>Portsnap</primary>
+      <primary>ÄÏËÕÍÅÎÔÁÃÉÑ</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>äÏËÕÍÅÎÔÁÃÉÑ Ñ×ÌÑÅÔÓÑ ÎÅÏÔßÅÍÌÅÍÏÊ ÞÁÓÔØÀ ÏÐÅÒÁÃÉÏÎÎÏÊ
+      ÓÉÓÔÅÍÙ &os;.  é ÈÏÔÑ ÁËÔÕÁÌØÎÁÑ ×ÅÒÓÉÑ ÄÏËÕÍÅÎÔÁÃÉÉ &os; ×ÓÅÇÄÁ
+      ÄÏÓÔÕÐÎÁ ÎÁ ÓÁÊÔÅ &os; (<link
+	xlink:href="&url.base;/doc/">http://www.freebsd.org/doc/</link>),
+      ÍÏÖÅÔ ÂÙÔØ ÕÄÏÂÎÏ ÉÍÅÔØ ÐÏÄ ÒÕËÏÊ ÁËÔÕÁÌØÎÕÀ ÌÏËÁÌØÎÕÀ ËÏÐÉÀ
+      ÓÁÊÔÁ &os;, ÒÕËÏ×ÏÄÓÔ×, <acronym>FAQ</acronym> É ÓÔÁÔÅÊ.</para>
 
-    <para>îÁ ÜÔÏÍ ÐÒÏÃÅÓÓ ÚÁ×ÅÒÛ£Î, É ÔÅÐÅÒØ ÐÒÉÌÏÖÅÎÉÑ ÍÏÖÎÏ
-      ÕÓÔÁÎÏ×ÉÔØ ÉÌÉ ÏÂÎÏ×ÉÔØ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ëÏÌÌÅËÃÉÉ ðÏÒÔÏ×.</para>
+    <para>÷ ÜÔÏÍ ÒÁÚÄÅÌÅ ÏÐÉÓÙ×ÁÅÔÓÑ, ËÁË ÉÓÐÏÌØÚÏ×ÁÔØ ÉÓÈÏÄÎÙÊ ÔÅËÓÔ
+      ÉÌÉ ëÏÌÌÅËÃÉÀ ðÏÒÔÏ× &os; ÄÌÑ ÏÒÇÁÎÉÚÁÃÉÉ ÁËÔÕÁÌØÎÏÊ ÌÏËÁÌØÎÏÊ
+      ËÏÐÉÉ ÄÏËÕÍÅÎÔÁÃÉÉ &os;.</para>
 
-    <para>äÌÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÇÏ ÚÁÐÕÓËÁ ÏÂÏÉÈ ÐÒÏÃÅÓÓÏ× ×ÙÐÏÌÎÉÔÅ
-      ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ:</para>
+    <para>úÁ ÉÎÆÏÒÍÁÃÉÅÊ Ï ÒÅÄÁËÔÉÒÏ×ÁÎÉÉ É ÏÔÐÒÁ×ËÅ ÉÚÍÅÎÅÎÉÊ
+      ÄÌÑ ÄÏËÕÍÅÎÔÁÃÉÉ ÏÂÒÁÝÁÊÔÅÓØ Ë &os; Documentation Project
+      Primer for New Contributors (<link
+	  xlink:href="&url.books.fdp-primer;">http://www.freebsd.org/doc/en_US.ISO8859-1/books/fdp-primer/</link>).</para>
 
-    <screen>&prompt.root; <userinput>portsnap fetch update</userinput></screen>
-  </sect1>    
+    <sect2 xml:id="updating-installed-documentation">
+      <title>ïÂÎÏ×ÌÅÎÉÅ ÄÏËÕÍÅÎÔÁÃÉÉ ÉÚ ÉÓÈÏÄÎÏÇÏ ËÏÄÁ</title>
 
-  <sect1 xml:id="current-stable">
-    <title>éÓÐÏÌØÚÏ×ÁÎÉÅ ×ÅÔ×É ÒÁÚÒÁÂÏÔËÉ</title>
-    <indexterm><primary>-CURRENT</primary></indexterm>
-    <indexterm><primary>-STABLE</primary></indexterm>
+      <para>äÌÑ ÐÅÒÅÓÔÒÏÅÎÉÑ ÄÏËÕÍÅÎÔÁÃÉÉ &os; ÉÚ ÉÓÈÏÄÎÏÇÏ ÔÅËÓÔÁ
+	ÔÒÅÂÕÅÔÓÑ ÎÁÂÏÒ ÉÎÓÔÒÕÍÅÎÔÏ×, ËÏÔÏÒÙÊ ÎÅ Ñ×ÌÑÅÔÓÑ ÞÁÓÔØÀ
+	ÏÓÎÏ×ÎÏÊ ÓÉÓÔÅÍÙ &os;.  ôÒÅÂÕÅÍÙÅ ÉÎÓÔÒÕÍÅÎÔÙ, ×ËÌÀÞÁÑ
+	<application>svn</application>, ÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÉÚ ÐÁËÅÔÁ
+	ÉÌÉ ÐÏÒÔÁ <package>textproc/docproj</package>, ÒÁÚÒÁÂÏÔÁÎÎÏÇÏ
+	× ÒÁÍËÁÈ ÐÒÏÅËÔÁ ÄÏËÕÍÅÎÔÁÃÉÉ &os;.</para>
 
-    <para>÷Ï FreeBSD ÉÍÅÅÔÓÑ Ä×Å ×ÅÔËÉ ÒÁÚÒÁÂÏÔËÉ: &os.current; É &os.stable;.
-      üÔÏÔ ÒÁÚÄÅÌ ÏÐÉÓÙ×ÁÅÔ ËÁÖÄÕÀ ÉÚ ÎÉÈ É ÏÂßÑÓÎÑÅÔ, ËÁË ÓÉÎÈÒÏÎÉÚÉÒÏ×ÁÔØ
-      ×ÁÛÕ ÓÉÓÔÅÍÕ Ó ÌÀÂÏÊ ÉÚ ×ÅÔÏË.  óÎÁÞÁÌÁ ÂÕÄÅÔ ÏÂÓÕÖÄÁÔØÓÑ ×ÅÔËÁ
-      &os.current;, ÚÁÔÅÍ &os.stable;.</para>
+      <para>ðÏÓÌÅ ÕÓÔÁÎÏ×ËÉ ÉÓÐÏÌØÚÕÊÔÅ <application>svn</application>
+	ÄÌÑ ÐÏÌÕÞÅÎÉÑ ËÏÐÉÉ ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ× ÄÏËÕÍÅÎÔÁÃÉÉ:</para>
 
-    <sect2 xml:id="current">
-      <title>ëÁË ÓÌÅÄÏ×ÁÔØ ÔÅËÕÝÉÍ ÒÁÚÒÁÂÏÔËÁÍ ×Ï &os;</title>
+      <screen>&prompt.root; <userinput>svn checkout https://svn.FreeBSD.org/doc/head /usr/doc</userinput></screen>

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


More information about the svn-doc-all mailing list