From owner-svn-doc-head@FreeBSD.ORG  Sun May 10 11:10:41 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5F7C150E;
 Sun, 10 May 2015 11:10:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4133A10CA;
 Sun, 10 May 2015 11:10:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4ABAfRF063990;
 Sun, 10 May 2015 11:10:41 GMT (envelope-from bhd@FreeBSD.org)
Received: (from bhd@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4ABAfeX063989;
 Sun, 10 May 2015 11:10:41 GMT (envelope-from bhd@FreeBSD.org)
Message-Id: <201505101110.t4ABAfeX063989@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bhd set sender to bhd@FreeBSD.org
 using -f
From: Bjoern Heidotting <bhd@FreeBSD.org>
Date: Sun, 10 May 2015 11:10:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46674 - head/de_DE.ISO8859-1/books/handbook/config
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 May 2015 11:10:41 -0000

Author: bhd
Date: Sun May 10 11:10:40 2015
New Revision: 46674
URL: https://svnweb.freebsd.org/changeset/doc/46674

Log:
  Remove outdated note about ndis not supporting USB, add list of card
  types supported to previous paragraph.
  
  Edit redundant language.
  
  Clarify explanation of 32-bit versus 64-bit drivers.
  
  Approved by:	bcr (mentor)

Modified:
  head/de_DE.ISO8859-1/books/handbook/config/chapter.xml

Modified: head/de_DE.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- head/de_DE.ISO8859-1/books/handbook/config/chapter.xml	Sat May  9 17:02:15 2015	(r46673)
+++ head/de_DE.ISO8859-1/books/handbook/config/chapter.xml	Sun May 10 11:10:40 2015	(r46674)
@@ -922,13 +922,8 @@ dc1: [ITHREAD]</screen>
           den binären &windows;-Treiber, indem er diesem vorgibt,
           unter &windows; zu laufen.  Da der &man.ndis.4;-Treiber
           eine &windows;-Binärdatei nutzt, kann er nur auf
-          &i386;- und amd64-Systemen verwendet werden.</para>
-
-        <note>
-          <para>Der &man.ndis.4;-Treiber unterstützt primär
-            PCI-, CardBus- sowie PCMCIA-Geräte, USB-Geräte
-            werden hingegen noch nicht unterstützt.</para>
-        </note>
+	  &i386;- und amd64-Systemen verwendet werden.  Unterstützt
+	  werden PCI, CardBus, PCMCIA (PC-Card) und USB-Geräte.</para>
 
         <para>Um den NDISulator zu verwenden, benötigen Sie drei
           Dinge:</para>
@@ -956,11 +951,10 @@ dc1: [ITHREAD]</screen>
           die Dateien <filename>W32DRIVER.SYS</filename> und
           <filename>W32DRIVER.INF</filename> verwendet.</para>
 
-        <note>
-          <para>Sie können einen &windows;/i386-Treiber nicht
-            unter &os;/amd64 einsetzen, vielmehr benötigen Sie
-            dafür einen &windows;/amd64-Treiber.</para>
-        </note>
+	<para>Die Architektur des Treibers muss zur jeweiligen
+	  Version von &os; passen.  Benutzen Sie einen &windows;
+	  32-bit Treiber für &os;/i386.  Für &os;/amd64 wird ein
+	  &windows; 64-bit Treiber benötigt.</para>
 
         <para>Als Nächstes kompilieren Sie den binären
           Treiber, um ein Kernelmodul zu erzeugen.  Dazu rufen Sie als
@@ -970,8 +964,9 @@ dc1: [ITHREAD]</screen>
 
         <para>&man.ndisgen.8; arbeitet interaktiv, benötigt es
           weitere Informationen, so fragt es Sie danach.  Als Ergebnis
-          erhalten Sie ein Kernelmodul im Arbeitsverzeichnis, das Sie
-          wie folgt laden können:</para>
+	  erhalten Sie ein Kernelmodul im aktuellen
+	  Arbeitsverzeichnis.  Benutzen Sie &man.kldload.8; um das
+	  neue Modul zu laden:</para>
 
         <screen>&prompt.root; <userinput>kldload ./W32DRIVER.ko</userinput></screen>
 
@@ -1936,7 +1931,7 @@ security.bsd.see_other_uids=0</programli
   </sect1>
 
   <sect1 xml:id="configtuning-sysctl">
-    <title>Einstellungen mit sysctl</title>
+    <title>Einstellungen mit &man.sysctl.8;</title>
 
     <indexterm><primary>sysctl</primary></indexterm>
     <indexterm>

From owner-svn-doc-head@FreeBSD.ORG  Sun May 10 21:04:09 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AC0FFCD5;
 Sun, 10 May 2015 21:04:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 813271C1C;
 Sun, 10 May 2015 21:04:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4AL49Gj066597;
 Sun, 10 May 2015 21:04:09 GMT (envelope-from brueffer@FreeBSD.org)
Received: (from brueffer@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4AL49jt066596;
 Sun, 10 May 2015 21:04:09 GMT (envelope-from brueffer@FreeBSD.org)
Message-Id: <201505102104.t4AL49jt066596@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: brueffer set sender to
 brueffer@FreeBSD.org using -f
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Sun, 10 May 2015 21:04:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46675 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 May 2015 21:04:09 -0000

Author: brueffer
Date: Sun May 10 21:04:08 2015
New Revision: 46675
URL: https://svnweb.freebsd.org/changeset/doc/46675

Log:
  Add vBSDCon and BSDCon Brazil.

Modified:
  head/share/xml/events2015.xml

Modified: head/share/xml/events2015.xml
==============================================================================
--- head/share/xml/events2015.xml	Sun May 10 11:10:40 2015	(r46674)
+++ head/share/xml/events2015.xml	Sun May 10 21:04:08 2015	(r46675)
@@ -184,4 +184,52 @@
       1-2nd for tutorials and October 3-4th for the main
       conference.</description>
   </event>
+
+  <event id="vbsdcon-2015">
+    <name>vBSDCon 2015</name>
+    <url>http://www.vbsdcon.com/</url>
+    <startdate>
+      <year>2015</year>
+      <month>9</month>
+      <day>11</day>
+    </startdate>
+    <enddate>
+      <year>2015</year>
+      <month>9</month>
+      <day>13</day>
+    </enddate>
+    <location>
+      <country code="US">United States</country>
+      <city>Reston</city>
+      <site>Sheraton Reston Hotel</site>
+    </location>
+    <description>This exciting weekend will bring together members of
+      the BSD community for a series of roundtable discussions,
+      educational sessions, best practice conversations, and exclusive
+      networking opportunities.</description>
+  </event>
+
+  <event id="bsdcon-brazil-2015">
+    <name>BSDCon Brazil 2015</name>
+    <url>http://www.bsdcon.com.br/</url>
+    <startdate>
+      <year>2015</year>
+      <month>10</month>
+      <day>9</day>
+    </startdate>
+    <enddate>
+      <year>2015</year>
+      <month>10</month>
+      <day>10</day>
+    </enddate>
+    <location>
+      <country code="BR">Brazil</country>
+      <city>Fortaleza</city>
+    </location>
+    <description>BSDCon Brazil is the Brazilian BSD powered
+      and flavored conference.  The first edition was in 2005 and it brought
+      together a great mix of *BSD developers and users for a nice blend of
+      both developer-centric and user-centric presentations, and activities.
+    </description>
+  </event>
 </events>

From owner-svn-doc-head@FreeBSD.ORG  Mon May 11 11:12:37 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 14952FB6;
 Mon, 11 May 2015 11:12:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 016BA1249;
 Mon, 11 May 2015 11:12:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4BBCafU087080;
 Mon, 11 May 2015 11:12:36 GMT (envelope-from bhd@FreeBSD.org)
Received: (from bhd@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4BBCaDo087079;
 Mon, 11 May 2015 11:12:36 GMT (envelope-from bhd@FreeBSD.org)
Message-Id: <201505111112.t4BBCaDo087079@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bhd set sender to bhd@FreeBSD.org
 using -f
From: Bjoern Heidotting <bhd@FreeBSD.org>
Date: Mon, 11 May 2015 11:12:36 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46676 - head/de_DE.ISO8859-1/books/handbook/config
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 May 2015 11:12:37 -0000

Author: bhd
Date: Mon May 11 11:12:36 2015
New Revision: 46676
URL: https://svnweb.freebsd.org/changeset/doc/46676

Log:
  Fix some style nits found by igor.
  
  Approved by:	bcr (mentor)

Modified:
  head/de_DE.ISO8859-1/books/handbook/config/chapter.xml

Modified: head/de_DE.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- head/de_DE.ISO8859-1/books/handbook/config/chapter.xml	Sun May 10 21:04:08 2015	(r46675)
+++ head/de_DE.ISO8859-1/books/handbook/config/chapter.xml	Mon May 11 11:12:36 2015	(r46676)
@@ -7,23 +7,54 @@
      $FreeBSDde: de-docproj/books/handbook/config/chapter.xml,v 1.151 2011/12/19 14:55:31 bcr Exp $
      basiert auf: r38967
 -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="config-tuning">
-  <info><title>Konfiguration und Tuning</title>
+<chapter xmlns="http://docbook.org/ns/docbook"
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:id="config-tuning">
+
+  <info>
+    <title>Konfiguration und Tuning</title>
+
     <authorgroup>
-      <author><personname><firstname>Chern</firstname><surname>Lee</surname></personname><contrib>Geschrieben von </contrib></author>
+      <author>
+	<personname>
+	  <firstname>Chern</firstname>
+	  <surname>Lee</surname>
+	</personname>
+	<contrib>Geschrieben von </contrib>
+      </author>
     </authorgroup>
+
     <authorgroup>
-      <author><personname><firstname>Mike</firstname><surname>Smith</surname></personname><contrib>Nach einem Tutorium von </contrib></author>
+      <author>
+	<personname>
+	  <firstname>Mike</firstname>
+	  <surname>Smith</surname>
+	</personname>
+	<contrib>Nach einem Tutorium von </contrib>
+      </author>
     </authorgroup>
+
     <authorgroup>
-      <author><personname><firstname>Matt</firstname><surname>Dillon</surname></personname><contrib>Basiert ebenfalls auf tuning(7) von </contrib></author>
+      <author>
+	<personname>
+	  <firstname>Matt</firstname>
+	  <surname>Dillon</surname>
+	</personname>
+	<contrib>Basiert ebenfalls auf tuning(7) von </contrib>
+      </author>
     </authorgroup>
+
     <authorgroup>
-      <author><personname><firstname>Martin</firstname><surname>Heinen</surname></personname><contrib>Übersetzt von </contrib></author>
+      <author>
+	<personname>
+	  <firstname>Martin</firstname>
+	  <surname>Heinen</surname>
+	</personname>
+	<contrib>Übersetzt von </contrib>
+      </author>
     </authorgroup>
   </info>
 
-  
 
   <sect1 xml:id="config-synopsis">
     <title>Übersicht</title>
@@ -45,38 +76,46 @@
 	<para>Wie Sie effizient Dateisysteme und
 	  Swap-Partitionen auf Ihrer Festplatte einrichten.</para>
       </listitem>
+
       <listitem>
 	<para>Die Grundlagen der Konfiguration mit
 	  <filename>rc.conf</filename> und des Systems zum Starten
-	  von Anwendungen in <filename>/usr/local/etc/rc.d</filename>.</para>
+	  von Anwendungen in
+	  <filename>/usr/local/etc/rc.d</filename>.</para>
       </listitem>
+
       <listitem>
 	<para>Wie Sie Netzwerkkarten konfigurieren und testen.</para>
       </listitem>
+
       <listitem>
 	<para>Wie Sie virtuelle Hosts und Netzwerkgeräte
 	  konfigurieren.</para>
       </listitem>
+
       <listitem>
 	<para>Wie Sie die verschiedenen Konfigurationsdateien
 	  in <filename>/etc</filename> benutzen.</para>
       </listitem>
+
       <listitem>
 	<para>Wie Sie mit <command>sysctl</command>-Variablen &os;
 	  einstellen können.</para>
       </listitem>
+
       <listitem>
-	<para>Wie Sie die Platten-Performance einstellen und Kernel-Parameter
-	  modifizieren können.</para>
+	<para>Wie Sie die Platten-Performance einstellen und
+	  Kernel-Parameter modifizieren können.</para>
       </listitem>
     </itemizedlist>
 
     <para>Bevor Sie dieses Kapitel lesen, sollten Sie</para>
     <itemizedlist>
       <listitem>
-	<para>die Grundlagen von &unix; und &os; (<xref linkend="basics"/>)
-	  verstehen.</para>
+	<para>die Grundlagen von &unix; und
+	  &os; (<xref linkend="basics"/>) verstehen.</para>
       </listitem>
+
       <listitem>
 	<para>Damit vertraut sein, wie Sie einen Kernel konfigurieren
 	  und kompilieren (<xref linkend="kernelconfig"/>).</para>
@@ -103,54 +142,60 @@
 	  Festplatten auf Daten in den äußeren Spuren
 	  schneller zugreifen können als auf Daten in den
 	  inneren Spuren.  Daher sollten die kleineren oft benutzten
-	  Dateisysteme, wie das Root-Dateisystem oder die Swap-Partition,
-	  an den äußeren Rand der Platte gelegt werden.
-	  Die größeren Partitionen wie <filename>/usr</filename> sollten in die inneren Bereiche
+	  Dateisysteme, wie das Root-Dateisystem oder die
+	  Swap-Partition, an den äußeren Rand der Platte gelegt
+	  werden.  Die größeren Partitionen wie
+	  <filename>/usr</filename> sollten in die inneren Bereiche
 	  gelegt werden.  Es empfiehlt sich, die Partitionen in einer
-	  ähnlichen Reihenfolge wie Root-Partition, Swap, <filename>/var</filename> und <filename>/usr</filename> anzulegen.</para>
+	  ähnlichen Reihenfolge wie Root-Partition, Swap,
+	  <filename>/var</filename> und <filename>/usr</filename>
+	  anzulegen.</para>
+
+	<para>Die Größe der <filename>/var</filename>-Partition ist
+	  abhängig vom Zweck der Maschine.  Das
+	  <filename>/var</filename>-Dateisystem enthält hauptsächlich
+	  Postfächer, den Spoolbereich zum Drucken und Logdateien.
+	  Abhängig von der Anzahl der Systembenutzer und der
+	  Aufbewahrungszeit für Logdateien, können gerade die
+	  Postfächer und Logdateien zu ungeahnten Größen wachsen.
+	  Die meisten Benutzer werden selten mehr als etwa ein
+	  Gigabyte in <filename>/var</filename> benötigen.</para>
 
-	<para>Die Größe der <filename>/var</filename>-Partition ist abhängig vom
-	  Zweck der Maschine.  Das <filename>/var</filename>-Dateisystem enthält
-	  hauptsächlich Postfächer, den Spoolbereich zum Drucken und
-	  Logdateien.  Abhängig von der Anzahl der Systembenutzer und der
-	  Aufbewahrungszeit für Logdateien, können gerade
-	  die Postfächer und Logdateien zu ungeahnten Größen
-	  wachsen.  Die meisten Benutzer werden selten mehr als etwa ein
-	  Gigabyte in <filename>/var</filename>
-	  benötigen.</para>
-
-        <note>
-          <para>Ein paar Mal wird es vorkommen, dass viel Festplattenspeicher
-            in <filename>/var/tmp</filename> gebraucht
-            wird.  Wenn neue Software mit &man.pkg.add.1; installiert wird,
-            extrahieren die Paketwerkzeuge eine vorübergehende Kopie der
-            Pakete unter <filename>/var/tmp</filename>.  Die
-            Installation grosser Softwarepakete wie
-            <application>Firefox</application>,
-            <application>Openoffice</application> oder
-            <application>LibreOffice</application> kann sich wegen zu wenig
-            Speicherplatz in <filename>/var/tmp</filename>
-            als trickreich herausstellen.</para>
-        </note>
-
-        <para>Die <filename>/usr</filename>-Partition
-          enthält viele der Hauptbestandteile des Systems, dazu
-          gehöhren die &man.ports.7;-Sammlung (empfohlen) und die Quellen
-          (optional).  Sowohl die Ports als auch die Quellen des Basissystems
-          sind zum Zeitpunkt der Installation optional, trotzdem sollten Sie
-          mindestens zwei&nbsp;Gigabyte für diese Partition
-          vorsehen.</para>
+	<note>
+	  <para>Ein paar Mal wird es vorkommen, dass viel
+	    Festplattenspeicher in <filename>/var/tmp</filename>
+	    gebraucht wird.  Wenn neue Software mit &man.pkg.add.1;
+	    installiert wird, extrahieren die Paketwerkzeuge eine
+	    vorübergehende Kopie der Pakete unter
+	    <filename>/var/tmp</filename>.  Die Installation grosser
+	    Softwarepakete wie <application>Firefox</application>,
+	    <application>Openoffice</application> oder
+	    <application>LibreOffice</application> kann sich wegen zu
+	    wenig Speicherplatz in <filename>/var/tmp</filename> als
+	    trickreich herausstellen.</para>
+	</note>
+
+	<para>Die <filename>/usr</filename>-Partition enthält viele
+	  der Hauptbestandteile des Systems, dazu gehöhren die
+	  &man.ports.7;-Sammlung (empfohlen) und die Quellen
+	  (optional).  Sowohl die Ports als auch die Quellen des
+	  Basissystems sind zum Zeitpunkt der Installation optional,
+	  trotzdem sollten Sie mindestens zwei&nbsp;Gigabyte für diese
+	  Partition vorsehen.</para>
 
 	<para>Wenn Sie die Größe der Partitionen festlegen,
 	  beachten Sie bitte das Wachstum Ihres Systems.  Wenn Sie den
 	  Platz auf einer Partition vollständig aufgebraucht haben,
-	  eine andere Partition aber kaum benutzen, kann die Handhabung des
-	  Systems schwierig werden.</para>
+	  eine andere Partition aber kaum benutzen, kann die
+	  Handhabung des Systems schwierig werden.</para>
 
-	<note><para>Die automatische Partitionierung von &man.sysinstall.8;
-	  mit <literal>Auto-defaults</literal> legt manchmal zu kleine
-	  <filename>/</filename> und <filename>/var</filename>-Partition an.  Partitionieren Sie
-	  weise und großzügig.</para></note>
+	<note>
+	  <para>Die automatische Partitionierung von
+	    &man.sysinstall.8; mit <literal>Auto-defaults</literal>
+	    legt manchmal zu kleine <filename>/</filename> und
+	    <filename>/var</filename>-Partition an.  Partitionieren
+	    Sie weise und großzügig.</para>
+	</note>
       </sect3>
 
       <sect3 xml:id="swap-design">
@@ -165,34 +210,34 @@
 	<para>Als Daumenregel sollten Sie doppelt soviel Speicher
 	  für die Swap-Partition vorsehen, als Sie Hauptspeicher
 	  haben.  Verfügt die Maschine beispielsweise über
-	  128&nbsp;Megabyte Hauptspeicher, sollten Sie 256&nbsp;Megabyte
-	  für den Swap-Bereich vorsehen.  Systeme mit weniger Speicher
-	  werden wahrscheinlich mit viel mehr Swap mehr leisten.  Es
-	  wird nicht empfohlen, weniger als 256&nbsp;Megabyte Swap einzurichten.
-	  Außerdem sollten Sie künftige Speichererweiterungen
-	  beachten, wenn Sie die Swap-Partition einrichten.  Die
-	  VM-Paging-Algorithmen im Kernel sind so eingestellt, dass
-	  Sie am besten laufen, wenn die Swap-Partition mindestens
-	  doppelt so groß wie der Hauptspeicher ist.  Zu wenig
-	  Swap kann zu einer Leistungsverminderung im
-	  <foreignphrase>VM page scanning</foreignphrase>
-	  Code führen, sowie Probleme verursachen, wenn Sie später
-	  mehr Speicher in Ihre Maschine bauen.</para>
+	  128&nbsp;Megabyte Hauptspeicher, sollten Sie
+	  256&nbsp;Megabyte für den Swap-Bereich vorsehen.  Systeme
+	  mit weniger Speicher werden wahrscheinlich mit viel mehr
+	  Swap mehr leisten.  Es wird nicht empfohlen, weniger als
+	  256&nbsp;Megabyte Swap einzurichten.  Außerdem sollten Sie
+	  künftige Speichererweiterungen beachten, wenn Sie die
+	  Swap-Partition einrichten.  Die VM-Paging-Algorithmen im
+	  Kernel sind so eingestellt, dass Sie am besten laufen, wenn
+	  die Swap-Partition mindestens doppelt so groß wie der
+	  Hauptspeicher ist.  Zu wenig Swap kann zu einer
+	  Leistungsverminderung im
+	  <foreignphrase>VM page scanning</foreignphrase> Code führen,
+	  sowie Probleme verursachen, wenn Sie später mehr Speicher in
+	  Ihre Maschine bauen.</para>
 
 	<para>Auf größeren Systemen mit mehreren SCSI-Laufwerken
-	  (oder mehreren IDE-Laufwerken an unterschiedlichen Controllern)
-	  empfehlen wir Ihnen, Swap-Bereiche auf bis zu
-	  vier Laufwerken einzurichten.  Diese Swap-Partitionen sollten
-	  ungefähr dieselbe Größe haben.  Der Kernel
-	  kann zwar mit beliebigen Größen umgehen, aber
-	  die internen Datenstrukturen skalieren bis zur vierfachen
-	  Größe der größten Partition.  Ungefähr
-	  gleich große Swap-Partitionen erlauben es dem Kernel,
-	  den Swap-Bereich optimal über die Laufwerke zu verteilen.
-	  Große Swap-Bereiche, auch wenn sie nicht oft gebraucht
-	  werden, sind nützlich, da sich ein speicherfressendes
-	  Programm unter Umständen auch ohne einen Neustart des Systems
-	  beenden lässt.</para>
+	  (oder mehreren IDE-Laufwerken an unterschiedlichen
+	  Controllern) empfehlen wir Ihnen, Swap-Bereiche auf bis zu
+	  vier Laufwerken einzurichten.  Diese Swap-Partitionen
+	  sollten ungefähr dieselbe Größe haben.  Der Kernel kann zwar
+	  mit beliebigen Größen umgehen, aber die internen
+	  Datenstrukturen skalieren bis zur vierfachen Größe der
+	  größten Partition.  Ungefähr gleich große Swap-Partitionen
+	  erlauben es dem Kernel, den Swap-Bereich optimal über die
+	  Laufwerke zu verteilen.  Große Swap-Bereiche, auch wenn sie
+	  nicht oft gebraucht werden, sind nützlich, da sich ein
+	  speicherfressendes Programm unter Umständen auch ohne einen
+	  Neustart des Systems beenden lässt.</para>
       </sect3>
 
       <sect3>
@@ -200,10 +245,12 @@
 
 	<para>Gegen eine einzelne Partition sprechen mehrere Gründe.
 	  Jede Partition hat im Betrieb unterschiedliche Eigenschaften
-	  und die Trennung der Partitionen erlaubt es, die Dateisysteme
-	  an diese Eigenschaften anzupassen.  Die Root- und <filename>/usr</filename>-Partitionen weisen meist nur
-	  lesende Zugriffe auf, während <filename>/var</filename> und <filename>/var/tmp</filename> hauptsächlich
-	  beschrieben werden.</para>
+	  und die Trennung der Partitionen erlaubt es, die
+	  Dateisysteme an diese Eigenschaften anzupassen.  Die
+	  Root- und <filename>/usr</filename>-Partitionen weisen meist
+	  nur lesende Zugriffe auf, während <filename>/var</filename>
+	  und <filename>/var/tmp</filename> hauptsächlich beschrieben
+	  werden.</para>
 
 	<para>Indem Sie ein System richtig partitionieren, verhindern
 	  Sie, dass eine Fragmentierung in den häufig beschriebenen
@@ -213,14 +260,14 @@
 	  I/O-Leistung diesen Partitionen steigen.
 	  Die I/O-Leistung ist natürlich auch für große
 	  Partitionen wichtig, doch erzielen Sie eine größere
-	  Leistungssteigerung, wenn Sie <filename>/var</filename> an den Rand der Platte legen.
-	  Schließlich sollten Sie noch die Stabilität des Systems
-	  beachten.  Eine kleine Root-Partition, auf die meist nur lesend
-	  zugegriffen wird, überlebt einen schlimmen Absturz
-	  wahrscheinlich eher als eine große Partition.</para>
+	  Leistungssteigerung, wenn Sie <filename>/var</filename> an
+	  den Rand der Platte legen.  Schließlich sollten Sie noch die
+	  Stabilität des Systems beachten.  Eine kleine
+	  Root-Partition, auf die meist nur lesend zugegriffen wird,
+	  überlebt einen schlimmen Absturz wahrscheinlich eher als
+	  eine große Partition.</para>
       </sect3>
     </sect2>
-
   </sect1>
 
   <sect1 xml:id="configtuning-core-configuration">
@@ -239,16 +286,18 @@
 
     <para>In <filename>rc.conf</filename> werden die Vorgabewerte aus
       <filename>/etc/defaults/rc.conf</filename> überschrieben.
-      Die Vorgabedatei sollte nicht nach <filename>/etc</filename> kopiert werden, da sie die
-      Vorgabewerte und keine Beispiele enthält.  Jede systemspezifische
-      Änderung wird in <filename>rc.conf</filename> vorgenommen.</para>
+      Die Vorgabedatei sollte nicht nach <filename>/etc</filename>
+      kopiert werden, da sie die Vorgabewerte und keine Beispiele
+      enthält.  Jede systemspezifische Änderung wird in
+      <filename>rc.conf</filename> vorgenommen.</para>
 
     <para>Um den administrativen Aufwand gering zu halten, existieren
       in geclusterten Anwendungen mehrere Strategien,
       globale Konfigurationen von systemspezifischen Konfigurationen
       zu trennen.  Der empfohlene Weg hält die globale Konfiguration
-      in einer separaten Datei z.B. <filename>/etc/rc.conf.local</filename>.
-      Zum Beispiel so:</para>
+      in einer separaten Datei z.B.
+      <filename>/etc/rc.conf.local</filename>.  Zum Beispiel
+      so:</para>
 
     <itemizedlist>
       <listitem><para><filename>/etc/rc.conf</filename>:</para>
@@ -264,9 +313,10 @@ ifconfig_fxp0="inet 10.1.1.1/8"</program
     </itemizedlist>
 
     <para>Die <filename>rc.conf</filename> Datei kann dann auf jedes
-      System mit <command>rsync</command> oder einem ähnlichen Programm
-      verteilt werden, während die <filename>rc.conf.local</filename>
-      Datei dabei systemspezifisch bleibt.</para>
+      System mit <command>rsync</command> oder einem ähnlichen
+      Programm verteilt werden, während die
+      <filename>rc.conf.local</filename> Datei dabei systemspezifisch
+      bleibt.</para>
 
     <para>Bei einem Upgrade des Systems mit &man.sysinstall.8; oder
       <command>make world</command> wird <filename>rc.conf</filename>
@@ -274,12 +324,13 @@ ifconfig_fxp0="inet 10.1.1.1/8"</program
       erhalten bleibt.</para>
 
     <tip>
-      <para>Die Konfigurationsdatei <filename>/etc/rc.conf</filename> wird
-        von &man.sh.1; gelesen.  Dies erlaubt es dem Systemadministrator,
-        eine bestimmte Menge an Logik dieser Datei hinzuzufügen, was
-        dabei helfen kann, komplexe Konfigurationsszenarien zu erstellen.
-        Lesen Sie dazu &man.rc.conf.5;, um weitere Informationen zu diesem
-        Thema zu erhalten.</para>
+      <para>Die Konfigurationsdatei <filename>/etc/rc.conf</filename>
+	wird von &man.sh.1; gelesen.  Dies erlaubt es dem
+	Systemadministrator, eine bestimmte Menge an Logik dieser
+	Datei hinzuzufügen, was dabei helfen kann, komplexe
+	Konfigurationsszenarien zu erstellen.  Lesen Sie dazu
+	&man.rc.conf.5;, um weitere Informationen zu diesem Thema zu
+	erhalten.</para>
     </tip>
   </sect1>
 
@@ -294,18 +345,20 @@ ifconfig_fxp0="inet 10.1.1.1/8"</program
 
     <indexterm><primary>/usr/local/etc</primary></indexterm>
 
-    <para>Für gewöhnlich werden diese Dateien in <filename>/usr/local/etc</filename> installiert.  Besitzt
-      eine Anwendung viele Konfigurationsdateien, werden
-      diese in einem separaten Unterverzeichnis abgelegt.</para>
+    <para>Für gewöhnlich werden diese Dateien in
+      <filename>/usr/local/etc</filename> installiert.  Besitzt
+      eine Anwendung viele Konfigurationsdateien, werden diese in
+      einem separaten Unterverzeichnis abgelegt.</para>
 
     <para>Wenn ein Port oder ein Paket installiert wird, werden
       normalerweise auch Beispiele für die Konfigurationsdateien
-      installiert.  Diese erkennt man gewöhnlich an dem
-      Suffix <filename>.default</filename>.  Wenn keine Konfigurationsdateien
-      für eine Anwendung existieren, werden sie durch
-      Kopieren der <filename>.default</filename> Dateien erstellt.</para>
+      installiert.  Diese erkennt man gewöhnlich an dem Suffix
+      <filename>.default</filename>.  Wenn keine Konfigurationsdateien
+      für eine Anwendung existieren, werden sie durch Kopieren der
+      <filename>.default</filename> Dateien erstellt.</para>
 
-    <para>Als Beispiel sei <filename>/usr/local/etc/apache</filename> gezeigt:</para>
+    <para>Als Beispiel sei
+      <filename>/usr/local/etc/apache</filename> gezeigt:</para>
 
     <literallayout class="monospaced">-rw-r--r--  1 root  wheel   2184 May 20  1998 access.conf
 -rw-r--r--  1 root  wheel   2184 May 20  1998 access.conf.default
@@ -318,20 +371,26 @@ ifconfig_fxp0="inet 10.1.1.1/8"</program
 -rw-r--r--  1 root  wheel   7980 May 20  1998 srm.conf
 -rw-r--r--  1 root  wheel   7933 May 20  1998 srm.conf.default</literallayout>
 
-    <para>Anhand der Dateigröße erkennen Sie, dass sich
-      nur <filename>srm.conf</filename> geändert hat.  Eine
-      spätere Aktualisierung des <application>Apache</application>-Ports
+    <para>Anhand der Dateigröße erkennen Sie, dass sich nur
+      <filename>srm.conf</filename> geändert hat.  Eine spätere
+      Aktualisierung des <application>Apache</application>-Ports
       überschreibt diese Datei nicht.</para>
-
   </sect1>
 
   <sect1 xml:id="configtuning-starting-services">
-    <info><title>Start von Diensten</title>
+    <info>
+      <title>Start von Diensten</title>
+
       <authorgroup>
-	 <author><personname><firstname>Tom</firstname><surname>Rhodes</surname></personname><contrib>Beigetragen von </contrib></author>
+	<author>
+	  <personname>
+	    <firstname>Tom</firstname>
+	    <surname>Rhodes</surname>
+	  </personname>
+	  <contrib>Beigetragen von </contrib>
+	</author>
       </authorgroup>
     </info>
-    
 
     <indexterm>
       <primary>Dienste</primary>
@@ -353,8 +412,8 @@ ifconfig_fxp0="inet 10.1.1.1/8"</program
       einfachen Skripten gestartet werden.</para>
 
     <sect2>
-      <title>Dienste über das
-        <filename>rc.d</filename>-System starten</title>
+      <title>Dienste über das <filename>rc.d</filename>-System
+	starten</title>
 
       <para>Mit <filename>rc.d</filename> lässt sich der Start
 	von Anwendungen besser steuern als mit den vorher besprochenen
@@ -398,8 +457,8 @@ run_rc_command "$1"</programlisting>
 	Prozess-<acronym>ID</acronym> (<acronym>PID</acronym>)
 	der Anwendung in einer Datei zu speichern.</para>
 
-      <para>In <filename>/etc/rc.conf</filename> könnte
-        für diese Anwendung die folgende Zeile stehen:</para>
+      <para>In <filename>/etc/rc.conf</filename> könnte für diese
+	Anwendung die folgende Zeile stehen:</para>
 
       <programlisting>utility_enable="YES"</programlisting>
 
@@ -421,15 +480,18 @@ run_rc_command "$1"</programlisting>
 	Konfigurationszeile in der Datei
 	<filename>/etc/inetd.conf</filename> hinzugefügt oder
 	in der aktuellen Konfiguration durch Entfernen der Kommentare
-	aktiviert werden.  Der Abschnitt <xref linkend="network-inetd"/> beschreibt den
-	<application>inetd</application> und dessen Konfiguration.</para>
+	aktiviert werden.  Der Abschnitt
+	<xref linkend="network-inetd"/> beschreibt den
+	<application>inetd</application> und dessen
+	Konfiguration.</para>
 
       <para>Systemdienste können auch mit &man.cron.8; gestartet
-	werden.  Dieser Ansatz hat einige Vorteile; nicht zuletzt, weil
-	&man.cron.8; die Prozesse unter dem Eigentümer der
+	werden.  Dieser Ansatz hat einige Vorteile; nicht zuletzt,
+	weil &man.cron.8; die Prozesse unter dem Eigentümer der
 	<filename>crontab</filename> startet, ist es möglich, dass
-	Dienste von nicht-<systemitem class="username">root</systemitem> Benutzern gestartet
-	und gepflegt werden können.</para>
+	Dienste von
+	nicht-<systemitem class="username">root</systemitem> Benutzern
+	gestartet und gepflegt werden können.</para>
 
       <para>Dies nutzt eine Eigenschaft von &man.cron.8;:
 	Für die Zeitangabe kann <literal>@reboot</literal>
@@ -439,12 +501,19 @@ run_rc_command "$1"</programlisting>
   </sect1>
 
   <sect1 xml:id="configtuning-cron">
-    <info><title>Programme mit <command>cron</command> starten</title>
+    <info>
+      <title>Programme mit <command>cron</command> starten</title>
+
       <authorgroup>
-	<author><personname><firstname>Tom</firstname><surname>Rhodes</surname></personname><contrib>Beigetragen von </contrib></author>
+	<author>
+	  <personname>
+	    <firstname>Tom</firstname>
+	    <surname>Rhodes</surname>
+	  </personname>
+	  <contrib>Beigetragen von </contrib>
+	</author>
       </authorgroup>
     </info>
-    
 
     <indexterm>
       <primary><command>cron</command></primary>
@@ -454,10 +523,11 @@ run_rc_command "$1"</programlisting>
       <command>cron</command> läuft im Hintergrund und
       überprüft fortlaufend die Datei
       <filename>/etc/crontab</filename>.  Beim Start sucht
-      <command>cron</command> neue <filename>crontab</filename>-Dateien
-      im Verzeichnis <filename>/var/cron/tabs</filename>.
-      In den <filename>crontab</filename>-Dateien wird
-      festgelegt, welche Programme zu welchem Zeitpunkt laufen sollen.</para>
+      <command>cron</command> neue
+      <filename>crontab</filename>-Dateien im Verzeichnis
+      <filename>/var/cron/tabs</filename>.  In den
+      <filename>crontab</filename>-Dateien wird festgelegt, welche
+      Programme zu welchem Zeitpunkt laufen sollen.</para>
 
     <para>Das Werkzeug <command>cron</command> verwendet zwei
       verschiedene Konfigurationsdateien: die
@@ -469,7 +539,7 @@ run_rc_command "$1"</programlisting>
       das Kommando ausführen wird.  In einer
       Benutzer-<filename>crontab</filename> werden alle Kommandos
       unter dem Benutzer ausgeführt, welcher die
-      <filename>crontab</filename> erstellt hat. Hier ist das sechste
+      <filename>crontab</filename> erstellt hat.  Hier ist das sechste
       Feld das letzte Feld.  Dies ist ein wichtiges
       Sicherheitsmerkmal.  Das letzte Feld bezeichnet immer das
       Kommando, das ausgeführt werden soll.</para>
@@ -498,7 +568,8 @@ run_rc_command "$1"</programlisting>
 	erstellen.</para>
     </note>
 
-    <para>Der folgende Auszug aus der System-<filename>crontab</filename>
+    <para>Der folgende Auszug aus der
+      System-<filename>crontab</filename>
       <filename>/etc/crontab</filename> zeigt den Aufbau
       einer <filename>crontab</filename>-Datei:</para>
 
@@ -573,8 +644,9 @@ HOME=/var/log
 	  <literal>*</literal> ist ein Platzhalter und steht
 	  für <emphasis>jede</emphasis> mögliche Zeit.
 	  Diese Zeile führt das Kommando <command>atrun</command>
-	  unter dem <systemitem class="username">root</systemitem>-Account alle fünf
-	  Minuten aus.  Mehr über das Kommando
+	  unter dem
+	  <systemitem class="username">root</systemitem>-Account alle
+	  fünf Minuten aus.  Mehr über das Kommando
 	  <command>atrun</command> erfahren Sie in der
 	  Hilfeseite &man.atrun.8;.</para>
 
@@ -608,37 +680,47 @@ HOME=/var/log
 
       <para>Eine Benutzer-<filename>crontab</filename>, beispielsweise
 	die Datei <filename>crontab</filename>, können Sie mit
-	jedem Editor erstellen.  Die Benutzer-<filename>crontab</filename>
-	installieren Sie mit dem nachstehenden Befehl:</para>
+	jedem Editor erstellen.  Die
+	Benutzer-<filename>crontab</filename> installieren Sie mit dem
+	nachstehenden Befehl:</para>
 
       <screen>&prompt.root; <userinput>crontab crontab</userinput></screen>
 
       <para>Das Argument zum Befehl <command>crontab</command>
-	ist die vorher erstellte Datei <filename>crontab</filename>.</para>
+	ist die vorher erstellte Datei
+	<filename>crontab</filename>.</para>
 
       <para>Der Befehl <command>crontab -l</command> zeigt
 	die installierte <filename>crontab</filename>-Datei an.</para>
 
-      <para>Benutzer, die eine eigene <filename>crontab</filename>-Datei
-	ohne Vorlage erstellen wollen, können den Befehl
-	<command>crontab -e</command> verwenden.  Dieser Befehl
-	ruft einen Editor auf und installiert beim Verlassen des
-	Editors die <filename>crontab</filename>-Datei.</para>
+      <para>Benutzer, die eine eigene
+	<filename>crontab</filename>-Datei ohne Vorlage erstellen
+	wollen, können den Befehl <command>crontab -e</command>
+	verwenden.  Dieser Befehl ruft einen Editor auf und
+	installiert beim Verlassen des Editors die
+	<filename>crontab</filename>-Datei.</para>
 
       <para>Wollen Sie die installierte
-        Benutzer-<filename>crontab</filename> entfernen, rufen Sie den
-        Befehl <command>crontab</command> mit der Option
-        <option>-r</option> auf.</para>
+	Benutzer-<filename>crontab</filename> entfernen, rufen Sie den
+	Befehl <command>crontab</command> mit der Option
+	<option>-r</option> auf.</para>
     </sect2>
   </sect1>
 
   <sect1 xml:id="configtuning-rcd">
-    <info><title>Das rc-System für Systemdienste</title>
+    <info>
+      <title>Das rc-System für Systemdienste</title>
+
       <authorgroup>
-	<author><personname><firstname>Tom</firstname><surname>Rhodes</surname></personname><contrib>Beigetragen von </contrib></author>
+	<author>
+	  <personname>
+	    <firstname>Tom</firstname>
+	    <surname>Rhodes</surname>
+	  </personname>
+	  <contrib>Beigetragen von </contrib>
+	</author>
       </authorgroup>
     </info>
-    
 
     <para>2002 wurde das <application>rc.d</application>-System von
       NetBSD zum Start von Systemdiensten in &os; integriert.
@@ -661,10 +743,10 @@ HOME=/var/log
 
     <programlisting>natd_enable="YES"</programlisting>
 
-    <para>Wenn dort bereits die Zeile <option>natd_enable="NO"</option>
-      existiert, ändern Sie einfach <option>NO</option> in
-      <option>YES</option>.  Die rc-Skripten starten, wie unten
-      beschrieben, auch abhängige Dienste.</para>
+    <para>Wenn dort bereits die Zeile
+      <option>natd_enable="NO"</option> existiert, ändern Sie einfach
+      <option>NO</option> in <option>YES</option>.  Die rc-Skripten
+      starten, wie unten beschrieben, auch abhängige Dienste.</para>
 
     <para>Da das <application>rcNG</application>-System primär
       zum automatischen Starten und Stoppen von Systemdiensten
@@ -746,20 +828,21 @@ sshd is running as pid 433.</screen>
 
     <itemizedlist>
       <listitem>
-	<para><literal>PROVIDE</literal>: Gibt die Namen der Dienste an,
-	  die mit dieser Datei zur Verfügung gestellt werden.</para>
+	<para><literal>PROVIDE</literal>: Gibt die Namen der Dienste
+	  an, die mit dieser Datei zur Verfügung gestellt
+	  werden.</para>
       </listitem>
     </itemizedlist>
 
     <para>Die folgenden Schlüsselwörter können im Kopf
-      des Startskripts angegeben werden.  Sie sind zwar nicht unbedingt
-      notwendig, sind aber hilfreich beim Umgang mit
+      des Startskripts angegeben werden.  Sie sind zwar nicht
+      unbedingt notwendig, sind aber hilfreich beim Umgang mit
       &man.rcorder.8;:</para>
 
     <itemizedlist>
       <listitem>
-	<para><literal>REQUIRE</literal>: Gibt die Namen der Dienste an,
-	  von denen dieser Dienst abhängt.  Diese Datei wird
+	<para><literal>REQUIRE</literal>: Gibt die Namen der Dienste
+	  an, von denen dieser Dienst abhängt.  Diese Datei wird
 	  <emphasis>nach</emphasis> den angegebenen Diensten
 	  ausgeführt.</para>
       </listitem>
@@ -788,14 +871,19 @@ sshd is running as pid 433.</screen>
   </sect1>
 
   <sect1 xml:id="config-network-setup">
-    <info><title>Einrichten von Netzwerkkarten</title>
+    <info>
+      <title>Einrichten von Netzwerkkarten</title>
+
       <authorgroup>
-        <author><personname><firstname>Marc</firstname><surname>Fonvieille</surname></personname><contrib>Beigetragen von </contrib></author>
+	<author>
+	  <personname>
+	    <firstname>Marc</firstname>
+	    <surname>Fonvieille</surname>
+	  </personname><contrib>Beigetragen von </contrib>
+	</author>
       </authorgroup>
     </info>
 
-    
-
     <indexterm>
       <primary>Netzwerkkarten</primary>
       <secondary>einrichten</secondary>
@@ -809,19 +897,19 @@ sshd is running as pid 433.</screen>
       <title>Bestimmen des richtigen Treibers</title>
 
       <indexterm>
-        <primary>Netzwerkkarten</primary>
-        <secondary>Treiber</secondary>
+	<primary>Netzwerkkarten</primary>
+	<secondary>Treiber</secondary>
       </indexterm>
 
-      <para>Bevor Sie anfangen, sollten Sie das Modell Ihrer Karte kennen,
-        wissen welchen Chip die Karte benutzt und bestimmen, ob es sich
-	um eine PCI- oder ISA-Karte handelt.  Eine Aufzählung der
-	unterstützten PCI- und ISA-Karten finden Sie in der
-	Liste der unterstützen Geräte.  Schauen Sie nach, ob Ihre
+      <para>Bevor Sie anfangen, sollten Sie das Modell Ihrer Karte
+	kennen, wissen welchen Chip die Karte benutzt und bestimmen,
+	ob es sich um eine PCI- oder ISA-Karte handelt.  Eine
+	Aufzählung der unterstützten PCI- und ISA-Karten finden Sie in
+	der Liste der unterstützen Geräte.  Schauen Sie nach, ob Ihre
 	Karte dort aufgeführt ist.</para>
 
-      <para>Wenn Sie wissen, dass Ihre Karte unterstützt wird,
-        müssen Sie den Treiber für Ihre Karte bestimmen.
+      <para>Wenn Sie wissen, dass Ihre Karte unterstützt wird, müssen
+	Sie den Treiber für Ihre Karte bestimmen.
 	<filename>/usr/src/sys/conf/NOTES</filename> und
 	<filename>/usr/src/sys/arch/conf/NOTES</filename>
 	enthalten eine
@@ -833,10 +921,10 @@ sshd is running as pid 433.</screen>
 	und macht auch auf mögliche Probleme aufmerksam.</para>
 
       <para>Wenn Sie eine gebräuchliche Karte besitzen, brauchen Sie
-        meistens nicht lange nach dem passenden Treiber zu suchen.  Die
-	Treiber zu diesen Karten sind schon im
-	<filename>GENERIC</filename>-Kernel enthalten und die Karte sollte
-	während des Systemstarts erkannt werden:</para>
+	meistens nicht lange nach dem passenden Treiber zu suchen.
+	Die Treiber zu diesen Karten sind schon im
+	<filename>GENERIC</filename>-Kernel enthalten und die Karte
+	sollte während des Systemstarts erkannt werden:</para>
 
 <screen>dc0: &lt;82c169 PNIC 10/100BaseTX&gt; port 0xa000-0xa0ff mem 0xd3800000-0xd38
 000ff irq 15 at device 11.0 on pci0
@@ -854,7 +942,7 @@ dc1: Ethernet address: 00:a0:cc:da:da:db
 dc1: [ITHREAD]</screen>
 
       <para>Im Beispiel erkennt das System zwei Karten, die den
-        &man.dc.4; Treiber benutzen.</para>
+	&man.dc.4; Treiber benutzen.</para>
 
       <para>Ist der Treiber für Ihre Netzwerkkarte nicht
 	in <filename>GENERIC</filename> enthalten, müssen
@@ -887,126 +975,128 @@ dc1: [ITHREAD]</screen>
       <sect3 xml:id="config-network-ndis">
 	<title>&windows;-NDIS-Treiber einsetzen</title>
 
-        <indexterm><primary>NDIS</primary></indexterm>
-        <indexterm><primary>NDISulator</primary></indexterm>
-        <indexterm><primary>&windows;-Treiber</primary></indexterm>
-        <indexterm><primary>Microsoft Windows</primary></indexterm>
-        <indexterm>
-          <primary>Microsoft Windows</primary>
-          <secondary>Gerätetreiber</secondary></indexterm>
-        <indexterm><primary>KLD (kernel loadable object)</primary></indexterm>
+	<indexterm><primary>NDIS</primary></indexterm>
+	<indexterm><primary>NDISulator</primary></indexterm>
+	<indexterm><primary>&windows;-Treiber</primary></indexterm>
+	<indexterm><primary>Microsoft Windows</primary></indexterm>
+	<indexterm>
+	  <primary>Microsoft Windows</primary>
+	  <secondary>Gerätetreiber</secondary></indexterm>
+	<indexterm><primary>KLD (kernel loadable object)</primary></indexterm>
 
         <!-- Hm.  Soll man den letzten Indexterm abwandeln, d.h. die
-          Langversion weglassen?  Keine Ahnung.  Wenn ja, dann muss das
-          auch in handbook/linuxemu/chapter.xml passieren! -->
+	  Langversion weglassen?  Keine Ahnung.  Wenn ja, dann muss
+	  das auch in handbook/linuxemu/chapter.xml passieren! -->
+
+	<para>Leider stellen nach wie vor viele Unternehmen die
+	  Spezifikationen ihrer Treiber der Open Source Gemeinde
+	  nicht zur Verfügung, weil sie diese Informationen
+	  als Geschäftsgeheimnisse betrachten.  Daher haben die
+	  Entwickler von &os; und anderen Betriebssystemen nur
+	  zwei Möglichkeiten.  Entweder versuchen sie in einem
+	  aufwändigen Prozess den Treiber durch
+	  <foreignphrase>Reverse Engineering</foreignphrase>
+	  nachzubauen, oder sie versuchen, die vorhandenen
+	  Binärtreiber der &microsoft.windows;-Plattform zu
+	  verwenden.  Die meisten Entwickler, darunter auch die an
+	  &os; beteiligten, haben sich für den zweiten Ansatz
+	  entschieden.</para>
+
+	<para>Bill Paul (wpaul) ist es zu verdanken, dass es seit eine
+	  <quote>native</quote> Unterstützung der
+	  <foreignphrase>Network Driver Interface Specification</foreignphrase>
+	  (NDIS) gibt.  Der &os; NDISulator (auch als Project Evil
+	  bekannt) nutzt den binären &windows;-Treiber, indem er
+	  diesem vorgibt, unter &windows; zu laufen.  Da der
+	  &man.ndis.4;-Treiber eine &windows;-Binärdatei nutzt, kann
+	  er nur auf &i386;- und amd64-Systemen verwendet werden.
+	  Unterstützt werden PCI, CardBus, PCMCIA (PC-Card) und
+	  USB-Geräte.</para>
 
-        <para>Leider stellen nach wie vor viele Unternehmen die
-          Spezifikationen ihrer Treiber der Open Source Gemeinde
-          nicht zur Verfügung, weil sie diese Informationen
-          als Geschäftsgeheimnisse betrachten.  Daher haben die
-          Entwickler von FreeBSD und anderen Betriebssystemen nur
-          zwei Möglichkeiten.  Entweder versuchen sie in einem
-          aufwändigen Prozess den Treiber durch
-          <foreignphrase>Reverse Engineering</foreignphrase>
-          nachzubauen, oder sie versuchen, die vorhandenen
-          Binärtreiber der &microsoft.windows;-Plattform zu
-          verwenden.  Die meisten Entwickler, darunter auch die an
-          FreeBSD beteiligten, haben sich für den zweiten Ansatz
-          entschieden.</para>
-
-        <para>Bill Paul (wpaul) ist es zu verdanken, dass es seit
-          eine <quote>native</quote> Unterstützung der
-          <foreignphrase>Network Driver Interface
-          Specification</foreignphrase> (NDIS) gibt.  Der
-          FreeBSD NDISulator (auch als Project Evil bekannt) nutzt
-          den binären &windows;-Treiber, indem er diesem vorgibt,
-          unter &windows; zu laufen.  Da der &man.ndis.4;-Treiber
-          eine &windows;-Binärdatei nutzt, kann er nur auf
-	  &i386;- und amd64-Systemen verwendet werden.  Unterstützt
-	  werden PCI, CardBus, PCMCIA (PC-Card) und USB-Geräte.</para>
-
-        <para>Um den NDISulator zu verwenden, benötigen Sie drei
-          Dinge:</para>
-
-        <orderedlist>
-          <listitem>
-            <para>Die Kernelquellen</para>
-          </listitem>
-
-          <listitem>
-            <para>Den &windowsxp;-Binärtreiber
-             (mit der Erweiterung <filename>.SYS</filename>)</para>
-          </listitem>
-
-          <listitem>
-            <para>Die Konfigurationsdatei des &windowsxp;-Treibers
-            (mit der Erweiterung <filename>.INF</filename>)</para>
-          </listitem>
-        </orderedlist>
-
-        <para>Suchen Sie die Dateien für Ihre Karte.  Diese
-          befinden sich meistens auf einer beigelegten CD-ROM, oder
-          können von der Internetseite des Herstellers
-          heruntergeladen werden.  In den folgenden Beispielen werden
-          die Dateien <filename>W32DRIVER.SYS</filename> und
-          <filename>W32DRIVER.INF</filename> verwendet.</para>
+	<para>Um den NDISulator zu verwenden, benötigen Sie drei
+	  Dinge:</para>
+
+	<orderedlist>
+	  <listitem>
+	    <para>Die Kernelquellen</para>
+	  </listitem>
+
+	  <listitem>
+	    <para>Den &windowsxp;-Binärtreiber
+	      (mit der Erweiterung <filename>.SYS</filename>)</para>
+	  </listitem>
+
+	<listitem>
+	  <para>Die Konfigurationsdatei des &windowsxp;-Treibers
+	    (mit der Erweiterung <filename>.INF</filename>)</para>
+	</listitem>
+	</orderedlist>
+
+	<para>Suchen Sie die Dateien für Ihre Karte.  Diese
+	  befinden sich meistens auf einer beigelegten CD-ROM, oder
+	  können von der Internetseite des Herstellers
+	  heruntergeladen werden.  In den folgenden Beispielen werden
+	  die Dateien <filename>W32DRIVER.SYS</filename> und
+	  <filename>W32DRIVER.INF</filename> verwendet.</para>
 
 	<para>Die Architektur des Treibers muss zur jeweiligen
 	  Version von &os; passen.  Benutzen Sie einen &windows;
 	  32-bit Treiber für &os;/i386.  Für &os;/amd64 wird ein
 	  &windows; 64-bit Treiber benötigt.</para>
 
-        <para>Als Nächstes kompilieren Sie den binären
-          Treiber, um ein Kernelmodul zu erzeugen.  Dazu rufen Sie als
-          <systemitem class="username">root</systemitem> &man.ndisgen.8; auf:</para>
+	<para>Als Nächstes kompilieren Sie den binären Treiber, um ein
+	  Kernelmodul zu erzeugen.  Dazu rufen Sie als
+	  <systemitem class="username">root</systemitem>
+	  &man.ndisgen.8; auf:</para>
 
-        <screen>&prompt.root; <userinput>ndisgen /path/to/W32DRIVER.INF /path/to/W32DRIVER.SYS</userinput></screen>
+	<screen>&prompt.root; <userinput>ndisgen /path/to/W32DRIVER.INF /path/to/W32DRIVER.SYS</userinput></screen>
 
-        <para>&man.ndisgen.8; arbeitet interaktiv, benötigt es
-          weitere Informationen, so fragt es Sie danach.  Als Ergebnis
+	<para>&man.ndisgen.8; arbeitet interaktiv, benötigt es weitere
+	  Informationen, so fragt es Sie danach.  Als Ergebnis
 	  erhalten Sie ein Kernelmodul im aktuellen
 	  Arbeitsverzeichnis.  Benutzen Sie &man.kldload.8; um das
 	  neue Modul zu laden:</para>
 
-        <screen>&prompt.root; <userinput>kldload ./W32DRIVER.ko</userinput></screen>
+	<screen>&prompt.root; <userinput>kldload ./W32DRIVER.ko</userinput></screen>
 
-        <para>Neben dem vorhin erzeugten Kernelmodul müssen Sie
-          auch die Kernelmodule <filename>ndis.ko</filename> und
-          <filename>if_ndis.ko</filename> laden.  Diese Module sollten
-          automatisch geladen werden, wenn Sie ein von &man.ndis.4;
-          abhängiges Modul laden.  Wollen Sie die Module hingegen
-          manuell laden, geben Sie die folgenden Befehle ein:</para>
+	<para>Neben dem vorhin erzeugten Kernelmodul müssen Sie
+	  auch die Kernelmodule <filename>ndis.ko</filename> und
+	  <filename>if_ndis.ko</filename> laden.  Diese Module sollten
+	  automatisch geladen werden, wenn Sie ein von &man.ndis.4;
+	  abhängiges Modul laden.  Wollen Sie die Module hingegen
+	  manuell laden, geben Sie die folgenden Befehle ein:</para>
 
-        <screen>&prompt.root; <userinput>kldload ndis</userinput>
+	<screen>&prompt.root; <userinput>kldload ndis</userinput>
 &prompt.root; <userinput>kldload if_ndis</userinput></screen>
 
-        <para>Der erste Befehl lädt dabei den NDIS-Miniport-Treiber,
-          der zweite das tatsächliche Netzwerkgerät.</para>
+	<para>Der erste Befehl lädt dabei den NDIS-Miniport-Treiber,
+	  der zweite das tatsächliche Netzwerkgerät.</para>
 
-        <para>Überprüfen Sie nun die Ausgabe von &man.dmesg.8;
-          auf eventuelle Fehler während des Ladevorgangs.  Gab es
-          dabei keine Probleme, sollten Sie eine Ausgabe ähnlich
-          der folgenden erhalten:</para>
+	<para>Überprüfen Sie nun die Ausgabe von &man.dmesg.8;
+	  auf eventuelle Fehler während des Ladevorgangs.  Gab es
+	  dabei keine Probleme, sollten Sie eine Ausgabe ähnlich
+	  der folgenden erhalten:</para>
 
-        <screen>ndis0: &lt;Wireless-G PCI Adapter&gt; mem 0xf4100000-0xf4101fff irq 3 at device 8.0 on pci1
+	<screen>ndis0: &lt;Wireless-G PCI Adapter&gt; mem 0xf4100000-0xf4101fff irq 3 at device 8.0 on pci1
 ndis0: NDIS API version: 5.0
 ndis0: Ethernet address: 0a:b1:2c:d3:4e:f5
 ndis0: 11b rates: 1Mbps 2Mbps 5.5Mbps 11Mbps
 ndis0: 11g rates: 6Mbps 9Mbps 12Mbps 18Mbps 36Mbps 48Mbps 54Mbps</screen>
 
-        <para>Ab jetzt können Sie mit dem Gerät
-          <filename>ndis0</filename> wie mit jeder anderen
-          Gerätedatei (etwa <filename>dc0</filename>)
-          arbeiten.</para>
-
-        <para>Wie jedes Kernelmodul können auch die NDIS-Module
-          beim Systemstart automatisch geladen werden.  Dazu kopieren
-          Sie das erzeugte Modul (<filename>W32DRIVER_SYS.ko</filename>)
-          in das Verzeichnis <filename>/boot/modules</filename>.  Danach
-          fügen Sie die folgende Zeile in
-          <filename>/boot/loader.conf</filename> ein:</para>
+	<para>Ab jetzt können Sie mit dem Gerät
+	  <filename>ndis0</filename> wie mit jeder anderen
+	  Gerätedatei (etwa <filename>dc0</filename>)
+	  arbeiten.</para>
+
+	<para>Wie jedes Kernelmodul können auch die NDIS-Module
+	  beim Systemstart automatisch geladen werden.  Dazu kopieren
+	  Sie das erzeugte Modul
+	  (<filename>W32DRIVER_SYS.ko</filename>) in das Verzeichnis
+	  <filename>/boot/modules</filename>.  Danach fügen Sie die
+	  folgende Zeile in <filename>/boot/loader.conf</filename>
+	  ein:</para>
 
-        <programlisting>W32DRIVER_SYS_load="YES"</programlisting>
+	<programlisting>W32DRIVER_SYS_load="YES"</programlisting>
       </sect3>
     </sect2>
 
@@ -1014,17 +1104,18 @@ ndis0: 11g rates: 6Mbps 9Mbps 12Mbps 18M
       <title>Konfiguration von Netzwerkkarten</title>
 
       <indexterm>
-        <primary>Netzwerkkarten</primary>
-        <secondary>einrichten</secondary>
+	<primary>Netzwerkkarten</primary>
+	<secondary>einrichten</secondary>
       </indexterm>
 
       <para>Nachdem der richtige Treiber für die Karte geladen ist,
-        muss die Karte konfiguriert werden.  Unter Umständen ist
+	muss die Karte konfiguriert werden.  Unter Umständen ist
 	die Karte schon während der Installation mit
-	<application>sysinstall</application> konfiguriert worden.</para>
+	<application>sysinstall</application> konfiguriert
+	worden.</para>
 
-      <para>Das nachstehende Kommando zeigt die Konfiguration der Karten
-        eines Systems an:</para>
+      <para>Das nachstehende Kommando zeigt die Konfiguration der
+	Karten eines Systems an:</para>
 
 <screen>&prompt.user; <userinput>ifconfig</userinput>
 dc0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; metric 0 mtu 1500
@@ -1048,7 +1139,7 @@ lo0: flags=8049&lt;UP,LOOPBACK,RUNNING,M
         nd6 options=3&lt;PERFORMNUD,ACCEPT_RTADV&gt;</screen>
 
       <para>Im Beispiel werden Informationen zu den folgenden Geräten
-        angezeigt:</para>
+	angezeigt:</para>
 
       <itemizedlist>
 	<listitem>
@@ -1072,14 +1163,14 @@ lo0: flags=8049&lt;UP,LOOPBACK,RUNNING,M
 	</listitem>
       </itemizedlist>
 
-      <para>Der Name der Netzwerkkarte wird aus dem Namen des Treibers und
-        einer Zahl zusammengesetzt.  Die Zahl gibt die Reihenfolge an, in
-	der die Geräte beim Systemstart erkannt wurden.  Die dritte

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

From owner-svn-doc-head@FreeBSD.ORG  Mon May 11 11:33:14 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D4549439;
 Mon, 11 May 2015 11:33:14 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A807514A5;
 Mon, 11 May 2015 11:33:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4BBXEiX097103;
 Mon, 11 May 2015 11:33:14 GMT (envelope-from jkois@FreeBSD.org)
Received: (from jkois@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4BBXE8P097101;
 Mon, 11 May 2015 11:33:14 GMT (envelope-from jkois@FreeBSD.org)
Message-Id: <201505111133.t4BBXE8P097101@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jkois set sender to
 jkois@FreeBSD.org using -f
From: Johann Kois <jkois@FreeBSD.org>
Date: Mon, 11 May 2015 11:33:14 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46677 - in head: de_DE.ISO8859-1/share/xml
 en_US.ISO8859-1/htdocs/docproj
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 May 2015 11:33:14 -0000

Author: jkois
Date: Mon May 11 11:33:13 2015
New Revision: 46677
URL: https://svnweb.freebsd.org/changeset/doc/46677

Log:
  http://doc.bsdgroup.de is dead.
  
  Move the status page for the FreeBSD German Documentation Projekt to new location.
  Update links pointing to them.

Modified:
  head/de_DE.ISO8859-1/share/xml/navibar.l10n.ent
  head/en_US.ISO8859-1/htdocs/docproj/translations.xml

Modified: head/de_DE.ISO8859-1/share/xml/navibar.l10n.ent
==============================================================================
--- head/de_DE.ISO8859-1/share/xml/navibar.l10n.ent	Mon May 11 11:12:36 2015	(r46676)
+++ head/de_DE.ISO8859-1/share/xml/navibar.l10n.ent	Mon May 11 11:33:13 2015	(r46677)
@@ -75,7 +75,7 @@
 <li><a href="&base;/docs/webresources.html">Internet-Ressourcen</a></li>
 <li><a href="&base;/projects/newbies.html">Für Einsteiger</a></li>
 <li><a href="&base;/docproj/">Documentation Project</a></li>
-<li><a href="https://doc.bsdgroup.de/index.html">German Documentation Project</a></li>
+<li><a href="https://people.freebsd.org/~jkois/FreeBSDde/de/">German Documentation Project</a></li>
 </ul>
 </div> <!-- SIDENAV -->
 '>

Modified: head/en_US.ISO8859-1/htdocs/docproj/translations.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/docproj/translations.xml	Mon May 11 11:12:36 2015	(r46676)
+++ head/en_US.ISO8859-1/htdocs/docproj/translations.xml	Mon May 11 11:33:13 2015	(r46677)
@@ -244,12 +244,12 @@ http://www.bsd.ee/tolge.php</a><br/>
 <a name="german"></a>
 <h2>The FreeBSD German Documentation Project</h2>
 
-<b>Web</b>: <a href="https://doc.bsdgroup.de">https://doc.bsdgroup.de</a><br/>
+<b>Web</b>: <a href="https://people.freebsd.org/~jkois/FreeBSDde/de/">German Project status page</a><br/>
 <b>E-Mail</b>: <a href="mailto:de-bsd-translators@de.FreeBSD.org">de-bsd-translators@de.FreeBSD.org</a><br/>
 <b>IRC</b>: Server: irc.freenode.net, Channel: #FreeBSD-Doc.de<br/>
 
 <dl>
-<dt><i>Documents available</i></dt>
+<dt><i>Documents available/being worked on:</i></dt>
   <dd>
     <a href="../de/index.html">Web</a>,
     <a href="../doc/de_DE.ISO8859-1/books/developers-handbook/index.html">developers-handbook</a>,
@@ -259,10 +259,6 @@ http://www.bsd.ee/tolge.php</a><br/>
     <a href="../doc/de_DE.ISO8859-1/books/porters-handbook/index.html">porters-handbook</a>,
     <a href="../doc/de_DE.ISO8859-1/articles/">some articles</a>.
   </dd>
-<dt><i>Documents currently being worked on</i></dt>
-  <dd>
-    <a href="https://doc.bsdgroup.de/doc/de_DE.ISO8859-1/books/arch-handbook/index.html">arch-handbook</a>.
-  </dd>
 </dl>
 
 <a name="greek"></a>

From owner-svn-doc-head@FreeBSD.ORG  Mon May 11 12:46:38 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 89B158D8;
 Mon, 11 May 2015 12:46:38 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7788A1CD3;
 Mon, 11 May 2015 12:46:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4BCkcYd035130;
 Mon, 11 May 2015 12:46:38 GMT (envelope-from bhd@FreeBSD.org)
Received: (from bhd@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4BCkcsm035129;
 Mon, 11 May 2015 12:46:38 GMT (envelope-from bhd@FreeBSD.org)
Message-Id: <201505111246.t4BCkcsm035129@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bhd set sender to bhd@FreeBSD.org
 using -f
From: Bjoern Heidotting <bhd@FreeBSD.org>
Date: Mon, 11 May 2015 12:46:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46678 - head/de_DE.ISO8859-1/books/handbook/config
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 May 2015 12:46:38 -0000

Author: bhd
Date: Mon May 11 12:46:37 2015
New Revision: 46678
URL: https://svnweb.freebsd.org/changeset/doc/46678

Log:
  Update to r39077:
  Make example swap partition names more realistic.
  
  Approved by:	bcr (mentor)

Modified:
  head/de_DE.ISO8859-1/books/handbook/config/chapter.xml

Modified: head/de_DE.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- head/de_DE.ISO8859-1/books/handbook/config/chapter.xml	Mon May 11 11:33:13 2015	(r46677)
+++ head/de_DE.ISO8859-1/books/handbook/config/chapter.xml	Mon May 11 12:46:37 2015	(r46678)
@@ -5,7 +5,7 @@
 
      $FreeBSD$
      $FreeBSDde: de-docproj/books/handbook/config/chapter.xml,v 1.151 2011/12/19 14:55:31 bcr Exp $
-     basiert auf: r38967
+     basiert auf: r39077
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
   xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
@@ -2913,7 +2913,7 @@ kern.maxvnodes: 100000</screen>
 	System hinzuzufügen.  Zum Beispiel:</para>
 
       <screen>&prompt.root; <userinput>swapon<replaceable>
-/dev/ada1s1p2</replaceable></userinput></screen>
+/dev/ada1s1b</replaceable></userinput></screen>
 
       <warning>
 	<para>Sie können jede Partition verwenden, sofern sie nicht
@@ -2930,7 +2930,7 @@ kern.maxvnodes: 100000</screen>
 	hinzuzufügen, fügen Sie einen Eintrag für die Partition in
 	<filename>/etc/fstab</filename> hinzu:</para>
 
-      <programlisting><replaceable>/dev/ada1s1p1</replaceable>	none	swap	sw	0	0</programlisting>
+      <programlisting><replaceable>/dev/ada1s1b</replaceable>	none	swap	sw	0	0</programlisting>
 
       <para>Die einzelnen Einträge von <filename>/etc/fstab</filename>
 	werden in &man.fstab.5; erläutert.</para>

From owner-svn-doc-head@FreeBSD.ORG  Mon May 11 12:51:56 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D8CBEB38;
 Mon, 11 May 2015 12:51:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C6D9C1DDE;
 Mon, 11 May 2015 12:51:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4BCpu07039497;
 Mon, 11 May 2015 12:51:56 GMT (envelope-from ryusuke@FreeBSD.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4BCpuAC039496;
 Mon, 11 May 2015 12:51:56 GMT (envelope-from ryusuke@FreeBSD.org)
Message-Id: <201505111251.t4BCpuAC039496@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ryusuke set sender to
 ryusuke@FreeBSD.org using -f
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Mon, 11 May 2015 12:51:56 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46679 - head/ja_JP.eucJP/htdocs/docproj
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 May 2015 12:51:57 -0000

Author: ryusuke
Date: Mon May 11 12:51:56 2015
New Revision: 46679
URL: https://svnweb.freebsd.org/changeset/doc/46679

Log:
  - Merge the following from the English version:
  
  	r39769 -> r46677	head/ja_JP.eucJP/htdocs/docproj/translations.xml

Modified:
  head/ja_JP.eucJP/htdocs/docproj/translations.xml

Modified: head/ja_JP.eucJP/htdocs/docproj/translations.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/docproj/translations.xml	Mon May 11 12:46:37 2015	(r46678)
+++ head/ja_JP.eucJP/htdocs/docproj/translations.xml	Mon May 11 12:51:56 2015	(r46679)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="euc-jp"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
-"http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [
+"http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY title "FreeBSD ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È: ËÝÌõ">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r39769 -->
+<!-- Original revision: r46677 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
@@ -246,7 +246,7 @@ http://www.bsd.ee/tolge.php</a><br/>
 <a name="german"></a>
 <h2>FreeBSD ¥É¥¤¥Ä¸ì¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È</h2>
 
-<b>Web</b>: <a href="https://doc.bsdgroup.de">https://doc.bsdgroup.de</a><br/>
+<b>Web</b>: <a href="https://people.freebsd.org/~jkois/FreeBSDde/de/">¥É¥¤¥Ä¸ì¥×¥í¥¸¥§¥¯¥È¤Î¥¹¥Æ¡¼¥¿¥¹¥Ú¡¼¥¸</a><br/>
 <b>E-Mail</b>: <a href="mailto:de-bsd-translators@de.FreeBSD.org">de-bsd-translators@de.FreeBSD.org</a><br/>
 <b>IRC</b>: ¥µ¡¼¥Ð: irc.freenode.net ¥Á¥ã¥Í¥ë: #FreeBSD-Doc.de<br/>
 

From owner-svn-doc-head@FreeBSD.ORG  Tue May 12 10:27:18 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2780DF2E;
 Tue, 12 May 2015 10:27:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 157E11842;
 Tue, 12 May 2015 10:27:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4CARHUr076323;
 Tue, 12 May 2015 10:27:17 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4CARH6W076322;
 Tue, 12 May 2015 10:27:17 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201505121027.t4CARH6W076322@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Tue, 12 May 2015 10:27:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46681 -
 head/en_US.ISO8859-1/books/porters-handbook/makefiles
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 May 2015 10:27:18 -0000

Author: mat
Date: Tue May 12 10:27:17 2015
New Revision: 46681
URL: https://svnweb.freebsd.org/changeset/doc/46681

Log:
  Add two new magic MASTER_SITES macros entries.
  
  Differential Revision:	https://reviews.freebsd.org/D2513
  Approved by:	wblock (mentor)
  Sponsored by:	Absolight

Modified:
  head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml

Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml	Tue May 12 08:03:23 2015	(r46680)
+++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml	Tue May 12 10:27:17 2015	(r46681)
@@ -1727,6 +1727,16 @@ MASTER_SITE_SUBDIR=	stardict/WyabdcRealP
 
 	    <tbody>
 	      <row>
+		<entry><varname>APACHE_COMMONS_BINARIES</varname></entry>
+		<entry><literal>${PORTNAME:S,commons-,,}</literal></entry>
+	      </row>
+
+	      <row>
+		<entry><varname>APACHE_COMMONS_SOURCE</varname></entry>
+		<entry><literal>${PORTNAME:S,commons-,,}</literal></entry>
+	      </row>
+
+	      <row>
 		<entry><varname>APACHE_JAKARTA</varname></entry>
 		<entry><literal>${PORTNAME:S,-,/,}/source</literal></entry>
 	      </row>

From owner-svn-doc-head@FreeBSD.ORG  Tue May 12 08:03:26 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 86209792;
 Tue, 12 May 2015 08:03:26 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 71E2A1794;
 Tue, 12 May 2015 08:03:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4C83QpS007040;
 Tue, 12 May 2015 08:03:26 GMT (envelope-from taras@FreeBSD.org)
Received: (from taras@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4C83O4R007025;
 Tue, 12 May 2015 08:03:24 GMT (envelope-from taras@FreeBSD.org)
Message-Id: <201505120803.t4C83O4R007025@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: taras set sender to
 taras@FreeBSD.org using -f
From: Taras Korenko <taras@FreeBSD.org>
Date: Tue, 12 May 2015 08:03:24 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: 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
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Mailman-Approved-At: Tue, 12 May 2015 11:19:34 +0000
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 May 2015 08:03:26 -0000

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 &amp;&amp; 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-
 &lt;/Policy&gt;</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; ÐÏ ÕÍÏÌÞÁÎÉÀ &mdash;
-      <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> &mdash; ÜÔÏ ÓÁÍÁÑ ÐÏÓÌÅÄÎÑÑ ×ÅÒÓÉÑ ÏÐÅÒÁÃÉÏÎÎÏÊ
-	    ÓÉÓÔÅÍÙ ÄÌÑ ÌÉÎÅÊËÉ ËÏÍÐØÀÔÅÒÏ× &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> &mdash;
+	      ×ÙÓÏËÏÐÒÏÉÚ×ÏÄÉÔÅÌØÎÙÊ ×ÅÂ-ÓÅÒ×ÅÒ, ÏÔÌÉÞÁÀÝÉÊÓÑ ÎÉÚËÉÍÉ
+	      ÔÒÅÂÏ×ÁÎÉÑÍÉ Ë ÏÂßÅÍÕ ÏÐÅÒÁÔÉ×ÎÏÊ ÐÁÍÑÔÉ É ÏÂÌÁÄÁÀÝÉÊ
+	      ËÌÀÞÅ×ÙÍÉ ÆÕÎËÃÉÏÎÁÌØÎÙÍÉ ×ÏÚÍÏÖÎÏÓÔÑÍÉ ÄÌÑ ÐÏÓÔÒÏÅÎÉÑ
+	      ÓÏ×ÒÅÍÅÎÎÏÊ ×ÅÂ-ÉÎÆÒÁÓÔÒÕËÔÕÒÙ.  æÕÎËÃÉÏÎÁÌØÎÙÅ
+	      ×ÏÚÍÏÖÎÏÓÔÉ ×ËÌÀÞÁÀÔ ÓÌÅÄÕÀÝÅÅ: 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 @@
 	×ÙÛÅÏÐÉÓÁÎÎÏÅ&nbsp;&mdash; ÄÌÑ ÒÁÚÎÙÈ ×ÅÒÓÉÊ 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>&nbsp;&mdash; ÌÕÞÛÉÊ ÐÏ ÜÆÆÅËÔÉ×ÎÏÓÔÉ
-	  ÓÐÏÓÏÂ ÐÏÄÄÅÒÖËÉ ÚÅÒËÁÌÁ, ÏÄÎÁËÏ ÏÎ ÄÏÓÔÕÐÅÎ ÌÉÛØ Ó ÎÅÂÏÌØÛÏÇÏ ÞÉÓÌÁ
-	  ÓÁÊÔÏ×.</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>.  ðÒÉ ÕÓÌÏ×ÉÉ ÎÁÌÉÞÉÑ Õ ×ÁÓ ËÏÐÉÉ
-	ÒÅÐÏÚÉÔÏÒÉÑ, ×ÓÅ, ÞÔÏ ÄÌÑ ÜÔÏÇÏ ÐÏÔÒÅÂÕÅÔÓÑ&nbsp;&mdash; ×ÙÐÏÌÎÉÔØ
-	ËÏÍÁÎÄÕ</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>&nbsp;&mdash; ÎÏÍÅÒ ÚÅÒËÁÌÁ × ÄÁÎÎÏÊ ÓÔÒÁÎÅ.
 	üÔÏÔ ÖÅ ÐÒÉÎÃÉÐ ÐÒÉÍÅÎÉÍ Ë ÉÍÅÎÁÍ ÈÏÓÔÏ×
-	<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@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@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@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@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;&mdash;ÔÁË ÞÔÏ ÏÎÏ ÎÁÞΣÔÓÑ Ó ÏÓÎÏ×.
-	ðÒÅÄÐÏÌÁÇÁÅÔÓÑ, ÞÔÏ ×Ù ÉÓÐÏÌØÚÕÅÔÅ ÄÉÓÔÒÉÂÕÔÉ× &os; ×ÅÒÓÉÉ 2.0.5
-	ÉÌÉ ÂÏÌÅÅ ÐÏÚÄÎÅÊ, ÒÁÓÐÒÏÓÔÒÁÎÑÅÍÙÊ &os;.org, É × ×ÁÛÅÊ ÓÉÓÔÅÍÅ (ÎÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ) ÉÍÅÅÔÓÑ ÏÄÉÎ
-	ÐÏÌØÚÏ×ÁÔÅÌØ (ÜÔÏ ×Ù)&mdash;É ×Ù ÈÏÒÏÛÏ ÏÒÉÅÎÔÉÒÕÅÔÅÓØ × DOS/&windows;
-	ÉÌÉ &os2;.</para>
+	<emphasis>É</emphasis> &unix;&mdash;ÔÁË ÞÔÏ ÏÎÏ ÎÁÞΣÔÓÑ Ó
+	ÏÓÎÏ×.</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 &gt; 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 ***

From owner-svn-doc-head@FreeBSD.ORG  Tue May 12 14:24:06 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2DA6B887;
 Tue, 12 May 2015 14:24:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0F07B1410;
 Tue, 12 May 2015 14:24:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4CEO5gd094284;
 Tue, 12 May 2015 14:24:05 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4CEO5VJ094283;
 Tue, 12 May 2015 14:24:05 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201505121424.t4CEO5VJ094283@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: brd set sender to brd@FreeBSD.org
 using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Tue, 12 May 2015 14:24:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46682 - head/en_US.ISO8859-1/books/handbook/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 May 2015 14:24:06 -0000

Author: brd
Date: Tue May 12 14:24:05 2015
New Revision: 46682
URL: https://svnweb.freebsd.org/changeset/doc/46682

Log:
  Reword the section about pkg backups to reflect that they are enabled by default now.

Modified:
  head/en_US.ISO8859-1/books/handbook/ports/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue May 12 10:27:17 2015	(r46681)
+++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue May 12 14:24:05 2015	(r46682)
@@ -854,34 +854,38 @@ Deinstalling ca_root_nss-3.15.1_1... don
     </sect2>
 
     <sect2 xml:id="pkgng-backup">
-      <title>Backing Up the Package Database</title>
+      <title>Restoring the Package Database</title>
 
       <para>Unlike the traditional package management system,
 	<application>pkg</application> includes its own package
-	database backup mechanism.  To manually back up the contents
-	of the package database, run the following command, replacing
-	<replaceable>pkgng.db</replaceable> with a suitable file
-	name:</para>
-
-      <screen>&prompt.root; <userinput>pkg backup -d <replaceable>pkgng.db</replaceable></userinput></screen>
-
-      <para>Additionally, <application>pkg</application> includes
-	a &man.periodic.8; script to automatically perform a daily
-	back up of the package database.  This functionality is
-	enabled if <literal>daily_backup_pkgdb_enable</literal> is
-	set to <literal>YES</literal> in &man.periodic.conf.5;.</para>
+	database backup mechanism.  This functionality is enabled by
+	default.</para>
 
       <tip>
 	<para>To disable the periodic script from backing up the
 	  package database, set
-	  <literal>daily_backup_pkgdb_enable</literal> to
-	  <literal>NO</literal> in &man.periodic.conf.5;.</para>
+	  <literal>daily_backup_pkgdb_enable="NO"</literal> in
+	  &man.periodic.conf.5;.</para>
       </tip>
 
       <para>To restore the contents of a previous package database
-	backup, run:</para>
+	backup, run the following command replacing
+	<replaceable>/path/to/pkg.sql</replaceable> with the location of
+	the backup:</para>
 
-      <screen>&prompt.root; <userinput>pkg backup -r <replaceable>/path/to/pkgng.db</replaceable></userinput></screen>
+      <screen>&prompt.root; <userinput>pkg backup -r <replaceable>/path/to/pkg.sql</replaceable></userinput></screen>
+
+      <note>
+	<para>If restoring a backup taken by the periodic script,
+	  it must be decompressed prior to be restored.</para>
+      </note>
+
+      <para>To run a manual backup of the
+	<application>pkg</application> database, run the following
+	command, replacing <replaceable>/path/to/pkg.sql</replaceable>
+	with a suitable file name and location:</para>
+
+      <screen>&prompt.root; <userinput>pkg backup -d <replaceable>/path/to/pkg.sql</replaceable></userinput></screen>
     </sect2>
 
     <sect2 xml:id="pkgng-clean">

From owner-svn-doc-head@FreeBSD.ORG  Tue May 12 14:41:58 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 98F38E31;
 Tue, 12 May 2015 14:41:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8769D168B;
 Tue, 12 May 2015 14:41:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4CEfwPB004309;
 Tue, 12 May 2015 14:41:58 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4CEfw0T004308;
 Tue, 12 May 2015 14:41:58 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201505121441.t4CEfw0T004308@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: brd set sender to brd@FreeBSD.org
 using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Tue, 12 May 2015 14:41:58 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46683 - head/en_US.ISO8859-1/books/handbook/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 May 2015 14:41:58 -0000

Author: brd
Date: Tue May 12 14:41:57 2015
New Revision: 46683
URL: https://svnweb.freebsd.org/changeset/doc/46683

Log:
  Update the pkg clean section to reflect that now expired packages are not kept in the cache.

Modified:
  head/en_US.ISO8859-1/books/handbook/ports/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue May 12 14:24:05 2015	(r46682)
+++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue May 12 14:41:57 2015	(r46683)
@@ -893,13 +893,16 @@ Deinstalling ca_root_nss-3.15.1_1... don
 
       <para>By default, <application>pkg</application> stores
 	binary packages in a cache directory defined by
-	<envar>PKG_CACHEDIR</envar> in pkg.conf(5).  When upgrading
-	packages with <command>pkg upgrade</command>, old versions
-	of the upgraded packages are not automatically removed.</para>
-
-      <para>To remove these outdated binary packages, run:</para>
+	<envar>PKG_CACHEDIR</envar> in &man.pkg.conf.5;.  Only copies
+	of the latest installed packages are kept.  Older versions of
+	<application>pkg</application> kept all previous packages.  To
+	remove these outdated binary packages, run:</para>
 
       <screen>&prompt.root; <userinput>pkg clean</userinput></screen>
+
+      <para>The entire cache may be cleared by running:</para>
+
+      <screen>&prompt.root; <userinput>pkg clean -a</userinput></screen>
     </sect2>
 
     <sect2 xml:id="pkgng-set">

From owner-svn-doc-head@FreeBSD.ORG  Tue May 12 15:07:27 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C4781731;
 Tue, 12 May 2015 15:07:27 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B36371947;
 Tue, 12 May 2015 15:07:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4CF7RQp014840;
 Tue, 12 May 2015 15:07:27 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4CF7Rsm014839;
 Tue, 12 May 2015 15:07:27 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201505121507.t4CF7Rsm014839@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: brd set sender to brd@FreeBSD.org
 using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Tue, 12 May 2015 15:07:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46684 - head/en_US.ISO8859-1/books/handbook/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 May 2015 15:07:27 -0000

Author: brd
Date: Tue May 12 15:07:26 2015
New Revision: 46684
URL: https://svnweb.freebsd.org/changeset/doc/46684

Log:
  Simplify the section on upgrading with pkg.

Modified:
  head/en_US.ISO8859-1/books/handbook/ports/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue May 12 14:41:57 2015	(r46683)
+++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue May 12 15:07:26 2015	(r46684)
@@ -807,19 +807,14 @@ Proceed with deleting packages [y/N]: <u
     <sect2 xml:id="pkgng-upgrading">
       <title>Upgrading Installed Packages</title>
 
-      <para>Packages that are outdated can be found with
-	<command>pkg version</command>.  If a local ports tree
-	does not exist, pkg-version(8) will use the remote
-	repository catalogue.  Otherwise, the local ports tree will
-	be used to identify package versions.</para>
-
       <para>Installed packages can be upgraded to their latest
-	versions by typing <command>pkg upgrade</command>.  This
-	command will compare the installed versions with those
-	available in the repository catalogue.  When finished, it
-	will list the applications that have newer versions.  Type
-	<userinput>y</userinput> to proceed with the upgrade or
-	<userinput>n</userinput> to cancel the upgrade.</para>
+	versions by running:</para>
+
+      <screen>&prompt.root; <userinput>pkg upgrade</userinput></screen>
+
+      <para>This command will compare the installed versions with those
+	available in the repository catalogue and upgrade them from the
+	repository.</para>
     </sect2>
 
     <sect2 xml:id="pkgng-auditing">

From owner-svn-doc-head@FreeBSD.ORG  Tue May 12 18:40:40 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C6F0E4E1;
 Tue, 12 May 2015 18:40:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B54C115D3;
 Tue, 12 May 2015 18:40:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4CIee2Q020915;
 Tue, 12 May 2015 18:40:40 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4CIeeVA020914;
 Tue, 12 May 2015 18:40:40 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201505121840.t4CIeeVA020914@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: brd set sender to brd@FreeBSD.org
 using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Tue, 12 May 2015 18:40:40 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46685 - head/share/pgpkeys
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 May 2015 18:40:41 -0000

Author: brd
Date: Tue May 12 18:40:39 2015
New Revision: 46685
URL: https://svnweb.freebsd.org/changeset/doc/46685

Log:
  Update my PGP key

Modified:
  head/share/pgpkeys/brd.key

Modified: head/share/pgpkeys/brd.key
==============================================================================
--- head/share/pgpkeys/brd.key	Tue May 12 15:07:26 2015	(r46684)
+++ head/share/pgpkeys/brd.key	Tue May 12 18:40:39 2015	(r46685)
@@ -3,47 +3,69 @@
 sh ./addkey.sh brd ED0A754D;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   1024D/ED0A754D 2005-05-14 [expires: 2014-02-21]
+pub   1024D/ED0A754D 2005-05-14 [expires: 2020-05-10]
       Key fingerprint = 5DFD D1A6 BEEE A6D4 B3F5  4236 D362 3291 ED0A 754D
-uid                  Brad Davis <so14k@so14k.com>
 uid                  Brad Davis <brd@FreeBSD.org>
-sub   2048g/1F29D404 2005-05-14 [expires: 2014-02-21]
+uid                  Brad Davis <so14k@so14k.com>
+sub   2048g/1F29D404 2005-05-14 [expires: 2020-05-10]
 ]]></programlisting>
-<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-=HfL5
+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
+ZKE0AJ9BmdOm/tzGOgP920RU95sUDiRsag==
+=OvLH
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

From owner-svn-doc-head@FreeBSD.ORG  Tue May 12 20:44:13 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7B1B5E40;
 Tue, 12 May 2015 20:44:13 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6A05714C3;
 Tue, 12 May 2015 20:44:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4CKiDVY083464;
 Tue, 12 May 2015 20:44:13 GMT (envelope-from jgh@FreeBSD.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4CKiDPw083463;
 Tue, 12 May 2015 20:44:13 GMT (envelope-from jgh@FreeBSD.org)
Message-Id: <201505122044.t4CKiDPw083463@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jgh set sender to jgh@FreeBSD.org
 using -f
From: Jason Helfman <jgh@FreeBSD.org>
Date: Tue, 12 May 2015 20:44:13 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46686 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 May 2015 20:44:13 -0000

Author: jgh
Date: Tue May 12 20:44:12 2015
New Revision: 46686
URL: https://svnweb.freebsd.org/changeset/doc/46686

Log:
  - address broken link in faq
  
  Differential Revision:	https://reviews.freebsd.org/D2522
  Submitted by:	jhs@berklix.com
  Approved by:	bcr (mentor)

Modified:
  head/en_US.ISO8859-1/books/faq/book.xml

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Tue May 12 18:40:39 2015	(r46685)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Tue May 12 20:44:12 2015	(r46686)
@@ -4963,7 +4963,7 @@ Key F15        A        A        Menu Wo
 	  <para>If the
 	    connection to the Internet is over Ethernet, use &man.natd.8;.
 	    A tutorial can be found in the <link
-	      xlink:href="&url.books.handbook;/network-natd.html">natd</link>
+	      xlink:href="&url.books.handbook;/firewalls-ipfw.html#network-natd">natd</link>
 	    section of the Handbook.</para>
 	</answer>
       </qandaentry>
@@ -4996,7 +4996,7 @@ Key F15        A        A        Menu Wo
 	      entry on PPP</link>.  To use NAT over
 	    some other sort of network connection, look at the
 	    <link
-	      xlink:href="&url.books.handbook;/network-natd.html">natd</link>
+	      xlink:href="&url.books.handbook;/firewalls-ipfw.html#network-natd">natd</link>
 	    section of the Handbook.</para>
 	</answer>
       </qandaentry>

From owner-svn-doc-head@FreeBSD.ORG  Tue May 12 21:12:10 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1202A411;
 Tue, 12 May 2015 21:12:10 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0152517E3;
 Tue, 12 May 2015 21:12:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4CLC99r098135;
 Tue, 12 May 2015 21:12:09 GMT (envelope-from bjk@FreeBSD.org)
Received: (from bjk@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4CLC9dC098134;
 Tue, 12 May 2015 21:12:09 GMT (envelope-from bjk@FreeBSD.org)
Message-Id: <201505122112.t4CLC9dC098134@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bjk set sender to bjk@FreeBSD.org
 using -f
From: Benjamin Kaduk <bjk@FreeBSD.org>
Date: Tue, 12 May 2015 21:12:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46687 - head/en_US.ISO8859-1/books/handbook/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 May 2015 21:12:10 -0000

Author: bjk
Date: Tue May 12 21:12:09 2015
New Revision: 46687
URL: https://svnweb.freebsd.org/changeset/doc/46687

Log:
  Fix grammar nit from r46682
  
  Approved by:	hrs (mentor, implicit)

Modified:
  head/en_US.ISO8859-1/books/handbook/ports/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue May 12 20:44:12 2015	(r46686)
+++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue May 12 21:12:09 2015	(r46687)
@@ -872,7 +872,7 @@ Deinstalling ca_root_nss-3.15.1_1... don
 
       <note>
 	<para>If restoring a backup taken by the periodic script,
-	  it must be decompressed prior to be restored.</para>
+	  it must be decompressed prior to being restored.</para>
       </note>
 
       <para>To run a manual backup of the

From owner-svn-doc-head@FreeBSD.ORG  Wed May 13 07:41:03 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0AFD8659;
 Wed, 13 May 2015 07:41:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E23F31BFD;
 Wed, 13 May 2015 07:41:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4D7f2SH009420;
 Wed, 13 May 2015 07:41:02 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4D7f2Ng009417;
 Wed, 13 May 2015 07:41:02 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201505130741.t4D7f2Ng009417@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Wed, 13 May 2015 07:41:02 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46689 - in head/en_US.ISO8859-1/books/porters-handbook:
 special uses
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 May 2015 07:41:03 -0000

Author: mat
Date: Wed May 13 07:41:01 2015
New Revision: 46689
URL: https://svnweb.freebsd.org/changeset/doc/46689

Log:
  Update XFCE section.
  
  PR:		197878 (based on)
  Differential Revision:	https://reviews.freebsd.org/D2439
  Submitted by:	olivierd
  Reviewed by:	wblock, gjb
  Approved by:	wblock (mentor)
  Sponsored by:	Absolight

Modified:
  head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
  head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml

Modified: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml	Wed May 13 03:55:46 2015	(r46688)
+++ head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml	Wed May 13 07:41:01 2015	(r46689)
@@ -4122,83 +4122,128 @@ post-patch:
   <sect1 xml:id="using-xfce">
     <title>Using Xfce</title>
 
-    <para><varname>USE_XFCE</varname> is used to
-      autoconfigure the dependencies for ports which use an Xfce
-      based library or application like
-      <package role="port">x11-toolkits/libxfce4gui</package>
-      and <package role="port">x11-wm/xfce4-panel</package>.</para>
-
-    <para>These Xfce libraries and applications are
-      recognized:</para>
-
-    <itemizedlist>
-      <listitem>
-	<para>libexo: <package
-	    role="port">x11/libexo</package></para>
-      </listitem>
-
-      <listitem>
-	<para>libgui: <package
-	    role="port">x11-toolkits/libxfce4gui</package></para>
-      </listitem>
-
-      <listitem>
-	<para>libutil: <package
-	    role="port">x11/libxfce4util</package></para>
-      </listitem>
-
-      <listitem>
-	<para>libmcs: <package
-	    role="port">x11/libxfce4mcs</package></para>
-      </listitem>
-
-      <listitem>
-	<para>mcsmanager: <package
-	    role="port">sysutils/xfce4-mcs-manager</package></para>
-      </listitem>
-
-      <listitem>
-	<para>panel: <package
-	    role="port">x11-wm/xfce4-panel</package></para>
-      </listitem>
-
-      <listitem>
-	<para>thunar: <package
-	    role="port">x11-fm/thunar</package></para>
-      </listitem>
-
-      <listitem>
-	<para>wm: <package
-	    role="port">x11-wm/xfce4-wm</package></para>
-      </listitem>
-
-      <listitem>
-	<para>xfdev: <package
-	    role="port">dev/xfce4-dev-tools</package></para>
-      </listitem>
-    </itemizedlist>
-
-    <para>These additional parameters are recognized:</para>
-
-    <itemizedlist>
-      <listitem>
-	<para>configenv: Use this if the port requires a special
-	  modified <varname>CONFIGURE_ENV</varname> to find its
-	  required libraries.</para>
-
-	<programlisting>-I&dollar;{LOCALBASE}/include -L&dollar;{LOCALBASE}/lib</programlisting>
-
-	<para>gets added to CPPFLAGS to
-	  <varname>CONFIGURE_ENV</varname>.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>Therefore, if a port has a dependency on
-      <package role="port">sysutils/xfce4-mcs-manager</package>
-      and requires the special CPPFLAGS in its configure
-      environment, the syntax will be:</para>
+    <para>Ports that need <application>Xfce</application> libraries or
+      applications set <literal>USES=xfce</literal>.</para>
 
-    <programlisting>USE_XFCE=	mcsmanager configenv</programlisting>
+    <para>Specific <application>Xfce</application> library and
+      application dependencies are set with values assigned to
+      <varname>USE_XFCE</varname>.  They are defined in
+      <filename>/usr/ports/Mk/Uses/xfce.mk</filename>.  The possible
+      values are:</para>
+
+    <variablelist>
+      <title>Values of <varname>USE_XFCE</varname></title>
+
+      <varlistentry>
+	<term>garcon</term>
+
+	<listitem>
+	  <para><package role="port">sysutils/garcon</package></para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>libexo</term>
+
+	<listitem>
+	  <para><package role="port">x11/libexo</package></para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+
+	<term>libgui</term>
+
+	<listitem>
+	  <para><package
+	      role="port">x11-toolkits/libxfce4gui</package></para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>libmenu</term>
+
+	<listitem>
+	  <para><package role="port">x11/libxfce4menu</package></para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>libutil</term>
+
+	<listitem>
+	  <para><package role="port">x11/libxfce4util</package></para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>panel</term>
+
+	<listitem>
+	  <para><package
+	      role="port">x11-wm/xfce4-panel</package></para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>thunar</term>
+
+	<listitem>
+	  <para><package role="port">x11-fm/thunar</package></para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>xfconf</term>
+
+	<listitem>
+	  <para><package role="port">x11/xfce4-conf</package></para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+
+    <example xml:id="use-xfce">
+      <title><varname>USES=xfce</varname> Example</title>
+
+      <programlisting>USES=		xfce
+USE_XFCE=	libmenu</programlisting>
+    </example>
+
+    <example xml:id="use-xfce-gtk3">
+      <title>Using Xfce's Own GTK3 Widgets</title>
+
+      <para>In this example, the ported application uses the
+	<application>GTK3</application>-specific widgets <package
+	  role="port">x11/libxfce4menu</package> and <package
+	  role="port">x11/xfce4-conf</package>.</para>
+
+      <programlisting>USES=		xfce:gtk3
+USE_XFCE=	libmenu xfconf</programlisting>
+    </example>
+
+    <tip>
+      <para><application>Xfce</application> components included this
+	way will automatically include any dependencies they need.  It
+	is no longer necessary to specify the entire list.  If the
+	port only needs <package
+	  role="port">x11-wm/xfce4-panel</package>, use:</para>
+
+      <programlisting>USES=		xfce
+USE_XFCE=	panel</programlisting>
+
+      <para>There is no need to list the components <package
+	  role="port">x11-wm/xfce4-panel</package> needs itself like
+	this:</para>
+
+      <programlisting>USES=		xfce
+USE_XFCE=	libexo libmenu libutil panel</programlisting>
+
+      <para>However, <application>Xfce</application> components and
+	non-<application>Xfce</application> dependencies of the port
+	must be included explicitly.  Do not count on an
+	<application>Xfce</application> component to provide a
+	sub-dependency other than itself for the main port.</para>
+    </tip>
   </sect1>
 
   <sect1 xml:id="using-mozilla">

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Wed May 13 03:55:46 2015	(r46688)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Wed May 13 07:41:01 2015	(r46689)
@@ -1378,9 +1378,16 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssa
 
 	  <entry>(none), <literal>gtk3</literal></entry>
 
-	  <entry>Provide support for <application>Xfce</application>
-	    related ports.  See <xref linkend="using-xfce"/> for
-	    details.</entry>
+	  <entry>
+	    <para>Provide support for <application>Xfce</application>
+	      related ports.  See <xref linkend="using-xfce"/> for
+	      details.</para>
+
+	    <para>The <literal>gtk3</literal> argument specifies that
+	      the port requires <application>GTK3</application>
+	      features provided by <package
+		role="port">x11/libxfce4menu</package>.</para>
+	  </entry>
 	</row>
 
 	<row xml:id="uses-zip">

From owner-svn-doc-head@FreeBSD.ORG  Wed May 13 12:36:39 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C2BCB93C;
 Wed, 13 May 2015 12:36:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B0B4511A5;
 Wed, 13 May 2015 12:36:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4DCaddm056792;
 Wed, 13 May 2015 12:36:39 GMT (envelope-from ryusuke@FreeBSD.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4DCadV0056791;
 Wed, 13 May 2015 12:36:39 GMT (envelope-from ryusuke@FreeBSD.org)
Message-Id: <201505131236.t4DCadV0056791@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ryusuke set sender to
 ryusuke@FreeBSD.org using -f
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 13 May 2015 12:36:39 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46690 - head/ja_JP.eucJP/books/handbook/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Mailman-Approved-At: Wed, 13 May 2015 14:03:12 +0000
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 May 2015 12:36:40 -0000

Author: ryusuke
Date: Wed May 13 12:36:38 2015
New Revision: 46690
URL: https://svnweb.freebsd.org/changeset/doc/46690

Log:
  - Merge the following from the English version:
  
  	r46642 -> r46682	head/ja_JP.eucJP/books/handbook/ports/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/ports/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/ports/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/ports/chapter.xml	Wed May 13 07:41:01 2015	(r46689)
+++ head/ja_JP.eucJP/books/handbook/ports/chapter.xml	Wed May 13 12:36:38 2015	(r46690)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r46642
+     Original revision: r46682
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -879,37 +879,40 @@ Deinstalling ca_root_nss-3.15.1_1... don
     </sect2>
 
     <sect2 xml:id="pkgng-backup">
-      <title>package ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×</title>
+      <title>package ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ê¥¹¥È¥¢</title>
 
       <para>ÅÁÅýŪ¤Ê package ´ÉÍý¥·¥¹¥Æ¥à¤È¤Ï°Û¤Ê¤ê¡¢
 	<application>pkg</application> ¤Ë¤Ï package
 	¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¥Ð¥Ã¥¯¥¢¥Ã¥×¤¹¤ë¥á¥«¥Ë¥º¥à¤¬¤¢¤ê¤Þ¤¹¡£
-	package ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÆâÍƤò¼êÆ°¤Ç¥Ð¥Ã¥¯¥¢¥Ã¥×¤¹¤ë¤Ë¤Ï¡¢
-	°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£°Ê²¼¤Î
-	<replaceable>pkgng.db</replaceable>
-	¤òŬÀڤʥե¡¥¤¥ë̾¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <screen>&prompt.root; <userinput>pkg backup -d <replaceable>pkgng.db</replaceable></userinput></screen>
-
-      <para>¤µ¤é¤Ë¡¢<application>pkg</application> ¤Ï
-	package ¥Ç¡¼¥¿¥Ù¡¼¥¹¤òËèÆü¼«Æ°Åª¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤¹¤ë
-	&man.periodic.8; ¥¹¥¯¥ê¥×¥È¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
-	¤³¤Îµ¡Ç½¤Ï¡¢&man.periodic.conf.5; ¤ÎÃæ¤Ç¡¢
-	<literal>daily_backup_pkgdb_enable</literal> ¤ò
-	<literal>YES</literal> ¤ËÀßÄꤹ¤ë¤ÈÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
-
+	¤³¤Îµ¡Ç½¤Ï¥Ç¥Õ¥©¥ë¥È¤ÇÍ­¸ú¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+	
       <tip>
 	<para>¥¹¥¯¥ê¥×¥È¤Ë¤è¤ëÄê´üŪ¤Ê
 	  package ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò̵¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢
 	  &man.periodic.conf.5; ¤ÎÃæ¤Ç¡¢
-	  <literal>daily_backup_pkgdb_enable</literal> ¤ò
-	  <literal>NO</literal> ¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
+	  <literal>daily_backup_pkgdb_enable="NO"</literal> 
+	  ¤ÈÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
       </tip>
 
       <para>²áµî¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤·¤¿ package
-	¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÃæ¿È¤ò¥ê¥¹¥È¥¢¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÃæ¿È¤ò¥ê¥¹¥È¥¢¤¹¤ë¤Ë¤Ï¡¢
+	°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£
+	°Ê²¼¤Î¥³¥Þ¥ó¥É¤Î <replaceable>/path/to/pkg.sql</replaceable>
+	¤Ë¤Ä¤¤¤Æ¤Ï¡¢¥Ð¥Ã¥¯¥¢¥Ã¥×¤Î¤¢¤ë¾ì½ê¤ËÃÖ¤­´¹¤¨¤Æ¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <screen>&prompt.root; <userinput>pkg backup -r <replaceable>/path/to/pkg.sql</replaceable></userinput></screen>
+
+      <note>
+	<para>¥·¥¹¥Æ¥à¤ÎÄê´üŪ¤Ê¥¹¥¯¥ê¥×¥È¤Ë¤è¤Ã¤Æ¼èÆÀ¤µ¤ì¤¿¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¥ê¥¹¥È¥¢¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢
+	  ¥ê¥¹¥È¥¢¤ÎÁ°¤ËŸ³«¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para>
+      </note>
+
+      <para>¼êÆ°¤Ç <application>pkg</application>
+	¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¥Ð¥Ã¥¯¥¢¥Ã¥×¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£
+	°Ê²¼¤Î¥³¥Þ¥ó¥É¤Î <replaceable>/path/to/pkg.sql</replaceable>
+	¤Ë¤Ä¤¤¤Æ¤Ï¡¢Å¬Àڤʥե¡¥¤¥ë̾¤È¾ì½ê¤ËÃÖ¤­´¹¤¨¤Æ²¼¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg backup -r <replaceable>/path/to/pkgng.db</replaceable></userinput></screen>
+      <screen>&prompt.root; <userinput>pkg backup -d <replaceable>/path/to/pkg.sql</replaceable></userinput></screen>
     </sect2>
 
     <sect2 xml:id="pkgng-clean">

From owner-svn-doc-head@FreeBSD.ORG  Wed May 13 18:09:07 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 24273D35;
 Wed, 13 May 2015 18:09:07 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 04934104E;
 Wed, 13 May 2015 18:09:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4DI96AU022378;
 Wed, 13 May 2015 18:09:06 GMT (envelope-from bhd@FreeBSD.org)
Received: (from bhd@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4DI965U022377;
 Wed, 13 May 2015 18:09:06 GMT (envelope-from bhd@FreeBSD.org)
Message-Id: <201505131809.t4DI965U022377@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bhd set sender to bhd@FreeBSD.org
 using -f
From: Bjoern Heidotting <bhd@FreeBSD.org>
Date: Wed, 13 May 2015 18:09:06 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46691 - head/de_DE.ISO8859-1/books/handbook/config
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 May 2015 18:09:07 -0000

Author: bhd
Date: Wed May 13 18:09:06 2015
New Revision: 46691
URL: https://svnweb.freebsd.org/changeset/doc/46691

Log:
  Update to r39872:
  Remove redundant words, fix title capitalization
  
  Approved by:	bcr (mentor)

Modified:
  head/de_DE.ISO8859-1/books/handbook/config/chapter.xml

Modified: head/de_DE.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- head/de_DE.ISO8859-1/books/handbook/config/chapter.xml	Wed May 13 12:36:38 2015	(r46690)
+++ head/de_DE.ISO8859-1/books/handbook/config/chapter.xml	Wed May 13 18:09:06 2015	(r46691)
@@ -5,7 +5,7 @@
 
      $FreeBSD$
      $FreeBSDde: de-docproj/books/handbook/config/chapter.xml,v 1.151 2011/12/19 14:55:31 bcr Exp $
-     basiert auf: r39077
+     basiert auf: r39872
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
   xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
@@ -477,10 +477,9 @@ run_rc_command "$1"</programlisting>
 	<acronym>IMAP</acronym> können über
 	&man.inetd.8; gestartet werden.  Nach der Installation
 	der Anwendung aus der Ports-Sammlung muss eine
-	Konfigurationszeile in der Datei
-	<filename>/etc/inetd.conf</filename> hinzugefügt oder
-	in der aktuellen Konfiguration durch Entfernen der Kommentare
-	aktiviert werden.  Der Abschnitt
+	Konfigurationszeile in <filename>/etc/inetd.conf</filename>
+	hinzugefügt oder in der aktuellen Konfiguration durch
+	Entfernen der Kommentare aktiviert werden.  Der Abschnitt
 	<xref linkend="network-inetd"/> beschreibt den
 	<application>inetd</application> und dessen
 	Konfiguration.</para>
@@ -637,18 +636,16 @@ HOME=/var/log
       </callout>
 
       <callout arearefs="co-main">
-	<para>Diese Zeile definiert die Zeitpunkte an denen das
-	  Kommando <command>atrun</command> laufen soll.  Beachten
+	<para>Diese Zeile definiert die Zeitpunkte an denen
+	  <command>atrun</command> laufen soll.  Beachten
 	  Sie die Zeichenfolge <literal>*/5</literal> gefolgt von
 	  mehreren <literal>*</literal>-Zeichen.  Das Zeichen
 	  <literal>*</literal> ist ein Platzhalter und steht
 	  für <emphasis>jede</emphasis> mögliche Zeit.
-	  Diese Zeile führt das Kommando <command>atrun</command>
-	  unter dem
+	  Diese Zeile führt <command>atrun</command> unter dem
 	  <systemitem class="username">root</systemitem>-Account alle
-	  fünf Minuten aus.  Mehr über das Kommando
-	  <command>atrun</command> erfahren Sie in der
-	  Hilfeseite &man.atrun.8;.</para>
+	  fünf Minuten aus.  Mehr über <command>atrun</command>
+	  erfahren Sie in der Manualpage &man.atrun.8;.</para>
 
 	<para>Bei den Kommandos können beliebige Optionen
 	  angegeben werden.  Wenn das Kommando zu lang ist und
@@ -659,7 +656,7 @@ HOME=/var/log
     </calloutlist>
 
     <para>Bis auf das sechste Feld, das den Account angibt, sieht
-      jede <filename>crontab</filename>-Datei so wie das Beispiel
+      jede <filename>crontab</filename> so wie das Beispiel
       aus.  Das sechste Feld existiert nur in der Systemdatei
       <filename>/etc/crontab</filename>.  In den restlichen
       <filename>crontab</filename>-Dateien fehlt dieses Feld.</para>
@@ -783,7 +780,7 @@ $sshd_enable=YES</screen>
 
     <note>
       <para>Die zweite Zeile (<literal># sshd</literal>) wird
-	vom Kommando <command>sshd</command> ausgegeben; sie
+	von <command>sshd</command> ausgegeben; sie
 	kennzeichnet nicht die Eingabeaufforderung von
 	<systemitem class="username">root</systemitem>.</para>
     </note>
@@ -2102,7 +2099,7 @@ kern.maxfiles: 2088 -&gt; 5000</screen>
       für wahr und <literal>0</literal> für falsch.</para>
 
     <para>Wenn Sie Variablen automatisch während des Systemstarts
-      setzen wollen, fügen Sie die Variablen in die Datei
+      setzen wollen, fügen Sie die Variablen in
       <filename>/etc/sysctl.conf</filename> ein.  Weiteres
       entnehmen Sie bitte der Hilfeseite &man.sysctl.conf.5;
       und dem <xref linkend="configtuning-sysctlconf"/>.</para>
@@ -2134,9 +2131,9 @@ device_probe_and_attach: cbb0 attach ret
 
       <para>Um dieses Problem zu lösen, muss eine
 	schreibgeschützte sysctl-Variable verändert werden.  Eine
-	<acronym>OID</acronym> kann in der Datei
+	<acronym>OID</acronym> kann in
 	<filename>/boot/loader.conf</filename> überschrieben werden.
-	Die Datei <filename>/boot/defaults/loader.conf</filename>
+	<filename>/boot/defaults/loader.conf</filename>
 	enthält Vorgabewwerte für sysctl-Variablen.</para>
 
       <para>Das oben erwähnte Problem wird durch die Angabe von
@@ -2599,9 +2596,9 @@ device_probe_and_attach: cbb0 attach ret
 	  Sie benötigen wirklich eine riesige Anzahl von ihnen.
 	  Viele der von <varname>kern.maxusers</varname> auf einen
 	  Standardwert gesetzten Parameter können beim Systemstart
-	  oder im laufenden Betrieb in der Datei
+	  oder im laufenden Betrieb in
 	  <filename>/boot/loader.conf</filename> (sehen Sie sich dazu
-	  auch &man.loader.conf.5; sowie die Datei
+	  auch &man.loader.conf.5; sowie
 	  <filename>/boot/defaults/loader.conf</filename> an) an Ihre
 	  Bedürfnisse angepasst werden, so wie es bereits an anderer
 	  Stelle dieses Dokuments beschrieben ist.</para>
@@ -3366,7 +3363,7 @@ kern.maxvnodes: 100000</screen>
 	  funktioniert, wenn Sie nach einem Suspend weiterarbeiten
 	  wollen.  Ist dies bei Ihnen der Fall, reicht es meistens
 	  aus, den Eintrag
-	  <literal>hint.psm.0.flags="0x3000"</literal> in Ihre
+	  <literal>hint.psm.0.flags="0x3000"</literal> in
 	  <filename>/boot/loader.conf</filename> aufzunehmen.  Besteht
 	  das Problem weiterhin, sollten Sie einen Fehlerbericht
 	  an das &os; Project senden.</para>

From owner-svn-doc-head@FreeBSD.ORG  Wed May 13 21:36:26 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 151C7380;
 Wed, 13 May 2015 21:36:26 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 040E71979;
 Wed, 13 May 2015 21:36:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4DLaPvC029172;
 Wed, 13 May 2015 21:36:25 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4DLaP1a029171;
 Wed, 13 May 2015 21:36:25 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201505132136.t4DLaP1a029171@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 13 May 2015 21:36:25 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46692 - head/share/pgpkeys
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 May 2015 21:36:26 -0000

Author: gjb
Date: Wed May 13 21:36:25 2015
New Revision: 46692
URL: https://svnweb.freebsd.org/changeset/doc/46692

Log:
  Fix build.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/share/pgpkeys/brd.key

Modified: head/share/pgpkeys/brd.key
==============================================================================
--- head/share/pgpkeys/brd.key	Wed May 13 18:09:06 2015	(r46691)
+++ head/share/pgpkeys/brd.key	Wed May 13 21:36:25 2015	(r46692)
@@ -9,6 +9,7 @@ uid                  Brad Davis <brd@Fre
 uid                  Brad Davis <so14k@so14k.com>
 sub   2048g/1F29D404 2005-05-14 [expires: 2020-05-10]
 ]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 mQGiBEKGCoMRBADKcY+c0DClCJ6cqBHMdye/IiDENT6SMUV8S1T3Iz8UDUrYjtbR  

From owner-svn-doc-head@FreeBSD.ORG  Wed May 13 22:09:26 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A43F9CAF;
 Wed, 13 May 2015 22:09:26 +0000 (UTC)
Received: from valentine.liquidneon.com (unknown [IPv6:2001:4978:f:5c6::2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "valentine.liquidneon.com",
 Issuer "Gandi Standard SSL CA 2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 7B5F41D22;
 Wed, 13 May 2015 22:09:26 +0000 (UTC)
Received: by valentine.liquidneon.com (Postfix, from userid 1018)
 id 04ABD8FFC6; Wed, 13 May 2015 16:09:23 -0600 (MDT)
Date: Wed, 13 May 2015 16:09:23 -0600
From: Brad Davis <brd@FreeBSD.org>
To: Glen Barber <gjb@FreeBSD.org>
Cc: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: Re: svn commit: r46692 - head/share/pgpkeys
Message-ID: <20150513220923.GA91287@valentine.liquidneon.com>
References: <201505132136.t4DLaP1a029171@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201505132136.t4DLaP1a029171@svn.freebsd.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 May 2015 22:09:26 -0000

On Wed, May 13, 2015 at 09:36:25PM +0000, Glen Barber wrote:
> Author: gjb
> Date: Wed May 13 21:36:25 2015
> New Revision: 46692
> URL: https://svnweb.freebsd.org/changeset/doc/46692
> 
> Log:
>   Fix build.

Thank you! My local build didn't catch this.


Regards,
Brad Davis


From owner-svn-doc-head@FreeBSD.ORG  Wed May 13 22:26:26 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from hub.FreeBSD.org (hub.freebsd.org
 [IPv6:2001:1900:2254:206c::16:88])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B792913A;
 Wed, 13 May 2015 22:26:25 +0000 (UTC)
Date: Wed, 13 May 2015 22:26:21 +0000
From: Glen Barber <gjb@FreeBSD.org>
To: Brad Davis <brd@FreeBSD.org>
Cc: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: Re: svn commit: r46692 - head/share/pgpkeys
Message-ID: <20150513222621.GD1515@hub.FreeBSD.org>
References: <201505132136.t4DLaP1a029171@svn.freebsd.org>
 <20150513220923.GA91287@valentine.liquidneon.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="XvKFcGCOAo53UbWW"
Content-Disposition: inline
In-Reply-To: <20150513220923.GA91287@valentine.liquidneon.com>
X-Operating-System: FreeBSD 11.0-CURRENT amd64
X-SCUD-Definition: Sudden Completely Unexpected Dataloss
X-SULE-Definition: Sudden Unexpected Learning Event
User-Agent: Mutt/1.5.23 (2014-03-12)
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 May 2015 22:26:26 -0000


--XvKFcGCOAo53UbWW
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Wed, May 13, 2015 at 04:09:23PM -0600, Brad Davis wrote:
> On Wed, May 13, 2015 at 09:36:25PM +0000, Glen Barber wrote:
> > Author: gjb
> > Date: Wed May 13 21:36:25 2015
> > New Revision: 46692
> > URL: https://svnweb.freebsd.org/changeset/doc/46692
> >=20
> > Log:
> >   Fix build.
>=20
> Thank you! My local build didn't catch this.
>=20

No problem.

Glen


--XvKFcGCOAo53UbWW
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJVU8+NAAoJEAMUWKVHj+KTyGsP/RmlXPcaZnaJZNdL+oQOs3KH
F7wQkrtYl2ISO8t+NneqQtl5lclvSX72huY1j5rGq2IKBe7jNoQNH0G6QbYr9o+k
JOl0WKfAxHB6SmRtXsK5WICeKzGlcoKwVi2L6MKC5EL+aQGCy+TPAPGTjiNFgMEP
fGTFgiBnyDKvSKwns6xPiJWC4KFX3AJVtWtwxl7/HrFwBPfCGh5DL9xWEZ3EMwb6
X6DLyRZIQjuM5gnmrD3KbPt4OZQnSaw1ZHYUGzFcEP1tXBNg4fTg+dWsClb4DBxg
5cVTergVbu5XTtJArOiPyiXN34WZzJwO86yGYlo3iV+1vRmOWKi++fp06bezCLaS
HTfYuPb5mjGeIlNtwKJnVi3MU+UNoIY1XXiWmDhCkJrqxmcjeqlDJQc7s+vfklw4
OmqUjdjnymJwajbnSEoP1bXxiilOiHD5xOVrGZiLwmfLd5bwo8I6nhDumQsbP1kv
V8wi7dnDU3MBv0kQjGxy9BTt7//Th1D38zGMdio1pG7ldSODiVmAw0+GbBEJTUXg
g2uOAemd+fu5CMdUm3Y+eIPfS+WjP9axQmlnmQGjoev3P/SXLxkWQ/koPGuVe1J8
llj2fmw/pSfBxWZN/GnDnOAFPSMA5QcbiYP85IQDZTx322vCv1qTAsrxzD01/7p/
Y4hRtaGlo4nopDKqChdv
=29jf
-----END PGP SIGNATURE-----

--XvKFcGCOAo53UbWW--

From owner-svn-doc-head@FreeBSD.ORG  Wed May 13 23:07:22 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CBA89CBE;
 Wed, 13 May 2015 23:07:22 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B80BF1395;
 Wed, 13 May 2015 23:07:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4DN7MYY074266;
 Wed, 13 May 2015 23:07:22 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4DN7KnY074244;
 Wed, 13 May 2015 23:07:20 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201505132307.t4DN7KnY074244@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 13 May 2015 23:07:20 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46693 - in head/share: security/advisories
 security/patches/EN-15:04 security/patches/EN-15:05 xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 May 2015 23:07:22 -0000

Author: delphij
Date: Wed May 13 23:07:20 2015
New Revision: 46693
URL: https://svnweb.freebsd.org/changeset/doc/46693

Log:
  Add two recent errata notices.

Added:
  head/share/security/advisories/FreeBSD-EN-15:04.freebsd-update.asc   (contents, props changed)
  head/share/security/advisories/FreeBSD-EN-15:05.ufs.asc   (contents, props changed)
  head/share/security/patches/EN-15:04/
  head/share/security/patches/EN-15:04/freebsd-update-8.patch   (contents, props changed)
  head/share/security/patches/EN-15:04/freebsd-update-8.patch.asc   (contents, props changed)
  head/share/security/patches/EN-15:04/freebsd-update.patch   (contents, props changed)
  head/share/security/patches/EN-15:04/freebsd-update.patch.asc   (contents, props changed)
  head/share/security/patches/EN-15:05/
  head/share/security/patches/EN-15:05/ufs.patch   (contents, props changed)
  head/share/security/patches/EN-15:05/ufs.patch.asc   (contents, props changed)
Modified:
  head/share/xml/notices.xml

Added: head/share/security/advisories/FreeBSD-EN-15:04.freebsd-update.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/advisories/FreeBSD-EN-15:04.freebsd-update.asc	Wed May 13 23:07:20 2015	(r46693)
@@ -0,0 +1,156 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-EN-15:04.freebsd-update                                 Errata Notice
+                                                          The FreeBSD Project
+
+Topic:          freebsd-update(8) does not ensure the previous upgrade was
+                completed
+
+Category:       core
+Module:         freebsd-update
+Announced:      2015-05-13
+Credits:        Allan Jude
+Affects:        All supported versions of FreeBSD.
+Corrected:      2015-05-13 22:36:00 UTC (stable/10, 10.1-STABLE)
+                2015-05-13 22:52:35 UTC (releng/10.1, 10.1-RELEASE-p10)
+                2015-05-13 22:36:52 UTC (stable/9, 9.3-STABLE)
+                2015-05-13 22:52:51 UTC (releng/9.3, 9.3-RELEASE-p14)
+                2015-05-13 22:39:29 UTC (stable/8, 8.4-STABLE)
+                2015-05-13 22:52:51 UTC (releng/8.4, 8.4-RELEASE-p28)
+
+For general information regarding FreeBSD Errata Notices and Security
+Advisories, including descriptions of the fields above, security
+branches, and the following sections, please visit
+<URL:https://security.freebsd.org/>.
+
+I.   Background
+
+The freebsd-update(8) utility is used to apply binary patches to FreeBSD
+systems installed from official release images, as an alternative to
+rebuilding from source.  A freebsd-update(8) build server generates the
+signed update packages, consisting of an index of files and directories
+with checksums before the update, a set of binary patches, and an
+index of files and directories with checksums after the update.  The
+client downloads the indexes, verifies the signatures and checksums,
+then downloads and applies the required patches.
+
+II.  Problem Description
+
+Binary upgrades using the freebsd-update(8) utility consist of several
+invocations of the freebsd-update(8) utility itself.  Each invocation
+performs a different task that depends on the previous invocation being
+successfully completed.
+
+If an upgrade is not thoroughly completed, it is possible for the
+freebsd-update(8) utility to download a subsequent patchset to a system
+with an inconsistent userland and/or kernel.  In the case of such an
+incomplete upgrade, the freebsd-update(8) utility may incorrectly
+evaluate the running userland and/or kernel, which can cause binary
+patches to be incorrectly applied.  In some situations, it is possible
+for patches to be applied for the incorrect FreeBSD version.
+
+III. Impact
+
+If incorrect patches are applied to the system as a result of a previous
+incomplete upgrade, it is possible that some system services may fail to
+start after rebooting the system, such as if the service is started by an
+executable that depends on a shared library that has been relocated as
+part of the upgrade.
+
+IV.  Workaround
+
+No workaround is available, but systems that do not use FreeBSD-provided
+binary updates to upgrade are not affected.
+
+V.   Solution
+
+Perform one of the following:
+
+1) Upgrade your system to a supported FreeBSD stable or release / security
+branch (releng) dated after the correction date.
+
+2) To update your present system via a binary patch:
+
+Systems running a RELEASE version of FreeBSD on the i386 or amd64
+platforms can be updated via the freebsd-update(8) utility:
+
+# freebsd-update fetch
+# freebsd-update install
+
+3) To update your present system via a source code patch:
+
+The following patches have been verified to apply to the applicable
+FreeBSD release branches.
+
+a) Download the relevant patch from the location below, and verify the
+detached PGP signature using your PGP utility.
+
+[FreeBSD 9.3 and 10.1]
+# fetch https://security.FreeBSD.org/patches/EN-15:04/freebsd-update.patch
+# fetch https://security.FreeBSD.org/patches/EN-15:04/freebsd-update.patch.asc
+# gpg --verify freebsd-update.patch.asc
+
+[FreeBSD 8.4]
+# fetch https://security.FreeBSD.org/patches/EN-15:04/freebsd-update-8.patch
+# fetch https://security.FreeBSD.org/patches/EN-15:04/freebsd-update-8.patch.asc
+# gpg --verify freebsd-update-8.patch.asc
+
+b) Apply the patch.  Execute the following commands as root:
+
+# cd /usr/src
+# patch < /path/to/patch
+
+c) Recompile the operating system using buildworld and installworld as
+described in <URL:https://www.FreeBSD.org/handbook/makeworld.html>.
+
+VI.  Correction details
+
+The following list contains the correction revision numbers for each
+affected branch.
+
+Branch/path                                                      Revision
+- -------------------------------------------------------------------------
+stable/8/                                                         r282872
+releng/8.4/                                                       r282874
+stable/9/                                                         r282871
+releng/9.3/                                                       r282874
+stable/10/                                                        r282870
+releng/10.1/                                                      r282873
+- -------------------------------------------------------------------------
+
+To see which files were modified by a particular revision, run the
+following command, replacing NNNNNN with the revision number, on a
+machine with Subversion installed:
+
+# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base
+
+Or visit the following URL, replacing NNNNNN with the revision number:
+
+<URL:https://svnweb.freebsd.org/base?view=revision&revision=NNNNNN>
+
+VII. References
+
+<URL:https://bugs.freebsd.org/196760>
+
+The latest revision of this Errata Notice is available at
+https://security.FreeBSD.org/advisories/FreeBSD-EN-15:04.freebsd-update.asc
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.2 (FreeBSD)
+
+iQIcBAEBCgAGBQJVU9dbAAoJEO1n7NZdz2rnCewQAM51TcFY4IZvSJbSe5RLDGRr
+4KsAwkgNW45Z+iUjvg5wnnkXZYau1fadMyQilbrKLk9d0MY1dQlJ7lW0Jkk9q+Oq
+JhXjanQYvIZKK9eYi0gpVVqp9sN57dpv96ZP+CDiJX9FDow7OPGKmEiJgoavahpb
+kg5kOywjDEv/DkttLJgHHmEBK41Gad2Jrz16N6k7mlHFSpFmEGRefaqqPqmLdzs0
+t0liDFI+fIAYOOKgIDG8Gqe3FCqbhnAf3bmkU/gyJKf1o5vPWowo9O5CvGH+mHPl
+hmQBD70d+6kkv6ZH5RxMa38Vc3FpZXmaipdObJyoIoOjBw1UqEV6OwS+810xNDCx
+bwN5q8QP5l/M7SHDO1n/FyP8BVbk6TXVKJ1R+t1bsKd07synL12gVTe0VVm+w0rh
++TVdF7cFRWB1Rp3JFw7cGz47ZFv08AaZ3CzdoH9qCEKOTnJnkyW3L4hceTWjkF8H
+c5gas5Wp3UZeUZ2LT+LcB89W4LSn3Xv3y7AJDsVP9MGHSkjSDGIJKfWiXl/GWHql
+M/zT6WeraOZyOwNr4F9QFp1hYSxvR+Izh7C0nFefBNf8YID3/hiKYNjxkf5Dz+fN
+4A+RVt3COUteAeF5ikPVUiMfJljubingmN5NvTVmKQN6nRm5Pn6rrOouJqf3W0Mh
+QE8Ps/3y/Sw1e/m45snD
+=IdxG
+-----END PGP SIGNATURE-----

Added: head/share/security/advisories/FreeBSD-EN-15:05.ufs.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/advisories/FreeBSD-EN-15:05.ufs.asc	Wed May 13 23:07:20 2015	(r46693)
@@ -0,0 +1,138 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-EN-15:05.ufs                                            Errata Notice
+                                                          The FreeBSD Project
+
+Topic:          Deadlock on reboot with UFS tuned with SU+J
+
+Category:       core
+Module:         ufs
+Announced:      2015-05-13
+Credits:        Konstantin Belousov
+Affects:        FreeBSD 10.1
+Corrected:      2015-04-10 02:23:44 UTC (stable/10, 10.1-STABLE)
+                2015-05-13 22:52:35 UTC (releng/10.1, 10.1-RELEASE-p10)
+
+For general information regarding FreeBSD Errata Notices and Security
+Advisories, including descriptions of the fields above, security
+branches, and the following sections, please visit
+<URL:https://security.freebsd.org/>.
+
+I.   Background
+
+The Unix File System (UFS) is one of several filesystems available on
+FreeBSD.  UFS supports several optimization features, such as soft updates
+and journaling, both of which keep track of filesystem metadata to ensure
+a consistent state in the event of a crash or power failure.
+
+II.  Problem Description
+
+When the root filesystem is configured with soft updates and journaling
+both enabled, which is the default for FreeBSD 10.1-RELEASE installations,
+the system may deadlock after a source-based or binary upgrade when the
+init(8) binary is replaced.  The deadlock occurs when issuing reboot(8)
+or shutdown(8), after which the system becomes unresponsive when syncing
+the filesystem.
+
+III. Impact
+
+When the deadlock occurs, a hard system reset or power cycle may be
+required.
+
+IV.  Workaround
+
+Systems that do not have soft updates and journaling enabled on a UFS root
+filesystem are unaffected.
+
+It is possible to work around the issue by waiting before issuing reboot(8)
+or shutdown(8) after upgrading the userland.  It has been observed that
+deferring the reboot(8) for a period of 60 seconds to be sufficient.  It is
+encouraged to issue several sync(8) commands during this period, to help
+ensure the filesystem writes have completed.
+
+Additionally, disabling soft update journaling on the root filesystem can
+also work around the issue.
+
+V.   Solution
+
+Perform one of the following:
+
+1) Upgrade your system to a supported FreeBSD stable or release / security
+branch (releng) dated after the correction date.
+
+2) To update your present system via a binary patch:
+
+Systems running a RELEASE version of FreeBSD on the i386 or amd64
+platforms can be updated via the freebsd-update(8) utility:
+
+# freebsd-update fetch
+# freebsd-update install
+
+3) To update your present system via a source code patch:
+
+The following patches have been verified to apply to the applicable
+FreeBSD release branches.
+
+a) Download the relevant patch from the location below, and verify the
+detached PGP signature using your PGP utility.
+
+# fetch https://security.FreeBSD.org/patches/EN-15:05/ufs.patch
+# fetch https://security.FreeBSD.org/patches/EN-15:05/ufs.patch.asc
+# gpg --verify ufs.patch.asc
+
+b) Apply the patch.  Execute the following commands as root:
+
+# cd /usr/src
+# patch < /path/to/patch
+
+c) Recompile your kernel as described in
+<URL:https://www.FreeBSD.org/handbook/kernelconfig.html> and reboot the
+system.
+
+VI.  Correction details
+
+The following list contains the correction revision numbers for each
+affected branch.
+
+Branch/path                                                      Revision
+- -------------------------------------------------------------------------
+stable/10/                                                        r281350
+releng/10.1/                                                      r282873
+- -------------------------------------------------------------------------
+
+To see which files were modified by a particular revision, run the
+following command, replacing NNNNNN with the revision number, on a
+machine with Subversion installed:
+
+# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base
+
+Or visit the following URL, replacing NNNNNN with the revision number:
+
+<URL:https://svnweb.freebsd.org/base?view=revision&revision=NNNNNN>
+
+VII. References
+
+<URL:https://bugs.freebsd.org/195458>
+
+The latest revision of this Errata Notice is available at
+https://security.FreeBSD.org/advisories/FreeBSD-EN-15:05.ufs.asc
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.2 (FreeBSD)
+
+iQIcBAEBCgAGBQJVU9dbAAoJEO1n7NZdz2rn3JYP/2HeyHsGEAwl+1NCVLu/Eimj
+wl/jK7Pl2SMWCEAkynkP8Cs5ibCbtzA4SV1RP8OPCF42yQJmk/kzR0Rmuq+LboFC
+QGmus/0Q/JCXqabDEzNx7/tHibeJInveGDf4a4/rg38Q+zO7MYZFmGsWoFEC2RKn
+lEWb/kh5AxMagaj5lns4WHmo0TFlyOUFaJijGxXhHu3IFZwuZB60a5cXJ8OjBulk
+FO7uIcZ7OTP43y4VvvBsFV6bxeFyoMNF8tgB+dsBzatNQhl7yAxWMMEiDUNBEaqV
+mfjKZxHRkB+GGjQwv2Cq4463kNQvwknN9vms536fS7HuecFMITbyD37ySR3pSRoi
+KVGopfpDr0NWjn1/N7UyAsY+6CAYqpsilYvq2slBu2J/Aj6jCyDhPUTnjHKz1m91
+rdyBjkHod9XkLYqwCkJlWjIxnLxCDlv8vwUjOe2/TjCUFO6FIO6lgvCVkgekIlwG
+rPxx+bqfKSarQQSL6a4MWFFYwt79c292A3nodS0sLIL4YRNwQnFvuYVB/qxIWD1x
+ecKJmbL0bm3S1T/qWa89Xh55NWFKs0bxVmjQCWu84re/20+oWcaXFg8Oeqnq+xFV
+ke4EzbxhoU4KWzvsFbc+U+EZhTVLVlnjbAW073Z6QyykfBs2RhudUGB51T/3XB3I
+jAU8LNkMBjZhe7khLFLD
+=BTx0
+-----END PGP SIGNATURE-----

Added: head/share/security/patches/EN-15:04/freebsd-update-8.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/EN-15:04/freebsd-update-8.patch	Wed May 13 23:07:20 2015	(r46693)
@@ -0,0 +1,458 @@
+Index: usr.sbin/freebsd-update/freebsd-update.8
+===================================================================
+--- usr.sbin/freebsd-update/freebsd-update.8	(revision 282245)
++++ usr.sbin/freebsd-update/freebsd-update.8	(working copy)
+@@ -25,7 +25,7 @@
+ .\"
+ .\" $FreeBSD$
+ .\"
+-.Dd July 14, 2010
++.Dd March 2, 2015
+ .Dt FREEBSD-UPDATE 8
+ .Os FreeBSD
+ .Sh NAME
+@@ -36,10 +36,12 @@
+ .Op Fl b Ar basedir
+ .Op Fl d Ar workdir
+ .Op Fl f Ar conffile
++.Op Fl F
+ .Op Fl k Ar KEY
+ .Op Fl r Ar newrelease
+ .Op Fl s Ar server
+ .Op Fl t Ar address
++.Op Fl -not-running-from-cron
+ .Cm command ...
+ .Sh DESCRIPTION
+ The
+@@ -49,21 +51,21 @@ updates to the FreeBSD base system.
+ Note that updates are only available if they are being built for the
+ FreeBSD release and architecture being used; in particular, the
+ .Fx
+-Security Team only builds updates for releases shipped in binary form 
++Security Team only builds updates for releases shipped in binary form
+ by the
+ .Fx
+ Release Engineering Team, e.g.,
+ .Fx
+-7.3-RELEASE and
++9.3-RELEASE and
+ .Fx
+-8.0, but not
++10.1-RELEASE, but not
+ .Fx
+-6.3-STABLE or
++9.3-STABLE or
+ .Fx
+-9.0-CURRENT.
++11-CURRENT.
+ .Sh OPTIONS
+ The following options are supported:
+-.Bl -tag -width "-f conffile"
++.Bl -tag -width "-r newrelease"
+ .It Fl b Ar basedir
+ Operate on a system mounted at
+ .Ar basedir .
+@@ -81,6 +83,10 @@ Read configuration options from
+ .Ar conffile .
+ (default:
+ .Pa /etc/freebsd-update.conf )
++.It Fl F
++Force
++.Nm Cm fetch
++to proceed where it normally would not, such as an unfinished upgrade
+ .It Fl k Ar KEY
+ Trust an RSA key with SHA256 of
+ .Ar KEY .
+@@ -98,13 +104,21 @@ Mail output of
+ command, if any, to
+ .Ar address .
+ (default: root, or as given in the configuration file.)
++.It Fl -not-running-from-cron
++Force
++.Nm Cm fetch
++to proceed when there is no controlling tty.
++This is for use by automated scripts and orchestration tools.
++Please do not run
++.Nm Cm fetch
++from crontab or similar using this flag, see:
++.Nm Cm cron
+ .El
+ .Sh COMMANDS
+ The
+ .Cm command
+ can be any one of the following:
+-.Pp
+-.Bl -tag -width "-f conffile"
++.Bl -tag -width "rollback"
+ .It Cm fetch
+ Based on the currently installed world and the configuration
+ options set, fetch all available binary updates.
+@@ -128,6 +142,11 @@ Fetch files necessary for upgrading to a
+ Before using this command, make sure that you read the
+ announcement and release notes for the new release in
+ case there are any special steps needed for upgrading.
++Note that this command may require up to 500 MB of space in
++.Ar workdir
++depending on which components of the
++.Fx
++base system are installed.
+ .It Cm install
+ Install the most recently fetched updates or upgrade.
+ .It Cm rollback
+@@ -149,7 +168,7 @@ other than 3AM, to avoid overly imposing
+ on the server(s) hosting the updates.
+ .It
+ In spite of its name,
+-.Cm
++.Nm
+ IDS should not be relied upon as an "Intrusion Detection
+ System", since if the system has been tampered with
+ it cannot be trusted to operate correctly.
+@@ -158,11 +177,11 @@ purposes, make sure you boot from a secu
+ .El
+ .Sh FILES
+ .Bl -tag -width "/etc/freebsd-update.conf"
+-.It /etc/freebsd-update.conf
++.It Pa /etc/freebsd-update.conf
+ Default location of the
+ .Nm
+ configuration file.
+-.It /var/db/freebsd-update/
++.It Pa /var/db/freebsd-update/
+ Default location where
+ .Nm
+ stores temporary files and downloaded updates.
+@@ -170,4 +189,4 @@ stores temporary files and downloaded up
+ .Sh SEE ALSO
+ .Xr freebsd-update.conf 5
+ .Sh AUTHORS
+-.An Colin Percival Aq cperciva@FreeBSD.org
++.An Colin Percival Aq Mt cperciva@FreeBSD.org
+Index: usr.sbin/freebsd-update/freebsd-update.sh
+===================================================================
+--- usr.sbin/freebsd-update/freebsd-update.sh	(revision 282245)
++++ usr.sbin/freebsd-update/freebsd-update.sh	(working copy)
+@@ -43,12 +43,15 @@ Options:
+                   (default: /var/db/freebsd-update/)
+   -f conffile  -- Read configuration options from conffile
+                   (default: /etc/freebsd-update.conf)
++  -F           -- Force a fetch operation to proceed
+   -k KEY       -- Trust an RSA key with SHA256 hash of KEY
+   -r release   -- Target for upgrade (e.g., 6.2-RELEASE)
+   -s server    -- Server from which to fetch updates
+                   (default: update.FreeBSD.org)
+   -t address   -- Mail output of cron command, if any, to address
+                   (default: root)
++  --not-running-from-cron
++               -- Run without a tty, for use by automated tools
+ Commands:
+   fetch        -- Fetch updates from server
+   cron         -- Sleep rand(3600) seconds, fetch updates, and send an
+@@ -284,6 +287,9 @@ config_TargetRelease () {
+ 	else
+ 		return 1
+ 	fi
++	if echo ${TARGETRELEASE} | grep -qE '^[0-9.]+$'; then
++		TARGETRELEASE="${TARGETRELEASE}-RELEASE"
++	fi
+ }
+ 
+ # Define what happens to output of utilities
+@@ -396,6 +402,12 @@ init_params () {
+ 
+ 	# No commands specified yet
+ 	COMMANDS=""
++
++	# Force fetch to proceed
++	FORCEFETCH=0
++
++	# Run without a TTY
++	NOTTYOK=0
+ }
+ 
+ # Parse the command line
+@@ -408,6 +420,12 @@ parse_cmdline () {
+ 			if [ ! -z "${CONFFILE}" ]; then usage; fi
+ 			shift; CONFFILE="$1"
+ 			;;
++		-F)
++			FORCEFETCH=1
++			;;
++		--not-running-from-cron)
++			NOTTYOK=1
++			;;
+ 
+ 		# Configuration file equivalents
+ 		-b)
+@@ -569,7 +587,7 @@ fetch_setup_verboselevel () {
+ # running *-p[0-9]+, strip off the last part; if the
+ # user is running -SECURITY, call it -RELEASE.  Chdir
+ # into the working directory.
+-fetch_check_params () {
++fetchupgrade_check_params () {
+ 	export HTTP_USER_AGENT="freebsd-update (${COMMAND}, `uname -r`)"
+ 
+ 	_SERVERNAME_z=\
+@@ -577,6 +595,7 @@ fetch_check_params () {
+ 	_KEYPRINT_z="Key must be given via -k option or configuration file."
+ 	_KEYPRINT_bad="Invalid key fingerprint: "
+ 	_WORKDIR_bad="Directory does not exist or is not writable: "
++	_WORKDIR_bad2="Directory is not on a persistent filesystem: "
+ 
+ 	if [ -z "${SERVERNAME}" ]; then
+ 		echo -n "`basename $0`: "
+@@ -600,6 +619,13 @@ fetch_check_params () {
+ 		echo ${WORKDIR}
+ 		exit 1
+ 	fi
++	case `df -T ${WORKDIR}` in */dev/md[0-9]* | *tmpfs*)
++		echo -n "`basename $0`: "
++		echo -n "${_WORKDIR_bad2}"
++		echo ${WORKDIR}
++		exit 1
++		;;
++	esac
+ 	chmod 700 ${WORKDIR}
+ 	cd ${WORKDIR} || exit 1
+ 
+@@ -652,9 +678,29 @@ fetch_check_params () {
+ 	BDHASH=`echo ${BASEDIR} | sha256 -q`
+ }
+ 
++# Perform sanity checks etc. before fetching updates.
++fetch_check_params () {
++	fetchupgrade_check_params
++
++	if ! [ -z "${TARGETRELEASE}" ]; then
++		echo -n "`basename $0`: "
++		echo -n "-r option is meaningless with 'fetch' command.  "
++		echo "(Did you mean 'upgrade' instead?)"
++		exit 1
++	fi
++
++	# Check that we have updates ready to install
++	if [ -f ${BDHASH}-install/kerneldone -a $FORCEFETCH -eq 0 ]; then
++		echo "You have a partially completed upgrade pending"
++		echo "Run '$0 install' first."
++		echo "Run '$0 fetch -F' to proceed anyway."
++		exit 1
++	fi
++}
++
+ # Perform sanity checks etc. before fetching upgrades.
+ upgrade_check_params () {
+-	fetch_check_params
++	fetchupgrade_check_params
+ 
+ 	# Unless set otherwise, we're upgrading to the same kernel config.
+ 	NKERNCONF=${KERNCONF}
+@@ -1185,7 +1231,7 @@ fetch_metadata_sanity () {
+ 	# Some aliases to save space later: ${P} is a character which can
+ 	# appear in a path; ${M} is the four numeric metadata fields; and
+ 	# ${H} is a sha256 hash.
+-	P="[-+./:=%@_[~[:alnum:]]"
++	P="[-+./:=,%@_[~[:alnum:]]"
+ 	M="[0-9]+\|[0-9]+\|[0-9]+\|[0-9]+"
+ 	H="[0-9a-f]{64}"
+ 
+@@ -1456,7 +1502,7 @@ fetch_inspect_system () {
+ 	    sort -k 3,3 -t '|' > $2.tmp
+ 	rm filelist
+ 
+-	# Check if an error occured during system inspection
++	# Check if an error occurred during system inspection
+ 	if [ -f .err ]; then
+ 		return 1
+ 	fi
+@@ -2240,6 +2286,19 @@ upgrade_oldall_to_oldnew () {
+ 	mv $2 $3
+ }
+ 
++# Helper for upgrade_merge: Return zero true iff the two files differ only
++# in the contents of their RCS tags.
++samef () {
++	X=`sed -E 's/\\$FreeBSD.*\\$/\$FreeBSD\$/' < $1 | ${SHA256}`
++	Y=`sed -E 's/\\$FreeBSD.*\\$/\$FreeBSD\$/' < $2 | ${SHA256}`
++
++	if [ $X = $Y ]; then
++		return 0;
++	else
++		return 1;
++	fi
++}
++
+ # From the list of "old" files in $1, merge changes in $2 with those in $3,
+ # and update $3 to reflect the hashes of merged files.
+ upgrade_merge () {
+@@ -2323,6 +2382,14 @@ upgrade_merge () {
+ 
+ 		# Ask the user to handle any files which didn't merge.
+ 		while read F; do
++			# If the installed file differs from the version in
++			# the old release only due to RCS tag expansion
++			# then just use the version in the new release.
++			if samef merge/old/${F} merge/${OLDRELNUM}/${F}; then
++				cp merge/${RELNUM}/${F} merge/new/${F}
++				continue
++			fi
++
+ 			cat <<-EOF
+ 
+ The following file could not be merged automatically: ${F}
+@@ -2337,9 +2404,18 @@ manually...
+ 		# Ask the user to confirm that he likes how the result
+ 		# of merging files.
+ 		while read F; do
+-			# Skip files which haven't changed.
+-			if [ -f merge/new/${F} ] &&
+-			    cmp -s merge/old/${F} merge/new/${F}; then
++			# Skip files which haven't changed except possibly
++			# in their RCS tags.
++			if [ -f merge/old/${F} ] && [ -f merge/new/${F} ] &&
++			    samef merge/old/${F} merge/new/${F}; then
++				continue
++			fi
++
++			# Skip files where the installed file differs from
++			# the old file only due to RCS tags.
++			if [ -f merge/old/${F} ] &&
++			    [ -f merge/${OLDRELNUM}/${F} ] &&
++			    samef merge/old/${F} merge/${OLDRELNUM}/${F}; then
+ 				continue
+ 			fi
+ 
+@@ -2526,6 +2602,10 @@ upgrade_run () {
+ 	# Leave a note behind to tell the "install" command that the kernel
+ 	# needs to be installed before the world.
+ 	touch ${BDHASH}-install/kernelfirst
++
++	# Remind the user that they need to run "freebsd-update install"
++	# to install the downloaded bits, in case they didn't RTFM.
++	echo "To install the downloaded upgrades, run \"$0 install\"."
+ }
+ 
+ # Make sure that all the file hashes mentioned in $@ have corresponding
+@@ -2577,14 +2657,14 @@ backup_kernel_finddir () {
+ 	while true ; do
+ 		# Pathname does not exist, so it is OK use that name
+ 		# for backup directory.
+-		if [ ! -e $BACKUPKERNELDIR ]; then
++		if [ ! -e $BASEDIR/$BACKUPKERNELDIR ]; then
+ 			return 0
+ 		fi
+ 
+ 		# If directory do exist, we only use if it has our
+ 		# marker file.
+-		if [ -d $BACKUPKERNELDIR -a \
+-			-e $BACKUPKERNELDIR/.freebsd-update ]; then
++		if [ -d $BASEDIR/$BACKUPKERNELDIR -a \
++			-e $BASEDIR/$BACKUPKERNELDIR/.freebsd-update ]; then
+ 			return 0
+ 		fi
+ 
+@@ -2592,7 +2672,7 @@ backup_kernel_finddir () {
+ 		# the end and try again.
+ 		CNT=$((CNT + 1))
+ 		if [ $CNT -gt 9 ]; then
+-			echo "Could not find valid backup dir ($BACKUPKERNELDIR)"
++			echo "Could not find valid backup dir ($BASEDIR/$BACKUPKERNELDIR)"
+ 			exit 1
+ 		fi
+ 		BACKUPKERNELDIR="`echo $BACKUPKERNELDIR | sed -Ee 's/[0-9]\$//'`"
+@@ -2619,17 +2699,17 @@ backup_kernel () {
+ 	# Remove old kernel backup files.  If $BACKUPKERNELDIR was
+ 	# "not ours", backup_kernel_finddir would have exited, so
+ 	# deleting the directory content is as safe as we can make it.
+-	if [ -d $BACKUPKERNELDIR ]; then
+-		rm -fr $BACKUPKERNELDIR
++	if [ -d $BASEDIR/$BACKUPKERNELDIR ]; then
++		rm -fr $BASEDIR/$BACKUPKERNELDIR
+ 	fi
+ 
+ 	# Create directories for backup.
+-	mkdir -p $BACKUPKERNELDIR
+-	mtree -cdn -p "${KERNELDIR}" | \
+-	    mtree -Ue -p "${BACKUPKERNELDIR}" > /dev/null
++	mkdir -p $BASEDIR/$BACKUPKERNELDIR
++	mtree -cdn -p "${BASEDIR}/${KERNELDIR}" | \
++	    mtree -Ue -p "${BASEDIR}/${BACKUPKERNELDIR}" > /dev/null
+ 
+ 	# Mark the directory as having been created by freebsd-update.
+-	touch $BACKUPKERNELDIR/.freebsd-update
++	touch $BASEDIR/$BACKUPKERNELDIR/.freebsd-update
+ 	if [ $? -ne 0 ]; then
+ 		echo "Could not create kernel backup directory"
+ 		exit 1
+@@ -2647,8 +2727,8 @@ backup_kernel () {
+ 	fi
+ 
+ 	# Backup all the kernel files using hardlinks.
+-	(cd $KERNELDIR && find . -type f $FINDFILTER -exec \
+-	    cp -pl '{}' ${BACKUPKERNELDIR}/'{}' \;)
++	(cd ${BASEDIR}/${KERNELDIR} && find . -type f $FINDFILTER -exec \
++	    cp -pl '{}' ${BASEDIR}/${BACKUPKERNELDIR}/'{}' \;)
+ 
+ 	# Re-enable patchname expansion.
+ 	set +f
+@@ -2746,7 +2826,7 @@ install_files () {
+ 
+ 		# Update linker.hints if necessary
+ 		if [ -s INDEX-OLD -o -s INDEX-NEW ]; then
+-			kldxref -R /boot/ 2>/dev/null
++			kldxref -R ${BASEDIR}/boot/ 2>/dev/null
+ 		fi
+ 
+ 		# We've finished updating the kernel.
+@@ -2797,14 +2877,14 @@ Kernel updates have been installed.  Ple
+ 		install_delete INDEX-OLD INDEX-NEW || return 1
+ 
+ 		# Rebuild /etc/spwd.db and /etc/pwd.db if necessary.
+-		if [ /etc/master.passwd -nt /etc/spwd.db ] ||
+-		    [ /etc/master.passwd -nt /etc/pwd.db ]; then
+-			pwd_mkdb /etc/master.passwd
++		if [ ${BASEDIR}/etc/master.passwd -nt ${BASEDIR}/etc/spwd.db ] ||
++		    [ ${BASEDIR}/etc/master.passwd -nt ${BASEDIR}/etc/pwd.db ]; then
++			pwd_mkdb -d ${BASEDIR}/etc ${BASEDIR}/etc/master.passwd
+ 		fi
+ 
+ 		# Rebuild /etc/login.conf.db if necessary.
+-		if [ /etc/login.conf -nt /etc/login.conf.db ]; then
+-			cap_mkdb /etc/login.conf
++		if [ ${BASEDIR}/etc/login.conf -nt ${BASEDIR}/etc/login.conf.db ]; then
++			cap_mkdb ${BASEDIR}/etc/login.conf
+ 		fi
+ 
+ 		# We've finished installing the world and deleting old files
+@@ -3011,21 +3091,8 @@ IDS_compare () {
+ 	mv INDEX-NOTMATCHING.tmp INDEX-NOTMATCHING
+ 
+ 	# Go through the lines and print warnings.
+-	while read LINE; do
+-		FPATH=`echo "${LINE}" | cut -f 1 -d '|'`
+-		TYPE=`echo "${LINE}" | cut -f 2 -d '|'`
+-		OWNER=`echo "${LINE}" | cut -f 3 -d '|'`
+-		GROUP=`echo "${LINE}" | cut -f 4 -d '|'`
+-		PERM=`echo "${LINE}" | cut -f 5 -d '|'`
+-		HASH=`echo "${LINE}" | cut -f 6 -d '|'`
+-		LINK=`echo "${LINE}" | cut -f 7 -d '|'`
+-		P_TYPE=`echo "${LINE}" | cut -f 8 -d '|'`
+-		P_OWNER=`echo "${LINE}" | cut -f 9 -d '|'`
+-		P_GROUP=`echo "${LINE}" | cut -f 10 -d '|'`
+-		P_PERM=`echo "${LINE}" | cut -f 11 -d '|'`
+-		P_HASH=`echo "${LINE}" | cut -f 12 -d '|'`
+-		P_LINK=`echo "${LINE}" | cut -f 13 -d '|'`
+-
++	local IFS='|'
++	while read FPATH TYPE OWNER GROUP PERM HASH LINK P_TYPE P_OWNER P_GROUP P_PERM P_HASH P_LINK; do
+ 		# Warn about different object types.
+ 		if ! [ "${TYPE}" = "${P_TYPE}" ]; then
+ 			echo -n "${FPATH} is a "
+@@ -3153,7 +3220,7 @@ get_params () {
+ # Fetch command.  Make sure that we're being called
+ # interactively, then run fetch_check_params and fetch_run
+ cmd_fetch () {
+-	if [ ! -t 0 ]; then
++	if [ ! -t 0 -a $NOTTYOK -eq 0 ]; then
+ 		echo -n "`basename $0` fetch should not "
+ 		echo "be run non-interactively."
+ 		echo "Run `basename $0` cron instead."

Added: head/share/security/patches/EN-15:04/freebsd-update-8.patch.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/EN-15:04/freebsd-update-8.patch.asc	Wed May 13 23:07:20 2015	(r46693)
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.2 (FreeBSD)
+
+iQIcBAABCgAGBQJVU9dpAAoJEO1n7NZdz2rnLP8QAIxBQd1NKef3YVnFMGuppEoy
+Tc9/vhtEZfiI78fvMaLK9uLwKZWLx+JS6HTXNmEWzy6Tg+WX4pYMzGGDxGG2RVSz
+C/Ur1bZVqNvcyKPK5+xO94asFVYcrcuYSbxMbjYPUjH5WTrySznPvjCF3E4puGvZ
+e+FFTvoQ7bwY/qs5drAYo6nK74/rm4YuESxH/3t056vuhSVj8bM12ADHZ+evOzRE
+4DFtxDB+9CdtGmqCfvaF0kJn+6IhwqGsRx1pUvriYdvVYzDa+tJBPDk82P0xphgq
+Lsid+fjQl/3q0c8CgNNvDArYQACqZUZtqrDzxIx+UOvCz5FeowIhWypEPy5Je2YK
+Qnzj6bd4cwF/WwncXGnZDj4Sybv+EJAF+l4s18B9B4v84/M91Gmq+9JgjJQtWPw7
+mI/G7jD3TrYXzzfyIBJJV/6yH/oOwZXZrhHaHHb6s2PuOhEZw5RzG2qXaWhvVQ3p
+3X6+zs2okCrzOm9VYDFJIgVJOo8zVjgX+rqH0A/qjhcZK64sr5gh6F0I4LNwE+AV
+9DFC9ysIG+Cay28XnEQy0lHpA6MBFWpDZnm/qX4jhIscPGG/3mhLpn7N+L62pgxu
+eCAO8wW11w2fcJ575SADcHmQa8rXR/wIbDIx2tmgOFDmJI6MGKj4tU4SUJCm5Blf
+GPWANnnxoBwF2Pe/NLCs
+=vvQY
+-----END PGP SIGNATURE-----

Added: head/share/security/patches/EN-15:04/freebsd-update.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/EN-15:04/freebsd-update.patch	Wed May 13 23:07:20 2015	(r46693)
@@ -0,0 +1,152 @@
+Index: usr.sbin/freebsd-update/freebsd-update.8
+===================================================================
+--- usr.sbin/freebsd-update/freebsd-update.8	(revision 282245)
++++ usr.sbin/freebsd-update/freebsd-update.8	(working copy)
+@@ -25,7 +25,7 @@
+ .\"
+ .\" $FreeBSD$
+ .\"
+-.Dd July 14, 2010
++.Dd March 2, 2015
+ .Dt FREEBSD-UPDATE 8
+ .Os FreeBSD
+ .Sh NAME
+@@ -36,10 +36,12 @@
+ .Op Fl b Ar basedir
+ .Op Fl d Ar workdir
+ .Op Fl f Ar conffile
++.Op Fl F
+ .Op Fl k Ar KEY
+ .Op Fl r Ar newrelease
+ .Op Fl s Ar server
+ .Op Fl t Ar address
++.Op Fl -not-running-from-cron
+ .Cm command ...
+ .Sh DESCRIPTION
+ The
+@@ -54,16 +56,16 @@ by the
+ .Fx
+ Release Engineering Team, e.g.,
+ .Fx
+-7.3-RELEASE and
++9.3-RELEASE and
+ .Fx
+-8.0-RELEASE, but not
++10.1-RELEASE, but not
+ .Fx
+-6.3-STABLE or
++9.3-STABLE or
+ .Fx
+-9.0-CURRENT.
++11-CURRENT.
+ .Sh OPTIONS
+ The following options are supported:
+-.Bl -tag -width "-f conffile"
++.Bl -tag -width "-r newrelease"
+ .It Fl b Ar basedir
+ Operate on a system mounted at
+ .Ar basedir .
+@@ -81,6 +83,10 @@ Read configuration options from
+ .Ar conffile .
+ (default:
+ .Pa /etc/freebsd-update.conf )
++.It Fl F
++Force
++.Nm Cm fetch
++to proceed where it normally would not, such as an unfinished upgrade
+ .It Fl k Ar KEY
+ Trust an RSA key with SHA256 of
+ .Ar KEY .
+@@ -98,12 +104,21 @@ Mail output of
+ command, if any, to
+ .Ar address .
+ (default: root, or as given in the configuration file.)
++.It Fl -not-running-from-cron
++Force
++.Nm Cm fetch
++to proceed when there is no controlling tty.
++This is for use by automated scripts and orchestration tools.
++Please do not run
++.Nm Cm fetch
++from crontab or similar using this flag, see:
++.Nm Cm cron
+ .El
+ .Sh COMMANDS
+ The
+ .Cm command
+ can be any one of the following:
+-.Bl -tag -width "-f conffile"
++.Bl -tag -width "rollback"
+ .It Cm fetch
+ Based on the currently installed world and the configuration
+ options set, fetch all available binary updates.
+Index: usr.sbin/freebsd-update/freebsd-update.sh
+===================================================================
+--- usr.sbin/freebsd-update/freebsd-update.sh	(revision 282245)
++++ usr.sbin/freebsd-update/freebsd-update.sh	(working copy)
+@@ -43,12 +43,15 @@ Options:
+                   (default: /var/db/freebsd-update/)
+   -f conffile  -- Read configuration options from conffile
+                   (default: /etc/freebsd-update.conf)
++  -F           -- Force a fetch operation to proceed
+   -k KEY       -- Trust an RSA key with SHA256 hash of KEY
+   -r release   -- Target for upgrade (e.g., 6.2-RELEASE)
+   -s server    -- Server from which to fetch updates
+                   (default: update.FreeBSD.org)
+   -t address   -- Mail output of cron command, if any, to address
+                   (default: root)
++  --not-running-from-cron
++               -- Run without a tty, for use by automated tools
+ Commands:
+   fetch        -- Fetch updates from server
+   cron         -- Sleep rand(3600) seconds, fetch updates, and send an
+@@ -399,6 +402,12 @@ init_params () {
+ 
+ 	# No commands specified yet
+ 	COMMANDS=""
++
++	# Force fetch to proceed
++	FORCEFETCH=0
++
++	# Run without a TTY
++	NOTTYOK=0
+ }
+ 
+ # Parse the command line
+@@ -411,6 +420,12 @@ parse_cmdline () {
+ 			if [ ! -z "${CONFFILE}" ]; then usage; fi
+ 			shift; CONFFILE="$1"
+ 			;;
++		-F)
++			FORCEFETCH=1
++			;;
++		--not-running-from-cron)
++			NOTTYOK=1
++			;;
+ 
+ 		# Configuration file equivalents
+ 		-b)
+@@ -665,6 +680,14 @@ fetch_check_params () {
+ 		echo "(Did you mean 'upgrade' instead?)"
+ 		exit 1
+ 	fi
++
++	# Check that we have updates ready to install
++	if [ -f ${BDHASH}-install/kerneldone -a $FORCEFETCH -eq 0 ]; then
++		echo "You have a partially completed upgrade pending"
++		echo "Run '$0 install' first."
++		echo "Run '$0 fetch -F' to proceed anyway."
++		exit 1
++	fi
+ }
+ 
+ # Perform sanity checks etc. before fetching upgrades.
+@@ -3202,7 +3225,7 @@ get_params () {
+ # Fetch command.  Make sure that we're being called
+ # interactively, then run fetch_check_params and fetch_run
+ cmd_fetch () {
+-	if [ ! -t 0 ]; then
++	if [ ! -t 0 -a $NOTTYOK -eq 0 ]; then
+ 		echo -n "`basename $0` fetch should not "
+ 		echo "be run non-interactively."
+ 		echo "Run `basename $0` cron instead."

Added: head/share/security/patches/EN-15:04/freebsd-update.patch.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/EN-15:04/freebsd-update.patch.asc	Wed May 13 23:07:20 2015	(r46693)
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1.2 (FreeBSD)
+
+iQIcBAABCgAGBQJVU9dqAAoJEO1n7NZdz2rnZggQAKiJ0+2WY1gDvdWDkj0BcIcY
+OCig1qDeuZLwDEFfqdqwoEJb7XoYI2tRQu4D/edxe5WAGQNOdIe3cOk/hIvC0Ozi
+O/EpsZSf1RBrDBXdIDXc8C3BPeqcr5OYdc/XMZAoW14BTKU8K6ZsZyvoFcEInp5y
+Qf0MvMB5QwO4e1LSJEVaT3kNLJuEVdoFzYh6h1e5Tlh7tcnrys9eReKO1SsRIEmp
+zmCjfxaAjtftJyw+hxDuid0xkyyi8azPnl3U4JeIMsZE/KIrpAiMTjfnUPznIaai
+x6SgIkKQaK7+43mZ92UOqWM3ELHaxWx55aNfX49aDWBIw4SpFqZAkfKt0FPd3Ws1
+Qdo06D8861mT9klQUsYNPrLed6cku6T1PA+bY6dBE3HpL0wlzm8PGdbPe3lLTcM9
+SP5SMMg8Jwy8oi7foyWeD2cibU5VzZRQEIwcQoI/d0Cayj85Oz6KDEtgwpUYDVL/
+sjrRr6ViA8b3qoS7+Ek9nksGUHg5DPOV9sllWZi2JWYn5tR0boRe16Ecb92chylS
+VIEz0gwCy46VxAXmrTSa4qUM6uIeoMZXx84b/E8R92KvPXdBGMNhCXoEqEFYertd
+prk3LlwUyXbuhkgziBJK6b+zN9ZshL/jY4kjjHCpjd7aNruRnUr9qr43dEJuMOPj
+DuwqCaCT3VTyEObhW6Io
+=bxKG
+-----END PGP SIGNATURE-----

Added: head/share/security/patches/EN-15:05/ufs.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/EN-15:05/ufs.patch	Wed May 13 23:07:20 2015	(r46693)
@@ -0,0 +1,313 @@
+Index: sys/ufs/ffs/ffs_softdep.c
+===================================================================
+--- sys/ufs/ffs/ffs_softdep.c	(revision 282245)
++++ sys/ufs/ffs/ffs_softdep.c	(working copy)
+@@ -735,9 +735,10 @@ static struct malloc_type *memtype[] = {
+ static	void check_clear_deps(struct mount *);
+ static	void softdep_error(char *, int);
+ static	int softdep_process_worklist(struct mount *, int);
+-static	int softdep_waitidle(struct mount *);
++static	int softdep_waitidle(struct mount *, int);
+ static	void drain_output(struct vnode *);
+ static	struct buf *getdirtybuf(struct buf *, struct rwlock *, int);
++static	int check_inodedep_free(struct inodedep *);
+ static	void clear_remove(struct mount *);
+ static	void clear_inodedeps(struct mount *);
+ static	void unlinked_inodedep(struct mount *, struct inodedep *);
+@@ -1377,6 +1378,10 @@ softdep_flush(addr)
+ 	mp = (struct mount *)addr;
+ 	ump = VFSTOUFS(mp);
+ 	atomic_add_int(&stat_flush_threads, 1);
++	ACQUIRE_LOCK(ump);
++	ump->softdep_flags &= ~FLUSH_STARTING;
++	wakeup(&ump->softdep_flushtd);
++	FREE_LOCK(ump);
+ 	if (print_threads) {
+ 		if (stat_flush_threads == 1)
+ 			printf("Running %s at pid %d\n", bufdaemonproc->p_comm,
+@@ -1389,7 +1394,7 @@ softdep_flush(addr)
+ 		    VFSTOUFS(mp)->softdep_jblocks->jb_suspended))
+ 			kthread_suspend_check();
+ 		ACQUIRE_LOCK(ump);
+-		if ((ump->softdep_flags & FLUSH_CLEANUP) == 0)
++		if ((ump->softdep_flags & (FLUSH_CLEANUP | FLUSH_EXIT)) == 0)
+ 			msleep(&ump->softdep_flushtd, LOCK_PTR(ump), PVM,
+ 			    "sdflush", hz / 2);
+ 		ump->softdep_flags &= ~FLUSH_CLEANUP;
+@@ -1419,11 +1424,9 @@ worklist_speedup(mp)
+ 
+ 	ump = VFSTOUFS(mp);
+ 	LOCK_OWNED(ump);
+-	if ((ump->softdep_flags & (FLUSH_CLEANUP | FLUSH_EXIT)) == 0) {

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

From owner-svn-doc-head@FreeBSD.ORG  Thu May 14 04:09:34 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 897C6312;
 Thu, 14 May 2015 04:09:34 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7208115A1;
 Thu, 14 May 2015 04:09:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4E49Ypj023652;
 Thu, 14 May 2015 04:09:34 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4E49XgH023647;
 Thu, 14 May 2015 04:09:33 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201505140409.t4E49XgH023647@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 14 May 2015 04:09:33 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46694 - in head/en_US.ISO8859-1/htdocs/releases: 10.1R
 8.4R 9.3R
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 May 2015 04:09:34 -0000

Author: gjb
Date: Thu May 14 04:09:33 2015
New Revision: 46694
URL: https://svnweb.freebsd.org/changeset/doc/46694

Log:
  Regen after r282875.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/en_US.ISO8859-1/htdocs/releases/10.1R/errata.html
  head/en_US.ISO8859-1/htdocs/releases/8.4R/errata.html
  head/en_US.ISO8859-1/htdocs/releases/9.3R/errata.html

Modified: head/en_US.ISO8859-1/htdocs/releases/10.1R/errata.html
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/10.1R/errata.html	Wed May 13 23:07:20 2015	(r46693)
+++ head/en_US.ISO8859-1/htdocs/releases/10.1R/errata.html	Thu May 14 04:09:33 2015	(r46694)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>FreeBSD 10.1-RELEASE Errata</title><link rel="stylesheet" type="text/css" href="docbook.css" /><link rev="made" href="mailto:doc@FreeBSD.org" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><meta name="description" content="This document lists errata items for FreeBSD 10.1-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD. This errata document for FreeB
 SD 10.1-RELEASE will be maintained until the release of FreeBSD 10.2-RELEASE." /><script xmlns="" type="text/javascript" src="/layout/js/google.js"></script></head><body><div class="article"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="idp60847088"></a>FreeBSD 10.1-RELEASE Errata </h1></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="author"><h3 class="author"><span class="orgname">The FreeBSD Project</span></h3></div></div><div><p xmlns="http://www.w3.org/1999/xhtml" class="copyright">Copyright © 2015 The FreeBSD Documentation
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>FreeBSD 10.1-RELEASE Errata</title><link rel="stylesheet" type="text/css" href="docbook.css" /><link rev="made" href="mailto:doc@FreeBSD.org" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><meta name="description" content="This document lists errata items for FreeBSD 10.1-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD. This errata document for FreeB
 SD 10.1-RELEASE will be maintained until the release of FreeBSD 10.2-RELEASE." /><script xmlns="" type="text/javascript" src="/layout/js/google.js"></script></head><body><div class="article"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="idp60892272"></a>FreeBSD 10.1-RELEASE Errata </h1></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="author"><h3 class="author"><span class="orgname">The FreeBSD Project</span></h3></div></div><div><p xmlns="http://www.w3.org/1999/xhtml" class="copyright">Copyright © 2015 The FreeBSD Documentation
 	Project</p></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="legalnotice"><a id="trademarks"></a><p xmlns="http://www.w3.org/TR/xhtml1/transitional">FreeBSD is a registered trademark of
   the FreeBSD Foundation. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Intel, Celeron, Centrino, Core, EtherExpress, i386,
   i486, Itanium, Pentium, and Xeon are trademarks or registered
@@ -45,7 +45,9 @@
 	    Service </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="errata"></a>3. Errata Notices</h2></div></div></div><div class="informaltable"><table width="100%" border="0"><colgroup><col width="40%" /><col width="30%" /><col width="30%" /></colgroup><thead><tr><th>Errata</th><th>Date</th><th>Topic</th></tr></thead><tbody><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:13.freebsd-update.asc" target="_top">FreeBSD-EN-14:13.freebsd-update</a></td><td>23 December 2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fixed directory deletion issue in
 	    <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:01.vt.asc" target="_top">FreeBSD-EN-15:01.vt</a></td><td>25 February 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=vt&amp;sektion=4"><span class="citerefentry"><span class="refentrytitle">vt</span>(4)</span></a> crash with improper ioctl
 	    parameters </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:02.openssl.asc" target="_top">FreeBSD-EN-15:02.openssl</a></td><td>25 February 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">OpenSSL update </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:03.freebsd-update.asc" target="_top">FreeBSD-EN-15:03.freebsd-update</a></td><td>25 February 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> updates libraries in
-	    suboptimal order </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="open-issues"></a>4. Open Issues</h2></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">FreeBSD/i386 10.1-RELEASE running as a guest
+	    suboptimal order </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:04.freebsd-update.asc" target="_top">FreeBSD-EN-15:04.freebsd-update</a></td><td>13 May 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> does not ensure the
+	    previous upgrade has completed </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:05.ufs.asc" target="_top">FreeBSD-EN-15:05.ufs</a></td><td>13 May 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Deadlock on reboot with UFS tuned with
+	    SU+J </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="open-issues"></a>4. Open Issues</h2></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p xmlns="http://www.w3.org/TR/xhtml1/transitional">FreeBSD/i386 10.1-RELEASE running as a guest
 	  operating system on <span xmlns="http://www.w3.org/1999/xhtml" class="application">VirtualBox</span>
 	  can have a problem with disk I/O access.  It depends on some
 	  specific hardware configuration and does not depend on a

Modified: head/en_US.ISO8859-1/htdocs/releases/8.4R/errata.html
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/8.4R/errata.html	Wed May 13 23:07:20 2015	(r46693)
+++ head/en_US.ISO8859-1/htdocs/releases/8.4R/errata.html	Thu May 14 04:09:33 2015	(r46694)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>FreeBSD 8.4-RELEASE Errata</title><link rel="stylesheet" type="text/css" href="docbook.css" /><link rev="made" href="mailto:doc@FreeBSD.org" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><meta name="description" content="This document lists errata items for FreeBSD 8.4-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD. This errata document for FreeBSD
  8.4-RELEASE will be maintained until the FreeBSD 8.4-RELEASE end of life." /><script xmlns="" type="text/javascript" src="/layout/js/google.js"></script></head><body><div class="article"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="idp60736368"></a>FreeBSD 8.4-RELEASE Errata</h1></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="author"><h3 class="author"><span class="orgname">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>FreeBSD 8.4-RELEASE Errata</title><link rel="stylesheet" type="text/css" href="docbook.css" /><link rev="made" href="mailto:doc@FreeBSD.org" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><meta name="description" content="This document lists errata items for FreeBSD 8.4-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD. This errata document for FreeBSD
  8.4-RELEASE will be maintained until the FreeBSD 8.4-RELEASE end of life." /><script xmlns="" type="text/javascript" src="/layout/js/google.js"></script></head><body><div class="article"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="idp60699504"></a>FreeBSD 8.4-RELEASE Errata</h1></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="author"><h3 class="author"><span class="orgname">
     The FreeBSD Project
     </span></h3></div></div><div><p xmlns="http://www.w3.org/1999/xhtml" class="copyright">Copyright © 2015 The FreeBSD Documentation Project</p></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="legalnotice"><a id="trademarks"></a><p>FreeBSD is a registered trademark of
   the FreeBSD Foundation.</p><p>Intel, Celeron, Centrino, Core, EtherExpress, i386,
@@ -82,7 +82,8 @@
 	    interoperability issue</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:09.jail.asc" target="_top">FreeBSD-EN-14:09.jail</a></td><td>8 July 2014</td><td><p>Fix jail fails to start if
 	    WITHOUT_INET/WITHOUT_INET6 is use</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:10.tzdata.asc" target="_top">FreeBSD-EN-14:10.tzdata</a></td><td>21 October 2014</td><td><p>Time zone data file update</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:12.zfs.asc" target="_top">FreeBSD-EN-14:12.zfs</a></td><td>4 November 2014</td><td><p>Fix NFSv4 and ZFS cache consistency
 	    issue</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:13.freebsd-update.asc" target="_top">FreeBSD-EN-14:13.freebsd-update</a></td><td>23 December 2014</td><td><p>Fix directory deletion issue</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:02.openssl.asc" target="_top">FreeBSD-EN-15:02.openssl</a></td><td>25 February 2015</td><td><p>OpenSSL update</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:03.freebsd-update.asc" target="_top">FreeBSD-EN-15:03.freebsd-update</a></td><td>25 February 2015</td><td><p><a class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> updates libraries in
-	    suboptimal order</p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="open-issues"></a>4. Open Issues</h2></div></div></div><p>[20130613] The <a class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=vtnet&amp;sektion=4"><span class="citerefentry"><span class="refentrytitle">vtnet</span>(4)</span></a> network interface driver
+	    suboptimal order</p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:04.freebsd-update.asc" target="_top">FreeBSD-EN-15:04.freebsd-update</a></td><td>13 May 2015</td><td><p><a class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> does not ensure the
+	    previous upgrade has completed</p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="open-issues"></a>4. Open Issues</h2></div></div></div><p>[20130613] The <a class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=vtnet&amp;sektion=4"><span class="citerefentry"><span class="refentrytitle">vtnet</span>(4)</span></a> network interface driver
       displays the following message upon configuration when using
       <span class="application">QEMU</span> 1.4.1 and later:</p><pre class="screen">vtnet0: error setting host MAC filter table</pre><p>This message is harmless when the interface has only one MAC
       address.  The patch for this issue is filed to a PR <a class="link" href="http://www.FreeBSD.org/cgi/query-pr.cgi?pr=178955" target="_top">kern/178955</a>.</p><p>[20130609] There is incompatibility in <a class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=jail&amp;sektion=8"><span class="citerefentry"><span class="refentrytitle">jail</span>(8)</span></a>

Modified: head/en_US.ISO8859-1/htdocs/releases/9.3R/errata.html
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/9.3R/errata.html	Wed May 13 23:07:20 2015	(r46693)
+++ head/en_US.ISO8859-1/htdocs/releases/9.3R/errata.html	Thu May 14 04:09:33 2015	(r46694)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>FreeBSD 9.3-RELEASE Errata</title><link rel="stylesheet" type="text/css" href="docbook.css" /><link rev="made" href="mailto:doc@FreeBSD.org" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><meta name="description" content="This document lists errata items for FreeBSD 9.3-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD. This errata document for FreeBSD
  9.3-RELEASE will be maintained until the EoL of FreeBSD 9.3-STABLE." /><script xmlns="" type="text/javascript" src="/layout/js/google.js"></script></head><body><div class="article"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="idp61771504"></a>FreeBSD 9.3-RELEASE Errata</h1></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="author"><h3 class="author"><span class="orgname">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>FreeBSD 9.3-RELEASE Errata</title><link rel="stylesheet" type="text/css" href="docbook.css" /><link rev="made" href="mailto:doc@FreeBSD.org" /><meta name="generator" content="DocBook XSL Stylesheets V1.78.1" /><meta name="description" content="This document lists errata items for FreeBSD 9.3-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as well as news relating to the software or documentation that could affect its operation or usability. An up-to-date version of this document should always be consulted before installing this version of FreeBSD. This errata document for FreeBSD
  9.3-RELEASE will be maintained until the EoL of FreeBSD 9.3-STABLE." /><script xmlns="" type="text/javascript" src="/layout/js/google.js"></script></head><body><div class="article"><div xmlns="" class="titlepage"><div><div><h1 xmlns="http://www.w3.org/1999/xhtml" class="title"><a id="idp61775600"></a>FreeBSD 9.3-RELEASE Errata</h1></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="author"><h3 class="author"><span class="orgname">
     The FreeBSD Project
     </span></h3></div></div><div><p xmlns="http://www.w3.org/1999/xhtml" class="copyright">Copyright © 2015 The FreeBSD Documentation Project</p></div><div><div xmlns="http://www.w3.org/1999/xhtml" class="legalnotice"><a id="trademarks"></a><p xmlns="http://www.w3.org/TR/xhtml1/transitional">FreeBSD is a registered trademark of
   the FreeBSD Foundation. </p><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Intel, Celeron, Centrino, Core, EtherExpress, i386,
@@ -53,7 +53,8 @@
 	    issue </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-14:13.freebsd-update.asc" target="_top">FreeBSD-EN-14:13.freebsd-update</a></td><td>23 December 2014</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">Fixed directory deletion issue in
 	    <a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:01.vt.asc" target="_top">FreeBSD-EN-15:01.vt</a></td><td>25 February 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=vt&amp;sektion=4"><span class="citerefentry"><span class="refentrytitle">vt</span>(4)</span></a> crash with improper ioctl
 	    parameters </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:02.openssl.asc" target="_top">FreeBSD-EN-15:02.openssl</a></td><td>25 February 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional">OpenSSL update </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:03.freebsd-update.asc" target="_top">FreeBSD-EN-15:03.freebsd-update</a></td><td>25 February 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> updates libraries in
-	    suboptimal order </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="late-news"></a>4. Late-Breaking News</h2></div></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional">No late-breaking news. </p></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>This file, and other release-related documents,
+	    suboptimal order </p></td></tr><tr><td><a class="link" href="https://www.FreeBSD.org/security/advisories/FreeBSD-EN-15:04.freebsd-update.asc" target="_top">FreeBSD-EN-15:04.freebsd-update</a></td><td>13 May 2015</td><td><p xmlns="http://www.w3.org/TR/xhtml1/transitional"><a xmlns="http://www.w3.org/1999/xhtml" class="citerefentry" href="http://www.FreeBSD.org/cgi/man.cgi?query=freebsd-update&amp;sektion=8"><span class="citerefentry"><span class="refentrytitle">freebsd-update</span>(8)</span></a> does not ensure the
+	    previous upgrade has completed </p></td></tr></tbody></table></div></div><div class="sect1"><div xmlns="" class="titlepage"><div><div><h2 xmlns="http://www.w3.org/1999/xhtml" class="title" style="clear: both"><a id="late-news"></a>4. Late-Breaking News</h2></div></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional">No late-breaking news. </p></div></div><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>This file, and other release-related documents,
       can be downloaded from <a href="https://www.FreeBSD.org/releases/">https://www.FreeBSD.org/releases/</a>.</small></p><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>For questions about FreeBSD, read the
       <a href="http://www.FreeBSD.org/docs.html">documentation</a> before
       contacting &lt;<a href="mailto:questions@FreeBSD.org">questions@FreeBSD.org</a>&gt;.</small></p><p xmlns="http://www.w3.org/TR/xhtml1/transitional" align="center"><small>All users of FreeBSD 9.3-STABLE should

From owner-svn-doc-head@FreeBSD.ORG  Thu May 14 16:32:21 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 80788589;
 Thu, 14 May 2015 16:32:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5432F1241;
 Thu, 14 May 2015 16:32:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4EGWLRS018450;
 Thu, 14 May 2015 16:32:21 GMT (envelope-from ryusuke@FreeBSD.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4EGWL6U018449;
 Thu, 14 May 2015 16:32:21 GMT (envelope-from ryusuke@FreeBSD.org)
Message-Id: <201505141632.t4EGWL6U018449@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ryusuke set sender to
 ryusuke@FreeBSD.org using -f
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Thu, 14 May 2015 16:32:21 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46695 - head/ja_JP.eucJP/books/handbook/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 May 2015 16:32:21 -0000

Author: ryusuke
Date: Thu May 14 16:32:20 2015
New Revision: 46695
URL: https://svnweb.freebsd.org/changeset/doc/46695

Log:
  - Merge the following from the English version:
  
  	r46682 -> r46683	head/ja_JP.eucJP/books/handbook/ports/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/ports/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/ports/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/ports/chapter.xml	Thu May 14 04:09:33 2015	(r46694)
+++ head/ja_JP.eucJP/books/handbook/ports/chapter.xml	Thu May 14 16:32:20 2015	(r46695)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r46682
+     Original revision: r46683
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -919,18 +919,20 @@ Deinstalling ca_root_nss-3.15.1_1... don
       <title>¸Å¤¯¤Ê¤Ã¤¿ package ¤Îºï½ü</title>
 
       <para>¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢<application>pkg</application>
-	¤Ï¥­¥ã¥Ã¥·¥å¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥Ð¥¤¥Ê¥ê packages ¤òÊݸ¤·¤Þ¤¹¡£
-	¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢pkg.conf(5) ¤Î
-	<envar>PKG_CACHEDIR</envar> ÊÑ¿ô¤ÇÄêµÁ¤µ¤ì¤Þ¤¹¡£
-	<command>pkg upgrade</command> ¤ò»È¤Ã¤Æ packages
-	¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ëºÝ¤Ë¤Ï¡¢
-	¥¢¥Ã¥×¥°¥ì¡¼¥É¤µ¤ì¤¿ package
-	¤Î¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Ï¼«Æ°Åª¤Ë¤Ïºï½ü¤µ¤ì¤Þ¤»¤ó¡£</para>
-
-      <para>¥·¥¹¥Æ¥à¤«¤é¤³¤ì¤é¤Î¸Å¤¤¥Ð¥¤¥Ê¥ê package ¤òºï½ü¤¹¤ë¤Ë¤Ï¡¢
+	¤Ï¡¢&man.pkg.conf.5; ¤Î	<envar>PKG_CACHEDIR</envar>
+	ÊÑ¿ô¤ÇÄêµÁ¤µ¤ì¤ë¥­¥ã¥Ã¥·¥å¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥Ð¥¤¥Ê¥ê
+	packages ¤òÊݸ¤·¤Þ¤¹¡£
+	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë package ¤ÎºÇ¿·¤Î¥³¥Ô¡¼¤Î¤ß¤¬Êݸ¤µ¤ì¤Þ¤¹¡£
+	¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î <application>pkg</application> ¤Ç¤Ï¡¢
+	²áµî¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¤¹¤Ù¤Æ¤Î package ¤¬Êݸ¤µ¤ì¤Æ¤¤¤Þ¤·¤¿¡£
+	¤³¤ì¤é¤Î¸Å¤¯¤Ê¤Ã¤¿¥Ð¥¤¥Ê¥ê package ¤òºï½ü¤¹¤ë¤Ë¤Ï¡¢
 	°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>pkg clean</userinput></screen>
+
+      <para>¥­¥ã¥Ã¥·¥åÁ´ÂΤòºï½ü¤¹¤ë¤Ë¤Ï°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <screen>&prompt.root; <userinput>pkg clean -a</userinput></screen>
     </sect2>
 
     <sect2 xml:id="pkgng-set">

From owner-svn-doc-head@FreeBSD.ORG  Fri May 15 17:33:27 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 70235E99;
 Fri, 15 May 2015 17:33:27 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5CD4F1ABF;
 Fri, 15 May 2015 17:33:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4FHXR1o069953;
 Fri, 15 May 2015 17:33:27 GMT (envelope-from skreuzer@FreeBSD.org)
Received: (from skreuzer@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4FHXRVn069952;
 Fri, 15 May 2015 17:33:27 GMT (envelope-from skreuzer@FreeBSD.org)
Message-Id: <201505151733.t4FHXRVn069952@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: skreuzer set sender to
 skreuzer@FreeBSD.org using -f
From: Steven Kreuzer <skreuzer@FreeBSD.org>
Date: Fri, 15 May 2015 17:33:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46696 - head/share/pgpkeys
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 May 2015 17:33:27 -0000

Author: skreuzer
Date: Fri May 15 17:33:26 2015
New Revision: 46696
URL: https://svnweb.freebsd.org/changeset/doc/46696

Log:
  Update my PGP key

Modified:
  head/share/pgpkeys/skreuzer.key

Modified: head/share/pgpkeys/skreuzer.key
==============================================================================
--- head/share/pgpkeys/skreuzer.key	Thu May 14 16:32:20 2015	(r46695)
+++ head/share/pgpkeys/skreuzer.key	Fri May 15 17:33:26 2015	(r46696)
@@ -1,60 +1,59 @@
 <!-- $FreeBSD$ -->
 <!--
-sh ./addkey.sh skreuzer E0D6F907;
+sh addkey.sh skreuzer F528158459D71EE7 ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   1024D/E0D6F907 2009-03-16 [expires: 2015-04-09]
-      Key fingerprint = 8D8F 14D6 ED9F 6BD0 7756  7A46 66BA B4B6 E0D6 F907
-uid                  Steven Kreuzer <skreuzer@exit2shell.com>
-uid                  Steven Kreuzer <skreuzer@freebsd.org>
-sub   4096g/76940A06 2009-03-16 [expires: 2015-03-13]
+pub   rsa2048/F528158459D71EE7 2015-05-01 [expires: 2017-04-30]
+      Key fingerprint = 1DB8 2B72 1C60 E59E 946A  FF7F F528 1584 59D7 1EE7
+uid                          Steven Kreuzer <skreuzer@exit2shell.com>
+uid                          Steven Kreuzer <skreuzer@freebsd.org>
+uid                          Steven Kreuzer <steven@kreuzer.cx>
+sub   rsa2048/540AD5219F26626F 2015-05-01
+
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-lgCfZOa+QkqMPrm6oNaz6hEDARjrAu4=
-=gqde
+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
+=KXVm
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

From owner-svn-doc-head@FreeBSD.ORG  Sat May 16 15:47:09 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 127AE2E2;
 Sat, 16 May 2015 15:47:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D9E8913F0;
 Sat, 16 May 2015 15:47:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4GFl8b0040229;
 Sat, 16 May 2015 15:47:08 GMT (envelope-from ryusuke@FreeBSD.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4GFl8lL040228;
 Sat, 16 May 2015 15:47:08 GMT (envelope-from ryusuke@FreeBSD.org)
Message-Id: <201505161547.t4GFl8lL040228@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ryusuke set sender to
 ryusuke@FreeBSD.org using -f
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 16 May 2015 15:47:08 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46697 - head/ja_JP.eucJP/books/handbook/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Mailman-Approved-At: Sat, 16 May 2015 15:59:49 +0000
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 May 2015 15:47:09 -0000

Author: ryusuke
Date: Sat May 16 15:47:08 2015
New Revision: 46697
URL: https://svnweb.freebsd.org/changeset/doc/46697

Log:
  - Merge the following from the English version:
  
  	r46683 -> r46687	head/ja_JP.eucJP/books/handbook/ports/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/ports/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/ports/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/ports/chapter.xml	Fri May 15 17:33:26 2015	(r46696)
+++ head/ja_JP.eucJP/books/handbook/ports/chapter.xml	Sat May 16 15:47:08 2015	(r46697)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r46683
+     Original revision: r46687
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -827,24 +827,15 @@ Proceed with deleting packages [y/N]: <u
     <sect2 xml:id="pkgng-upgrading">
       <title>¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë package ¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É</title>
 
-      <para><command>pkg version</command>
-	¤òÍѤ¤¤Æ¸Å¤¯¤Ê¤Ã¤¿ packages ¤ò¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	¥í¡¼¥«¥ë¤Ë ports ¥Ä¥ê¡¼¤¬¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢
-	pkg-version(8) ¤Ï¡¢¥ê¥â¡¼¥È¥ê¥Ý¥¸¥È¥ê¤Î¥«¥¿¥í¥°¤òÍøÍѤ·¤Þ¤¹¡£
-	¤½¤¦¤Ç¤Ê¤±¤ì¤Ð¡¢¥í¡¼¥«¥ë¤Î ports ¥Ä¥ê¡¼¤ò»È¤Ã¤Æ
-	package ¤Î¥Ð¡¼¥¸¥ç¥ó¤òƱÄꤷ¤Þ¤¹¡£</para>
-
-      <para><application>pkg upgrade</application> ¤ò¼Â¹Ô¤¹¤ë¤È¡¢
+      <para>°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢
 	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë packages
-	¤¬ºÇ¿·¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤µ¤ì¤Þ¤¹¡£
-	¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥½¥Õ¥È¥¦¥§¥¢¤Î¥Ð¡¼¥¸¥ç¥ó¤È¡¢
-	¥ê¥Ý¥¸¥È¥ê¤Î¥«¥¿¥í¥°¤«¤éÍøÍѤǤ­¤ë¥Ð¡¼¥¸¥ç¥ó¤È¤òÈæ³Ó¤·¤Þ¤¹¡£
-	Èæ³Ó¤¬½ª¤ï¤Ã¤¿¤é¡¢
-	¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î°ìÍ÷¤òɽ¼¨¤·¤Þ¤¹¡£
-	¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Ô¤¦¤Î¤Ç¤¢¤ì¤Ð¡¢
-	<userinput>y</userinput> ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£
-	¥­¥ã¥ó¥»¥ë¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢
-	<userinput>n</userinput> ¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	¤¬ºÇ¿·¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤µ¤ì¤Þ¤¹¡£</para>
+
+      <screen>&prompt.root; <userinput>pkg upgrade</userinput></screen>
+
+      <para>¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥½¥Õ¥È¥¦¥§¥¢¤Î¥Ð¡¼¥¸¥ç¥ó¤È¡¢
+	¥ê¥Ý¥¸¥È¥ê¤Î¥«¥¿¥í¥°¤«¤éÍøÍѤǤ­¤ë¥Ð¡¼¥¸¥ç¥ó¤È¤òÈæ³Ó¤·¡¢
+	¥ê¥Ý¥¸¥È¥ê¤«¤é¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹¡£</para>
     </sect2>
 
     <sect2 xml:id="pkgng-auditing">

From owner-svn-doc-head@FreeBSD.ORG  Sat May 16 16:56:01 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ECDBE934;
 Sat, 16 May 2015 16:56:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D93C91B05;
 Sat, 16 May 2015 16:56:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4GGu1Ov075721;
 Sat, 16 May 2015 16:56:01 GMT (envelope-from gavin@FreeBSD.org)
Received: (from gavin@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4GGu1KL075720;
 Sat, 16 May 2015 16:56:01 GMT (envelope-from gavin@FreeBSD.org)
Message-Id: <201505161656.t4GGu1KL075720@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gavin set sender to
 gavin@FreeBSD.org using -f
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Sat, 16 May 2015 16:56:01 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46698 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 May 2015 16:56:02 -0000

Author: gavin
Date: Sat May 16 16:56:01 2015
New Revision: 46698
URL: https://svnweb.freebsd.org/changeset/doc/46698

Log:
  Correct publish date in the index for FreeBSD-EN-15:05.ufs and
  FreeBSD-EN-15:04.freebsd-update to 13th May.  The actual notices contain the
  correct date.
  
  Hat:		secteam

Modified:
  head/share/xml/notices.xml

Modified: head/share/xml/notices.xml
==============================================================================
--- head/share/xml/notices.xml	Sat May 16 15:47:08 2015	(r46697)
+++ head/share/xml/notices.xml	Sat May 16 16:56:01 2015	(r46698)
@@ -11,7 +11,7 @@
       <name>5</name>
 
       <day>
-        <name>25</name>
+        <name>13</name>
 
         <notice>
           <name>FreeBSD-EN-15:05.ufs</name>

From owner-svn-doc-head@FreeBSD.ORG  Sat May 16 21:32:52 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 728C7651;
 Sat, 16 May 2015 21:32:52 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6248116CE;
 Sat, 16 May 2015 21:32:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4GLWqwB016221;
 Sat, 16 May 2015 21:32:52 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4GLWqJF016220;
 Sat, 16 May 2015 21:32:52 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201505162132.t4GLWqJF016220@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: brd set sender to brd@FreeBSD.org
 using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Sat, 16 May 2015 21:32:52 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46699 - head/en_US.ISO8859-1/books/handbook/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 May 2015 21:32:52 -0000

Author: brd
Date: Sat May 16 21:32:51 2015
New Revision: 46699
URL: https://svnweb.freebsd.org/changeset/doc/46699

Log:
  Note that pkg(8) uses the official mirrors by default and link to the Poudriere section for more information about building a custom repository.
  Clean up some man page links.
  Add a section about configuring Poudriere repositories and configuring pkg(8) to use them.

Modified:
  head/en_US.ISO8859-1/books/handbook/ports/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Sat May 16 16:56:01 2015	(r46698)
+++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Sat May 16 21:32:51 2015	(r46699)
@@ -698,18 +698,15 @@ docbook                     =
 
       <programlisting>WITH_PKGNG=	yes</programlisting>
 
-      <para>The <application>pkg</application> package management
-	system uses a package repository for most operations.  The
-	default package repository location is defined in
-	<filename>/usr/local/etc/pkg.conf</filename> or by the
-	<envar>PACKAGESITE</envar> environment variable, which
-	overrides the configuration file.</para>
+      <para>By default <application>pkg</application> uses the &os;
+	package mirrors.  For information about building a custom
+	package repository, see <xref linkend="ports-poudriere"/></para>
 
       <para>Additional <application>pkg</application>
-	configuration options are described in pkg.conf(5).</para>
+	configuration options are described in &man.pkg.conf.5;.</para>
 
       <para>Usage information for <application>pkg</application> is
-	available in pkg(8) or by running
+	available in the &man.pkg.8; manpage or by running
 	<command>pkg</command> without additional arguments.</para>
 
       <para>Each <application>pkg</application> command argument is
@@ -1319,7 +1316,7 @@ Deinstalling ca_root_nss-3.15.1_1... don
 
       <para>Installed ports can be uninstalled using <command>pkg
 	  delete</command>.  Examples for using this command can be
-	found in <xref linkend="pkgng-intro"/>.</para>
+	found in the &man.pkg-delete.8; manpage.</para>
 
       <para>Alternately, <command>make deinstall</command> can be
 	run in the port's directory:</para>
@@ -1764,6 +1761,40 @@ ports-mgmt/pkg
 	and the main web site, <link
 	  xlink:href="https://github.com/freebsd/poudriere/wiki"></link>.</para>
     </sect2>
+    <sect2>
+      <title>Configuring pkg clients to use a Poudriere repository</title>
+
+      <para>While it is possible to use both a custom repository along
+	side of the official repository.  Sometimes it is useful to
+	disable the official repository.  This is done by creating a
+	configuration file that overrides and disables the official
+	configuration file.  Create
+	<filename>/usr/local/etc/pkg/repos/FreeBSD.conf</filename>
+	that contains the following:</para>
+
+      <screen>FreeBSD: {
+	enabled: no
+}</screen>
+
+      <para>Usually it is easiest to serve a poudriere repository to the
+	client machines via HTTP.  Setup a webserver to serve up the
+	package directory, usually something like:
+	<filename>/usr/local/poudriere/data/packages/<replaceable>10amd64</replaceable></filename>.
+	Where <filename>10amd64</filename> is the name of the build.
+      </para>
+
+      <para>If the URL to the package repository is:
+	<literal>http://pkg.example.com/10amd64</literal>, then the
+	repository configuration file in
+	<filename>/usr/local/etc/pkg/repos/custom.conf</filename> would
+	look like:</para>
+
+      <screen>custom: {
+	url: "<replaceable>http://pkg.example.com/10amd64</replaceable>",
+	mirror_type: "http",
+	enabled: yes,
+}</screen>
+    </sect2>
   </sect1>
 
   <sect1 xml:id="ports-nextsteps">