From owner-svn-doc-all@FreeBSD.ORG  Sun Dec  9 00:05:26 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2E884EF7;
 Sun,  9 Dec 2012 00:05:26 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id ED5BE8FC12;
 Sun,  9 Dec 2012 00:05:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB905Pn0046378;
 Sun, 9 Dec 2012 00:05:25 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB905Pcb046377;
 Sun, 9 Dec 2012 00:05:25 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201212090005.qB905Pcb046377@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 9 Dec 2012 00:05:25 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-translations@freebsd.org
Subject: svn commit: r40310 - translations/nl_NL.ISO8859-1/books/faq
X-SVN-Group: doc-translations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Dec 2012 00:05:26 -0000

Author: rene
Date: Sun Dec  9 00:05:25 2012
New Revision: 40310
URL: http://svnweb.freebsd.org/changeset/doc/40310

Log:
  Somehow CVS revision 1.1100 was not merged in, fix this.

Modified:
  translations/nl_NL.ISO8859-1/books/faq/book.xml

Modified: translations/nl_NL.ISO8859-1/books/faq/book.xml
==============================================================================
--- translations/nl_NL.ISO8859-1/books/faq/book.xml	Sat Dec  8 23:51:04 2012	(r40309)
+++ translations/nl_NL.ISO8859-1/books/faq/book.xml	Sun Dec  9 00:05:25 2012	(r40310)
@@ -7503,23 +7503,30 @@ Key F15        A        A        Menu Wo
 
       <qandaentry>
 	<question id="extra-named-port">
-	  <para>BIND (<command>named</command>) is listening on port 53
-	    and some other high-numbered port.  What is going on?</para>
+	  <para>BIND (<command>named</command>) is listening on
+	    some other high-numbered ports.  What is going on?</para>
 	</question>
 
 	<answer>
 	  <para>BIND uses a random high-numbered port for outgoing
-	    queries.  If you want to use port 53 for outgoing queries,
-	    either to get past a firewall or to make yourself feel
-	    better, you can try the following in
-	    <filename>/etc/namedb/named.conf</filename>:</para>
-
-	  <programlisting>options {
-	query-source address * port 53;
-};</programlisting>
-
-	  <para>You can replace the <literal>*</literal> with a single
-	    IP address if you want to tighten things further.</para>
+	    queries.  Recent versions of it choose a new, random UDP
+	    port for each query.  This may cause problems for some
+	    network configurations, especially if a firewall blocks
+	    incoming UDP packets on particular ports.  If you want to
+	    get past that firewall, you can try the
+	    <literal>avoid-v4-udp-ports</literal> and
+	    <literal>avoid-v6-udp-ports</literal> options to avoid
+	    selecting random port numbers within a blocked range.</para>
+ 
+	  <warning>
+	    <para>If a port number (like 53) is specified via the
+	      <literal>query-source</literal> or
+	      <literal>query-source-v6</literal> options in
+	      <filename>/etc/namedb/named.conf</filename>, randomized
+	      port selection will not be used.  It is strongly
+	      recommended that these options not be used to specify
+	      fixed port numbers.</para>
+	  </warning>
 
 	  <para>Congratulations, by the way.  It is good practice to
 	    read your &man.sockstat.1; output and notice odd

From owner-svn-doc-all@FreeBSD.ORG  Sun Dec  9 10:36:42 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 66168CE3;
 Sun,  9 Dec 2012 10:36:42 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 30FF68FC13;
 Sun,  9 Dec 2012 10:36:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB9AagYY033139;
 Sun, 9 Dec 2012 10:36:42 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB9Aafni033137;
 Sun, 9 Dec 2012 10:36:41 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201212091036.qB9Aafni033137@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 9 Dec 2012 10:36:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40311 - in head/nl_NL.ISO8859-1: books htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Dec 2012 10:36:42 -0000

Author: rene
Date: Sun Dec  9 10:36:41 2012
New Revision: 40311
URL: http://svnweb.freebsd.org/changeset/doc/40311

Log:
  MFen:
  - books/Makefile r38826 -> r40258 (SRCID bump only)
  - htdocs/where.xml r39920 -> r40278

Modified:
  head/nl_NL.ISO8859-1/books/Makefile
  head/nl_NL.ISO8859-1/htdocs/where.xml

Modified: head/nl_NL.ISO8859-1/books/Makefile
==============================================================================
--- head/nl_NL.ISO8859-1/books/Makefile	Sun Dec  9 00:05:25 2012	(r40310)
+++ head/nl_NL.ISO8859-1/books/Makefile	Sun Dec  9 10:36:41 2012	(r40311)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 #
 # %SOURCE%	en_US.ISO8859-1/books/Makefile
-# %SRCID%	38826
+# %SRCID%	40258
 #
 
 SUBDIR = handbook

Modified: head/nl_NL.ISO8859-1/htdocs/where.xml
==============================================================================
--- head/nl_NL.ISO8859-1/htdocs/where.xml	Sun Dec  9 00:05:25 2012	(r40310)
+++ head/nl_NL.ISO8859-1/htdocs/where.xml	Sun Dec  9 10:36:41 2012	(r40311)
@@ -6,7 +6,7 @@
 ]>
 <!-- Vertaald door: Siebrand Mazeland / Rene Ladan
      %SOURCE%	en_US.ISO8859-1/htdocs/where.xml
-     %SRCID%	39920
+     %SRCID%	40278
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -51,11 +51,7 @@
 
     <p>Als u &os; via FTP of HTTP wilt downloaden, bekijk dan de lijst met <a
 	href="&enbase;/doc/nl_NL.ISO8859-1/books/handbook/mirrors-ftp.html"><strong>spiegelsites</strong></a>
-      in het handboek om te zien of er een site is die dichterbij u is. Als
-      alternatief kunt u &os; via het BitTorrent-protocol downloaden.  De
-      <q>.torrent</q>-bestanden kunnen van de <a
-	href="http://torrents.FreeBSD.org8080/">&os; BitTorrent Tracker</a>
-      gedownload worden.</p>
+      in het handboek om te zien of er een site is die dichterbij u is.</p>
 
     <table class="tblbasic">
       <thead>

From owner-svn-doc-all@FreeBSD.ORG  Sun Dec  9 17:47:25 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 1AF2BCCE;
 Sun,  9 Dec 2012 17:47:25 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F3F6D8FC0C;
 Sun,  9 Dec 2012 17:47:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB9HlOpX094942;
 Sun, 9 Dec 2012 17:47:24 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB9HlOJh094941;
 Sun, 9 Dec 2012 17:47:24 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212091747.qB9HlOJh094941@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Sun, 9 Dec 2012 17:47:24 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40312 - head/en_US.ISO8859-1/articles/portbuild
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Dec 2012 17:47:25 -0000

Author: linimon
Date: Sun Dec  9 17:47:24 2012
New Revision: 40312
URL: http://svnweb.freebsd.org/changeset/doc/40312

Log:
  Fix the location of the rc.d files.  Add the very handy sysutils/zfs-stats
  port to recommended.

Modified:
  head/en_US.ISO8859-1/articles/portbuild/article.xml

Modified: head/en_US.ISO8859-1/articles/portbuild/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/portbuild/article.xml	Sun Dec  9 10:36:41 2012	(r40311)
+++ head/en_US.ISO8859-1/articles/portbuild/article.xml	Sun Dec  9 17:47:24 2012	(r40312)
@@ -2947,7 +2947,8 @@ sysutils/screen</screen>
 benchmarks/bonnie++
 ports-mgmt/pkg_tree
 sysutils/dmidecode
-sysutils/smartmontools</screen>
+sysutils/smartmontools
+sysutils/zfs-stats</screen>
 	  </para>
 	</step>
 
@@ -3126,7 +3127,7 @@ sysutils/smartmontools</screen>
 
 	<step>
 	  <para>Copy the following files from
-	    <filename>/var/portbuild/conf/etc/rc.d/</filename> to
+	    <filename>/var/portbuild/etc/rc.d/</filename> to
 	    <filename>/usr/local/etc/rc.d/</filename>:<screen>
 buildproxy.sh
 pollmachine.sh

From owner-svn-doc-all@FreeBSD.ORG  Sun Dec  9 20:07:02 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id BFA0DD0A;
 Sun,  9 Dec 2012 20:07:02 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A5FD38FC0C;
 Sun,  9 Dec 2012 20:07:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB9K72SN019292;
 Sun, 9 Dec 2012 20:07:02 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB9K72Xv019291;
 Sun, 9 Dec 2012 20:07:02 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212092007.qB9K72Xv019291@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 9 Dec 2012 20:07:02 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40313 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Dec 2012 20:07:02 -0000

Author: gjb
Date: Sun Dec  9 20:07:02 2012
New Revision: 40313
URL: http://svnweb.freebsd.org/changeset/doc/40313

Log:
  Link the Privacy Policy to the index page.

Modified:
  head/share/xml/header.ent

Modified: head/share/xml/header.ent
==============================================================================
--- head/share/xml/header.ent	Sun Dec  9 17:47:24 2012	(r40312)
+++ head/share/xml/header.ent	Sun Dec  9 20:07:02 2012	(r40313)
@@ -64,6 +64,7 @@
 	  <li><a href="&base;/features.html">Features</a></li>
 	  <li><a href="&base;/advocacy/">Advocacy</a></li>
 	  <li><a href="&base;/marketing/">Marketing</a></li>
+	  <li><a href="&base;/privacy.html">Privacy Policy</a></li>
 	</ul>
       </li>
     </ul>

From owner-svn-doc-all@FreeBSD.ORG  Sun Dec  9 22:25:21 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 57C3EFEB;
 Sun,  9 Dec 2012 22:25:21 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3BEFF8FC0C;
 Sun,  9 Dec 2012 22:25:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB9MPLPG047454;
 Sun, 9 Dec 2012 22:25:21 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB9MPLuR047453;
 Sun, 9 Dec 2012 22:25:21 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201212092225.qB9MPLuR047453@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 9 Dec 2012 22:25:21 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40314 - head/nl_NL.ISO8859-1/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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Dec 2012 22:25:21 -0000

Author: rene
Date: Sun Dec  9 22:25:20 2012
New Revision: 40314
URL: http://svnweb.freebsd.org/changeset/doc/40314

Log:
  MFen r39989 -> r40313

Modified:
  head/nl_NL.ISO8859-1/share/xml/header.l10n.ent

Modified: head/nl_NL.ISO8859-1/share/xml/header.l10n.ent
==============================================================================
--- head/nl_NL.ISO8859-1/share/xml/header.l10n.ent	Sun Dec  9 20:07:02 2012	(r40313)
+++ head/nl_NL.ISO8859-1/share/xml/header.l10n.ent	Sun Dec  9 22:25:20 2012	(r40314)
@@ -2,7 +2,7 @@
 
 <!-- $FreeBSD$
      %SOURCE%	share/xml/header.ent
-     %SRCID%	39989
+     %SRCID%	40313
  -->
 
 <!-- FreeBSD HTML Header Entiteiten -->
@@ -43,6 +43,7 @@
 	  <li><a href="&base;/features.html">Mogelijkheden</a></li>
 	  <li><a href="&enbase;/advocacy/">Voorspraak</a></li>
 	  <li><a href="&enbase;/marketing/">Marketing</a></li>
+	  <li><a href="&base;/privacy.html">Privacybeleid</a></li>
 	</ul>
       </li>
     </ul>

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 02:01:51 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id F22E3F6C;
 Mon, 10 Dec 2012 02:01:50 +0000 (UTC) (envelope-from kaduk@mit.edu)
Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU
 [18.9.25.13]) by mx1.freebsd.org (Postfix) with ESMTP id 4FE338FC0C;
 Mon, 10 Dec 2012 02:01:49 +0000 (UTC)
X-AuditID: 1209190d-b7f266d00000092b-9d-50c5415b6935
Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])
 by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP id
 FC.CF.02347.B5145C05; Sun,  9 Dec 2012 20:56:43 -0500 (EST)
Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
 by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id qBA1uh2s031947;
 Sun, 9 Dec 2012 20:56:43 -0500
Received: from multics.mit.edu (SYSTEM-LOW-SIPB.MIT.EDU [18.187.2.37])
 (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU)
 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qBA1ueLx021376
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
 Sun, 9 Dec 2012 20:56:42 -0500 (EST)
Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308)
 id qBA1udIb013897; Sun, 9 Dec 2012 20:56:39 -0500 (EST)
Date: Sun, 9 Dec 2012 20:56:39 -0500 (EST)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Eitan Adler <eadler@freebsd.org>
Subject: Re: svn commit: r40306 - head/en_US.ISO8859-1/books/porters-handbook
In-Reply-To: <201212081332.qB8DWMnV046772@svn.freebsd.org>
Message-ID: <alpine.GSO.1.10.1212092055090.2164@multics.mit.edu>
References: <201212081332.qB8DWMnV046772@svn.freebsd.org>
User-Agent: Alpine 1.10 (GSO 962 2008-03-14)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrAIsWRmVeSWpSXmKPExsUixG6nohvteDTAYPM2IYsfHw8xWez6O4fZ
 4sai/UwWu/t7mR1YPGZ8ms8SwBjFZZOSmpNZllqkb5fAlXFluWjBbIGKGwsWsjUw9vN2MXJy
 SAiYSDzZcIkdwhaTuHBvPVsXIxeHkMA+RomuR3NZIZz1jBLN024zQTjHmSTO/O5hBWkREqiX
 2N00HcxmEdCSOLr4BzOIzSagIjHzzUY2EFsEyP6+/ycTiM0sECWxZ2kjUD0Hh7CAv0TfRAOQ
 MKeAlcTvhW1gJbwCDhJT+7ayQIy3lGg+ex1sjKiAjsTq/VNYIGoEJU7OfMICMdJS4tyf62wT
 GAVnIUnNQpJawMi0ilE2JbdKNzcxM6c4NVm3ODkxLy+1SNdILzezRC81pXQTIyhgOSV5dzC+
 O6h0iFGAg1GJh3eBzNEAIdbEsuLK3EOMkhxMSqK8/vZAIb6k/JTKjMTijPii0pzU4kOMEhzM
 SiK8XMeOBAjxpiRWVqUW5cOkpDlYlMR5r6Tc9BcSSE8sSc1OTS1ILYLJynBwKEnwKjkADRUs
 Sk1PrUjLzClBSDNxcIIM5wEargxSw1tckJhbnJkOkT/FqCglzvsY5CIBkERGaR5cLyyhvGIU
 B3pFmPc3SBUPMBnBdb8CGswENPik4GGQwSWJCCmpBkYDQZngpevXn2rsfKQzp6PbcFdH1+Oo
 bN5dHFKzF22RuCPaufHWHnnuj5paupYq6477myev8656Vs2z12OSN9fVbSycPS2esWLnSqqU
 O//Lyf0Xlnk0+Tz34d9/jrZzd9m7384L42sQjdZV0Qp81C8dHi8tf7f75ubCjsUrX2yTvN/u
 JWWQpcRSnJFoqMVcVJwIAN1JKjoDAwAA
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 02:01:51 -0000

On Sat, 8 Dec 2012, Eitan Adler wrote:

> Author: eadler
> Date: Sat Dec  8 13:32:22 2012
> New Revision: 40306
> URL: http://svnweb.freebsd.org/changeset/doc/40306
>
> Log:
>  Wording tweaks to the pkg-descr section of the porter's handbook.
>
>  Submitted by:	wblock
>  Approved by:	bcr (mentor)
>
> Modified:
>  head/en_US.ISO8859-1/books/porters-handbook/book.xml
>
> Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml
> ==============================================================================
> --- head/en_US.ISO8859-1/books/porters-handbook/book.xml	Sat Dec  8 00:09:39 2012	(r40305)
> +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Sat Dec  8 13:32:22 2012	(r40306)
> @@ -185,18 +185,17 @@ USE_IMAKE=	yes
> 	    fonts).</para>
> 	</note>
>
> -	<para>Well-written description text should describe the port
> -	  completely enough that users would not have to consult its
> -	  documentation or visit its website to understand what does it
> -	  do, how it can be useful for them, what particularly nice
> -	  features (if any) does it have, etc.  You might want to
> -	  mention certain requirements (e.g. the graphical toolkit),
> -	  heavy dependencies, runtime environment, or implementation
> -	  languages, to help users to decide if they want to install
> -	  this port or not.</para>
> +	<para>A well-written <filename>pkg-descr</filename> describes
> +	  the port completely enough that users would not have to
> +	  consult the documentation or visit the website to understand
> +	  what the software does, how it can be useful, or what
> +	  particularly nice features it has.  Mentioning certain
> +	  requirements like a graphical toolkit, heavy dependencies,
> +	  runtime environment, or implementation languages help users
> +	  whether this port will work for them.</para>

Presumably such knowledge will help users *decide* whether this port will 
work for them (as opposed to helping them whether or not the port will 
work for them, which is I guess also true).

-Ben Kaduk

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 02:06:28 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id AC371C4
 for <svn-doc-all@freebsd.org>; Mon, 10 Dec 2012 02:06:28 +0000 (UTC)
 (envelope-from lists@eitanadler.com)
Received: from mail-la0-f54.google.com (mail-la0-f54.google.com
 [209.85.215.54])
 by mx1.freebsd.org (Postfix) with ESMTP id 0DF958FC12
 for <svn-doc-all@freebsd.org>; Mon, 10 Dec 2012 02:06:27 +0000 (UTC)
Received: by mail-la0-f54.google.com with SMTP id j13so2033764lah.13
 for <svn-doc-all@freebsd.org>; Sun, 09 Dec 2012 18:06:26 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=eitanadler.com; s=0xdeadbeef;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type;
 bh=cxzm0ShstynuSUBWgE5Uk/DqwqKlDDT5sI0VmFo/euo=;
 b=VVcnJ/WpMZAzAqCOLtIQe6/R1+DQ4zTUX+lPP2Q4D5NMocg/uR4ki9R8Ika/xpIR6g
 /kGEJhkLpj9RRkjYapg9apHNwQCleyWnYn66dqOOb/RT5ogNJ+iYhsHPvzt8UGksWSQT
 PRcsyWvgY6YQYdlRvsOf4uGCQXpwMCdbiAFWI=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type
 :x-gm-message-state;
 bh=cxzm0ShstynuSUBWgE5Uk/DqwqKlDDT5sI0VmFo/euo=;
 b=TmAOcp0+EyDb1P+NfGvhlfSMeJAfpIUdUm9stXgPk9VtxDvc/IaLdE21bAIdZ+Frpl
 1bczzyaPNdQ0fw58qFXkykYIgErNB3dtJJAsMNhTKtO062ZkOrcftpFKG1xxPv++5JLr
 Rsgrs2oUx4vOhQ3iUDezwfyLQ/tuEVaFEbj+gGkbcsj9FGA88h9kNcP02/iJMei1OXUf
 PL6+2fqJ0iDOg8Yyai38ZPyS4I4MGkxRxSa+vQUs9X+wdn2i7WtdURfsoJsgVTKlwvUe
 pBN2KQx83bhDYCB2+hh6WsJfo6rmCF+2A6Bv3IcZ7fbqfH4RjquF90RsMBwX2SSAUK+g
 CJXw==
Received: by 10.152.105.103 with SMTP id gl7mr12109346lab.10.1355105186228;
 Sun, 09 Dec 2012 18:06:26 -0800 (PST)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.112.43.229 with HTTP; Sun, 9 Dec 2012 18:05:56 -0800 (PST)
In-Reply-To: <alpine.GSO.1.10.1212092055090.2164@multics.mit.edu>
References: <201212081332.qB8DWMnV046772@svn.freebsd.org>
 <alpine.GSO.1.10.1212092055090.2164@multics.mit.edu>
From: Eitan Adler <eadler@freebsd.org>
Date: Sun, 9 Dec 2012 21:05:56 -0500
X-Google-Sender-Auth: DWYZ6J7sVjJ-ZerUDSQ1tDNEuSU
Message-ID: <CAF6rxgmonuecyrRE0WLnJ99w6=-ySWp55+RbS1bYJxdWMy8JmQ@mail.gmail.com>
Subject: Re: svn commit: r40306 - head/en_US.ISO8859-1/books/porters-handbook
To: Benjamin Kaduk <kaduk@mit.edu>
Content-Type: text/plain; charset=UTF-8
X-Gm-Message-State: ALoCoQmBWW2Yipr69k3hBQbrLLm8RwPlqbUcegvmg8ZmrpLR/salQWGMQRRrCcxXJb0v38dsxqIQ
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 02:06:28 -0000

On 9 December 2012 20:56, Benjamin Kaduk <kaduk@mit.edu> wrote:
> On Sat, 8 Dec 2012, Eitan Adler wrote:
>
>> Author: eadler
>> Date: Sat Dec  8 13:32:22 2012
>> New Revision: 40306
>> URL: http://svnweb.freebsd.org/changeset/doc/40306
>>
>> Log:
>>  Wording tweaks to the pkg-descr section of the porter's handbook.
>>
>>  Submitted by:  wblock
>>  Approved by:   bcr (mentor)
>>
>> Modified:
>>  head/en_US.ISO8859-1/books/porters-handbook/book.xml
>>
>> Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml
>>
>> ==============================================================================
>> --- head/en_US.ISO8859-1/books/porters-handbook/book.xml        Sat Dec  8
>> 00:09:39 2012        (r40305)
>> +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml        Sat Dec  8
>> 13:32:22 2012        (r40306)
>> @@ -185,18 +185,17 @@ USE_IMAKE=        yes
>>             fonts).</para>
>>         </note>
>>
>> -       <para>Well-written description text should describe the port
>> -         completely enough that users would not have to consult its
>> -         documentation or visit its website to understand what does it
>> -         do, how it can be useful for them, what particularly nice
>> -         features (if any) does it have, etc.  You might want to
>> -         mention certain requirements (e.g. the graphical toolkit),
>> -         heavy dependencies, runtime environment, or implementation
>> -         languages, to help users to decide if they want to install
>> -         this port or not.</para>
>> +       <para>A well-written <filename>pkg-descr</filename> describes
>> +         the port completely enough that users would not have to
>> +         consult the documentation or visit the website to understand
>> +         what the software does, how it can be useful, or what
>> +         particularly nice features it has.  Mentioning certain
>> +         requirements like a graphical toolkit, heavy dependencies,
>> +         runtime environment, or implementation languages help users
>> +         whether this port will work for them.</para>
>
>
> Presumably such knowledge will help users *decide* whether this port will
> work for them (as opposed to helping them whether or not the port will work
> for them, which is I guess also true).

Will fix - thanks.

-- 
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 02:11:26 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 0249D150;
 Mon, 10 Dec 2012 02:11:26 +0000 (UTC) (envelope-from wen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DD2FE8FC15;
 Mon, 10 Dec 2012 02:11:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBA2BPD3090820;
 Mon, 10 Dec 2012 02:11:25 GMT (envelope-from wen@svn.freebsd.org)
Received: (from wen@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBA2BPm1090817;
 Mon, 10 Dec 2012 02:11:25 GMT (envelope-from wen@svn.freebsd.org)
Message-Id: <201212100211.qBA2BPm1090817@svn.freebsd.org>
From: Wen Heping <wen@FreeBSD.org>
Date: Mon, 10 Dec 2012 02:11:25 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40315 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 02:11:26 -0000

Author: wen (ports committer)
Date: Mon Dec 10 02:11:24 2012
New Revision: 40315
URL: http://svnweb.freebsd.org/changeset/doc/40315

Log:
  - Add my PGP key

Added:
  head/share/pgpkeys/wen.key   (contents, props changed)
Modified:
  head/share/pgpkeys/pgpkeys-developers.xml
  head/share/pgpkeys/pgpkeys.ent

Modified: head/share/pgpkeys/pgpkeys-developers.xml
==============================================================================
--- head/share/pgpkeys/pgpkeys-developers.xml	Sun Dec  9 22:25:20 2012	(r40314)
+++ head/share/pgpkeys/pgpkeys-developers.xml	Mon Dec 10 02:11:24 2012	(r40315)
@@ -656,6 +656,11 @@
       &pgpkey.mux;
     </sect2>
 
+    <sect2 id="pgpkey-wen">
+      <title>&a.wen;</title>
+      &pgpkey.wen;
+    </sect2>
+
     <sect2 id="pgpkey-dhn">
       <title>&a.dhn;</title>
       &pgpkey.dhn;

Modified: head/share/pgpkeys/pgpkeys.ent
==============================================================================
--- head/share/pgpkeys/pgpkeys.ent	Sun Dec  9 22:25:20 2012	(r40314)
+++ head/share/pgpkeys/pgpkeys.ent	Mon Dec 10 02:11:24 2012	(r40315)
@@ -387,6 +387,7 @@
 <!ENTITY pgpkey.vs SYSTEM "vs.key">
 <!ENTITY pgpkey.vsevolod SYSTEM "vsevolod.key">
 <!ENTITY pgpkey.wblock SYSTEM "wblock.key">
+<!ENTITY pgpkey.wen SYSTEM "wen.key">
 <!ENTITY pgpkey.weongyo SYSTEM "weongyo.key">
 <!ENTITY pgpkey.wes SYSTEM "wes.key">
 <!ENTITY pgpkey.wilko SYSTEM "wilko.key">

Added: head/share/pgpkeys/wen.key
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/pgpkeys/wen.key	Mon Dec 10 02:11:24 2012	(r40315)
@@ -0,0 +1,41 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh wen A03F07DA;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   2048R/A03F07DA 2012-12-10
+      Key fingerprint = 0258 F2C7 C123 E627 9E14  B4BA 270F 30AA A03F 07DA
+uid                  Wen Heping (wen) <wen@FreeBSD.org>
+sub   2048R/CFC8D6A9 2012-12-10
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFDFsuEBCACSJ//UOaDvnQbfeQIiQsRcg1fc2GlcyKnJxTv8H4N0NVw4c579
+D/zEPhRIQTcwrEL677xdeNWtxvYkQeePdrvu4OhXW6IfrZp5H8tedMNqh34MxykE
+J3EC7HmH8J85ondMFSsg8OtBolpDB7KLMJBuIbQ0GDXniijcp9muVVbiRCZ7vhqC
+1J8BJKZDGALD7GLttTfkK56xvp2H69aodYBeNsJcUxAj09gYW5rBLId8NgyPwQhR
+vR7C+VQgz1vlVT/YTvzMX6ZigbaH2nCJTgC1/LK1HJT9hkJIeUNskZwcAOoBA2L1
+DXhgTdkxFKVOb8F0d6wvYSdeVfAWZc8xzWVdABEBAAG0IldlbiBIZXBpbmcgKHdl
+bikgPHdlbkBGcmVlQlNELm9yZz6JATgEEwECACIFAlDFsuECGwMGCwkIBwMCBhUI
+AgkKCwQWAgMBAh4BAheAAAoJECcPMKqgPwfafzkH+wWio4GRrgvK8K5DoIkGgmk4
+bVdXd6g9T+sVGw7F5HTkCbiW83BAmTb49a8uDI4qRSDIEPLOSBbbSlzYcBqHZ9gf
+1/G2JaL6UzlMhdoUZUS3biIoGKFDGXrKBmFoSvMN3MKNnAajAP1rTyzk2bC5EhNV
+CsGL+KOC/JXBfHZ/wxXTgk++Wvm8bcZDXmYMptWsRaHMZKbkdakX9dmPtHmv1g7N
+3AIPSLrrjYDdWfejK8KvPKQuHnq0A9tLS4NOnSY8Ls1Wg3WfE1qvYZ2oEziVrMEu
+GIAxDQfFAN31GR81lDFW9FybAPqeuakD/cUuuyJ+15hUYb4fcmk7RHbxQrTcfHm5
+AQ0EUMWy4QEIANmhcffZZcinDeNMTFba+m4hSV28diXeGyoXfeRWkdk3+fOGywNl
++/HfYrXXSoDcfkmooUljMvGCj+vupP4obXeOY4MrcnzUYnUWjpfY6mQXejXGgAQy
+x2lcNF6W/g8jl80nnz+hfTEncg0xzNwFDE9ZzR7+G5x6uub0Xl30Rsc+3z6eabFS
+AQ5fFw1lEvt6Y8CGXCx86CPB6SQIJ0FddoHPL2LElSiuenaS7AKnnau9XqxwouD6
+MdFqDQJ601lZBhEWmIlWRBj9YAEwwgnvK6/OFCHcIRjFl6beQVFO2xyk35SZOq4I
+HL7GPs0+bg5D+f7a3ugzqt876LlMVuUQmEkAEQEAAYkBHwQYAQIACQUCUMWy4QIb
+DAAKCRAnDzCqoD8H2v+UB/9mpvePA5lZrFne+s/PyTZu0rI7+Mj67Yj3DywxVf3j
+pqzjeRlZgVoZ0HbVry+2wUk1IN2eWMJy1PECTAyK5tybdtl8ckNvGhrMi9ilF6gk
+WIn9wXRiduuCZ0hj+STtlsdGBCThz9JqMVr093uqHqe+kB6TSu6/uVMZ3LhyMEeQ
+oUkoDMlG3wMMKpD/mzLeJTTycXSZ9VzDmQMOOZAC7UypLri9ykjRAVc8J5c+1RA+
++dsNw0DTEtGxHsObfdTlrCP0vohTxOdGjWuXHKYTttrM5koc7M2eM4WSEXkpIKb7
+g7S0ogl+qD7RokD6CChkH7fnFesT2ksU8KvE/0a+/8Un
+=7kGj
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 11:23:33 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 11A89D64;
 Mon, 10 Dec 2012 11:23:33 +0000 (UTC)
 (envelope-from zeising@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D04EA8FC0C;
 Mon, 10 Dec 2012 11:23:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBABNWE6098969;
 Mon, 10 Dec 2012 11:23:32 GMT (envelope-from zeising@svn.freebsd.org)
Received: (from zeising@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBABNWZo098968;
 Mon, 10 Dec 2012 11:23:32 GMT (envelope-from zeising@svn.freebsd.org)
Message-Id: <201212101123.qBABNWZo098968@svn.freebsd.org>
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Mon, 10 Dec 2012 11:23:32 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40316 - head/en_US.ISO8859-1/books/porters-handbook
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 11:23:33 -0000

Author: zeising
Date: Mon Dec 10 11:23:32 2012
New Revision: 40316
URL: http://svnweb.freebsd.org/changeset/doc/40316

Log:
  Add documentation about the newly added OPTIONS knobs.
  
  Submitted by:	bapt
  Approved by:	joel (mentor)

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/book.xml	Mon Dec 10 02:11:24 2012	(r40315)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Mon Dec 10 11:23:32 2012	(r40316)
@@ -4427,6 +4427,13 @@ OPT6_DESC=	Describe OPT6</programlisting
 	  <programlisting>OPTIONS_SINGLE=		SG1
 OPTIONS_SINGLE_SG1=	OPT3 OPT4</programlisting>
 
+	  <para><makevar>OPTIONS</makevar> can be grouped as radio
+	    choices, where none or only one choice from each group
+	    is allowed:</para>
+
+	<programlisting>OPTIONS_RADIO=		RG1
+OPTIONS_RADIO_RG1=	OPT7 OPT8</programlisting>
+
 	  <para><makevar>OPTIONS</makevar> can also be grouped as
 	    <quote>multiple-choice</quote> lists, where
 	    <emphasis>at least one</emphasis> option must be
@@ -4435,20 +4442,12 @@ OPTIONS_SINGLE_SG1=	OPT3 OPT4</programli
 	  <programlisting>OPTIONS_MULTI=		MG1
 OPTIONS_MULTI_MG1=	OPT5 OPT6</programlisting>
 
-	  <para><makevar>OPTIONS_MULTI</makevar> and
-	    <makevar>OPTIONS_SINGLE</makevar> can also allow zero
-	    choices by including the group in
-	    <makevar>OPTIONS_DEFINE</makevar>:</para>
-
-	  <programlisting>OPTIONS_DEFINE=		MG1
-OPTIONS_MULTI=		MG1
-OPTIONS_MULTI_MG1=	OPT5 OPT6</programlisting>
+	  <para><makevar>OPTIONS</makevar> can also be grouped as
+	    <quote>multiple-choice</quote> lists, where non or any
+	    option can be enabled:</para>
 
-	  <para>This group then requires at least one
-	    <makevar>OPTION</makevar> from <makevar>MG1</makevar>
-	    only if the new <makevar>MG1</makevar>
-	    <makevar>OPTION</makevar> is selected.  Experimentation
-	    is encouraged to ensure that this is understood.</para>
+	  <programlisting>OPTIONS_GROUP=		GG1
+OPTIONS_GROUP_GG1=	OPT9 OPT10</programlisting>
 
 	  <para><makevar>OPTIONS</makevar> are unset by default,
 	    unless they are listed in

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:30:48 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 35AA1E8D;
 Mon, 10 Dec 2012 15:30:48 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1751D8FC1B;
 Mon, 10 Dec 2012 15:30:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFUlBB045270;
 Mon, 10 Dec 2012 15:30:47 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFUlNU045269;
 Mon, 10 Dec 2012 15:30:47 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212101530.qBAFUlNU045269@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:30:47 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40317 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:30:48 -0000

Author: eadler
Date: Mon Dec 10 15:30:47 2012
New Revision: 40317
URL: http://svnweb.freebsd.org/changeset/doc/40317

Log:
  Add an example of how to add a user to the 'wheel' group to the
  su-wheel-group FAQ.
  
  PR:		docs/174251
  Submitted by:	"Edward" <edward@rdtan.net>
  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	Mon Dec 10 11:23:32 2012	(r40316)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Dec 10 15:30:47 2012	(r40317)
@@ -5349,7 +5349,14 @@ C:\="DOS"</programlisting>
 
 	  <para>To allow someone to <command>su</command> to
 	    <username>root</username>, simply put them in the
-	    <groupname>wheel</groupname> group.</para>
+	    <groupname>wheel</groupname> group. Use &man.pw.8
+	    for this purpose.</para>
+
+	  <screen>&prompt.root; <userinput>pw groupmod wheel -m <replaceable>lisa</replaceable></userinput></screen>
+
+	  <para>The above example will add user
+	    <username>lisa</username> to the group
+	    <groupname>wheel</groupname>.</para>
 	</answer>
       </qandaentry>
 

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:30:50 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9327EE8E;
 Mon, 10 Dec 2012 15:30:50 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 76C558FC08;
 Mon, 10 Dec 2012 15:30:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFUohP045316;
 Mon, 10 Dec 2012 15:30:50 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFUoEJ045315;
 Mon, 10 Dec 2012 15:30:50 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212101530.qBAFUoEJ045315@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:30:50 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40318 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:30:50 -0000

Author: eadler
Date: Mon Dec 10 15:30:49 2012
New Revision: 40318
URL: http://svnweb.freebsd.org/changeset/doc/40318

Log:
  pcvt(4) hasn't been around since 6.X according to man pages.
  
  Noted by:	Derek Wood
  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	Mon Dec 10 15:30:47 2012	(r40317)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Dec 10 15:30:49 2012	(r40318)
@@ -5640,12 +5640,6 @@ options    SYSVMSG          # enable for
 	      does not exist if you compile your kernel with the
 	      <literal>SC_DISABLE_REBOOT</literal> option.</para>
 	  </note>
-
-	  <para>If you use the &man.pcvt.4; console driver, use the
-	    following kernel configuration line instead and rebuild the
-	    kernel:</para>
-
-	  <programlisting>options PCVT_CTRL_ALT_DEL</programlisting>
 	</answer>
       </qandaentry>
 

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:30:52 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D54C5E8F;
 Mon, 10 Dec 2012 15:30:52 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B953F8FC0C;
 Mon, 10 Dec 2012 15:30:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFUqtR045360;
 Mon, 10 Dec 2012 15:30:52 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFUqOs045358;
 Mon, 10 Dec 2012 15:30:52 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212101530.qBAFUqOs045358@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:30:52 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40319 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:30:52 -0000

Author: eadler
Date: Mon Dec 10 15:30:52 2012
New Revision: 40319
URL: http://svnweb.freebsd.org/changeset/doc/40319

Log:
  Fix minor branding detail in Apache OpenOffice - there is no space
  between "Open" and "Office" [1]
  
  [1] https://blogs.apache.org/OOo/entry/openoffice_org_is_now_apache
  Submitted by:	Jakub Lach <jakub_lach@mailplus.pl>
  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	Mon Dec 10 15:30:49 2012	(r40318)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Dec 10 15:30:52 2012	(r40319)
@@ -3519,7 +3519,7 @@ kern.timecounter.hardware: TSC -&gt; i82
 
 	<answer>
 	  <para>The open-source <application><ulink
-	      url="http://www.openoffice.org">Apache Open Office</ulink></application>
+	      url="http://www.openoffice.org">Apache OpenOffice</ulink></application>
 	    and <application><ulink
               url="http://www.libreoffice.org">LibreOffice</ulink></application>
             office suites work natively on &os;.</para>

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:30:55 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3214AEC6;
 Mon, 10 Dec 2012 15:30:55 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 155D38FC15;
 Mon, 10 Dec 2012 15:30:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFUsKd045406;
 Mon, 10 Dec 2012 15:30:54 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFUsLg045405;
 Mon, 10 Dec 2012 15:30:54 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212101530.qBAFUsLg045405@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:30:54 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40320 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:30:55 -0000

Author: eadler
Date: Mon Dec 10 15:30:54 2012
New Revision: 40320
URL: http://svnweb.freebsd.org/changeset/doc/40320

Log:
  It is hard to find IDE drives.  ZIP and JAZ drives are gone from the
  world of useful technologies.
  
  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	Mon Dec 10 15:30:52 2012	(r40319)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Dec 10 15:30:54 2012	(r40320)
@@ -1563,21 +1563,6 @@
       </qandaentry>
 
       <qandaentry>
-	<question id="boot-floppy-hangs">
-	  <para>Why does the boot floppy start, but hang at the
-	    <literal>Probing Devices...</literal> screen?</para>
-	</question>
-
-	<answer>
-	  <para>If you have a IDE &iomegazip; or &jaz; drive installed,
-	    remove it and try again.  The boot floppy can get confused by
-	    the drives.  After the system is installed you can reconnect
-	    the drive.  Hopefully this will be fixed in a later
-	    release.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="panic-on-install-reboot">
 	  <para>Why do I get a <errorname>panic: can't mount
 	    root</errorname> error when rebooting the system after

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:30:57 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 91287EEB;
 Mon, 10 Dec 2012 15:30:57 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5C56D8FC17;
 Mon, 10 Dec 2012 15:30:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFUvf8045449;
 Mon, 10 Dec 2012 15:30:57 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFUvZu045448;
 Mon, 10 Dec 2012 15:30:57 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212101530.qBAFUvZu045448@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:30:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40321 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:30:57 -0000

Author: eadler
Date: Mon Dec 10 15:30:56 2012
New Revision: 40321
URL: http://svnweb.freebsd.org/changeset/doc/40321

Log:
  SLIP was removed in 8.x.  Given that 7.x will only be supported for
  another 2 months it doesn't make much sense to keep this information in
  the FAQ.
  
  Noted by:	Joe Barbish
  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	Mon Dec 10 15:30:54 2012	(r40320)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Dec 10 15:30:56 2012	(r40321)
@@ -6788,27 +6788,16 @@ Key F15        A        A        Menu Wo
 
       <qandaentry>
 	<question id="slip-ppp-support">
-	  <para>Does &os; support SLIP and PPP?</para>
+	  <para>Does &os; support PPP?</para>
 	</question>
 
 	<answer>
-	  <para>Yes.  See the manual pages for &man.slattach.8;,
-	    &man.sliplogin.8;, &man.ppp.8;, and &man.pppd.8;.
-	    &man.ppp.8; and &man.pppd.8; provide support for both
-	    incoming and outgoing connections, while &man.sliplogin.8;
-	    deals exclusively with incoming connections, and
-	    &man.slattach.8; deals exclusively with outgoing
-	    connections.</para>
+	  <para>Yes.  &man.ppp.8; provides support for both
+	    incoming and outgoing connections.</para>
 
 	  <para>For more information on how to use these, please see the
 	    <ulink
-	      url="&url.books.handbook;/ppp-and-slip.html">Handbook chapter on PPP and SLIP</ulink>.</para>
-
-	  <para>If you only have access to the Internet through a
-	    <quote>shell account</quote>, you may want to have a look at
-	    the <filename role="package">net/slirp</filename> package.
-	    It can provide you with (limited) access to services such as
-	    ftp and http direct from your local machine.</para>
+	      url="&url.books.handbook;/ppp-and-slip.html">Handbook chapter on PPP</ulink>.</para>
 	</answer>
       </qandaentry>
 
@@ -8436,7 +8425,7 @@ ATDT1234567</programlisting>
     <title>Serial Communications</title>
 
     <para>This section answers common questions about serial
-      communications with &os;.  PPP and SLIP are covered in the <link
+      communications with &os;.  PPP is covered in the <link
       linkend="networking">Networking</link> section.</para>
 
     <qandaset>

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:30:59 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id CD432F24;
 Mon, 10 Dec 2012 15:30:59 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B1D598FC13;
 Mon, 10 Dec 2012 15:30:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFUxZB045497;
 Mon, 10 Dec 2012 15:30:59 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFUxqJ045494;
 Mon, 10 Dec 2012 15:30:59 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212101530.qBAFUxqJ045494@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:30:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40322 - head/en_US.ISO8859-1/books/porters-handbook
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:30:59 -0000

Author: eadler
Date: Mon Dec 10 15:30:59 2012
New Revision: 40322
URL: http://svnweb.freebsd.org/changeset/doc/40322

Log:
  Add missing word "decide"
  
  Submitted by:	bjk
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/book.xml	Mon Dec 10 15:30:56 2012	(r40321)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Mon Dec 10 15:30:59 2012	(r40322)
@@ -192,7 +192,7 @@ USE_IMAKE=	yes
 	  particularly nice features it has.  Mentioning certain
 	  requirements like a graphical toolkit, heavy dependencies,
 	  runtime environment, or implementation languages help users
-	  whether this port will work for them.</para>
+	  decide whether this port will work for them.</para>
 
 	<para>Include a URL to the official WWW homepage.
 	  Prepend <emphasis>one</emphasis> of

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:31:02 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 295ECF2C;
 Mon, 10 Dec 2012 15:31:02 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0DA238FC1A;
 Mon, 10 Dec 2012 15:31:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFV1MK045552;
 Mon, 10 Dec 2012 15:31:01 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFV1Y9045551;
 Mon, 10 Dec 2012 15:31:01 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212101531.qBAFV1Y9045551@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:31:01 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40323 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:31:02 -0000

Author: eadler
Date: Mon Dec 10 15:31:01 2012
New Revision: 40323
URL: http://svnweb.freebsd.org/changeset/doc/40323

Log:
  The PNP one can go...  it was only marginally useful back in the day,
  and now it reads like a bad wikipedia article. - imp.
  
  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	Mon Dec 10 15:30:59 2012	(r40322)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Dec 10 15:31:01 2012	(r40323)
@@ -9364,93 +9364,6 @@ hint.sio.7.irq="12"</programlisting>
       </qandaentry>
 
       <qandaentry>
-	<question id="pnp-initialize">
-	  <para>How are Plug&nbsp;N&nbsp;Play ISA cards detected and
-	    initialized?</para>
-	</question>
-
-	<answer>
-	  <para>By: Frank Durda IV
-	    <email>uhclem@nemesis.lonestar.org</email></para>
-
-	  <para>In a nutshell, there a few I/O ports that all of the PnP
-	    boards respond to when the host asks if anyone is out there.
-	    So when the PnP probe routine starts, it asks if there are
-	    any PnP boards present, and all the PnP boards respond with
-	    their model # to a I/O read of the same port, so the probe
-	    routine gets a wired-OR <quote>yes</quote> to that question.
-	    At least one bit will be on in that reply.  Then the probe
-	    code is able to cause boards with board model IDs (assigned
-	    by &microsoft;/&intel;) lower than <literal>X</literal> to
-	    go <quote>off-line</quote>.  It then looks to see if any
-	    boards are still responding to the query.  If the answer was
-	    <literal>0</literal>, then there are no boards with IDs
-	    above <literal>X</literal>.  Probe will then ask for boards
-	    below <literal>X</literal>.  Finally, probe requests boards
-	    greater than
-	    <literal>X&nbsp;-&nbsp;(limit&nbsp;/&nbsp;4)</literal> to go
-	    off-line.  It then repeats this query.  By repeating this
-	    semi-binary search of IDs-in-range enough times, the probing
-	    code will eventually identify all PnP boards present in a
-	    given machine with a number of iterations that is much lower
-	    than what 2<superscript>64</superscript> would take.</para>
-
-	  <para>The IDs are two 32-bit fields (hence
-	    2<superscript>64</superscript>) + 8-bit checksum.  The first
-	    32&nbsp;bits are a vendor identifier.  They never come out
-	    and say it, but it appears to be assumed that different
-	    types of boards from the same vendor could have different
-	    32-bit vendor IDs.  The idea of needing 32&nbsp;bits just
-	    for unique manufacturers is a bit excessive.</para>
-
-	  <para>The lower 32&nbsp;bits are a serial #, or something else
-	    that makes this one board unique.  The vendor must never
-	    produce a second board that has the same lower 32&nbsp;bits
-	    unless the upper 32&nbsp;bits are also different.  So you
-	    can have multiple boards of the same type in the machine and
-	    the full 64&nbsp;bits will still be unique.</para>
-
-	  <para>The 32-bit groups can never be all zero.  This
-	    allows the wired-OR to show non-zero bits during the initial
-	    binary search.</para>
-
-	  <para>Once the system has identified all the board IDs
-	    present, it will reactivate each board, one at a time (via the
-	    same I/O ports), and find out what resources the given board
-	    needs, what interrupt choices are available, etc.  A scan is
-	    made over all the boards to collect this information.</para>
-
-	  <para>This info is then combined with info from any ECU files
-	    on the hard disk or wired into the MLB BIOS.  The ECU and
-	    BIOS PnP support for hardware on the MLB is usually
-	    synthetic, and the peripherals do not really do genuine PnP.
-	    However by examining the BIOS info plus the ECU info, the
-	    probe routines can cause the devices that are PnP to avoid
-	    those devices the probe code cannot relocate.</para>
-
-	  <para>Then the PnP devices are visited once more and given
-	    their I/O, DMA, IRQ and Memory-map address assignments.  The
-	    devices will then appear at those locations and remain there
-	    until the next reboot, although there is nothing that says
-	    you cannot move them around whenever you want.</para>
-
-	  <para>There is a lot of oversimplification above, but you
-	    should get the general idea.</para>
-
-	  <para>&microsoft; took over some of the primary printer status
-	    ports to do PnP, on the logic that no boards decoded those
-	    addresses for the opposing I/O cycles.  I found a genuine
-	    IBM printer board that did decode writes of the status port
-	    during the early PnP proposal review period, but &microsoft;
-	    said <quote>tough</quote>.  So they do a write to the
-	    printer status port for setting addresses, plus that use
-	    that address + <literal>0x800</literal>, and a third I/O
-	    port for reading that can be located anywhere between
-	    <literal>0x200</literal> and <literal>0x3ff</literal>.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="alternate-directory-layout">
 	  <para>What about alternative layout policies for
 	    directories?</para>

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:31:04 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6C396F2D;
 Mon, 10 Dec 2012 15:31:04 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 506808FC0C;
 Mon, 10 Dec 2012 15:31:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFV4Zg045595;
 Mon, 10 Dec 2012 15:31:04 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFV4PH045594;
 Mon, 10 Dec 2012 15:31:04 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212101531.qBAFV4PH045594@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:31:04 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40324 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:31:04 -0000

Author: eadler
Date: Mon Dec 10 15:31:03 2012
New Revision: 40324
URL: http://svnweb.freebsd.org/changeset/doc/40324

Log:
  uha is no longer supported since CAM
  
  Noted by:	imp
  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	Mon Dec 10 15:31:01 2012	(r40323)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Dec 10 15:31:03 2012	(r40324)
@@ -2804,22 +2804,6 @@ quit</programlisting>
       </qandaentry>
 
       <qandaentry>
-	<question id="brkadrint-illegal-host-access">
-	  <para>What does the message <errorname>ahc0: brkadrint,
-	    Illegal Host Access at seqaddr 0x0</errorname> mean?</para>
-	</question>
-
-	<answer>
-	  <para>This is a conflict with an Ultrastor SCSI Host
-	    Adapter.</para>
-
-	  <para>During the boot process enter the kernel configuration
-	    menu and disable <devicename>uha0</devicename>, which is
-	    causing the problem.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="aci0-illegal-cable">
 	  <para>When I boot my system, I get the error <errorname>ahc0:
 	    illegal cable configuration</errorname>.  My cabling is

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:31:06 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B4837F66;
 Mon, 10 Dec 2012 15:31:06 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 981658FC16;
 Mon, 10 Dec 2012 15:31:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFV6nI045642;
 Mon, 10 Dec 2012 15:31:06 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFV6Zx045640;
 Mon, 10 Dec 2012 15:31:06 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212101531.qBAFV6Zx045640@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:31:06 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40325 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:31:06 -0000

Author: eadler
Date: Mon Dec 10 15:31:06 2012
New Revision: 40325
URL: http://svnweb.freebsd.org/changeset/doc/40325

Log:
  Discuss uart in a question about supporting serial cards.
  
  Noted by:	Andrea Venturoli,
  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	Mon Dec 10 15:31:03 2012	(r40324)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Dec 10 15:31:06 2012	(r40325)
@@ -2342,7 +2342,7 @@ bindkey ^[[3~ delete-char # for xterm</p
 	    <para>Some unnamed clone cards have also been known to work,
 	      especially those that claim to be AST compatible.</para>
 
-	    <para>Check the &man.sio.4; manual page to get more
+	    <para>Check &man.uart.4; and &man.sio.4; to get more
 	      information on configuring such cards.</para>
 	  </answer>
 	</qandaentry>

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:31:09 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 09A9FF6A;
 Mon, 10 Dec 2012 15:31:09 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E1EE58FC18;
 Mon, 10 Dec 2012 15:31:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFV8lV045682;
 Mon, 10 Dec 2012 15:31:08 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFV8ap045681;
 Mon, 10 Dec 2012 15:31:08 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212101531.qBAFV8ap045681@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:31:08 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40326 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:31:09 -0000

Author: eadler
Date: Mon Dec 10 15:31:08 2012
New Revision: 40326
URL: http://svnweb.freebsd.org/changeset/doc/40326

Log:
  Combine all the serial questions under one section in the FAQ.
  
  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	Mon Dec 10 15:31:06 2012	(r40325)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Dec 10 15:31:08 2012	(r40326)
@@ -2302,7 +2302,7 @@ bindkey ^[[3~ delete-char # for xterm</p
     </sect1>
 
     <sect1 id="compatibility-networking">
-      <title>Networking and Serial Devices</title>
+      <title>Networking</title>
 
       <qandaset>
 	<qandaentry>
@@ -2327,37 +2327,6 @@ bindkey ^[[3~ delete-char # for xterm</p
 	      &man.bwn.4; and &man.bwi.4; drivers.</para>
 	  </answer>
 	</qandaentry>
-
-	<qandaentry>
-	  <question id="multiport-serial-support">
-	    <para>Which multi-port serial cards are supported by
-	      &os;?</para>
-	  </question>
-
-	  <answer>
-	    <para>There is a list of these in the <ulink
-		url="&url.books.handbook;/serial.html">Serial Communications</ulink>
-	      chapter of the handbook.</para>
-
-	    <para>Some unnamed clone cards have also been known to work,
-	      especially those that claim to be AST compatible.</para>
-
-	    <para>Check &man.uart.4; and &man.sio.4; to get more
-	      information on configuring such cards.</para>
-	  </answer>
-	</qandaentry>
-
-	<qandaentry>
-	  <question id="serial-console-prompt">
-	    <para>How do I get the boot: prompt to show on the serial
-	      console?</para>
-	  </question>
-
-	  <answer>
-	    <para>See <ulink
-		url="&url.books.handbook;/serialconsole-setup.html">this section of the handbook</ulink>.</para>
-	  </answer>
-	</qandaentry>
       </qandaset>
     </sect1>
 
@@ -8414,6 +8383,37 @@ ATDT1234567</programlisting>
 
     <qandaset>
       <qandaentry>
+	<question id="multiport-serial-support">
+	  <para>Which multi-port serial cards are supported by
+	    &os;?</para>
+	</question>
+
+	<answer>
+	  <para>There is a list of these in the <ulink
+	      url="&url.books.handbook;/serial.html">Serial Communications</ulink>
+	    chapter of the handbook.</para>
+
+	  <para>Some unnamed clone cards have also been known to work,
+	    especially those that claim to be AST compatible.</para>
+
+	  <para>Check &man.uart.4; and &man.sio.4; to get more
+	    information on configuring such cards.</para>
+	</answer>
+      </qandaentry>
+
+      <qandaentry>
+	<question id="serial-console-prompt">
+	  <para>How do I get the boot: prompt to show on the serial
+	    console?</para>
+	</question>
+
+	<answer>
+	  <para>See <ulink
+	      url="&url.books.handbook;/serialconsole-setup.html">this section of the handbook</ulink>.</para>
+	</answer>
+      </qandaentry>
+
+      <qandaentry>
 	<question id="found-serial">
 	  <para>How do I tell if &os; found my serial ports or modem
 	    cards?</para>

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:31:11 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 71A1DFC0;
 Mon, 10 Dec 2012 15:31:11 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3B7B08FC15;
 Mon, 10 Dec 2012 15:31:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFVBgj045733;
 Mon, 10 Dec 2012 15:31:11 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFVBAS045732;
 Mon, 10 Dec 2012 15:31:11 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212101531.qBAFVBAS045732@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:31:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40327 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:31:11 -0000

Author: eadler
Date: Mon Dec 10 15:31:10 2012
New Revision: 40327
URL: http://svnweb.freebsd.org/changeset/doc/40327

Log:
  EISA is dead.
  
  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	Mon Dec 10 15:31:08 2012	(r40326)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Dec 10 15:31:10 2012	(r40327)
@@ -2444,52 +2444,6 @@ bindkey ^[[3~ delete-char # for xterm</p
       </qandaentry>
 
       <qandaentry>
-	<question id="hpnetserver-scsi-failure">
-	  <para>Why does &os; not detect my HP Netserver's SCSI
-	    controller?</para>
-	</question>
-
-	<answer>
-	  <para>This is basically a known problem.  The EISA on-board
-	    SCSI controller in the HP Netserver machines occupies EISA
-	    slot number 11, so all the <quote>true</quote> EISA slots
-	    are in front of it.  Alas, the address space for EISA slots
-	    &gt;= 10 collides with the address space assigned to PCI,
-	    and &os;'s auto-configuration currently cannot handle this
-	    situation very well.</para>
-
-	  <para>So now, the best you can do is to pretend there is no
-	    address range clash :), by bumping the kernel option
-	    <literal>EISA_SLOTS</literal> to a value of 12.  Configure
-	    and compile a kernel, as described in the <ulink
-	      url="&url.books.handbook;/kernelconfig.html">Handbook entry on configuring the kernel</ulink>.</para>
-
-	  <para>Of course, this does present you with a chicken-and-egg
-	    problem when installing on such a machine.  In order to work
-	    around this problem, a special hack is available inside
-	    <emphasis>UserConfig</emphasis>.  Do not use the
-	    <quote>visual</quote> interface, but the plain command-line
-	    interface there.  Simply type the following command at the
-	    prompt and install your system as usual:</para>
-
-	  <programlisting>eisa 12
-quit</programlisting>
-
-	  <para>While it is recommended you compile and install a custom
-	    kernel anyway.</para>
-
-	  <para>Hopefully, future versions will have a proper fix for
-	    this problem.</para>
-
-	  <note>
-	    <para>You cannot use a <literal>dangerously
-		dedicated</literal> disk with an HP Netserver.  See <link
-		linkend="dedicate">this note</link> for more info.</para>
-	  </note>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="ed1-timeout">
 	  <para>I keep seeing messages like <errorname>ed1:
 	    timeout</errorname>.  What do these messages mean?</para>

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:31:13 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A98AEFC5;
 Mon, 10 Dec 2012 15:31:13 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8D4688FC1F;
 Mon, 10 Dec 2012 15:31:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFVDRP045771;
 Mon, 10 Dec 2012 15:31:13 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFVDJa045770;
 Mon, 10 Dec 2012 15:31:13 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212101531.qBAFVDJa045770@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:31:13 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40328 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:31:13 -0000

Author: eadler
Date: Mon Dec 10 15:31:12 2012
New Revision: 40328
URL: http://svnweb.freebsd.org/changeset/doc/40328

Log:
  3dfx went defunct in 2002
  
  Noted by:	Chris Petrik <c.petrik.sosa@gmail.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	Mon Dec 10 15:31:10 2012	(r40327)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Dec 10 15:31:12 2012	(r40328)
@@ -6615,11 +6615,6 @@ Key F15        A        A        Menu Wo
 	  <para>For ATI&nbsp;Rage&nbsp;128 and Radeon, see the
 	    &man.ati.4x;, &man.r128.4x; and &man.radeon.4x; manual
 	    pages.</para>
-
-	  <para>For 3dfx Voodoo&nbsp;3, 4, 5, and Banshee cards, there
-	    is a <filename
-	      role="package">x11-servers/driglide</filename>
-	    port.</para>
 	</answer>
       </qandaentry>
     </qandaset>

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:31:16 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 1CD6AFF5;
 Mon, 10 Dec 2012 15:31:15 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CFB798FC12;
 Mon, 10 Dec 2012 15:31:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFVFmN045814;
 Mon, 10 Dec 2012 15:31:15 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFVF3c045813;
 Mon, 10 Dec 2012 15:31:15 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212101531.qBAFVF3c045813@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:31:15 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40329 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:31:16 -0000

Author: eadler
Date: Mon Dec 10 15:31:15 2012
New Revision: 40329
URL: http://svnweb.freebsd.org/changeset/doc/40329

Log:
  Hot plugging of the usb system works
  
  Noted by:	imp
  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	Mon Dec 10 15:31:12 2012	(r40328)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Dec 10 15:31:15 2012	(r40329)
@@ -2113,14 +2113,6 @@
 
 	    <para>See the &man.ukbd.4;, &man.kbdcontrol.1; and
 	      &man.kbdmux.4; manual pages for more information.</para>
-
-	    <note>
-	      <para>Hot-plugging and unplugging of the USB keyboard may
-		not work quite right yet.  We recommend connecting the
-		keyboard before starting the system and leaving it
-		connected until the system is shutdown to avoid
-		issues.</para>
-	    </note>
 	  </answer>
 	</qandaentry>
 

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:31:18 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 469F01000;
 Mon, 10 Dec 2012 15:31:18 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2BAEC8FC19;
 Mon, 10 Dec 2012 15:31:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFVIDu045857;
 Mon, 10 Dec 2012 15:31:18 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFVIXU045856;
 Mon, 10 Dec 2012 15:31:18 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212101531.qBAFVIXU045856@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:31:18 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40330 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:31:18 -0000

Author: eadler
Date: Mon Dec 10 15:31:17 2012
New Revision: 40330
URL: http://svnweb.freebsd.org/changeset/doc/40330

Log:
  use two spaces at sentence start
  
  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	Mon Dec 10 15:31:15 2012	(r40329)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Dec 10 15:31:17 2012	(r40330)
@@ -5106,7 +5106,7 @@ C:\="DOS"</programlisting>
 	      not be duplicated until they are next modified.</para>
 
 	    <para>Deduplication can also lead to some unexpected
-	      situations. In particular deleting files may become much
+	      situations.  In particular deleting files may become much
 	      slower.</para>
 	  </answer>
 	</qandaentry>

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:31:20 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8CE116B;
 Mon, 10 Dec 2012 15:31:20 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 711698FC0C;
 Mon, 10 Dec 2012 15:31:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFVK6w045895;
 Mon, 10 Dec 2012 15:31:20 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFVKKs045894;
 Mon, 10 Dec 2012 15:31:20 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212101531.qBAFVKKs045894@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:31:20 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40331 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:31:20 -0000

Author: eadler
Date: Mon Dec 10 15:31:19 2012
New Revision: 40331
URL: http://svnweb.freebsd.org/changeset/doc/40331

Log:
  Make some language in running-X nicer and more professional.
  
  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	Mon Dec 10 15:31:17 2012	(r40330)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Dec 10 15:31:19 2012	(r40331)
@@ -6002,10 +6002,10 @@ options    SYSVMSG          # enable for
 	    requires write access to &man.io.4;.  For more information,
 	    see at the &man.init.8; manual page.</para>
 
-	  <para>So the question is what else you should do instead, and
-	    you basically have two choices: set your
+	  <para>There are two solutions to the problem:
+	    Set your
 	    <literal>securelevel</literal> back down to zero (usually
-	    from <filename>/etc/rc.conf</filename>), or run &man.xdm.1;
+	    in <filename>/etc/rc.conf</filename>), or run &man.xdm.1;
 	    at boot time (before the <literal>securelevel</literal> is
 	    raised).</para>
 

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:31:22 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D1697E5;
 Mon, 10 Dec 2012 15:31:22 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B4D588FC12;
 Mon, 10 Dec 2012 15:31:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFVMjb045942;
 Mon, 10 Dec 2012 15:31:22 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFVMUE045940;
 Mon, 10 Dec 2012 15:31:22 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212101531.qBAFVMUE045940@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:31:22 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40332 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:31:22 -0000

Author: eadler
Date: Mon Dec 10 15:31:22 2012
New Revision: 40332
URL: http://svnweb.freebsd.org/changeset/doc/40332

Log:
  This answer is relatively clear and we have had multiple supported
  versions of FreeBSD for years.
  
  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	Mon Dec 10 15:31:19 2012	(r40331)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Dec 10 15:31:22 2012	(r40332)
@@ -314,11 +314,6 @@
 	  <para>What is the latest version of &os;?</para>
 	</question>
 
-<!--
-  This answer is a hack to deal with the fact that for now there are
-  multiple "latest" versions of FreeBSD.
--->
-
 	<answer>
 	  <para>At any point in the development of &os;, there can be
 	    multiple parallel branches.  &rel.relx; releases are

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:31:25 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 22219E7;
 Mon, 10 Dec 2012 15:31:25 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 06A2C8FC13;
 Mon, 10 Dec 2012 15:31:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFVO9T045981;
 Mon, 10 Dec 2012 15:31:24 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFVOYw045980;
 Mon, 10 Dec 2012 15:31:24 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212101531.qBAFVOYw045980@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:31:24 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40333 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:31:25 -0000

Author: eadler
Date: Mon Dec 10 15:31:24 2012
New Revision: 40333
URL: http://svnweb.freebsd.org/changeset/doc/40333

Log:
  iomega devices are no longer mentioned in the FAQ.
  
  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	Mon Dec 10 15:31:22 2012	(r40332)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Dec 10 15:31:24 2012	(r40333)
@@ -64,7 +64,6 @@
       &tm-attrib.ibm;
       &tm-attrib.ieee;
       &tm-attrib.intel;
-      &tm-attrib.iomega;
       &tm-attrib.linux;
       &tm-attrib.microsoft;
       &tm-attrib.mips;

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:31:27 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8A68911D;
 Mon, 10 Dec 2012 15:31:27 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 55B4F8FC14;
 Mon, 10 Dec 2012 15:31:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFVRYq046026;
 Mon, 10 Dec 2012 15:31:27 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFVRoc046025;
 Mon, 10 Dec 2012 15:31:27 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212101531.qBAFVRoc046025@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:31:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40334 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:31:27 -0000

Author: eadler
Date: Mon Dec 10 15:31:26 2012
New Revision: 40334
URL: http://svnweb.freebsd.org/changeset/doc/40334

Log:
  Manually mucking with disk geometry is obsolete.
  
  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	Mon Dec 10 15:31:24 2012	(r40333)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Dec 10 15:31:26 2012	(r40334)
@@ -3204,37 +3204,6 @@ kern.timecounter.hardware: TSC -&gt; i82
       </qandaentry>
 
       <qandaentry>
-	<question id="boot-read-error">
-	  <para>Why does &os;'s boot loader display <errorname>Read
-	    error</errorname> and stop after the BIOS screen?</para>
-	</question>
-
-	<answer>
-	  <para>&os;'s boot loader is incorrectly recognizing the hard
-	    drive's geometry.  This must be manually set within
-	    &man.fdisk.8; when creating or modifying &os;'s
-	    slice.</para>
-
-	  <para>The correct drive geometry values can be found within
-	    the machine's BIOS.  Look for the number of cylinders, heads
-	    and sectors for the particular drive.</para>
-
-	  <para>Within &man.sysinstall.8;'s fdisk, hit
-	    <keycap>G</keycap> to set the drive geometry.</para>
-
-	  <para>A dialog will pop up requesting the number of cylinders,
-	    heads and sectors.  Type the numbers found from the BIOS
-	    separated by forward slashes.  For example, values of 5000
-	    cylinders, 250 heads, and 60 sectors would be entered as
-	    <userinput>5000/250/60</userinput>.</para>
-
-	  <para>Press <keycap>Enter</keycap> to set the values, and hit
-	    <keycap>W</keycap> to write the new partition table to the
-	    drive.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="bootmanager-restore">
 	  <para>Another operating system destroyed my Boot Manager.  How
 	    do I get it back?</para>

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 15:35:45 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E18D973D;
 Mon, 10 Dec 2012 15:35:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C4D3C8FC08;
 Mon, 10 Dec 2012 15:35:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAFZjoM046802;
 Mon, 10 Dec 2012 15:35:45 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAFZj5L046801;
 Mon, 10 Dec 2012 15:35:45 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212101535.qBAFZj5L046801@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 10 Dec 2012 15:35:45 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40335 - head/en_US.ISO8859-1/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 15:35:46 -0000

Author: gjb
Date: Mon Dec 10 15:35:45 2012
New Revision: 40335
URL: http://svnweb.freebsd.org/changeset/doc/40335

Log:
  Put a more prominent "Donate to FreeBSD" button on the index page.
  This currently uses the same CSS as the "New to FreeBSD?" button for
  now.
  
  Requested by:	rwatson

Modified:
  head/en_US.ISO8859-1/htdocs/index.xsl

Modified: head/en_US.ISO8859-1/htdocs/index.xsl
==============================================================================
--- head/en_US.ISO8859-1/htdocs/index.xsl	Mon Dec 10 15:31:26 2012	(r40334)
+++ head/en_US.ISO8859-1/htdocs/index.xsl	Mon Dec 10 15:35:45 2012	(r40335)
@@ -193,6 +193,14 @@
 			<div class="frontnewroundbox">
 			  <div class="frontnewtop"><div><b style="display: none">.</b></div></div>
 			    <div class="frontnewcontent">
+				<a href="http://www.FreeBSDFoundation.org/donate/">Donate to FreeBSD</a>
+			    </div> <!-- frontnewcontent -->
+			  <div class="frontnewbot"><div><b style="display: none">.</b></div></div>
+			</div> <!-- frontnewroundbox -->
+
+			<div class="frontnewroundbox">
+			  <div class="frontnewtop"><div><b style="display: none">.</b></div></div>
+			    <div class="frontnewcontent">
 			      <a href="&base;/projects/newbies.html">New to FreeBSD?</a>
 			    </div> <!-- frontnewcontent -->
 			  <div class="frontnewbot"><div><b style="display: none">.</b></div></div>

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 16:09:39 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 39067FF5;
 Mon, 10 Dec 2012 16:09:39 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1A5BF8FC08;
 Mon, 10 Dec 2012 16:09:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAG9c0a052733;
 Mon, 10 Dec 2012 16:09:38 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAG9c7r052732;
 Mon, 10 Dec 2012 16:09:38 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201212101609.qBAG9c7r052732@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Mon, 10 Dec 2012 16:09:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40336 - head/nl_NL.ISO8859-1/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 16:09:39 -0000

Author: rene
Date: Mon Dec 10 16:09:38 2012
New Revision: 40336
URL: http://svnweb.freebsd.org/changeset/doc/40336

Log:
  MFen r40230 -> r40335

Modified:
  head/nl_NL.ISO8859-1/htdocs/index.xsl

Modified: head/nl_NL.ISO8859-1/htdocs/index.xsl
==============================================================================
--- head/nl_NL.ISO8859-1/htdocs/index.xsl	Mon Dec 10 15:35:45 2012	(r40335)
+++ head/nl_NL.ISO8859-1/htdocs/index.xsl	Mon Dec 10 16:09:38 2012	(r40336)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Vertaald door: Siebrand Mazeland / Rene Ladan
      %SOURCE%	en_US.ISO8859-1/htdocs/index.xsl
-     %SRCID%	40230
+     %SRCID%	40335
 -->
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
@@ -190,6 +190,14 @@
 			<div class="frontnewroundbox">
 			  <div class="frontnewtop"><div><b style="display: none">.</b></div></div>
 			    <div class="frontnewcontent">
+			      <a href="http://www.FreeBSDFoundation.org/donate/">Doneer aan &os;</a>
+			    </div> <!-- frontnewcontent -->
+			  <div class="frontnewbot"><div><b style="display: none">.</b></div></div>
+			</div> <!-- frontnewroundbox -->
+
+			<div class="frontnewroundbox">
+			  <div class="frontnewtop"><div><b style="display: none">.</b></div></div>
+			    <div class="frontnewcontent">
 			      <a href="&enbase;/projects/newbies.html">Nieuw bij &os;?</a>
 			    </div> <!-- frontnewcontent -->
 			  <div class="frontnewbot"><div><b style="display: none">.</b></div></div>

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 17:00:54 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E55B84AC;
 Mon, 10 Dec 2012 17:00:54 +0000 (UTC)
 (envelope-from zeising@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C8CF18FC12;
 Mon, 10 Dec 2012 17:00:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAH0s9Q062284;
 Mon, 10 Dec 2012 17:00:54 GMT (envelope-from zeising@svn.freebsd.org)
Received: (from zeising@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAH0sBm062283;
 Mon, 10 Dec 2012 17:00:54 GMT (envelope-from zeising@svn.freebsd.org)
Message-Id: <201212101700.qBAH0sBm062283@svn.freebsd.org>
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Mon, 10 Dec 2012 17:00:54 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40337 - head/en_US.ISO8859-1/books/porters-handbook
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 17:00:55 -0000

Author: zeising
Date: Mon Dec 10 17:00:54 2012
New Revision: 40337
URL: http://svnweb.freebsd.org/changeset/doc/40337

Log:
  Fix spelling.
  
  Noticed by:	wblock
  Approved by:	joel (mentor)

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/book.xml	Mon Dec 10 16:09:38 2012	(r40336)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Mon Dec 10 17:00:54 2012	(r40337)
@@ -4443,7 +4443,7 @@ OPTIONS_RADIO_RG1=	OPT7 OPT8</programlis
 OPTIONS_MULTI_MG1=	OPT5 OPT6</programlisting>
 
 	  <para><makevar>OPTIONS</makevar> can also be grouped as
-	    <quote>multiple-choice</quote> lists, where non or any
+	    <quote>multiple-choice</quote> lists, where none or any
 	    option can be enabled:</para>
 
 	  <programlisting>OPTIONS_GROUP=		GG1

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 18:33:10 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8FD53615;
 Mon, 10 Dec 2012 18:33:10 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 73FA38FC0C;
 Mon, 10 Dec 2012 18:33:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAIXAEL080764;
 Mon, 10 Dec 2012 18:33:10 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAIXAMu080763;
 Mon, 10 Dec 2012 18:33:10 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212101833.qBAIXAMu080763@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 10 Dec 2012 18:33:10 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40338 - head/en_US.ISO8859-1/htdocs/donations
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 18:33:10 -0000

Author: gjb
Date: Mon Dec 10 18:33:09 2012
New Revision: 40338
URL: http://svnweb.freebsd.org/changeset/doc/40338

Log:
  Add text to make it more clear where monetary donations can be
  sent.
  
  Requested by:	rwatson, gavin

Modified:
  head/en_US.ISO8859-1/htdocs/donations/index.xml

Modified: head/en_US.ISO8859-1/htdocs/donations/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/donations/index.xml	Mon Dec 10 17:00:54 2012	(r40337)
+++ head/en_US.ISO8859-1/htdocs/donations/index.xml	Mon Dec 10 18:33:09 2012	(r40338)
@@ -13,6 +13,24 @@
 
     <body class="navinclude.about">
 
+    <h2>Monetary FreeBSD Foundation Donations</h2>
+
+    <p>The &os;&nbsp;Foundation's fund-raising efforts are essential
+      to keeping &os; free.  As the Project grows, so do the
+      costs.</p>
+
+    <p>By donating to the foundation, you are helping us fund and
+      manage projects, sponsor &os; events, and provide travel
+      grants to &os; developers.  You are also helping us represent
+      the Project in executing contracts, license agreements,
+      copyrights, trademarks, and other legal arrangements that
+      require a recognized legal entity.</p>
+
+    <p>To make a monetary donation to the &os;&nbsp;Foundation, please
+      visit the <a
+	href="http://www.freebsdfoundation.org/donate/">&os;&nbsp;Foundation</a>
+      donation page.</p>
+
     <h2>Contents</h2>
     <ul>
       <li><a href="#goal">Donations Liaison Goals</a></li>

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 22:46:03 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A93F4498;
 Mon, 10 Dec 2012 22:46:03 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8D1DC8FC0C;
 Mon, 10 Dec 2012 22:46:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAMk3Og029479;
 Mon, 10 Dec 2012 22:46:03 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAMk3U0029478;
 Mon, 10 Dec 2012 22:46:03 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212102246.qBAMk3U0029478@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 10 Dec 2012 22:46:03 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40339 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 22:46:03 -0000

Author: gjb
Date: Mon Dec 10 22:46:02 2012
New Revision: 40339
URL: http://svnweb.freebsd.org/changeset/doc/40339

Log:
  Add a link to the FreeBSD Foundation Fundraising Campaign.
  
  Requested by:	rwatson

Modified:
  head/share/xml/news.xml

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Mon Dec 10 18:33:09 2012	(r40338)
+++ head/share/xml/news.xml	Mon Dec 10 22:46:02 2012	(r40339)
@@ -37,6 +37,24 @@
 	<name>5</name>
 
 	<event>
+	  <title>&os; Year-End Fundraising Campaign</title>
+
+	  <p>Your donations have helped make &os; the best OS
+	    available!  By investing in The &os;&nbsp;Foundation you
+	    have helped us keep &os; a high-performance, secure, and
+	    stable operating system.</p>
+
+	  <p>Thanks to people like you, the &os;&nbsp;Foundation has
+	    been proudly supporting the &os;&nbps;Project and
+	    community for 12 years now.  <a
+	      href="http://freebsdfoundation.blogspot.com/2012/12/year-end-fundraising-campaign.html">Read
+	      more...</a></p>
+	</event>
+      </day>
+      <day>
+	<name>5</name>
+
+	<event>
 	  <title>&os;&nbsp;Project Website is Using Google
 	    Analytics</title>
 

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 22:55:22 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 7FE9E5A5;
 Mon, 10 Dec 2012 22:55:22 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 64FF88FC0C;
 Mon, 10 Dec 2012 22:55:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAMtMPe031101;
 Mon, 10 Dec 2012 22:55:22 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAMtMZ2031100;
 Mon, 10 Dec 2012 22:55:22 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212102255.qBAMtMZ2031100@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 10 Dec 2012 22:55:22 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40340 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 22:55:22 -0000

Author: gjb
Date: Mon Dec 10 22:55:21 2012
New Revision: 40340
URL: http://svnweb.freebsd.org/changeset/doc/40340

Log:
  Fix an entity that I'm rather surprised did not generate an error.

Modified:
  head/share/xml/news.xml

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Mon Dec 10 22:46:02 2012	(r40339)
+++ head/share/xml/news.xml	Mon Dec 10 22:55:21 2012	(r40340)
@@ -45,7 +45,7 @@
 	    stable operating system.</p>
 
 	  <p>Thanks to people like you, the &os;&nbsp;Foundation has
-	    been proudly supporting the &os;&nbps;Project and
+	    been proudly supporting the &os;&nbsp;Project and
 	    community for 12 years now.  <a
 	      href="http://freebsdfoundation.blogspot.com/2012/12/year-end-fundraising-campaign.html">Read
 	      more...</a></p>

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 22:59:11 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id AE91164B;
 Mon, 10 Dec 2012 22:59:11 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 934488FC08;
 Mon, 10 Dec 2012 22:59:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBAMxBsq031749;
 Mon, 10 Dec 2012 22:59:11 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBAMxBFP031748;
 Mon, 10 Dec 2012 22:59:11 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212102259.qBAMxBFP031748@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 10 Dec 2012 22:59:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40341 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 22:59:11 -0000

Author: gjb
Date: Mon Dec 10 22:59:11 2012
New Revision: 40341
URL: http://svnweb.freebsd.org/changeset/doc/40341

Log:
  Fix duplicate entry of latest news addition.
  
  Pointyhat:	gjb (myself)

Modified:
  head/share/xml/news.xml

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Mon Dec 10 22:55:21 2012	(r40340)
+++ head/share/xml/news.xml	Mon Dec 10 22:59:11 2012	(r40341)
@@ -50,8 +50,7 @@
 	      href="http://freebsdfoundation.blogspot.com/2012/12/year-end-fundraising-campaign.html">Read
 	      more...</a></p>
 	</event>
-      </day>
-      <day>
+
 	<name>5</name>
 
 	<event>

From owner-svn-doc-all@FreeBSD.ORG  Mon Dec 10 23:56:23 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3DDAAAC5;
 Mon, 10 Dec 2012 23:56:23 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 22BDC8FC15;
 Mon, 10 Dec 2012 23:56:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBANuNuO042801;
 Mon, 10 Dec 2012 23:56:23 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBANuM9H042799;
 Mon, 10 Dec 2012 23:56:22 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212102356.qBANuM9H042799@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 10 Dec 2012 23:56:22 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40342 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 23:56:23 -0000

Author: gjb
Date: Mon Dec 10 23:56:22 2012
New Revision: 40342
URL: http://svnweb.freebsd.org/changeset/doc/40342

Log:
  Add the first Faces of FreeBSD entry.
  
  Submitted by:	deb

Modified:
  head/share/xml/news.xml

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Mon Dec 10 22:59:11 2012	(r40341)
+++ head/share/xml/news.xml	Mon Dec 10 23:56:22 2012	(r40342)
@@ -34,6 +34,23 @@
 	<name>12</name>
 
       <day>
+	<name>10</name>
+
+	<event>
+	  <title>Faces of &os; &dash; Alberto Mijares</title>
+
+	  <p>Are you aware of the tangible benefits derived from our
+	    support of the &os; community?  In conjunction with our
+	    year-end fundraising drive we are going to be spotlighting
+	    different people on our website, blog, and Facebook page
+	    who have received funding to work on development projects,
+	    run conferences, travel to conferences, and advocate for
+	    &os;.  <a
+	      href="http://freebsdfoundation.blogspot.com/2012/12/faces-of-freebsd-alberto-mijares.html">Read more...</a></p>
+	</event>
+      </day>
+
+      <day>
 	<name>5</name>
 
 	<event>

From owner-svn-doc-all@FreeBSD.ORG  Tue Dec 11 13:39:58 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 01682334;
 Tue, 11 Dec 2012 13:39:58 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BFE9C8FC0C;
 Tue, 11 Dec 2012 13:39:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBBDdvDD004488;
 Tue, 11 Dec 2012 13:39:57 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBBDdvHv004487;
 Tue, 11 Dec 2012 13:39:57 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201212111339.qBBDdvHv004487@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Tue, 11 Dec 2012 13:39:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40343 - head/ja_JP.eucJP/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Dec 2012 13:39:58 -0000

Author: ryusuke
Date: Tue Dec 11 13:39:57 2012
New Revision: 40343
URL: http://svnweb.freebsd.org/changeset/doc/40343

Log:
  - Merge the following from the English version:
  
  	r40230 -> r40335	head/ja_JP.eucJP/htdocs/index.xsl

Modified:
  head/ja_JP.eucJP/htdocs/index.xsl

Modified: head/ja_JP.eucJP/htdocs/index.xsl
==============================================================================
--- head/ja_JP.eucJP/htdocs/index.xsl	Mon Dec 10 23:56:22 2012	(r40342)
+++ head/ja_JP.eucJP/htdocs/index.xsl	Tue Dec 11 13:39:57 2012	(r40343)
@@ -5,7 +5,7 @@
 ]>
 
 <!-- $FreeBSD$ -->
-<!-- Original revision: r40230 -->
+<!-- Original revision: r40335 -->
 
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -63,7 +63,7 @@
 			</div> <!-- TXTFRONTFEATURELINK -->
 
 			<div
-			  style="width:640px; margin: 16px 16px 16px 32px; auto">
+			  style="width:550px; margin: 16px 16px 16px 32px; auto">
 
 			  <h1>Security Notice</h1>
 
@@ -187,6 +187,14 @@
 		      <div class="frontnewroundbox">
 			<div class="frontnewtop"><div>&#160;</div>&#160;</div>
 			<div class="frontnewcontent">
+			  <a href="http://www.FreeBSDFoundation.org/donate/">FreeBSD ¤Ø¤Î´óÉí</a>
+			</div> <!-- frontnewcontent -->
+			<div class="frontnewbot"><div><b style="display: none">.</b></div></div>
+		      </div> <!-- frontnewroundbox -->
+
+		      <div class="frontnewroundbox">
+			<div class="frontnewtop"><div><b style="display: none">.</b></div></div>
+			<div class="frontnewcontent">
 			  <a href="&base;/projects/newbies.html">FreeBSD ¤¬½é¤á¤Æ¤È¤¤¤¦Êý¤Ï¡¢¤³¤Á¤é¤Ø¤É¤¦¤¾</a>
 			</div> <!-- frontnewcontent -->
 			<div class="frontnewbot"><div>&#160;</div>&#160;</div>

From owner-svn-doc-all@FreeBSD.ORG  Tue Dec 11 16:49:18 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id CC95D5CF;
 Tue, 11 Dec 2012 16:49:18 +0000 (UTC)
 (envelope-from maxim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 98C5E8FC1E;
 Tue, 11 Dec 2012 16:49:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBBGnI8I041174;
 Tue, 11 Dec 2012 16:49:18 GMT (envelope-from maxim@svn.freebsd.org)
Received: (from maxim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBBGnInu041170;
 Tue, 11 Dec 2012 16:49:18 GMT (envelope-from maxim@svn.freebsd.org)
Message-Id: <201212111649.qBBGnInu041170@svn.freebsd.org>
From: Maxim Konovalov <maxim@FreeBSD.org>
Date: Tue, 11 Dec 2012 16:49:18 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40345 - in head/ru_RU.KOI8-R/books/handbook: .
 cutting-edge
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Dec 2012 16:49:18 -0000

Author: maxim
Date: Tue Dec 11 16:49:17 2012
New Revision: 40345
URL: http://svnweb.freebsd.org/changeset/doc/40345

Log:
  Grammar.

Modified:
  head/ru_RU.KOI8-R/books/handbook/chapters.ent
  head/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml

Modified: head/ru_RU.KOI8-R/books/handbook/chapters.ent
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/chapters.ent	Tue Dec 11 16:19:40 2012	(r40344)
+++ head/ru_RU.KOI8-R/books/handbook/chapters.ent	Tue Dec 11 16:49:17 2012	(r40345)
@@ -9,7 +9,7 @@
 -->
 <!--
      óÏÚÄÁÎÉÅ ÓÕÝÎÏÓÔÅÊ ÄÌÑ ËÁÖÄÏÇÏ ÒÁÚÄÅÌÁ òÕËÏ×ÏÄÓÔ×Á. ëÁÖÄÁÑ ÓÕÝÎÏÓÔØ
-     ÎÁÚÙ×ÁÅÔÓÑ chap.foo, ÇÄÅ foo ÚÎÁÞÅÎÉÅ ÁÔÔÒÉÂÕÔÁ id ÜÔÏÇÏ ÒÁÚÄÅÌÁ,
+     ÎÁÚÙ×ÁÅÔÓÑ chap.foo, ÇÄÅ foo ÚÎÁÞÅÎÉÅ ÁÔÒÉÂÕÔÁ id ÜÔÏÇÏ ÒÁÚÄÅÌÁ,
      É ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ÎÁÚ×ÁÎÉÀ ËÁÔÁÌÏÇÁ × ËÏÔÏÒÏÍ .xml ÆÁÊÌÙ ÏÔÎÏÓÑÝÉÅÓÑ
      Ë ÜÔÏÍÕ ÒÁÚÄÅÌÕ ÓÏÈÒÁÎÅÎÙ.
 

Modified: head/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml	Tue Dec 11 16:19:40 2012	(r40344)
+++ head/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml	Tue Dec 11 16:49:17 2012	(r40345)
@@ -467,7 +467,7 @@ Does this look reasonable (y/n)? y</scre
 	  <acronym>IDS</acronym>, ÜÔÏ ÎÉ × ËÏÅÊ ÍÅÒÅ ÎÅ ÄÏÌÖÎÏ Ñ×ÌÑÔØÓÑ
 	  ÚÁÍÅÎÏÊ ÓÉÓÔÅÍÅ ÏÂÎÁÒÕÖÅÎÉÑ ×ÔÏÒÖÅÎÉÊ, ÔÁËÏÊ ËÁË <filename
 	    role="package">security/snort</filename>.  ðÏÓËÏÌØËÕ
-	  <command>freebsd-update</command> ÓÏÈÒÁÎÁÅÔ Ó×ÏÉ ÄÁÎÎÙÅ ÎÁ
+	  <command>freebsd-update</command> ÓÏÈÒÁÎÑÅÔ Ó×ÏÉ ÄÁÎÎÙÅ ÎÁ
 	  ÄÉÓËÅ, ×ÏÚÍÏÖÎÏÓÔØ ÐÏÄÍÅÎÙ ÓÔÁÎÏ×ÉÔÓÑ ÏÞÅ×ÉÄÎÏÊ.  é ÈÏÔÑ ÜÔÁ
 	  ×ÏÚÍÏÖÎÏÓÔØ ÍÏÖÅÔ ÂÙÔØ ÕÍÅÎØÛÅÎÁ ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÎÁÓÔÒÏÊËÉ
 	  <varname>kern.securelevel</varname>, Á ÔÁËÖÅ ÉÓÐÏÌØÚÕÑ ÄÌÑ

From owner-svn-doc-all@FreeBSD.ORG  Tue Dec 11 16:19:41 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A2EB9752;
 Tue, 11 Dec 2012 16:19:41 +0000 (UTC)
 (envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 857168FC19;
 Tue, 11 Dec 2012 16:19:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBBGJfaD035791;
 Tue, 11 Dec 2012 16:19:41 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBBGJeh3035786;
 Tue, 11 Dec 2012 16:19:40 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201212111619.qBBGJeh3035786@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Tue, 11 Dec 2012 16:19:40 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40344 - in head/ru_RU.KOI8-R/books/handbook:
 cutting-edge kernelconfig preface serialcomms
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, 11 Dec 2012 17:31:08 +0000
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Dec 2012 16:19:41 -0000

Author: pluknet
Date: Tue Dec 11 16:19:40 2012
New Revision: 40344
URL: http://svnweb.freebsd.org/changeset/doc/40344

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

Modified:
  head/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
  head/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml
  head/ru_RU.KOI8-R/books/handbook/preface/preface.xml
  head/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml

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

Modified: head/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml	Tue Dec 11 13:39:57 2012	(r40343)
+++ head/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.xml	Tue Dec 11 16:19:40 2012	(r40344)
@@ -348,7 +348,7 @@ following line in &man.loader.conf.5;:
 	ÐÏÎÑÔØ, ÞÔÏ ×Ù ÕÄÁÌÉÌÉ ÓÏÂÓÔ×ÅÎÎÙÊ ÆÁÊÌ ÎÁÓÔÒÏÊËÉ ÑÄÒÁ.  îÅ
 	ÒÅÄÁËÔÉÒÕÊÔÅ ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ <filename>GENERIC</filename>, ÏÎ ÍÏÖÅÔ
 	ÂÙÔØ ÔÁËÖÅ ÐÅÒÅÚÁÐÉÓÁÎ É ÐÒÉ ÓÌÅÄÕÀÝÅÍ <link
-	linkend="cutting-edge">ÏÂÎÏ×ÌÅÎÉÉ ÄÅÒÅ×Á ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ×</link>,
+	linkend="updating-upgrading">ÏÂÎÏ×ÌÅÎÉÉ ÄÅÒÅ×Á ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ×</link>,
 	É ÉÚÍÅÎÅÎÉÑ ÑÄÒÁ ÂÕÄÕÔ ÐÏÔÅÒÑÎÙ.</para>
 
       <para>÷Ù ÍÏÖÅÔÅ ÓÏÈÒÁÎÉÔØ ÆÁÊÌ ËÏÎÆÉÇÕÒÁÃÉÉ ÑÄÒÁ × ÄÒÕÇÏÍ ÍÅÓÔÅ,
@@ -387,7 +387,7 @@ following line in &man.loader.conf.5;:
 
     <note>
       <para>åÓÌÉ ×Ù <link
-	linkend="cutting-edge">ÓÉÎÈÒÏÎÉÚÉÒÕÅÔÅ ÄÅÒÅ×Ï ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ×</link>
+	linkend="updating-upgrading">ÓÉÎÈÒÏÎÉÚÉÒÕÅÔÅ ÄÅÒÅ×Ï ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ×</link>
 	Ó ÄÅÒÅ×ÏÍ ÐÒÏÅËÔÁ &os;, ÎÅ ÚÁÂÕÄØÔÅ Ó×ÅÒÉÔØÓÑ Ó ÆÁÊÌÏÍ
 	<filename>/usr/src/UPDATING</filename> ÐÅÒÅÄ ÏÂÎÏ×ÌÅÎÉÅÍ. ÷ ÜÔÏÍ
 	ÆÁÊÌÅ ÏÐÉÓÁÎÙ ×ÓÅ ×ÁÖÎÙÅ ×ÏÐÒÏÓÙ É ÏÂÌÁÓÔÉ ÉÓÈÏÄÎÏÇÏ ËÏÄÁ, ÔÒÅÂÕÀÝÉÅ

Modified: head/ru_RU.KOI8-R/books/handbook/preface/preface.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/preface/preface.xml	Tue Dec 11 13:39:57 2012	(r40343)
+++ head/ru_RU.KOI8-R/books/handbook/preface/preface.xml	Tue Dec 11 16:19:40 2012	(r40344)
@@ -450,7 +450,8 @@
     </varlistentry>
 
     <varlistentry>
-      <term><emphasis><xref linkend="cutting-edge"/>, îÁ ÐÅÒÅÄÎÅÍ ËÒÁÅ ÒÁÚÒÁÂÏÔÏË</emphasis></term>
+      <term><emphasis><xref linkend="updating-upgrading"/>, ïÂÎÏ×ÌÅÎÉÅ
+	ÓÉÓÔÅÍÙ É ÓÍÅÎÁ ×ÅÒÓÉÉ</emphasis></term>
       <listitem>
 	<para>ïÂßÑÓÎÑÅÔ ÒÁÚÌÉÞÉÑ ÍÅÖÄÕ FreeBSD-STABLE, FreeBSD-CURRENT É
 	  FreeBSD-RELEASE.  òÁÓÓËÁÚÙ×ÁÅÔ, ËÏÍÕ ÉÚ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÂÕÄÅÔ ÐÏÌÅÚÎÏ

Modified: head/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml	Tue Dec 11 13:39:57 2012	(r40343)
+++ head/ru_RU.KOI8-R/books/handbook/serialcomms/chapter.xml	Tue Dec 11 16:19:40 2012	(r40344)
@@ -2699,7 +2699,7 @@ boot:</screen>
 	<procedure>
 	  <step>
 	    <para>ðÏÌÕÞÉÔÅ ÉÓÈÏÄÎÙÅ ÔÅËÓÔÙ ÑÄÒÁ (ÇÌÁ×Á
-	      <xref linkend="cutting-edge"/>)</para>
+	      <xref linkend="updating-upgrading"/>)</para>
 	  </step>
 
 	  <step>

From owner-svn-doc-all@FreeBSD.ORG  Tue Dec 11 23:26:50 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 988518CF;
 Tue, 11 Dec 2012 23:26:50 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7B7498FC12;
 Tue, 11 Dec 2012 23:26:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBBNQoRS015504;
 Tue, 11 Dec 2012 23:26:50 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBBNQoWk015503;
 Tue, 11 Dec 2012 23:26:50 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212112326.qBBNQoWk015503@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 11 Dec 2012 23:26:50 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40346 - head/en_US.ISO8859-1/htdocs/internal
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Dec 2012 23:26:50 -0000

Author: eadler
Date: Tue Dec 11 23:26:49 2012
New Revision: 40346
URL: http://svnweb.freebsd.org/changeset/doc/40346

Log:
  Update the i18n policy to fix a stale link.
  
  Approved by:	core (jhb)

Modified:
  head/en_US.ISO8859-1/htdocs/internal/i18n.xml

Modified: head/en_US.ISO8859-1/htdocs/internal/i18n.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/internal/i18n.xml	Tue Dec 11 16:49:17 2012	(r40345)
+++ head/en_US.ISO8859-1/htdocs/internal/i18n.xml	Tue Dec 11 23:26:49 2012	(r40346)
@@ -38,7 +38,8 @@
   <p>Reference:</p>
 
   <ol>
-    <li><a href="http://www-01.ibm.com/software/globalization/topics/writing/references.jsp">IBM
+    <li><a
+	href="http://www-01.ibm.com/software/globalization/topics/writing/">IBM
       Localization guidelines</a></li>
   </ol>
 

From owner-svn-doc-all@FreeBSD.ORG  Tue Dec 11 23:40:34 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B898BC92;
 Tue, 11 Dec 2012 23:40:34 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9C67B8FC1A;
 Tue, 11 Dec 2012 23:40:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBBNeYkS017094;
 Tue, 11 Dec 2012 23:40:34 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBBNeYWt017093;
 Tue, 11 Dec 2012 23:40:34 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212112340.qBBNeYWt017093@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 11 Dec 2012 23:40:34 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40347 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Dec 2012 23:40:34 -0000

Author: eadler
Date: Tue Dec 11 23:40:34 2012
New Revision: 40347
URL: http://svnweb.freebsd.org/changeset/doc/40347

Log:
  Add mention of specific hardware.
  
  Submitted by:	imp
  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 Dec 11 23:26:49 2012	(r40346)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Tue Dec 11 23:40:34 2012	(r40347)
@@ -8297,6 +8297,9 @@ ATDT1234567</programlisting>
 	      url="&url.books.handbook;/serial.html">Serial Communications</ulink>
 	    chapter of the handbook.</para>
 
+	  <para>Most multi-port PCI cards that are based on 16550 or
+	    clones are supported with no extra effort.</para>
+
 	  <para>Some unnamed clone cards have also been known to work,
 	    especially those that claim to be AST compatible.</para>
 

From owner-svn-doc-all@FreeBSD.ORG  Tue Dec 11 23:40:37 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2ACC0C93;
 Tue, 11 Dec 2012 23:40:37 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 109E78FC1B;
 Tue, 11 Dec 2012 23:40:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBBNeawO017129;
 Tue, 11 Dec 2012 23:40:36 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBBNeaJf017128;
 Tue, 11 Dec 2012 23:40:36 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212112340.qBBNeaJf017128@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 11 Dec 2012 23:40:36 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40348 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Dec 2012 23:40:37 -0000

Author: eadler
Date: Tue Dec 11 23:40:36 2012
New Revision: 40348
URL: http://svnweb.freebsd.org/changeset/doc/40348

Log:
  Special instructions for dealing with ancient mice are not needed
  anymore.
  
  Noted by:	imp
  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 Dec 11 23:40:34 2012	(r40347)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Tue Dec 11 23:40:36 2012	(r40348)
@@ -2111,54 +2111,6 @@
 	</qandaentry>
 
 	<qandaentry>
-	  <question id="busmouse">
-	    <para>I have an unusual bus mouse.  How do I set it
-	      up?</para>
-	  </question>
-
-	  <answer>
-	    <para>&os; supports the bus mouse and the InPort bus mouse
-	      from such manufacturers as Microsoft, Logitech and ATI.  The
-	      <filename>GENERIC</filename> kernel does not include the
-	      device driver.  To build a custom kernel with the bus mouse
-	      driver, add the following line to the kernel config
-	      file:</para>
-
-	    <programlisting>device mse0 at isa? port 0x23c irq5</programlisting>
-
-	    <para>Bus mice usually come with dedicated interface cards.
-	      These cards may allow you to set the port address and the
-	      IRQ number other than shown above.  Refer to the manual of
-	      your mouse and the &man.mse.4; manual page for more
-	      information.</para>
-	  </answer>
-	</qandaentry>
-
-	<qandaentry>
-	  <question id="ps2mouse">
-	    <para>How do I use my PS/2 (<quote>mouse port</quote> or
-	      <quote>keyboard</quote>) mouse?</para>
-	  </question>
-
-	  <answer>
-	    <para>The PS/2 mouse is supported out-of-the-box.  The
-	      necessary device driver, <devicename>psm</devicename>, is
-	      included in the kernel.</para>
-
-	    <para>If your custom kernel does not have this, add the
-	      following line to your kernel configuration and compile a
-	      new kernel.</para>
-
-	    <programlisting>device psm0 at atkbdc? irq 12</programlisting>
-
-	    <para>Once the kernel detects <devicename>psm0</devicename>
-	      correctly at boot time, a device node
-	      <devicename>psm0</devicename> will be created
-	      automatically.</para>
-	  </answer>
-	</qandaentry>
-
-	<qandaentry>
 	  <question id="moused">
 	    <para>Is it possible to use a mouse in any way outside the X
 	      Window system?</para>
@@ -2248,18 +2200,6 @@
 	</qandaentry>
 
 	<qandaentry>
-	  <question id="laptop-mouse-trackball">
-	    <para>How do I use the mouse/trackball/touchpad on my
-	      laptop?</para>
-	  </question>
-
-	  <answer>
-	    <para>Please refer to <link linkend="ps2mouse">the answer to
-	      the previous question</link>.</para>
-	  </answer>
-	</qandaentry>
-
-	<qandaentry>
 	  <question id="keyboard-delete-key">
 	    <para>How do I use my delete key in <command>sh</command>
 	      and <command>csh</command>?</para>

From owner-svn-doc-all@FreeBSD.ORG  Tue Dec 11 23:40:39 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 83D95C94;
 Tue, 11 Dec 2012 23:40:39 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 693B88FC08;
 Tue, 11 Dec 2012 23:40:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBBNed3f017165;
 Tue, 11 Dec 2012 23:40:39 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBBNedWP017164;
 Tue, 11 Dec 2012 23:40:39 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212112340.qBBNedWP017164@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 11 Dec 2012 23:40:39 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40349 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Dec 2012 23:40:39 -0000

Author: eadler
Date: Tue Dec 11 23:40:38 2012
New Revision: 40349
URL: http://svnweb.freebsd.org/changeset/doc/40349

Log:
  Don't make it seem like tcsh is in the ports collection
  
  Submitted by;	bjk
  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 Dec 11 23:40:36 2012	(r40348)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Tue Dec 11 23:40:38 2012	(r40349)
@@ -3734,10 +3734,11 @@ kern.timecounter.hardware: TSC -&gt; i82
 	    meeting as many of these requirements simultaneously as we
 	    can.  In order to keep <command>/bin/sh</command> small,
 	    we have not provided many of the convenience features that
-	    other shells have.  That is why the Ports Collection
-	    includes more featureful shells like
+	    other shells have.  That is why other more
+	    featureful shells like
 	    <command>bash</command>, <command>scsh</command>,
-	    &man.tcsh.1;, and <command>zsh</command>.  (You can
+	    &man.tcsh.1;, and <command>zsh</command> are available.
+	    (You can
 	    compare for yourself the memory utilization of all these
 	    shells by looking at the <quote>VSZ</quote> and
 	    <quote>RSS</quote> columns in a <command>ps

From owner-svn-doc-all@FreeBSD.ORG  Tue Dec 11 23:40:41 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D33D3CCC;
 Tue, 11 Dec 2012 23:40:41 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B7C278FC12;
 Tue, 11 Dec 2012 23:40:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBBNef1B017204;
 Tue, 11 Dec 2012 23:40:41 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBBNef6g017203;
 Tue, 11 Dec 2012 23:40:41 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212112340.qBBNef6g017203@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 11 Dec 2012 23:40:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40350 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Dec 2012 23:40:41 -0000

Author: eadler
Date: Tue Dec 11 23:40:41 2012
New Revision: 40350
URL: http://svnweb.freebsd.org/changeset/doc/40350

Log:
  "What other sources of information are there?" is answered by the entire
  next section: "Documentation and support"
  
  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 Dec 11 23:40:38 2012	(r40349)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Tue Dec 11 23:40:41 2012	(r40350)
@@ -606,19 +606,6 @@
 	    an article on how to write good problem reports.</para>
 	</answer>
       </qandaentry>
-
-      <qandaentry>
-	<question id="other-info-sources">
-	  <para>What other sources of information are there?</para>
-	</question>
-
-	<answer>
-	  <para>Please check the <ulink
-	      url="http://www.FreeBSD.org/docs.html">Documentation</ulink>
-	    list on the main <ulink
-	      url="http://www.FreeBSD.org">&os;</ulink> web site.</para>
-	</answer>
-      </qandaentry>
     </qandaset>
   </chapter>
 

From owner-svn-doc-all@FreeBSD.ORG  Tue Dec 11 23:40:44 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2A8AACCE;
 Tue, 11 Dec 2012 23:40:44 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0F7768FC13;
 Tue, 11 Dec 2012 23:40:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBBNehK0017241;
 Tue, 11 Dec 2012 23:40:43 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBBNehex017240;
 Tue, 11 Dec 2012 23:40:43 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212112340.qBBNehex017240@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 11 Dec 2012 23:40:43 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40351 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Dec 2012 23:40:44 -0000

Author: eadler
Date: Tue Dec 11 23:40:43 2012
New Revision: 40351
URL: http://svnweb.freebsd.org/changeset/doc/40351

Log:
  Prefer service(1) over explicitly running /etc/rc.d/ scripts.
  
  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 Dec 11 23:40:41 2012	(r40350)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Tue Dec 11 23:40:43 2012	(r40351)
@@ -5954,7 +5954,7 @@ options    SYSVMSG          # enable for
 	    with the following command (as
 	    <username>root</username>):</para>
 
-	  <screen>&prompt.root; <userinput>/etc/rc.d/devfs restart</userinput></screen>
+	  <screen>&prompt.root; <userinput>service devfs restart</userinput></screen>
 	</answer>
       </qandaentry>
 

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 00:07:34 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 97C7F2E2;
 Wed, 12 Dec 2012 00:07:34 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7B84F8FC08;
 Wed, 12 Dec 2012 00:07:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBC07Yht021761;
 Wed, 12 Dec 2012 00:07:34 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBC07YsQ021760;
 Wed, 12 Dec 2012 00:07:34 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212120007.qBC07YsQ021760@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 12 Dec 2012 00:07:34 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40352 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 00:07:34 -0000

Author: eadler
Date: Wed Dec 12 00:07:33 2012
New Revision: 40352
URL: http://svnweb.freebsd.org/changeset/doc/40352

Log:
  Almost no one is affected by this any more.
  
  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 Dec 11 23:40:43 2012	(r40351)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Wed Dec 12 00:07:33 2012	(r40352)
@@ -1466,22 +1466,6 @@
       </qandaentry>
 
       <qandaentry>
-	<question id="stop-at-boot-manager">
-	  <para>Why can I not get past the boot manager's
-	    <prompt>F?</prompt> prompt?</para>
-	</question>
-
-	<answer>
-	  <para>This is another symptom of the problem described in the
-	    preceding question.  Your BIOS geometry and &os; geometry
-	    settings do not agree!  If your controller or BIOS supports
-	    cylinder translation (often marked as <quote>&gt;1GB drive
-	    support</quote>), try toggling its setting and reinstalling
-	    &os;.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="need-complete-sources">
 	  <para>Do I need to install the source?</para>
 	</question>

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 00:07:37 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2B7312E3;
 Wed, 12 Dec 2012 00:07:37 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EA4628FC0C;
 Wed, 12 Dec 2012 00:07:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBC07aBX021801;
 Wed, 12 Dec 2012 00:07:36 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBC07aMO021800;
 Wed, 12 Dec 2012 00:07:36 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212120007.qBC07aMO021800@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 12 Dec 2012 00:07:36 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40353 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 00:07:37 -0000

Author: eadler
Date: Wed Dec 12 00:07:36 2012
New Revision: 40353
URL: http://svnweb.freebsd.org/changeset/doc/40353

Log:
  Even though floppies are still supported for the last
  three remaining users of PC-98 it isn't common to get questions
  about floppies. Instead answer
  with the most likely cause of the problem.
  
  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	Wed Dec 12 00:07:33 2012	(r40352)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Wed Dec 12 00:07:36 2012	(r40353)
@@ -1373,41 +1373,19 @@
 
       <qandaentry>
 	<question id="boot-floppy-strangeness">
-	  <para>Strange things happen when I boot the install floppy!
+	  <para>Strange things happen when I boot the install disk!
 	    What is happening?</para>
 	</question>
 
 	<answer>
 	  <para>If you are seeing things like the machine grinding to a
 	    halt or spontaneously rebooting when you try to boot the
-	    install floppy, here are three questions to ask
-	    yourself:</para>
-
-	  <orderedlist>
-	    <listitem>
-	      <para>Did you use a new, freshly-formatted, error-free
-		floppy (preferably a brand-new one straight out of the
-		box, as opposed to the magazine cover disk that has been
-		lying under the bed for the last three years)?</para>
-	    </listitem>
-
-	    <listitem>
-	      <para>Did you download the floppy image in binary (or
-		image) mode?  (do not be embarrassed, even the best of us
-		have accidentally downloaded a binary file in ASCII mode
-		at least once!)</para>
-	    </listitem>
-
-	    <listitem>
-	      <para>If you are using &windows;&nbsp;95 or
-		&windows;&nbsp;98 did you run <command>fdimage</command>
-		or <command>rawrite</command> in pure DOS mode?  These
-		operating systems can interfere with programs that write
-		directly to hardware, which the disk creation program
-		does; even running it inside a DOS shell in the GUI can
-		cause this problem.</para>
-	    </listitem>
-	  </orderedlist>
+	    &os; installer, make sure that the SHA256 hash of
+	    the image matches the one on the website.  If you
+	    accidently downloaded the disk image in binary (or
+	    image) mode the will be corrupted. (Do not be embarrassed,
+	    even the best of us have accidentally downloaded a binary
+	    file in ASCII mode at least once!)</para>
 	</answer>
       </qandaentry>
 

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 00:07:39 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 734AF2E4;
 Wed, 12 Dec 2012 00:07:39 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3DA528FC12;
 Wed, 12 Dec 2012 00:07:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBC07dxq021839;
 Wed, 12 Dec 2012 00:07:39 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBC07dQH021838;
 Wed, 12 Dec 2012 00:07:39 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212120007.qBC07dQH021838@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 12 Dec 2012 00:07:39 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40354 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 00:07:39 -0000

Author: eadler
Date: Wed Dec 12 00:07:38 2012
New Revision: 40354
URL: http://svnweb.freebsd.org/changeset/doc/40354

Log:
  HEAD is expected to be buildable and *work*; that said
  the users are expected to be able to deal with problems.
  
  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	Wed Dec 12 00:07:36 2012	(r40353)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Wed Dec 12 00:07:38 2012	(r40354)
@@ -382,17 +382,12 @@
 	      url="&url.books.handbook;/index.html">Handbook</ulink> for
 	    details on running <emphasis>-CURRENT</emphasis>.</para>
 
-	  <para>If you are not familiar with the operating system or are
-	    not capable of identifying the difference between a real
-	    problem and a temporary problem, you should not use
+	  <para>If you are not familiar with &os;
+	    you should not use
 	    &os.current;.  This branch sometimes evolves quite quickly
-	    and can be un-buildable sometimes.
+	    and due to mistake can be un-buildable at times.
 	    People that use &os.current; are expected to be able to
-	    analyze any problems and only report them if they are deemed
-	    to be mistakes rather than <quote>glitches</quote>.
-	    Questions such as <quote>make world produces some error
-	    about groups</quote> on the &a.current; may be treated with
-	    contempt.</para>
+	    analyze, debug, and report problems.</para>
 
 	  <para>Every month, <ulink
 	      url="&url.base;/snapshots/">snapshot</ulink>

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 00:07:41 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C42E133C;
 Wed, 12 Dec 2012 00:07:41 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 901508FC15;
 Wed, 12 Dec 2012 00:07:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBC07f8P021882;
 Wed, 12 Dec 2012 00:07:41 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBC07fFV021881;
 Wed, 12 Dec 2012 00:07:41 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212120007.qBC07fFV021881@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 12 Dec 2012 00:07:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40355 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 00:07:41 -0000

Author: eadler
Date: Wed Dec 12 00:07:40 2012
New Revision: 40355
URL: http://svnweb.freebsd.org/changeset/doc/40355

Log:
  Expand a bit upon the first FAQ question: "What is FreeBSD?"
  and don't redirect people to the home page for further information.
  
  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	Wed Dec 12 00:07:38 2012	(r40354)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Wed Dec 12 00:07:40 2012	(r40355)
@@ -121,17 +121,18 @@
 	</question>
 
 	<answer>
-	  <para>Briefly, &os; is a &unix;&nbsp;like operating system for
-	    AMD64 and &intel; EM64T, &i386; PC-98, IA-64, &arm;,
-	    &powerpc; and &ultrasparc; platforms based on U.C.
+	  <para>&os; is a modern operating system for desktops,
+	    laptops, servers, and embedded systems with
+	    support for a large number of  <ulink
+	      url="http://www.FreeBSD.org/platforms/">platforms</ulink>.</para>
+
+	  <para>It is based on U.C.
 	    Berkeley's <quote>4.4BSD-Lite</quote> release, with some
 	    <quote>4.4BSD-Lite2</quote> enhancements.  It is also based
 	    indirectly on William Jolitz's port of U.C. Berkeley's
 	    <quote>Net/2</quote> to the &i386;, known as
 	    <quote>386BSD</quote>, though very little of the 386BSD code
-	    remains.  A fuller description of what &os; is and how it
-	    can work for you may be found on the <ulink
-	      url="&url.base;/index.html">&os; home page</ulink>.</para>
+	    remains.</para>
 
 	  <para>&os; is used by companies, Internet Service Providers,
 	    researchers, computer professionals, students and home users

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 00:07:44 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 08DAC33D;
 Wed, 12 Dec 2012 00:07:44 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E085F8FC16;
 Wed, 12 Dec 2012 00:07:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBC07hTe021917;
 Wed, 12 Dec 2012 00:07:43 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBC07h1I021916;
 Wed, 12 Dec 2012 00:07:43 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212120007.qBC07h1I021916@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 12 Dec 2012 00:07:43 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40356 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 00:07:44 -0000

Author: eadler
Date: Wed Dec 12 00:07:43 2012
New Revision: 40356
URL: http://svnweb.freebsd.org/changeset/doc/40356

Log:
  "World Wide Web" sounds dated.
  
  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	Wed Dec 12 00:07:40 2012	(r40355)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Wed Dec 12 00:07:43 2012	(r40356)
@@ -86,7 +86,7 @@
 	unless otherwise noted.  If you are interested in helping with
 	this project, send email to the &a.doc;.  The latest version of
 	this document is always available from the <ulink
-	  url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/index.html">&os; World Wide Web server</ulink>.
+	  url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/index.html">&os; website</ulink>.
 	It may also be downloaded as one large <ulink
 	  url="book.html">HTML</ulink> file with HTTP or as a variety
 	of other formats from the <ulink

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 13:02:07 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 74D43149;
 Wed, 12 Dec 2012 13:02:07 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 590E48FC15;
 Wed, 12 Dec 2012 13:02:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCD27MJ052691;
 Wed, 12 Dec 2012 13:02:07 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBCD27I7052690;
 Wed, 12 Dec 2012 13:02:07 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212121302.qBCD27I7052690@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 12 Dec 2012 13:02:07 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40357 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 13:02:07 -0000

Author: eadler
Date: Wed Dec 12 13:02:06 2012
New Revision: 40357
URL: http://svnweb.freebsd.org/changeset/doc/40357

Log:
  This entire section has not been needed since kbdmux was added
  to GENERIC.
  
  Noted by:	tj
  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	Wed Dec 12 00:07:43 2012	(r40356)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Wed Dec 12 13:02:06 2012	(r40357)
@@ -2000,62 +2000,6 @@
 
       <qandaset>
 	<qandaentry>
-	  <question id="usbkbd">
-	    <para>Does &os; support my USB keyboard?</para>
-	  </question>
-
-	  <answer>
-	    <para>&os; supports USB keyboards out-of-the-box.  Once you
-	      have USB keyboard support enabled on your system, the AT
-	      keyboard becomes <devicename>/dev/kbd0</devicename> and
-	      the USB keyboard becomes
-	      <devicename>/dev/kbd1</devicename>, if both are connected
-	      to the system.  If there is the USB keyboard only, it will
-	      be <devicename>/dev/ukbd0</devicename>.</para>
-
-	    <para>If you want to use the USB keyboard in the console,
-	      you have to explicitly tell the console driver to use the
-	      existing USB keyboard.  This can be done by running the
-	      following command as a part of system
-	      initialization.</para>
-
-	    <screen>&prompt.root; <userinput>kbdcontrol -k /dev/kbd1 &lt; /dev/console &gt; /dev/null</userinput></screen>
-
-	    <para>Note that if the USB keyboard is the only keyboard, it
-	      is accessed as <devicename>/dev/ukbd0</devicename>, thus,
-	      the command should look like:</para>
-
-	    <screen>&prompt.root; <userinput>kbdcontrol -k /dev/ukbd0 &lt; /dev/console &gt; /dev/null</userinput></screen>
-
-	    <note>
-	      <para>To make this change permanent across reboots, add
-		<literal>keyboard="/dev/ukbd0"</literal> to
-		<filename>/etc/rc.conf</filename>.</para>
-	    </note>
-
-	    <para>Once this is done, the USB keyboard should work in the
-	      X environment as well without any special settings.</para>
-
-	    <para>If you want to switch back to the default keyboard,
-	      use this command:</para>
-
-	    <screen>&prompt.root; <userinput>kbdcontrol -k /dev/kbd0 &gt; /dev/null</userinput></screen>
-
-	    <para>To allow using both the second USB keyboard and the
-	      first AT keyboard at the same time on a console via
-	      &man.kbdmux.4; driver type the following commands:</para>
-
-	    <screen>&prompt.root; <userinput>kbdcontrol -K &lt; /dev/console &gt; /dev/null</userinput>
-&prompt.root; <userinput>kbdcontrol -a atkbd0 &lt; /dev/kbdmux0 &gt; /dev/null</userinput>
-&prompt.root; <userinput>kbdcontrol -a ukbd1 &lt; /dev/kbdmux0 &gt; /dev/null</userinput>
-&prompt.root; <userinput>kbdcontrol -k /dev/kbdmux0 &lt; /dev/console &gt; /dev/null</userinput></screen>
-
-	    <para>See the &man.ukbd.4;, &man.kbdcontrol.1; and
-	      &man.kbdmux.4; manual pages for more information.</para>
-	  </answer>
-	</qandaentry>
-
-	<qandaentry>
 	  <question id="moused">
 	    <para>Is it possible to use a mouse in any way outside the X
 	      Window system?</para>

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 13:02:09 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E8FB114A;
 Wed, 12 Dec 2012 13:02:09 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CDE388FC16;
 Wed, 12 Dec 2012 13:02:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCD29GL052727;
 Wed, 12 Dec 2012 13:02:09 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBCD2962052726;
 Wed, 12 Dec 2012 13:02:09 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212121302.qBCD2962052726@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 12 Dec 2012 13:02:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40358 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 13:02:10 -0000

Author: eadler
Date: Wed Dec 12 13:02:09 2012
New Revision: 40358
URL: http://svnweb.freebsd.org/changeset/doc/40358

Log:
  Do not wrap inside link: it causes an extra space where there shouldn't
  be one.
  
  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	Wed Dec 12 13:02:06 2012	(r40357)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Wed Dec 12 13:02:09 2012	(r40358)
@@ -5725,8 +5725,8 @@ options    SYSVMSG          # enable for
 	  <para>Although it is not recommended to delete this directory, to
 	    do so you will need to unset the <literal>schg</literal> flag
 	    first.  See the &man.chflags.1; manual page for more information
-	    (and bear in mind the answer to <link linkend="unsetting-schg">
-	      the question on unsetting the schg flag</link>).</para>
+	    (and bear in mind the answer to
+	    <link linkend="unsetting-schg">the question on unsetting the schg flag</link>).</para>
 	</answer>
       </qandaentry>
     </qandaset>

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 13:02:12 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 30DE514B;
 Wed, 12 Dec 2012 13:02:12 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 156B48FC13;
 Wed, 12 Dec 2012 13:02:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCD2BNi052766;
 Wed, 12 Dec 2012 13:02:11 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBCD2Bmb052765;
 Wed, 12 Dec 2012 13:02:11 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212121302.qBCD2Bmb052765@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 12 Dec 2012 13:02:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40359 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 13:02:12 -0000

Author: eadler
Date: Wed Dec 12 13:02:11 2012
New Revision: 40359
URL: http://svnweb.freebsd.org/changeset/doc/40359

Log:
  Point users that care about FreeBSD internals to the
  architecture handbook instead of a bibliography.
  
  Approved by:	bcr

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	Wed Dec 12 13:02:09 2012	(r40358)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Wed Dec 12 13:02:11 2012	(r40359)
@@ -8984,7 +8984,7 @@ hint.sio.7.irq="12"</programlisting>
 	<answer>
 	  <para>For a list of relevant books, please check the
 	    Handbook's <ulink
-	      url="&url.books.handbook;/bibliography-osinternals.html">Operating System Internals Bibliography</ulink>.</para>
+	      url="&url.books.arch-handbook;">&os; Architecture Handbook</ulink>.</para>
 
 	  <para>Additionally, much general &unix; knowledge is directly
 	    applicable to &os;.</para>

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 13:07:08 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3BECD424;
 Wed, 12 Dec 2012 13:07:08 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 202958FC0A;
 Wed, 12 Dec 2012 13:07:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCD78Vh053861;
 Wed, 12 Dec 2012 13:07:08 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBCD77Uj053860;
 Wed, 12 Dec 2012 13:07:07 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201212121307.qBCD77Uj053860@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 12 Dec 2012 13:07:07 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40360 - head/ja_JP.eucJP/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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 13:07:08 -0000

Author: ryusuke
Date: Wed Dec 12 13:07:07 2012
New Revision: 40360
URL: http://svnweb.freebsd.org/changeset/doc/40360

Log:
  - Merge the following from the English version:
  
  	r39989 -> r40313	head/ja_JP.eucJP/share/xml/header.l10n.ent

Modified:
  head/ja_JP.eucJP/share/xml/header.l10n.ent

Modified: head/ja_JP.eucJP/share/xml/header.l10n.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/header.l10n.ent	Wed Dec 12 13:02:11 2012	(r40359)
+++ head/ja_JP.eucJP/share/xml/header.l10n.ent	Wed Dec 12 13:07:07 2012	(r40360)
@@ -5,7 +5,7 @@
 <!-- PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN" -->
 
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r39989 -->
+<!-- Original revision: r40313 -->
 
 <!ENTITY copyright '<span xmlns="http://www.w3.org/1999/xhtml"><a href="&base;/search/index-site.html">¥µ¥¤¥È¥Þ¥Ã¥×</a> |
   <a href="&base;/copyright/">ÃÎŪºâ»º¸¢¤Ë¤Ä¤¤¤Æ</a> | <!-- &copy; -->(C) 1995&ndash;2012 The FreeBSD Project.
@@ -28,6 +28,7 @@
 	  <li><a href="&base;/features.html">ÆÃħ</a></li>
 	  <li><a href="&enbase;/advocacy/">¥×¥í¥â¡¼¥·¥ç¥ó³èÆ°</a></li>
 	  <li><a href="&enbase;/marketing/">¥Þ¡¼¥±¥Æ¥£¥ó¥°³èÆ°</a></li>
+	  <li><a href="&enbase;/privacy.html">¥×¥é¥¤¥Ð¥·¡¼¥Ý¥ê¥·¡¼</a></li>
 	</ul>
       </li>
     </ul>

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 19:12:44 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3731612E;
 Wed, 12 Dec 2012 19:12:44 +0000 (UTC) (envelope-from kaduk@mit.edu)
Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU
 [18.9.25.14]) by mx1.freebsd.org (Postfix) with ESMTP id 98BBF8FC08;
 Wed, 12 Dec 2012 19:12:43 +0000 (UTC)
X-AuditID: 1209190e-b7f516d0000008e4-36-50c8d5f8e190
Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])
 by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP id
 08.68.02276.8F5D8C05; Wed, 12 Dec 2012 14:07:36 -0500 (EST)
Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
 by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id qBCJ7a1O009696;
 Wed, 12 Dec 2012 14:07:36 -0500
Received: from multics.mit.edu (SYSTEM-LOW-SIPB.MIT.EDU [18.187.2.37])
 (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU)
 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qBCJ7Xqf023046
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
 Wed, 12 Dec 2012 14:07:35 -0500 (EST)
Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308)
 id qBCJ7XQg010282; Wed, 12 Dec 2012 14:07:33 -0500 (EST)
Date: Wed, 12 Dec 2012 14:07:33 -0500 (EST)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Eitan Adler <eadler@freebsd.org>
Subject: Re: svn commit: r40359 - head/en_US.ISO8859-1/books/faq
In-Reply-To: <201212121302.qBCD2Bmb052765@svn.freebsd.org>
Message-ID: <alpine.GSO.1.10.1212121406590.2164@multics.mit.edu>
References: <201212121302.qBCD2Bmb052765@svn.freebsd.org>
User-Agent: Alpine 1.10 (GSO 962 2008-03-14)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrIIsWRmVeSWpSXmKPExsUixG6nrvvj6okAg7UvJS1+fDzEZLHr7xxm
 ixuL9jNZ7O7vZXZg8ZjxaT5LAGMUl01Kak5mWWqRvl0CV8aJ5o/MBe2cFdt6W5kaGM+xdzFy
 cEgImEg0zvDoYuQEMsUkLtxbz9bFyMUhJLCPUWLlg8csIAkhgQ2MEtt2p0MkTjBJPHp+Baqq
 gVFi2fwrrCBVLALaEqfP3GMHsdkEVCRmvtnIBmKLANnf9/9kArGZBaIk9ixtBKsXFnCQ2L5x
 Llg9p4CVxLmpfcwgNi9Q/FDfG0aIzZYSSw4/BasRFdCRWL1/CgtEjaDEyZlPWCBmWkqc+3Od
 bQKj4CwkqVlIUgsYmVYxyqbkVunmJmbmFKcm6xYnJ+blpRbpGuvlZpbopaaUbmIEhSynJN8O
 xq8HlQ4xCnAwKvHwXnh5PECINbGsuDL3EKMkB5OSKO+yCycChPiS8lMqMxKLM+KLSnNSiw8x
 SnAwK4nwuh0AyvGmJFZWpRblw6SkOViUxHmvpNz0FxJITyxJzU5NLUgtgsnKcHAoSfA+vALU
 KFiUmp5akZaZU4KQZuLgBBnOAzT8GkgNb3FBYm5xZjpE/hSjopQ472WQhABIIqM0D64XllJe
 MYoDvSLMOwekigeYjuC6XwENZgIaHHfpOMjgkkSElFQDo3Gl/9XewmfTmeXXKFsceuGXl7v/
 hlBw5v36BGfPxDNMj3UC3eW2Wdx4MHli7ZXH7nr/T7A9as7fUR6lbnxzztuO3qdJMuvd/m2L
 2rNhYsajb8unWC1kfDy9tfhuS+3B+f2SB45tlODiXqq6zeKX2V0Leff1G0I5ygL+iX6IPSz5
 9fr6T9di7JRYijMSDbWYi4oTAZ/Q86AEAwAA
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 19:12:44 -0000

On Wed, 12 Dec 2012, Eitan Adler wrote:

> Author: eadler
> Date: Wed Dec 12 13:02:11 2012
> New Revision: 40359
> URL: http://svnweb.freebsd.org/changeset/doc/40359
>
> Log:
>  Point users that care about FreeBSD internals to the
>  architecture handbook instead of a bibliography.
>
>  Approved by:	bcr
>
> 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	Wed Dec 12 13:02:09 2012	(r40358)
> +++ head/en_US.ISO8859-1/books/faq/book.xml	Wed Dec 12 13:02:11 2012	(r40359)
> @@ -8984,7 +8984,7 @@ hint.sio.7.irq="12"</programlisting>
> 	<answer>
> 	  <para>For a list of relevant books, please check the
> 	    Handbook's <ulink
> -	      url="&url.books.handbook;/bibliography-osinternals.html">Operating System Internals Bibliography</ulink>.</para>
> +	      url="&url.books.arch-handbook;">&os; Architecture Handbook</ulink>.</para>

The Handbook's FreeBSD Architecture Handbook?
Pretty sure the two books are, well, different books.

-Ben

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 19:15:29 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 956B42C8
 for <svn-doc-all@freebsd.org>; Wed, 12 Dec 2012 19:15:29 +0000 (UTC)
 (envelope-from lists@eitanadler.com)
Received: from mail-la0-f54.google.com (mail-la0-f54.google.com
 [209.85.215.54])
 by mx1.freebsd.org (Postfix) with ESMTP id 06D618FC16
 for <svn-doc-all@freebsd.org>; Wed, 12 Dec 2012 19:15:28 +0000 (UTC)
Received: by mail-la0-f54.google.com with SMTP id j13so1007052lah.13
 for <svn-doc-all@freebsd.org>; Wed, 12 Dec 2012 11:15:27 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=eitanadler.com; s=0xdeadbeef;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type;
 bh=72AbE75903bQQutfFeGUg+FDMVqJHLOePAtoEXfz5RI=;
 b=HQMC8OPexBKwaZISCV0/jbK7m5Z6hrSTy/Wuj2zgs5f8xp4oM3G+SWGJQm7nKNZ9vL
 yJ+M+gebt3lvoDtkISO7uMZooMw+rwrch09C1dMeSeAWwcmpzwGlg4snLqo938AcW/4Y
 AIe8vvSr6sHGBTdwyemYKq1vfatulplEzTFTQ=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type
 :x-gm-message-state;
 bh=72AbE75903bQQutfFeGUg+FDMVqJHLOePAtoEXfz5RI=;
 b=NnqxyvBZqqFuTvziHf+VRoTbVdTfIvL8uilAFJ9ODGgbXuqXxWero5xi4tRMlePq+I
 bByUE0ML5Ag0K2j3ZZf43Vx1GdGvulC8WerFYT9PDw499tI2HZG+E7L3TgA1+P3Jhd7w
 TSu5eJ11xEyLnSX4HuvPKDzhENg4dqmD3Nx4wzjzdWMFZsDURH4xQ8PDQgkC8WNSMiBB
 mNrFR/mCgpk0UDbcCYffTamX/0vanu4xIdz6vX/Qh7jk/mQbuKAznKhWMub5eml3tp9w
 8anmQTU9usu21itziVu1EigjyynmKbtRbtHNQoRcDyF7hSozs9pckysGwH7R0v09T0GK
 FwJw==
Received: by 10.152.111.166 with SMTP id ij6mr2143077lab.47.1355339727818;
 Wed, 12 Dec 2012 11:15:27 -0800 (PST)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.112.149.225 with HTTP; Wed, 12 Dec 2012 11:14:57 -0800 (PST)
In-Reply-To: <alpine.GSO.1.10.1212121406590.2164@multics.mit.edu>
References: <201212121302.qBCD2Bmb052765@svn.freebsd.org>
 <alpine.GSO.1.10.1212121406590.2164@multics.mit.edu>
From: Eitan Adler <eadler@freebsd.org>
Date: Wed, 12 Dec 2012 14:14:57 -0500
X-Google-Sender-Auth: T5AjcDEyz9Gkjr5FPqntPulwsbA
Message-ID: <CAF6rxg=LKv-YPJQSZjVXg2bAafJL-_uvCv6TwdbKYaXQy_Kxvg@mail.gmail.com>
Subject: Re: svn commit: r40359 - head/en_US.ISO8859-1/books/faq
To: Benjamin Kaduk <kaduk@mit.edu>
Content-Type: text/plain; charset=UTF-8
X-Gm-Message-State: ALoCoQmMPAexkH5PSdS0SxMs4iK91TqDfXemKPB434ZIzVsfy+eY/8NGy/ZNGnxNB0P0VRlCerSN
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 19:15:29 -0000

On 12 December 2012 14:07, Benjamin Kaduk <kaduk@mit.edu> wrote:
> On Wed, 12 Dec 2012, Eitan Adler wrote:
>
>> Author: eadler
>> Date: Wed Dec 12 13:02:11 2012
>> New Revision: 40359
>> URL: http://svnweb.freebsd.org/changeset/doc/40359
>>
>> Log:
>>  Point users that care about FreeBSD internals to the
>>  architecture handbook instead of a bibliography.
>>
>>  Approved by:   bcr
>>
>> 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     Wed Dec 12 13:02:09 2012
>> (r40358)
>> +++ head/en_US.ISO8859-1/books/faq/book.xml     Wed Dec 12 13:02:11 2012
>> (r40359)
>> @@ -8984,7 +8984,7 @@ hint.sio.7.irq="12"</programlisting>
>>         <answer>
>>           <para>For a list of relevant books, please check the
>>             Handbook's <ulink
>> -
>> url="&url.books.handbook;/bibliography-osinternals.html">Operating System
>> Internals Bibliography</ulink>.</para>
>> +             url="&url.books.arch-handbook;">&os; Architecture
>> Handbook</ulink>.</para>
>
>
> The Handbook's FreeBSD Architecture Handbook?
> Pretty sure the two books are, well, different books.

Oops, this is one of those "reading what you want to read" cases. I'll
fix tonight unless you get to it first.

-- 
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 21:32:26 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 57AFA7F9;
 Wed, 12 Dec 2012 21:32:26 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3BF138FC12;
 Wed, 12 Dec 2012 21:32:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCLWQMV053759;
 Wed, 12 Dec 2012 21:32:26 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBCLWPIM053755;
 Wed, 12 Dec 2012 21:32:25 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212122132.qBCLWPIM053755@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 12 Dec 2012 21:32:25 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40361 - in head: en_US.ISO8859-1/htdocs
 en_US.ISO8859-1/htdocs/layout/css 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 21:32:26 -0000

Author: gjb
Date: Wed Dec 12 21:32:25 2012
New Revision: 40361
URL: http://svnweb.freebsd.org/changeset/doc/40361

Log:
  Per request of deb@, put the "Donate to FreeBSD" button in
  the default page header.  The following changes were made:
  
   - Remove the Donate to FreeBSD button added a few days ago
  
   - Add stylesheet entries for the new button.  Note this
     button is pure CSS, and does not use background images
     for the rounded boarders.
  
   - Move the 'Donate' and 'Contact' links from the header:
      o 'Donate' is now 'Hardware Donations' in the menu
         dropdown.
      o 'Contact' is now in the footer.
      o The 'Donate' link that existed in the menu dropdown
        is now 'Monetary Donations'.
  
   - The header2.donatebutton entity is now used for this
     button, so translation teams can modify localized
     header.l10n.ent for the button text.
  
   - Comment the header2.searchnav entity entries in header.ent
     for now, until I figure out what to do with them.
  
  This change should have zero UI regressions, and solves the
  problem of the previously added button pushing the 'New to
  FreeBSD' button down into the security text.[1]
  
  Requested by:	deb
  Reported by:	emaste[1], gavin[1]

Modified:
  head/en_US.ISO8859-1/htdocs/index.xsl
  head/en_US.ISO8859-1/htdocs/layout/css/layout.css
  head/share/xml/header.ent
  head/share/xml/xhtml.xsl

Modified: head/en_US.ISO8859-1/htdocs/index.xsl
==============================================================================
--- head/en_US.ISO8859-1/htdocs/index.xsl	Wed Dec 12 13:07:07 2012	(r40360)
+++ head/en_US.ISO8859-1/htdocs/index.xsl	Wed Dec 12 21:32:25 2012	(r40361)
@@ -193,14 +193,6 @@
 			<div class="frontnewroundbox">
 			  <div class="frontnewtop"><div><b style="display: none">.</b></div></div>
 			    <div class="frontnewcontent">
-				<a href="http://www.FreeBSDFoundation.org/donate/">Donate to FreeBSD</a>
-			    </div> <!-- frontnewcontent -->
-			  <div class="frontnewbot"><div><b style="display: none">.</b></div></div>
-			</div> <!-- frontnewroundbox -->
-
-			<div class="frontnewroundbox">
-			  <div class="frontnewtop"><div><b style="display: none">.</b></div></div>
-			    <div class="frontnewcontent">
 			      <a href="&base;/projects/newbies.html">New to FreeBSD?</a>
 			    </div> <!-- frontnewcontent -->
 			  <div class="frontnewbot"><div><b style="display: none">.</b></div></div>
@@ -344,5 +336,6 @@
 	permission of <a
 	  href="http://www.freebsdfoundation.org/documents/Guidelines.shtml">The
 	FreeBSD Foundation</a>.
+	<a href="&base;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a>
   </xsl:template>
 </xsl:stylesheet>

Modified: head/en_US.ISO8859-1/htdocs/layout/css/layout.css
==============================================================================
--- head/en_US.ISO8859-1/htdocs/layout/css/layout.css	Wed Dec 12 13:07:07 2012	(r40360)
+++ head/en_US.ISO8859-1/htdocs/layout/css/layout.css	Wed Dec 12 21:32:25 2012	(r40361)
@@ -409,6 +409,43 @@
   width: 150px;
 }
 
+/* Donate Button */
+ /* height and width details */
+.frontdonatetop div, .frontdonatetop, .frontdonatebot div, .frontdonatebot {
+  width: 20%;
+  height: 10px;
+  font-size: 1px;
+  text-align: center;
+}
+
+.frontdonatecontent {
+  margin: 0;
+  padding: 0;
+  margin-top: -4px;
+  margin-bottom: -4px;
+  text-align: center;
+  font-size: 1.1em;
+  font-weight: bold;
+}
+
+.frontdonatecontent a, .frontdonatecontent a:link, .frontdonatecontent a:visited, .frontdonatecontent a:hover, .frontdonatecontent a:active {
+  color: #990000;
+  text-decoration: none;
+}
+
+.frontdonateroundbox {
+  margin-top: 10px;
+  padding: 0;
+  /*padding-right: 30px;*/
+  width: 150px;
+  height: 25px;
+  background-color: white;
+  -moz-border-radius: 10px;
+  -webkit-border-radius: 10px;
+  -khtml-border-radius: 10px;
+  border-radius: 10px;
+}
+
 /* Get FreeBSD Box */
 
  /* set background images for corners */

Modified: head/share/xml/header.ent
==============================================================================
--- head/share/xml/header.ent	Wed Dec 12 13:07:07 2012	(r40360)
+++ head/share/xml/header.ent	Wed Dec 12 21:32:25 2012	(r40361)
@@ -37,6 +37,17 @@
 <!ENTITY header2.word.donate 'Donate'>
 <!ENTITY header2.word.contact 'Contact'>
 
+<!ENTITY header2.donatebutton '
+  <div xmlns="http://www.w3.org/1999/xhtml" class="frontdonateroundbox">
+    <div class="frontdonatetop"><div><b style="display: none;">.</b></div></div>
+      <div class="frontdonatecontent">
+	<a
+	  href="http://www.FreeBSDFoundation.org/donate/">Donate to FreeBSD</a>
+      </div>
+    <div class="frontdonatebot"><div><b style="display: none;">.</b></div></div>
+  </div>
+'>
+
 <!ENTITY header2.searchinputs '
 	<div xmlns="http://www.w3.org/1999/xhtml">
             <input type="hidden" name="max" value="25" />
@@ -119,7 +130,8 @@
     <ul>
       <li><a href="http://www.freebsdfoundation.org/">Foundation</a>
 	<ul>
-	  <li><a href="http://www.freebsdfoundation.org/donate/">Donate</a></li>
+	  <li><a href="http://www.freebsdfoundation.org/donate/">Monetary Donations</a></li>
+	  <li><a href="&base;/donations/">Hardware Donations</a></li>
 	</ul>
       </li>
     </ul>
@@ -131,9 +143,9 @@
 <!ENTITY header2.searchnav '
       <div xmlns="http://www.w3.org/1999/xhtml" id="searchnav">
         <ul id="searchnavlist">
-          <li><a href="&base;/donations/" title="&header2.word.donate;">&header2.word.donate;</a></li>
+	  <!--<li><a href="&base;/donations/" title="&header2.word.donate;">&header2.word.donate;</a></li>-->
 
-          <li class="last-child"><a href="&base;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a></li>
+	  <!--<li class="last-child"><a href="&base;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a></li>-->
         </ul>
       </div> <!-- SEARCHNAV -->
 '>
@@ -156,6 +168,7 @@
     </div> <!-- HEADERLOGOLEFT -->
 
     <div id="headerlogoright">
+      &header2.donatebutton;
       &header2.searchnav.label;
 
       &header2.searchnav;

Modified: head/share/xml/xhtml.xsl
==============================================================================
--- head/share/xml/xhtml.xsl	Wed Dec 12 13:07:07 2012	(r40360)
+++ head/share/xml/xhtml.xsl	Wed Dec 12 21:32:25 2012	(r40361)
@@ -63,6 +63,8 @@
 		</div> <!-- HEADERLOGOLEFT -->
 
 		<div id="headerlogoright">
+		  &header2.donatebutton;
+
 		  &header2.searchnav.label;
 
 		  &header2.searchnav;

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 21:52:30 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 1CAB6421;
 Wed, 12 Dec 2012 21:52:30 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F40F38FC0C;
 Wed, 12 Dec 2012 21:52:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCLqTbh057953;
 Wed, 12 Dec 2012 21:52:29 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBCLqT3s057952;
 Wed, 12 Dec 2012 21:52:29 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212122152.qBCLqT3s057952@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 12 Dec 2012 21:52:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40362 - head/en_US.ISO8859-1/htdocs/releng
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 21:52:30 -0000

Author: gjb
Date: Wed Dec 12 21:52:29 2012
New Revision: 40362
URL: http://svnweb.freebsd.org/changeset/doc/40362

Log:
  Remove reverence to 'www/' as a standalone repository.

Modified:
  head/en_US.ISO8859-1/htdocs/releng/index.xml

Modified: head/en_US.ISO8859-1/htdocs/releng/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releng/index.xml	Wed Dec 12 21:32:25 2012	(r40361)
+++ head/en_US.ISO8859-1/htdocs/releng/index.xml	Wed Dec 12 21:52:29 2012	(r40362)
@@ -62,8 +62,8 @@
     branches of the <tt>src/</tt> subtree of the FreeBSD CVS
     repository.  Commits to any branch listed as "frozen" must first
     be reviewed and approved by the relevant contact party.  The
-    status of other subtrees such as <tt>ports/</tt>, <tt>doc/</tt>,
-    and <tt>www/</tt> is also provided below.</p>
+    status of other subtrees such as <tt>ports/</tt> and <tt>doc/</tt>,
+    is also provided below.</p>
 
   <table class="tblbasic">
     <tr>

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 21:53:45 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E6F294AF;
 Wed, 12 Dec 2012 21:53:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CA60F8FC0C;
 Wed, 12 Dec 2012 21:53:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCLrjwK058219;
 Wed, 12 Dec 2012 21:53:45 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBCLrjgx058218;
 Wed, 12 Dec 2012 21:53:45 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212122153.qBCLrjgx058218@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 12 Dec 2012 21:53:45 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40363 - head/en_US.ISO8859-1/htdocs/releng
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 21:53:46 -0000

Author: gjb
Date: Wed Dec 12 21:53:45 2012
New Revision: 40363
URL: http://svnweb.freebsd.org/changeset/doc/40363

Log:
  Typo fix: s/include/includes/

Modified:
  head/en_US.ISO8859-1/htdocs/releng/charter.xml

Modified: head/en_US.ISO8859-1/htdocs/releng/charter.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releng/charter.xml	Wed Dec 12 21:52:29 2012	(r40362)
+++ head/en_US.ISO8859-1/htdocs/releng/charter.xml	Wed Dec 12 21:53:45 2012	(r40363)
@@ -32,7 +32,7 @@
     <tt>RELENG_*</tt> code freeze pending a -STABLE release.</p></li>
 
   <li><p>Creation and maintenance of <tt>RELENG_*</tt> branches of the
-    <tt>src/</tt> tree.  This include final authority over what
+    <tt>src/</tt> tree.  This includes final authority over what
     commits are made (and remain in) the -STABLE branch prior to the
     branching of a release branch.</p></li>
 

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 21:57:31 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 231FE591;
 Wed, 12 Dec 2012 21:57:31 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0521E8FC13;
 Wed, 12 Dec 2012 21:57:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCLvUaO058947;
 Wed, 12 Dec 2012 21:57:30 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBCLvUnN058946;
 Wed, 12 Dec 2012 21:57:30 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212122157.qBCLvUnN058946@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 12 Dec 2012 21:57:30 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40364 - head/en_US.ISO8859-1/htdocs/releng
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 21:57:31 -0000

Author: gjb
Date: Wed Dec 12 21:57:30 2012
New Revision: 40364
URL: http://svnweb.freebsd.org/changeset/doc/40364

Log:
  Remove another stray 'www/' repository reference.

Modified:
  head/en_US.ISO8859-1/htdocs/releng/index.xml

Modified: head/en_US.ISO8859-1/htdocs/releng/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releng/index.xml	Wed Dec 12 21:53:45 2012	(r40363)
+++ head/en_US.ISO8859-1/htdocs/releng/index.xml	Wed Dec 12 21:57:30 2012	(r40364)
@@ -366,13 +366,6 @@
       <td>&contact.doc;</td>
       <td>SGML/XML based documentation set.</td>
     </tr>
-
-    <tr>
-      <td><tt>www/</tt></td>
-      <td>Open</td>
-      <td>&contact.www;</td>
-      <td>FreeBSD Web site sources.</td>
-    </tr>
   </table>
 
   <h2><a name="docs" id="docs">Release Engineering Documentation</a></h2>

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 22:23:18 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 410F43CF;
 Wed, 12 Dec 2012 22:23:18 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 267728FC08;
 Wed, 12 Dec 2012 22:23:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCMNIRY064762;
 Wed, 12 Dec 2012 22:23:18 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBCMNHOC064760;
 Wed, 12 Dec 2012 22:23:17 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201212122223.qBCMNHOC064760@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Wed, 12 Dec 2012 22:23:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40365 - in head/nl_NL.ISO8859-1: htdocs 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 22:23:18 -0000

Author: rene
Date: Wed Dec 12 22:23:17 2012
New Revision: 40365
URL: http://svnweb.freebsd.org/changeset/doc/40365

Log:
  MFen the Dutch website:
  - index.xsl r40335 -> r40361 (and add missing process.footer text)
  - header.l10n.ent r40313 -> r40361

Modified:
  head/nl_NL.ISO8859-1/htdocs/index.xsl
  head/nl_NL.ISO8859-1/share/xml/header.l10n.ent

Modified: head/nl_NL.ISO8859-1/htdocs/index.xsl
==============================================================================
--- head/nl_NL.ISO8859-1/htdocs/index.xsl	Wed Dec 12 21:57:30 2012	(r40364)
+++ head/nl_NL.ISO8859-1/htdocs/index.xsl	Wed Dec 12 22:23:17 2012	(r40365)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Vertaald door: Siebrand Mazeland / Rene Ladan
      %SOURCE%	en_US.ISO8859-1/htdocs/index.xsl
-     %SRCID%	40335
+     %SRCID%	40361
 -->
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/xml/xslt10-freebsd.dtd" [
@@ -190,14 +190,6 @@
 			<div class="frontnewroundbox">
 			  <div class="frontnewtop"><div><b style="display: none">.</b></div></div>
 			    <div class="frontnewcontent">
-			      <a href="http://www.FreeBSDFoundation.org/donate/">Doneer aan &os;</a>
-			    </div> <!-- frontnewcontent -->
-			  <div class="frontnewbot"><div><b style="display: none">.</b></div></div>
-			</div> <!-- frontnewroundbox -->
-
-			<div class="frontnewroundbox">
-			  <div class="frontnewtop"><div><b style="display: none">.</b></div></div>
-			    <div class="frontnewcontent">
 			      <a href="&enbase;/projects/newbies.html">Nieuw bij &os;?</a>
 			    </div> <!-- frontnewcontent -->
 			  <div class="frontnewbot"><div><b style="display: none">.</b></div></div>
@@ -332,4 +324,14 @@
 	  </div> <!-- FRONTMAIN -->
 	</div> <!-- FRONTCONTAINER -->
   </xsl:template>
+
+  <xsl:template name="process.footer">
+	&copyright;
+
+	Het merk &os; is een geregistreerd handelsmerk van de &os; Foundation
+	en wordt gebruikt door The &os; Project met toestemming van <a
+	  href="http://www.freebsdfoundation.org/documents/Guidelines.shtml">The
+	  &os; Foundation</a>.
+	<a href="&base;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a>
+  </xsl:template>
 </xsl:stylesheet>

Modified: head/nl_NL.ISO8859-1/share/xml/header.l10n.ent
==============================================================================
--- head/nl_NL.ISO8859-1/share/xml/header.l10n.ent	Wed Dec 12 21:57:30 2012	(r40364)
+++ head/nl_NL.ISO8859-1/share/xml/header.l10n.ent	Wed Dec 12 22:23:17 2012	(r40365)
@@ -2,7 +2,7 @@
 
 <!-- $FreeBSD$
      %SOURCE%	share/xml/header.ent
-     %SRCID%	40313
+     %SRCID%	40361
  -->
 
 <!-- FreeBSD HTML Header Entiteiten -->
@@ -31,6 +31,17 @@
 <!ENTITY header2.word.donate 'Doneer'>
 <!ENTITY header2.word.contact 'Contact'>
 
+<!ENTITY header2.donatebutton '
+  <div xmlns="http://www.w3.org/1999/xhtml" class="frontdonateroundbox">
+    <div class="frontdonatetop"><div><b style="display: none;">.</b></div></div>
+      <div class="frontdonatecontent">
+	<a
+	  href="http://www.FreeBSDFoundation.org/donate/">Doneer aan &os;</a>
+      </div>
+    <div class="frontdonatebot"><div><b style="display: none;">.</b></div></div>
+  </div>
+'>
+
 <!ENTITY header2.topnav '
   <div xmlns="http://www.w3.org/1999/xhtml" id="menu">
     <ul class="first">
@@ -98,7 +109,8 @@
     <ul>
       <li><a href="http://www.freebsdfoundation.org">Foundation</a>
 	<ul>
-	  <li><a href="http://www.freebsdfoundation.org/donate/">Doneer</a></li>
+	  <li><a href="http://www.freebsdfoundation.org/donate/">Geldelijke donaties</a></li>
+	  <li><a href="&enbase;/donations/">Hardware-donaties</a></li>
 	</ul>
       </li>
     </ul>

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 22:39:28 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 931CA224;
 Wed, 12 Dec 2012 22:39:28 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7478E8FC0A;
 Wed, 12 Dec 2012 22:39:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCMdS6r068074;
 Wed, 12 Dec 2012 22:39:28 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBCMdR23068062;
 Wed, 12 Dec 2012 22:39:27 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212122239.qBCMdR23068062@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 12 Dec 2012 22:39:26 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-translations@freebsd.org
Subject: svn commit: r40366 - in translations/share: pgpkeys
 security/advisories security/patches/SA-12:06 security/patches/SA-12:07
 security/patches/SA-12:08 tools xml
X-SVN-Group: doc-translations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 22:39:28 -0000

Author: gjb
Date: Wed Dec 12 22:39:26 2012
New Revision: 40366
URL: http://svnweb.freebsd.org/changeset/doc/40366

Log:
  Merged /projects/pkgng/share:r39915-40152
   to translations/share
  Merged /head/share:r39641-39644,39933-40365
   to translations/share

Added:
  translations/share/pgpkeys/bar.key
     - copied unchanged from r40365, head/share/pgpkeys/bar.key
  translations/share/pgpkeys/bryanv.key
     - copied unchanged from r40365, head/share/pgpkeys/bryanv.key
  translations/share/pgpkeys/deischen.key
     - copied unchanged from r40365, head/share/pgpkeys/deischen.key
  translations/share/pgpkeys/kan.key
     - copied unchanged from r40365, head/share/pgpkeys/kan.key
  translations/share/pgpkeys/mdf.key
     - copied unchanged from r40365, head/share/pgpkeys/mdf.key
  translations/share/pgpkeys/olgeni.key
     - copied unchanged from r40365, head/share/pgpkeys/olgeni.key
  translations/share/pgpkeys/syuu.key
     - copied unchanged from r40365, head/share/pgpkeys/syuu.key
  translations/share/pgpkeys/wen.key
     - copied unchanged from r40365, head/share/pgpkeys/wen.key
  translations/share/pgpkeys/zeising.key
     - copied unchanged from r40365, head/share/pgpkeys/zeising.key
  translations/share/security/advisories/FreeBSD-SA-12:06.bind.asc
     - copied unchanged from r40365, head/share/security/advisories/FreeBSD-SA-12:06.bind.asc
  translations/share/security/advisories/FreeBSD-SA-12:07.hostapd.asc
     - copied unchanged from r40365, head/share/security/advisories/FreeBSD-SA-12:07.hostapd.asc
  translations/share/security/advisories/FreeBSD-SA-12:08.linux.asc
     - copied unchanged from r40365, head/share/security/advisories/FreeBSD-SA-12:08.linux.asc
  translations/share/security/patches/SA-12:06/
     - copied from r40365, head/share/security/patches/SA-12:06/
  translations/share/security/patches/SA-12:07/
     - copied from r40365, head/share/security/patches/SA-12:07/
  translations/share/security/patches/SA-12:08/
     - copied from r40365, head/share/security/patches/SA-12:08/
Modified:
  translations/share/pgpkeys/README
  translations/share/pgpkeys/adamw.key
  translations/share/pgpkeys/addkey.sh
  translations/share/pgpkeys/cs.key
  translations/share/pgpkeys/ebrandi.key
  translations/share/pgpkeys/ehaupt.key
  translations/share/pgpkeys/garga.key
  translations/share/pgpkeys/itetcu.key
  translations/share/pgpkeys/jkim.key
  translations/share/pgpkeys/kib.key
  translations/share/pgpkeys/nyan.key
  translations/share/pgpkeys/pgpkeys-core.xml
  translations/share/pgpkeys/pgpkeys-developers.xml
  translations/share/pgpkeys/pgpkeys.ent
  translations/share/pgpkeys/remko.key
  translations/share/pgpkeys/rene.key
  translations/share/pgpkeys/theraven.key
  translations/share/tools/webupdate
  translations/share/xml/advisories.xml
  translations/share/xml/authors.ent
  translations/share/xml/commercial.consult.xml
  translations/share/xml/commercial.isp.xml
  translations/share/xml/commercial.software.xml
  translations/share/xml/common.ent
  translations/share/xml/developers.ent
  translations/share/xml/events2013.xml
  translations/share/xml/freebsd-html.dsl
  translations/share/xml/freebsd.ent
  translations/share/xml/header.ent
  translations/share/xml/man-refs.ent
  translations/share/xml/mirrors.xml
  translations/share/xml/news.dtd
  translations/share/xml/news.xml
  translations/share/xml/press.xml
  translations/share/xml/xhtml.xsl
Directory Properties:
  translations/share/   (props changed)

Modified: translations/share/pgpkeys/README
==============================================================================
--- translations/share/pgpkeys/README	Wed Dec 12 22:23:17 2012	(r40365)
+++ translations/share/pgpkeys/README	Wed Dec 12 22:39:26 2012	(r40366)
@@ -26,16 +26,16 @@ address.  For instance, in my case:
 | Adding key to entity list...
 | 
 | Unless you are already listed there, you should now add the
-| following text to pgpkeys-developers.sgml (unless this is a role key
-| or you are a core member. In that case add to pgpkeys-officers.sgml
-| or pgpkeys-core.sgml). Remember to keep the list sorted by last name!
+| following text to pgpkeys-developers.xml (unless this is a role key
+| or you are a core member. In that case add to pgpkeys-officers.xml
+| or pgpkeys-core.xml). Remember to keep the list sorted by last name!
 | 
 |     <sect2 id="pgpkey-des">
 |       <title>&a.des;</title>
 |       &pgpkey.des;
 |     </sect2>
 | 
-| Don't forget to 'cvs add des.key' if this is a new entry,
+| Don't forget to 'svn add des.key' if this is a new entry,
 | and check your diffs before committing!
 
 If your login name is different from your freefall login name, specify
@@ -68,7 +68,7 @@ Beware that the keys are supposed to be 
 unsure where to add your entry, use finger(1) to check the surnames of
 those around you.
 
-Once you've successfully run addkey.sh, 'cvs add' your key file, check
+Once you've successfully run addkey.sh, 'svn add' your key file, check
 the diffs, and commit.
 
 
@@ -77,7 +77,7 @@ the diffs, and commit.
 
 There are two ways to update your key.  The first is to follow the
 above instructions as if you were adding your key for the first time -
-except that you don't need to edit chapter.sgml, because you're
+except that you don't need to edit chapter.xml, because you're
 already listed there.  The addkey.sh script will snarf the RCS Id from
 the old key file and generate a new one with whatever keys you
 specified.

Modified: translations/share/pgpkeys/adamw.key
==============================================================================
--- translations/share/pgpkeys/adamw.key	Wed Dec 12 22:23:17 2012	(r40365)
+++ translations/share/pgpkeys/adamw.key	Wed Dec 12 22:39:26 2012	(r40366)
@@ -1,35 +1,55 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh adamw 42C743FD;
+sh addkey.sh adamw C57CF3A8;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024D/42C743FD 2002-10-12 Adam Weinberger <adam@vectors.cx>
-     Key fingerprint = A980 3F2E 80A8 9619 9D1C  82E8 A3C2 8CD9 42C7 43FD
-sub  1024g/15D67628 2002-10-12
+pub   2048D/C57CF3A8 2012-11-15
+      Key fingerprint = CCD9 F28A BD1D 50A1 8D08  18A7 F48B B195 C57C F3A8
+uid                  Adam Weinberger (FreeBSD) <adamw@FreeBSD.org>
+uid                  Adam Weinberger (adamw.org) <adamw@adamw.org>
+sub   2048g/9C6D0E30 2012-11-15
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.0 (FreeBSD)
 
-mQGiBD2neE8RBADgkTfNUPbm3AVnVPn/Ds5lDO89yKowW3ULixWqJ6Mti+7sIQ6y
-A4v5/dlUODTH0sdL4Cl3q36pCOP13IIq7o14h4YOjMhdMhsv43678VYK0PvR70hK
-/PxqIRV3lQsP2g8LihKLpRy6sHleIXu1hRLbIBI6/iJTmFcENQfivyHpBwCg31J6
-6jew1OrTLlB76aWmmRJIlVkEAII7j0gAqV/zjR16sAsfiCSHSg9A8RGBmC67zUfK
-PxnrLiw0gqyrt77YnXvANGWDdIMHEZrcDBrb8ciSO8agBO2+/7mOVDVDU5I/SJRi
-rfJTQvFphcnOe7F3MaxdfA/vZE9woXq4JLXfnmcgUAey4iYB2QbV/+v1HBo6wys6
-qyDXBACMsXFWZbDNDwUZBxGVS66bLwpZ/UhWqkrAyvK/7M/HQjkFTUUX2fSTPnWh
-AkcA82asPxQFTdbd7BOs4JnXUY4m+wfP3pzGaCbgL6WYumRjvmvkmeyZtFD+2wxL
-nu/F3oO9PC2f4mGa6E928BLy2bRCV75L0OMmbR5Fd0Z+95k3kLQhQWRhbSBXZWlu
-YmVyZ2VyIDxhZGFtQHZlY3RvcnMuY3g+iFkEExECABkFAj2neE8ECwcDAgMVAgMD
-FgIBAh4BAheAAAoJEKPCjNlCx0P9I7UAmQGWPEjqlXfxptWgb5WKskfl+rkkAJwI
-OSvOdiBFM7/EBBgn9pUQ/6PVUrkBDQQ9p3haEAQAzc17FQj9ePY4tW2+nWiQzj8I
-GVG+8fsVwFhDb4hFcpJxPiR3/J07tU4iyKek/qUiOQdW/dI30vm3rOSIUa3r9iaj
-OaJilRVDO3ErUCdcrJjGf+fTWZFa8t2TLwOooyV8tJ5IUYLwJ8s7/3OpwWh1pfCQ
-qxGACCiXeKQo0a9jxJcAAwUD/35x0sm6jV2OZaHxX/JteeLu1hJOE4hc8oRqiE93
-4j8frz33jIsRFpKJ+H28LXtRmVXtVTdq3RuHll5JRCMG+IPLT3Tns/d0L90twpOj
-4r+2BFIK6SYE6JYngf+J5clwve3vE7Y/b8NbSawEApvVxdrpsevGH0Sn5MSdiukm
-EkJviEYEGBECAAYFAj2neFoACgkQo8KM2ULHQ/1NRgCeJ6ZJYvc1oOUBdEKd7SoH
-rFA6N/8An3A9ukQlZm3lPMutMia2vnsb108k
-=0qTN
+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
+IpuNrKfM7zuBiw==
+=yHIG
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

Modified: translations/share/pgpkeys/addkey.sh
==============================================================================
--- translations/share/pgpkeys/addkey.sh	Wed Dec 12 22:23:17 2012	(r40365)
+++ translations/share/pgpkeys/addkey.sh	Wed Dec 12 22:39:26 2012	(r40366)
@@ -72,9 +72,9 @@ mv pgpkeys.ent pgpkeys.ent.orig || exit 
 
 echo
 echo "Unless you are already listed there, you should now add the"
-echo "following text to pgpkeys-developers.sgml (unless this is a"
+echo "following text to pgpkeys-developers.xml (unless this is a"
 echo "role key or you are a core member. In that case add to"
-echo "pgpkeys-officers.sgml or pgpkeys-core.sgml)."
+echo "pgpkeys-officers.xml or pgpkeys-core.xml)."
 echo "Remember to keep the list sorted by last name!"
 echo
 echo "    <sect2 id=\"pgpkey-${me}\">"
@@ -85,5 +85,5 @@ echo
 echo "If this is a new entry, don't forget to 'svn add ${keyfile}'"
 echo "and 'svn propset svn:keywords \"FreeBSD=%H\" ${keyfile}'"
 echo "and commit each of ${keyfile}, pgpkeys.ent and"
-echo "pgpkeys-developers.sgml, pgpkeys-officers.sgml, or"
-echo "pgpkeys-core.sgml as required."
+echo "pgpkeys-developers.xml, pgpkeys-officers.xml, or"
+echo "pgpkeys-core.xml as required."

Copied: translations/share/pgpkeys/bar.key (from r40365, head/share/pgpkeys/bar.key)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ translations/share/pgpkeys/bar.key	Wed Dec 12 22:39:26 2012	(r40366, copy of r40365, head/share/pgpkeys/bar.key)
@@ -0,0 +1,50 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh bar 3DF5F750;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   2048R/3DF5F750 2012-11-13
+      Key fingerprint = D367 F6C8 2A5F 2921 70D2  B446 27DD 6FD6 3DF5 F750
+uid                  Barbara Guida <bar@FreeBSD.org>
+uid                  Barbara Guida <barbara.freebsd@gmail.com>
+sub   2048R/1DF7506C 2012-11-13
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFChmNUBCAD6H/nOlsSUv1C4GJUHns+0YmdcqwpoF06+mcfJXQ9ZIYz0mNqd
+7b03NpOzSscwiBHazZfACldGB3+6A8cNMvCH5BbENjeX6m89i8tEzYA2eDf74fw/
+0ldHyHZdnZuXJSQgooztjRmzo/5I2g2ScdhhYAOW5aqEqlFrQexD+0ijhwUU7ylR
+BtMlSwGozHpoynwtSNsOZVyXtEQ4CidgDY6sKx3jhGePh1Pqh4KI4mDCNh7hT48I
+v5elyTTHKj8Fw435SNfFqCzVE6M+POuN5Zydetk2ru57RD+0fnCsNc9sngLRVBM0
+xxOokNE7FpzsIBQ6tzLz+lZCz9L9uzuHjHdXABEBAAG0KUJhcmJhcmEgR3VpZGEg
+PGJhcmJhcmEuZnJlZWJzZEBnbWFpbC5jb20+iQE4BBMBAgAiBQJQoZjVAhsjBgsJ
+CAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAn3W/WPfX3UKDpB/wJijev63A8tQ64
+IqQvakpS5RAsrVJ0WqtP31Cb7aFWkelmyIabwOgfzeNgTyF2pdAI1+6mx24/C9AB
+ke2HwFvg7rXGeIm4S34tCvixDiJ85WHX08/V7f97//brueXE9EPjNZx9g9+fjPXE
+I9XAmVRMi1ZfF8HUHZUrJoEAUCK7lpa7WKmcItW/T/ojLVFSl3j3FJP1dJk6iHKW
+upKLjZ1gA33IriHkYkieXkPLCvZw/LD+Ei7KYyf7UacumQjx/T/jp2q282qyJ25A
+p7FEYY2oBQS7GHd+RLvkxZ2PeQJTgyoEoQEd0C6XU0oHpo658NToc91FKA0jfjcD
+cjESoWDRtB9CYXJiYXJhIEd1aWRhIDxiYXJARnJlZUJTRC5vcmc+iQE4BBMBAgAi
+BQJQsk/8AhsjBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAn3W/WPfX3UH9V
+B/0a5kosi/15TTmv+Y2cFNtMm+LxGUv/xCZ+oaWJyTUAWojEWvaek4//PZ3XMVxh
+K48VvQNxMWZOsZc6mo/gelEaUZJ0mtR/FdK8CiMynKQkfifsjsz1Sjf0o8WdCr5U
+ghGKdj33ssw/z4cxPUTgeGGwPjnI4O+ZuD4SIk0MydQREaltmdBxpAm68mKLZCjB
+/lT6TiD7NRKVM+2KZXgNzdjiSQG4aSa21V/d2bk0mZWVvj51Oqx+vlfs3/u+cO6A
+msslous7RMR4fuZAh6Uewky4OsDdyEcVCsTciG6QatqYVXfCXM/3bOXX53eisfIJ
+iTcbOJdO+qBzqC5e37ffOG1IuQENBFChmNUBCADOHnVkZkSyHz9iagHZcJ8UlA91
+87movEUtJLFRQbgRK3T7qqxwVMJMKGPrOZpkg8l6zPENbbvVWBQmjjoN8v5T6WWH
+tRY14AB4I0tJMfNSYoU3Jg6u/vthw86y7SBrcapvrABJ1vVHGm8W3Zsjftcs2sEr
+iEp33O9hh8QU/Ynr1GUg1IKAC/14mthymSi534DGjnVID6H+Hcpm1pvKJpkf0AvZ
+d0/pcI8vySZpHw4DKO8bF2zPoeT/E46xPj8U+PP9aCrryOVCh7lc2nnVJeIe6jgC
+JO3ka/qRyHb8Er1mJpl2IISfG3Sg60vQVKou+/xsOp3GkrZYj2YHwTKk4ckRABEB
+AAGJAR8EGAECAAkFAlChmNUCGwwACgkQJ91v1j3191Atbgf/e9uK+1tHJgRl5rdU
+gzRHHrR1S4BtoYe/dYC1UvbXjZOthbVAoLOZDcU/eU9qTQI57Bcl+JdjQr9ZClbc
+akxYNKp7PtTDARBwNmbU96Dpf1ef8XdwiyD7Ifl6mgDkevE9AaSxOQjQzaePiK9h
+r8DSxlL7wDQ2QqsDU0mdnOxS99v0le4FoItlpujtcWwXG5eTnEejD1VmCorumNTD
+cksouKVOSfzl67swNUr5/8gx1PV0WvCmCCzVoXjg5Mpn7rtBxH8nOUDrXKTuRtRr
+KQmTCRJk7gkKyUDkdfhyoPXo0E2rRzVKw+BvzmmHRqGd9K7ixac/5QFHfvuNtYyn
+AA+Qvw==
+=8co3
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>

Copied: translations/share/pgpkeys/bryanv.key (from r40365, head/share/pgpkeys/bryanv.key)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ translations/share/pgpkeys/bryanv.key	Wed Dec 12 22:39:26 2012	(r40366, copy of r40365, head/share/pgpkeys/bryanv.key)
@@ -0,0 +1,77 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh bryanv E97DB7DB;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   4096R/E97DB7DB 2012-11-05
+      Key fingerprint = 0F8F 11EF F4D2 EDCA ECEA  CB16 744C BF25 E97D B7DB
+uid                  Bryan Venteicher (DITC) <bryanv@daemoninthecloset.org>
+uid                  Bryan Venteicher (FreeBSD) <bryanv@freebsd.org>
+sub   4096R/2EBC1A46 2012-11-05
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFCXauUBEACj+NbRz1VJJmbIz6PO3fV3bTeCaAIcBjKWzsaKogvEpuFaVlPX
+eqwKqoRqqbxHxRKfs3Matco+e1EwiWVfna426PB2S5g0+0AuNKo7lq/XtpsSZXp4
+vCPUvZUwpCio6ZYqiu26lVzQ2iZqz4wlsBmsh6pYaP9tNKuf08gPYu80kaclov+a
+/o6uC5A+cNS5u4v2Z+nojMKAOZ3IP5TECKtNVTvmEBlRwGQWKg9tgCGo8g0YOU8s
+XG0hltfpFTe0JAeVWY6k+fI6CXXTfa8U6mBBb5hhmM6Aaxx9j9e5XLXV+VhQck+V
+vJMRKnekfqACauhNvRQQHZsDnduCwn++ohW1kwm8/a0UPPrG0WkJa++GymTmUQwP
+hJ1/HBD3GS9LuxSb7oBCzqOSfiYhYzq1Mh+LiR94pzMfsykJDA2d/PG5uOO7xvL3
+lEdPMB8k/g9YFkWpNUEmVLKPt5vkZwRt2GcMhbIiexxXfOg0A6UhQJy7BWV9bXu1
+DqCeOzdUP1MBF0d/PrdxiF1yjPEHe5s5pVlwoT1PKfTYhVmtiakJINe5M9r79/h5
+Nvd7R/289x1pNLm4CiKcT75mnmb+p0ftQB/QCpk7xngc8xf1uoCPszpFYjp+ktVQ
+XAV8AKjAwjknfhwxxCX7+ijPjYQXVUNVVrFfgZZeJqoBnDTHXsuMDCZcmQARAQAB
+tC9CcnlhbiBWZW50ZWljaGVyIChGcmVlQlNEKSA8YnJ5YW52QGZyZWVic2Qub3Jn
+PokCOAQTAQIAIgUCUJdq5QIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ
+dEy/Jel9t9vFUA/+K8LrI1I9pbN7hUlFQwxj/T6b6sQR/2vneKkNq0q6uj2GxoVo
+Y+r09sAtKENKi1rQBVPMGeZyt+gSWm4yk5pudzsLglHub+7ArFvzo4PzOd+y3j6h
+0r8zUtPZLQxg4gG9K2M0hev+Wmvvksh+NRUyEvbEgRmD2vP/aurAzMl8mIxKi5jK
+cSraBTP7slbuz7GR95/BCFV29ET1fczYOGrLEYfC9ucvHTWh6VVrEIFqjhJTrsMQ
+6X6cfTBm5Mv0VVnm9g5x610X3OH7YdRS9qlDr73vWCoFSCzzjawwv4j56tJIMLM7
+at5ZGsmBYEms2Fl5SOTcb2s12c2qPFf2e0YDcJjQiiX//hgV9/Dw+JEKkkZ739Ut
+r6TTP+icDMCAS7owOW555oYIxDakOsi46xU4XQ9lXjYqmOM68NF5clEw2cfC6H2i
+/smHClty57Ra3+RD55YOaT11qy9jJ6z5w0SwHMxVKnmuLL+wLrO8xFvz8YGtwTJx
+ULUgkyMU/g1NEDoiWetkydmjWa87J34/F3qo+Znz8FpTSx3syGJPtjirC242P0Hv
+aFEpobg+IieYj/y+tcBDrK7DcFhy+ddlPRikC33obf/pMe7Tq7XUDeGsAwRMDrZ8
+5Nz77ShoTyNVbQrjvMZ3mWUL6aIqQQiXYb30YX65qSfkbjeWFV/UqVWXwPe0NkJy
+eWFuIFZlbnRlaWNoZXIgKERJVEMpIDxicnlhbnZAZGFlbW9uaW50aGVjbG9zZXQu
+b3JnPokCOAQTAQIAIgUCUJdwvQIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AA
+CgkQdEy/Jel9t9v81g/9EgilQhRDnX+jbfI7wvIx7M2i1QeOV+Zige7fZiHS3038
+jbl0o/FylG+UfZiGRS6dr56wg52apG0GZMYN8v15b+w34x1jroCMp/NAXJFAb6Ju
+6molIDL07B8yWPRV78LJ71eG3lAsTmsXo72WvsbObAKmRKT1bOJkCnu6HCc4rMt8
+Gc2DVAfWM88/pnYu4VhDrs5q8hp5iblojiOu7wgDEapTd8+5aTCq1LEZYRit+k2L
+nl2FAXfswp6s+RhXS/4mNO9Bqr9Rj6SGLjbjEXUpNDzwjjyjaL+FgNvi/31yANml
+4rWEORrdzcFGdvgwKgSP25Xn85iMrJAme68fB1/4tMzyZ5TNugNU4X1ieL7gNNgN
+c3a18N+d1pnmfAkAqs6qvnysLrMJu/2wKbOmu42uZX3fEdAWkR8r233QJIvAp59n
+qEm3zRXZEOUUP3Pt0VCGZXQ4ztYP33kCWRJ7f/pIGq/gOZC5GZ2VRqDSv1VePoAH
+D9RJSKkxIFq62AvtJoyM5ahC6YpTf8DrdSsRW6/s1QdwSFIvd88wrfcVp4mwHyWm
+hGHIdcr2N/sppKdjFM0RVGEBh5X6XrQnWXfYYC8aNnYms1FYz3c1o2aYshT+FkC+
+fJ5QyMQeB/4VcOd6g3+BcFhb5ZYW4W9//D7jrYfkVyHloF2s81wGIOqqVywjwLS5
+Ag0EUJdq5QEQAKAFUhykhpw7uQe61dbFxCK/ZVzikZEjtcRfRZFQt4kXvd2PhyDc
+t+DyT8i/ZDSnP0UblRsSwTt4Ja6Yg0KUMbo9EIuvC5n7PVVktGAsIKZC1PrtMm84
+Gw1bBCm53LEwnrjhiPxXb2l3vX58wRXPRichZACxv5LsaFWlYAjqub9mkTV/MbFD
+4AG5X51gkqXQovTaOl3s0D/kpou9wv9nY9R0rKTis5z0K+hDrbl+l2WqaacZZWK/
+sPb+EjnAFvfNH3Y4jkp5Si0olmv9aKhCDuUMslENPN5j74Heap0zXWxXPlmVLBki
+wBwBaGsSKB6blnI+eJw5xqd3ast6qMUkW9JopCKztO1yrD5lB8dkRLxl2SepL2Z3
+QrYW5DVSlqX1mQyGoJ02Q1Z1bLipjqNoePwkjpsv4AAP4rXkWOZ50Yhi+DjVDpOs
+AsHCBSBE2GK6evzE0VIsHU+hKNHkcHhBmj8BnIJkhEVLPYF+r8ghLIGemtmkmSS5
+QzyCfr5KS3rELO3H1ZprvCddamOqbeWkeixcaz04NTCLBswTNPtqCueo77uo49IS
+kU52PVXjdOOea4nLiH8coUsxb1D9uEDBLPTI5zBM3BK9Xwv5jLjNLCm5e5HZTnJq
+2MDkqjruNTMQ9A3IFNcGKeNXILm5qm+HRJPDRmWSt90mq2mxWVr1i9stABEBAAGJ
+Ah8EGAECAAkFAlCXauUCGwwACgkQdEy/Jel9t9t2mQ//Sw5dWgrWDMDlVX7tJLtR
+I16tBJEvELkjUTTJkBRFazE6qT5L6Bvx+rewTkcq31cUqT8eAfqkk+mvVz6+L8XD
+N5pyMeUBSlZMrNF1Wsfc8F5nxLi8BnNixdAOpP9KJhC7KLzQuNpycSJMdX9nAfDx
+QHfQ8CVuqmnkYB34R6rpmyHHgN0kYBdA5q6MJzzlVATwO8oON9nCca60rFCbPZAX
+f6ZLRcFn+CIkZaEEmsEFK43mCy4jmH7DsabKtjyJdeaLAxyED1IxnQ1YWKSd4LBC
+ooYj87aZ34df7VpxBZe8/q4prwm+gEjM9V0gf2F+CgEB7m8JXmqXZ2id7p84PE7k
+UZJOBMTL1UegkiPXLb1thuCaSJodOLrf6t2W95v8auBb7fUAOXWNbQ2EId1IHPT7
+FOw2Yo32VjFOa/QUjKc98XlZBU4+0TZz1hZmsUaVRhhULqEc359DRdmNUfEDWv+P
+bDGiRwejjybGpb2f3lqnne3+7b1jEcLCI8k9VTklhj1l3flMWa5l0ubz57X2W9JM
+LkwHPSTICFJmJOU9KtWo6ujC1Rx20e5y+T8SMF4A9oDb/SuNRi+k0jhrYGsT+mWx
+De/WZ2m39Eshkbdd5R2izcYLuLV+nEcbj35ZsK+wgXkQqnSZK8JrjCArQvJuiJUl
+hvaQWSxKvtCA3RdI3vmKyQc=
+=6YAA
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>

Modified: translations/share/pgpkeys/cs.key
==============================================================================
--- translations/share/pgpkeys/cs.key	Wed Dec 12 22:23:17 2012	(r40365)
+++ translations/share/pgpkeys/cs.key	Wed Dec 12 22:39:26 2012	(r40366)
@@ -1,137 +1,125 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh cs 2C23E493 48C0D3F8;
+sh addkey.sh cs D06F0BD7;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   4096R/48C0D3F8 2012-06-05 [expires: 2017-06-04]
-      Key fingerprint = A2DD 6235 93E4 6520 1AF9  2B14 E925 8207 48C0 D3F8
+pub   3072R/D06F0BD7 2012-11-25 [expires: 2017-11-24]
+      Key fingerprint = 61A4 F2B8 2A6C B81E 5557  0798 78E7 DE70 D06F 0BD7
+uid                  Carlo Strub <cs@carlostrub.ch>
 uid                  Carlo Strub <cs@FreeBSD.org>
-sub   4096R/99AC2A67 2012-06-05 [expires: 2017-06-04]
-
-pub   4096R/2C23E493 2012-06-08 [expires: 2017-06-07]
-      Key fingerprint = 26E0 89EA B9BE 5FC5 D740  CBB4 EABC 7343 2C23 E493
-uid                  Carlo Strub (Mail) <cs@carlostrub.ch>
-sub   4096R/DF86FD3E 2012-06-08 [expires: 2017-06-07]
+sub   3072R/71C75997 2012-11-25 [expires: 2017-11-24]
+sub   3072R/318AEB16 2012-11-25 [expires: 2017-11-24]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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
-dOIESw==
-=hNp3
+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
+5w==
+=X5dP
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

Copied: translations/share/pgpkeys/deischen.key (from r40365, head/share/pgpkeys/deischen.key)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ translations/share/pgpkeys/deischen.key	Wed Dec 12 22:39:26 2012	(r40366, copy of r40365, head/share/pgpkeys/deischen.key)
@@ -0,0 +1,63 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh deischen 7D15560B;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   4096R/7D15560B 2012-11-17
+      Key fingerprint = 0039 2133 69CA 14D3 236A  E331 361A 68B2 7D15 560B
+uid                  Daniel Eischen <deischen@FreeBSD.org>
+sub   4096R/A51F81F7 2012-11-17
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+bwlGxw==
+=J3ZL
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>

Modified: translations/share/pgpkeys/ebrandi.key
==============================================================================
--- translations/share/pgpkeys/ebrandi.key	Wed Dec 12 22:23:17 2012	(r40365)
+++ translations/share/pgpkeys/ebrandi.key	Wed Dec 12 22:39:26 2012	(r40366)
@@ -1,243 +1,242 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh ebrandi 401FF8F3;
+sh addkey.sh ebrandi FFD3035B;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   2048R/401FF8F3 2010-10-21
-      Key fingerprint = 1BAB 0B87 EE89 B8D4 B418  66D6 A5C4 5B43 401F F8F3
+pub   3072R/FFD3035B 2012-11-26 [expires: 2017-11-25]
+      Key fingerprint = 443B 5363 564F 06C3 EA54  9482 209E 9B54 FFD3 035B
 uid                  Edson Brandi <ebrandi@FreeBSD.org>
-uid                  Edson Brandi (Born 1977-08-14 in S. S. DA GRAMA, SP - Brazil)
 uid                  Edson Brandi <ebrandi@fugspbr.org>
+uid                  Edson Brandi <ebrandi@ebrandi.eti.br>
 uid                  Edson Brandi <edson.brandi@gmail.com>
-uid                  Edson Brandi <ebrandi@gmail.com>
 uid                  Edson Brandi <ebrandi@primeirospassos.org>
-uid                  Edson Brandi <ebrandi@r7.com>
-uid                  Edson Brandi <ebrandi@sp.r7.com>
+uid                  Edson Brandi <ebrandi@gmail.com>
 uid                  Edson Brandi <ebrandi@fug.com.br>
 uid                  Edson Brandi <contato@edsonbrandi.com>
-uid                  Edson Brandi <ebrandi@ebrandi.eti.br>
-sub   2048R/E20441CD 2011-11-04 [expires: 2012-11-03]
-sub   2048R/734718A1 2011-11-04 [expires: 2012-11-03]
-sub   2048R/3C903007 2011-11-04 [expires: 2012-11-03]
-sub   2048R/409113D7 2012-09-14 [expires: 2015-09-14]
-sub   2048R/5A95E5EC 2012-09-14 [expires: 2015-09-14]
-sub   2048R/8F69BF17 2012-09-14 [expires: 2015-09-14]
+uid                  Edson Brandi (Born 1977-08-14 in S. S. DA GRAMA, SP - Brazil)
+sub   3072R/A34B8175 2012-11-26 [expires: 2013-11-26]
+sub   3072R/4EB0E0EA 2012-11-26 [expires: 2013-11-26]
+sub   3072R/89917E73 2012-11-26 [expires: 2013-11-26]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: GPGTools - http://gpgtools.org
 
-mQENBEzAJbsBCADZ8cjQRLhinjukta6ayV0xnOwZlANttQ7OPcOeQ9atIeNIYMtr
-gEARYySBcLWGY+YZejbSIWtYbWawRLGX9uRhSVHCYHXwr48Q092r0l373kD1IDEc
-Z/+NadllXwNbwJfpeyiHVUaS3f8E9anCXhdIMOZquPJv5cdeRAMSTRNxZidcVW0m
-DjP1jb81R8uNuQIbZXokalGeXkfJu/L5pHGUBQSNVYpYIXPuhwdSc7ie3m6vHmCk
-MGQfQ/iicVLSkeKy4m/24jxrBEzdYquCvT6fN43cbGTrdq6oLUE64oyvkP/qCd1Z
-EUbTcmOnvx6LG4ae1H2HW+ffOUR3mXYOiuxhABEBAAG0IkVkc29uIEJyYW5kaSA8
-ZWJyYW5kaUBGcmVlQlNELm9yZz6JATgEEwECACIFAlBSfZkCGwMGCwkIBwMCBhUI
-AgkKCwQWAgMBAh4BAheAAAoJEKXEW0NAH/jzw/MIALzsTFcajHvSHbc4SQDP4sVM
-v26DAh8YxH4hkQg5cJgxJMAyWPAzzdaAiYUA2lwmp25+z1eYsHy22VtB5y4vkux4
-X4lv/lAMDPTp1C3Yp3Ok9WrnleV65DMqFKx9DswJiuDblFid4kKpmx7B3lgafUd0
-+Rrp4VtxmgrnkOMD3dyh3xrIiKiGWp1px/QknZAmvukvh0cKrBcDDM2zjQuaaAjo
-LDQxd5ytUMwIFRkuys7/iwSbuQYxm+fx91ZAeE13TKOFxhuaab8tIdnzVACkTR8e
-2XWlX4u6qxrdAMIrTqrADfetuLw3X4f1sSuITC4mNG3Mbmoi3sVYqUmK2Dmy0zi0
-PUVkc29uIEJyYW5kaSAoQm9ybiAxOTc3LTA4LTE0IGluIFMuIFMuIERBIEdSQU1B
-LCBTUCAtIEJyYXppbCmJATgEEwECACIFAkzMHy0CGwMGCwkIBwMCBhUIAgkKCwQW
-AgMBAh4BAheAAAoJEKXEW0NAH/jzBoMIAMQEoXxDusvag0Pi7GB8J0C/gYQCts5a
-vMEeIT7D++1wdfWLMqvnlRJ0fqB2XJ+8geYVFInbmmbxK56K3CbYk26Sl1XQylIa
-W7Mca8tF4J98D2jxOk9bjLNmPWyRhmt9I81dNQHXZk1B/bpBeUvBaluKpS8NsPTf
-u6LTEeGqThYXhAt2maU0CeD0mcGbHBIJWSeUYOXQayXbMiy/NqDUaBdJ0Q9vsBoC
-CpjU6VILSoqyBf1TKF/55NOCXAgXVJjRzOQdyr+gygDM6BD5d+dYXBdIMqATSk21
-F5qEPerVa9YR5Wa/9DPkslMHb6sf7P5W0+BpFO3IJCHjnkJTIEa2D6e0IkVkc29u
-IEJyYW5kaSA8ZWJyYW5kaUBmdWdzcGJyLm9yZz6JATgEEwECACIFAkzAJbsCGwMG
-CwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEKXEW0NAH/jzOXMIAJbJ7SGGW5li
-m5JSjP/Rj5Ez4uI2AESFAoztLIfst3ixfeSbZPybGx/hvwpNNWUCLWiP4CbOGdiO
-3RiLwYvk3y10MuOZBDiOPGQizIYzR9aqTDvo0ltPR/ikHsdm8AlofZtqDZRYaQu0
-GVqGa9ZY88ZfRWtvJVQ4IISDOcRy108mBHP6Eov/RYCpB5+ZTjiHYNIq6IdLJKqa
-mEkNSVy9HAUTlWOLTkY5OrF/tt7DBTrHjjFHaMeJ9ytJUkpe24f01diqbKL7NPct
-j4DFRT0BAZ+Jmjx+k0K90mTSsVf+m26RNKR6jSGKoukKNgjvdfDplunvT3JUFuln
-meWQsFnUdvO0JUVkc29uIEJyYW5kaSA8ZWRzb24uYnJhbmRpQGdtYWlsLmNvbT6J
-ATgEEwECACIFAkzAK5ACGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEKXE
-W0NAH/jze80H/2GP/Uwcda4CIdzx6URd5yqjZoBj8CrTANs9bcXzbkB3F+YetJZC
-/izd0PN6XSLzLG+SpN9c5M7Bs5Ma3t7wXU/3u7IJM6SRZ12Mg7C+d+Briz5szn2L
-hjjNaG83f/idYmJ4z6+Eg041YMPPWWkVm/MwwSvbqH44bBstc3mxjHpAKxE5AtyB
-Js3q7SAJyu6tqUMjhpUY+njZEzOqtFMzjiKA/OU47dB55tT53ENmWQYJ5vWNm7Sc
-5YaZTv95ewwQf6jZ+HVn6/jEM0jvNtmZwcrU8Ka8WFwB9xUcdWnj/9qOom1EFRU8
-Hx4oGX298pFuyGWAlLSi2w/EAV1yEVdXDJ20IEVkc29uIEJyYW5kaSA8ZWJyYW5k
-aUBnbWFpbC5jb20+iQE4BBMBAgAiBQJMwC0hAhsDBgsJCAcDAgYVCAIJCgsEFgID
-AQIeAQIXgAAKCRClxFtDQB/4880cCACY57q8O8Agd98oaC1Tf85M/SGnFq4nEx9N
-zpm++nYCSeN1CpzsAlGgFQPcp6Ndw8MMjVx4bxWzayLuGOcYQNXdsRC8/8c7Ohe3
-UEy4u/Doetou1aoV6ZO3TcOYqv5M47vukrjRbNo5jssarkinseGvVDyzEh3djanf
-jctmWQOLiMF087SWcKZXFMerffkdHHZYp6jHL2aDgFc5r677eNZpmQFT3LQSPdSW
-Rt5Th4Rm3WUWi8nXYA8Si66rI2REIHA0IKk2J+z7V019XEcYmnnvDQNgk3d+IkWy
-+2ZeolwICMS9+jojkhKijrpPmNt2mfeqwkIy59S32gl7yOrH819+tCpFZHNvbiBC
-cmFuZGkgPGVicmFuZGlAcHJpbWVpcm9zcGFzc29zLm9yZz6JATgEEwECACIFAkzA
-LTwCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEKXEW0NAH/jzKoAIAKPA
-d87j1oh7LCGt8DMUZZjLrvPU3n6LNBHC93P7eJIJgqMGVu+NLHPWhsf1kVnx5OcQ
-rlkrnb6mrr3cAz2RFGlXvk2lLxUe5R0UfSe1jEqSy8Z4cHT6RbsT5/gd904Un/GI
-1GFfXmImYWAtxmjMyFWZofyP3jswjlI6sUQnfoSzMkGtkLlME15KMLp0LPcZ4/48
-srH7j4Glkkjh++yUqSCtYYoP/mWoTNLx6rw0IMyK0g4/1nDsQn3pj0+LgpPTBuWl
-itUTXe5CcwuTZp30z/y6O0qD/SIAvK3a2zW2apQjRAKnspYJZBU1A4fi6G9EGvBB
-9ik0oBFVEMG36cdmp+e0HUVkc29uIEJyYW5kaSA8ZWJyYW5kaUByNy5jb20+iQE4
-BBMBAgAiBQJMwC1dAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRClxFtD
-QB/483QsB/4l6ijH6hkkyCqtIcuq9IYtX4YoBoz7kUP1HeWKk97C1XwWBMO093B+
-uO7WutlqNV6Z9YkZ7x3BGiFVHOQ9lBSDlT1T2mgkxIz2xUJQa2JPqoul58r13Uf6
-NTZcliRbSTW1q1cEHMU+bcAno3zIQpWXHyQmRAprv3sIs/Hn0Z1oMk7DCvrVvdSC
-R6xnXH81U5EcI9G/V14q3+8JZByfBO2jDY34z7WQ4AIP6mAqTJt6JRtqijobD4co
-ALm/e/n7SWdBR7pdQf6i16CNOwZ3AK+xugBiwlgxj1Lug9/QUklDZYwl479PjYfz
-Ro9xA28selXWCBTRU0B8VtyaUAh3zhTHtCBFZHNvbiBCcmFuZGkgPGVicmFuZGlA
-c3AucjcuY29tPokBOAQTAQIAIgUCTMAtggIbAwYLCQgHAwIGFQgCCQoLBBYCAwEC
-HgECF4AACgkQpcRbQ0Af+PMetgf/c7vpc5DPKXmuhUs7CN9I7iun5tbI46DWO78R
-SyTShVkzlpJqJ7H+7EobkzBOiRDfrmuA4oW+cjKhKN+II295s2ZIOc4ezNMaN8N2
-LL+4k6rFQyKK5Ki3W3Vrapj0qdJoAZ1V8exiFDhanD3nD876lXLaEznE3rasPZUP
-ydaG3gkzmoX6KLtz95xDTNK2mMF9lGALLOzJYHeNkS4CcRXUuaA7CztDDcA7cMfW
-gwgwQsouubvTvoAF1NyVS336K4W9s8UOM5RPZYslnJBxnPqKsrwLyvMjZ0f/yzNe
-ns12r4vJRTJWSBA/OP+ooTn4EXSRv4M0xrnQjIej0G9O5XVQprQhRWRzb24gQnJh
-bmRpIDxlYnJhbmRpQGZ1Zy5jb20uYnI+iQE4BBMBAgAiBQJMwC27AhsDBgsJCAcD
-AgYVCAIJCgsEFgIDAQIeAQIXgAAKCRClxFtDQB/48z1lB/9ivUX6bPdHJCM0vJUX
-c2mmwvADA0yDhAoSGCNLy/6ggxOENujiynn7elImSIW1ri9fNaENqL4eU2KX29ZQ
-hVfMz18pd8FM/oCDO2DP8ACxwexXifLTt4g0UUq//SrCRSGKs2JSa9xI6MvbZ6Xv
-jNCJ9l8LlL/2rT9WH3m1WnutM19kEyrhWuk1Bn8jg6jkdQ4tsHWkBbVOZHLIGGAh
-UA6fiud5XskzRpwA3OS4GoTF4kzx7747boz1JV5E4u+a4SAeq85SdzOnMjf//4QP
-zf2vsvzNCbiw8JiGJe6YCLLgiVLzbTwNPbqgxc6jJ3iX8MwY1BMoHffnKlLgoMny
-JsG6tCZFZHNvbiBCcmFuZGkgPGNvbnRhdG9AZWRzb25icmFuZGkuY29tPokBOAQT
-AQIAIgUCTMAt6wIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQpcRbQ0Af
-+PNp/AgAwzPBCUmziPYeTFWKcrDT3/TTdQeYNr2k7ZSXcjotnATRS/PY/c1T3h5b
-Rpc6kK/LNxvB5MO9MA2UXNQscLAG0tK6WecvkV8HLkG1ptfU1zTXZfpAZkW3GCox
-O+VcYQF7CI8eiWVNQtvaTxt2R/RthQZ1ExSPqqZcSPJk0bqRrk3tj/ne4BSPKlHM
-DIqezShjoQhpVPjHaj74/Zm8+nYuRJzM3/bZcJFIZYZGJXm0KuSyPoPkYd9d80MB
-2soYTy2LfjHICa1ZhFSklLmbqOJvFuuQWk5VEjFoRTKrj5n0Aqw6shvwX5qwBfe5
-ap8sK4/SnqOCbLsTzIdzbAEl9uF+ubQlRWRzb24gQnJhbmRpIDxlYnJhbmRpQGVi
-cmFuZGkuZXRpLmJyPokBOAQTAQIAIgUCTMI4EQIbAwYLCQgHAwIGFQgCCQoLBBYC
-AwECHgECF4AACgkQpcRbQ0Af+PPzPAgAjZ+LtUP9sImcuC8q0ZdYwtjOwPKGCWt+
-xI93QnvYNp4h86mj432IgKNuzJkZ/d49dbW+0aAy9mje5ARimGmXV/1usbaAqcuL
-IzdqVj86tVjeOfZ6dkKVCe+w5F9EAiD4/QGXUuNqd11HroqKWNZQu6rNpSNRd6Ml
-98NPmWiBL9j7Zj9Yu5IMxP4x6/ajPc/wUTvFlqiZonUMtg0mQ7RQviUWn76HQZAz
-OCDUZ40tkR64f/EJQjOnNf6/AZczFqVXdZOLj/2BRy5rV5Q4iR9dNpL1YUTF407K
-E3twPtxGZmVP8Nduvx0L3IrezHweK0TRysGcaouIwv3musF0e/gH/7kBDQRMwCW7
-AQgA4ZPephulduSbNW12vhigK6ktrzPHXRrXbzWb7+rNQGWmk32fMCnAmsjAMpy2
-aC2XYSfmxrG3wp6Ug1f/hAZwEsrQEjRvQ2WwaQG8j0KbB7aU10stCmgyavChXFRD
-TaNd/epU5tkqN6jeGuiCr4rbePLgpd8TGH9cytcz3kIxM6nCsEtYLMgiJMAFdYaA
-ptx+SDOipYB/lY682wS66qVoZ+F3nND9TmWgLGszBgG8CrZEIJ8AlFLZLUibovlK
-0CKootHItKPIVLIQOI1cuYxe+vql6QYYMlm3hFSi6TiQhVldNftVG2u8th8c9zwV
-Y9CigU2QB9OcBonq5ec/iLR9NQARAQABiQElBBgBAgAPAhsMBQJMzAtBBQkB7RkG
-AAoJEKXEW0NAH/jzG98H/1rI41P4coElQmsB4qq0oTcu2jrKcotf2MiI9x8OaAqY
-NIPlOQzFlh065wnd5PqbdW2PAl/51uvDDmtpcJ+rWoyksrVyQVnTrWj3JIIX4yxa
-IKACIRVcAQAazOHSlLMAhP9BsoJiOmLGx2Dx9q2E6o2LMvNj1JGmBCDnCjbatf7Y
-hwY4DmJSDRyixs4ryo7lvTtQ7UyvrW5aYcpyXy2Jws/XC4PYDdCdNfLkAPUYIQCn
-86iihV/SDsWCalc0aDCp7jf41N5RLQ82s6/4LgXyaW4qHAeZEdRskkK5dSCRaZ+h
-ExNGPKbzTNjhB5Bd4kHg9da0U6kZWCDP6oOprvYYBsC5AQ0ETMwK+gEIAM/7k+pZ
-EU0muvPnNrD/0As9m8m+JnrowerJQYWk3n6cB0xAgwqoDr81gzDXFlBqKmuaIl6B
-WoFg4KBoLmsIu4gxHxAv610yI7DZ2Yh8tD155A+tM0EaB+A3+VoxGsytaAvxFWok
-99H0+Qsv/J4pcDlSq5oyB/Lo038hMkN6p92yKIaEUMxHIygGIkHogBMSg2n5EOz2
-786rbRiECF4qyVQCvxRjxi37nkJO/Fw9Bpzx+/erhvbuNzHuQCH5Qmy+DegROYpQ
-52YHjYI0N9HBjx6SRU5301qxRKl9ENfJh0PkPiUjsyNdE5v0MLiWWsIih9w/SrW7
-KIIxxXPul0A9ShUAEQEAAYkCRAQYAQIADwUCTMwK+gIbAgUJAeEzgAEpCRClxFtD
-QB/488BdIAQZAQIABgUCTMwK+gAKCRAGj5QpF2WIKGXrB/9NcgSROtLpulqVVcMt
-LT0dESS0Nduh9FzL0v8VXIhgmwaoS2g5BfgCkLIADtJyxesjQz+HRPuNGbbTYZTe
-P9MspClTL9YVqHoZ966NZ3Zu7Fcj3zJNbDba0UkldFhFVC1yjn8hetkMLNl+3rin
-SS0U0p2tSgbGJyMpvxJc8kP1bz61rHpYd45nPblUFt4G1uyA/D1ZqLf6r1snavW1
-MoTDD9hw3JP3B4vmuhTFZTT5DcUYqvTT1aHXspfVf1cVSaWa3nBM3WGgqIDMeH3l
-Qq6KT5C1BadrpWk/nraeInjdPar3HwgsXdULyIRA2QeX/LEo4r+y83ENR4r2dVXO
-IjLHLrUH/1dk4TdNrjgVNzNXg5+jtr9xeLmKT2N13KM2zjJlcwSaXu/JqA9qdG2i
-KF8dk3LnsEMkshdn9QB9adfTNUKM1jaFRCGp9pnNQ7qpfB7gQDn5B/XR8k24N3TA
-/JCUuncOEq2FvWmSaaSTIan2oe63huVx8XSTyoXzkgKs+4v7zJrRi+RG6uwfwjGZ
-NC+WHauOThohGERIOB22g2DUhVA/QRQfzNKJmvlGHNbNRghrrRQiTxbfB+125uIJ
-pzqwE8lu3iwUbr+M9zLkFDU4OEvVvb4zZjunYIwBjCW1RDDK6Y2qjOl9EI440dll
-bvM0DKiwE/8jeDjvDlgB7NJgzkSEWEu5AQ0ETMwLGQEIAL/MJ13WdwEn6ziMO4VE
-xtmGHXFsX20ww/nvoyEilxjsZkrJqLDisttPLI485GawIgqPEXnW9e6k9Pn8xWhc
-KL/RbqJteE8tNLX7WxF4nu2tbyWEBTn+IMja0JxWYn8BZsuqoWze62XmRmxhwqad
-uf7HtVEYjrPQBuhJaU/HbXDEXKUw7nlwjuV+UYrRc7SxTd2puV/0acxdHd2mkVcK
-ij2IMuz+yPl4v+FyGBIpAl2cQGcerMnGExLjHuwd2YQUESBi7eYq7UOqqHIlwdjp
-4tAo1ST3njSelE7N6KU5E382PVcRnKHvb0dM3kyE70FYmLd2bu+tMX1/+7CUuhV1
-V88AEQEAAYkBJQQYAQIADwUCTMwLGQIbIAUJAeEzgAAKCRClxFtDQB/48yRiCADK
-LjWdo1cHAzKBJsMbDCbek8fyZXGXVlRBX/ph20Gcg1H6munZZY/L//+2SH708PG3
-HuyF/G2AlN1V6fJefVU+OpQd0aM5ZqmrEBcKouaS34qRZA1wkbA846FlEeKAl0gO
-4Yys8hwfpFvn31pG1HyoYEE93tuURBhRXtH0GEzwPBJFse4M2J/oc7+JzVpykJlK
-KvEKePFb0VNjloNPvvoosFmpwUheU0znbVJUek6twVZG4/qjBpsziMerbygEvtgh
-oeyyC2ZjS0gotziba4WcWSAxXykEkMsWm6CyPYAhG6K18TSIJ6Cxg1PgBa7dieuM
-S3MQCzmTP04I/sK2PFVAuQENBE60IwcBCADhevPv0Dgtlsu/YGAmG1j6ci+egVR6
-WIapRoAjQFyL1zlw+M33GT6yHn0eOFKMwkjP2dzp5S+yvCDr9v8ws6vsLQ/uDdbo
-crXBjXs7WKufUQffh/o0oFFgO2eu0KEzLSC9yVT54QfYkdVahSTwN4c8u6re6rA6
-1QWMxQLVqCnxRELvLO2iq67xqNyYcHVXGud5rcrnu9QC1f2B9ppeupzGXE7dAEOl
-2fxE3ID3u3Mri3aXDs0klGzAB6z0+woe8SSVleytnLBZB8clfbZKeIKePP+c5BDQ
-W/pzVuBeDOdW4d1gKpjM9O0D/ufQSlD/mYOSFS/KuwWNSRPniLBLNL1nABEBAAGJ
-AkQEGAECAA8FAk60IwcCGwIFCQHhM4ABKQkQpcRbQ0Af+PPAXSAEGQECAAYFAk60
-IwcACgkQK7EEOeIEQc0Lcwf9FFqEYm9CPAArtZI3YaWLVVovnAXikZZDo1gDIOEw
-39YLlwqG1r7MdJFfWFi9Vy8xcs2IZ4Bs5C5j06IGv4g18UkTOTZ0q2L2vTdzGeEm
-CRNSiYAeFmHqTY2KIbH3ekqjvMZ0SofLvFoVQze+fOqShP/CcjCaK6Rd9Z4LbXhi
-A4zKcSB3IRvKtMOHFA8kbUNNnuALpq6WHG+3xDvKF+FQB5YhwjXRgRtqacaSy9oO
-hhHX3NZaGir4pVpFztNaYxteA4tQxkfsPZCQZNwTM52lwI6eGW/Rbiy8MpMsFuO2
-sKS/5B8eB4AC8HFvu81M1EJP3gQtEqvnGz1zS+yGeYMIjfojB/9Rk8aeBoy41A3A
-TmjRLUXgurugX4ePYI8zKgJU6tcRXk5JMhj2IuLkZ/E8kfx0JY8ub54HCkv4fFjw
-OJA1B/gPnwlkNv+9xA66Zr1U/82lJiNFsGy50QL0nyqNFy1OX58Dc1K3QxZRRVSa
-oTWe2v/dDljov3Df6lCy2lho6mCaOMiivpnNqOuSi8E9i7JzV45tggN5j5FLoFmZ
-0HiEjpRO9oOs7Rn9XpSq/cgK+gOmxTR0pRxV0+S6KJp4TTx8t3TuwZsgajMF4JcU
-3so0RaZYvjOJepmDVHaaj91n1ekG4IjoBwbRvOHIo08yO5HZZFYZnzphWPqxVK5D
-lDNDCHPxuQENBE60I2YBCADZ+tYailPMfRBMEczbqrnSy5SzdU59tRh8oEUt1mwZ
-6Hbz6n5Uph73Hl7JizZRlcpEZ+6zxDhsqzZj2gR4q5zRHLcIL1fHTobh1wSw/oMc
-wrQiUve4WEVR0Y11TezTcBu3Dv7fZcL8+CHS8JbpyZjiDOK4UyQsP2IrofdpXvLQ
-1h/hBmYTqMoz+A/BqMTUYsXs6SA2xYIBfQAVMK4xWZBySdsNsa1Gq6AGaqRoYoc/
-F+JmVdfD2lh4YaZVRES4caBRAaub1v2pLlXAMVILpgThLFvcnT01Pm08iP4Mz4L5
-HMafE6xLOHG3v83N+8DB0N3HpbGgL1ix9/PhUkhkeGvZABEBAAGJASUEGAECAA8F
-Ak60I2YCGwwFCQHhM4AACgkQpcRbQ0Af+POu4AgAiW1S2ovZqI/QGgCITG+eAcJj
-1Ly0l3kNMy82D6/oH53Tx2D6A4hJ2thQRfB8Fp8pDXTjB07TL6rFodF22iLqpeRl
-sv480D1VgiGA8vjhY6uhV8jyzaN7LOxcJIrf8VQ2EPY6uZhrRkD0YyKGjAS9xfWC
-6Z1TwKQHFuJyUmOiHIzag0+j6SP5r3gP5erDVioZZzozq5rRUa7F7vE25/yr4+tr
-NWf9mdDI+Erc2riFwFouMZ/nkxkaZylTJIU3X5CddLvaiyXVLAWDfz5PHjrIF80Q
-RNKsYCtb0kh8/TjoPmy6/wbNxwb52voy0RjN5jgIpy4RdYJRJHaAMVaiPHLHJrkB
-DQROtCOcAQgAvBD7QGmmmVM/KOAOR3DPTqmH9Axhb6XQVP0KaupcF/bUEIOm5Tle
-CXELCZks1N/UUYtJtM9qpw8ubHYuRxKkkGW6mde3OtBYomISN18Zl4OjwrTqiFn7
-fAf7QByROo8axY5uqzp9VWO2MvP6vja83QMJP+Y52s6iDDudo/dXLiUOlRFdPwl8
-4T4KXWIGEBZ6rfltfHK5diIWr8QhZkyk4ceosRRGqT0yorCGaz43kx+3lpK8K4x3
-LDBvksrPINGsgMy+RqzysXgx/sFD7vyCFFlMv93wCvWEYX4lm3fQ0vfXjF/MoM5C
-gECEYBDjeLR1KDGAo7iZ3uOEqDcHkW90bQARAQABiQElBBgBAgAPBQJOtCOcAhsg
-BQkB4TOAAAoJEKXEW0NAH/jzuhcH/1Zi7M3D06BTFhquQqQdNLw9Ui9+V0n3V5MZ
-kytxusMnQgMHadDmdx0PMm2d1hrPWq6/GrmweByJ8jpBtHBjOu0zZdWw/ro7+iZb
-mlWBcfFWSVRg1cwgv2NIf2t60Wvr2+2V0vrvh5PGz/r8M/hP3gpoyqqJECrC2O66
-gUtotOACponZ1z/zr6BToJL92nqFpXT+Gg1DR4ghcQ780CideKPc+lAXYseZmlw/
-u10Ngh3SrfOB8pKwWAqJyw+ozA1cROfiSpp9E7WpmhMuSt7Q40dwASeav5kc6Odx
-2hnH3bPqbVeLTpnkygiSqc6MKa/9zbL/6TgByTHUpIoAnP8xtmO5AQ0EUFJ+TgEI
-ANCUDEVSxutUDyEJsbAB7nVT4aT4DondHp2/cPsqk3hwWw8RBt8mSxtxjvRyHtCP
-b5okSmz0mGom/QcprZX3tzpd/FWDzvQS7zdFz3VXZnJvPfAuBFTL8XO9dQvKDfof
-vOgAeaycCXS4JsAeEW3KfCk/pxc5Wxo3pEa5kjaSg7vlr7LUYu1suNYbsYoQT0i1
-NNY2rt7VCS05BUHIM90i/AJWY9UT/Ef2UXjgMvCAO/XWXftySTlqnFON3z1Jj4KR
-8HM0ObvML07JHPK7slMx45hmu/G+S+UoZ77clmNjg8lgrG/hTGVWQc0gU4Zed+qB
-zvtFpgTYRhbkqhCvT+8jlasAEQEAAYkCRAQYAQIADwUCUFJ+TgIbAgUJBaOagAEp
-CRClxFtDQB/488BdIAQZAQIABgUCUFJ+TgAKCRDuPQUZQJET1wM1B/0bu/sowG1/
-MaFzh3dkKbvYCOyc0vYoB7VO4gTbRsSNMhch4XE5grsx35aipe5h49ob28ZZ/zDS
-Vd0+zFnbxpHuqYaSMaBJB2Tw0ONYHLta0OogCgh0agKFrki5Y6gmT/DcvT6mMBI5
-e11Iap8MlQMwetkGj3s4iRLtIlQewt+jz205w9PqWSEy/TlRxUAogq6gpn5eWXES
-PGIxdKGuKOKGd3j32MirJCtAVqatdZxXRVNKUaQppEEiIdTBPh/6e7Q/zxxHGcUp
-EXa7l0ZT+X0c8Y+x2btCBcRI4cGwkoKn1BLkwLnNSyGl3UcyGFFaqczpOrt5V+nG
-8E4xK7PbNCj87roH/RWl/YsD8bPC6CMZ8ISOTxH746bYFCpR5M+EuJNA/MeEMbEn
-NmEsUdjY+RpVwDqomLRtb3uq+IvUplh5VuW0fmju1fzVMuGCNNe5CpnMXzo/KiXD
-Sjx+TlcWgtHQ9kr6iz1filMTON6tULbGsXKkF9XZRAvp0rghyzrGh0l1GLRjDsHh
-+bUGSbdWVjY/6CsWDybHmSK10nk3IIRbfOYcsluhZdc4IUstNb5AYufK8h0/FkYy
-lhI7mlIQ3A8kYwTcdLejbxmZdHMfZZnKFyWaCbXM0DYkgp+IlyIiDojRHmg8y9wk
-9n0QUpMnmqlVJm0SmG2iVoK0LHBfAlbj1grsG1G5AQ0EUFJ+wQEIAMIvxbXZvqPy
-6g1BJyIfDyE9qXkvNGCDCcKOM3fDv3xkaZaKSiKiZGWMZiEt5+dvnmxNkkHJX4Si
-uIbjZ2r2JoZUL4zP07cEFLPP+cCIIJOCVEStxGljOjuTKUEVKbSSvYDi1D+F7Dy0
-9gkTpARHKtX/fsO/uSUyRdNdVb3MC+8DxWELZe8Cxp3Yj6ZM2tIBAAoa2DYxmFyz
-/QZE8Y5wfoApazau5XSyFlfghIbLP5GVxiAIMRElRq16LIY371QLyuHB4Bmru5gL
-Oa44msJNT8UI+TrDwYpkbV/IqNZ+NXycn0AtDFKplr5BnwRGTa7HCf6Q3PZhQ7GY
-lEaYhTVN8X8AEQEAAYkBJQQYAQIADwUCUFJ+wQIbDAUJBaOagAAKCRClxFtDQB/4
-8wG2CACFz4AW79VhKcjwSHzS52eYWbsfcoe/oCbcnt7d8MiSfiDFJMf9UZtbZ79L
-OizmlCmgVUsrjVfqaWvZ9Li5HoSPUqBlg3qkOIi5Os4q2NEP49j01ojMm435QIIg
-Om/MhKwIh+17zrBgzm2RL4XPwx+UdYpXwCmN5FRwh1sLRsXxtJ5x4oV/G7Eqht0N
-74vfBB2omvGWlLlXeuhGYe3VlcipHrTp8GepM/M4keD0+3kHkHaBvjfRRjiQnE9R
-aqGFQKjetqge/sjv472exe42KkZ4KPNweINwko9Rvs7GQ6K+/saTksKg26ZQn9BL
-Yi65CC+BYvmGAwqANaub5FIpl8JOuQENBFBSfwEBCADSEGY2DdMgOCkaJR9MRn+P
-LGKlAMme7vD+S71KX1BeM680ArTnAND9xjQM9Kr0R1LlwtZ5IWGcQHKxtZNqGsBC
-s3snpEAhAMw/V3G4VAfJJNe3YQVGWRNfVUHZO4byCGn5fbjEjKZxeZGLywgIrptk
-Sy3iUfbu/uROY9i4uPXTZcO3nhIHJZ4v1EcM9mdQrmXO0VaX4WUBKo7F9SI4aeYX
-pFKqxUC30dlhn+s52qwffhhnPQYgXm5fPZ6fGrKNyDl7vYljIEMM6+p6n9c4Qy8Z
-Ol46oG2GgeCQnPxFe/7c9yK/7+XSZjWon1ZTbKj6j90Gj1L3baVz76q3N1msSkqT
-ABEBAAGJASUEGAECAA8FAlBSfwECGyAFCQWjmoAACgkQpcRbQ0Af+POHZAgAoIK0
-Bef27BquFbnc1L+cRRnF081MXcJ/ZkvqBQ3PkeFpSeC2O/vSYUQXR6W/+5ni/z5l
-A/ZJFT5wBkmrsSPi8wZzQj2byPYXLNE6Odkgc4v0ypGSADS1uA8/w2lvZOZ3V/hd
-nYaibGqYKrxFq03ln+yHpx4rWV1iqim++N7aXg1BTAqhjBg7JGFd+IN1hsCbUeYU
-/ipaHbW0IHDHa6VMv13Q3eRuYYpgn53WOuxQwLBfqP4GYiVI5IGefRU3bXdOBwFC
-C7+5ENAcvVm9e6thnMYhHpLh0dJkeMiOqZpONYhgkF39cZs4D5w9mBR0kch67oHC
-LTVm62q9KJBi7xLwRQ==
-=ADsV
+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

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

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 22:39:41 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D019C25E;
 Wed, 12 Dec 2012 22:39:41 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id AE48C8FC0C;
 Wed, 12 Dec 2012 22:39:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCMdfZp068159;
 Wed, 12 Dec 2012 22:39:41 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBCMddwe068143;
 Wed, 12 Dec 2012 22:39:39 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212122239.qBCMddwe068143@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 12 Dec 2012 22:39:39 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-translations@freebsd.org
Subject: svn commit: r40367 - in translations/nl_NL.ISO8859-1:
 articles/contributing articles/contributing-ports books
 books/handbook/advanced-networking books/handbook/basics
 books/handbook/config books/ha...
X-SVN-Group: doc-translations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 22:39:41 -0000

Author: gjb
Date: Wed Dec 12 22:39:39 2012
New Revision: 40367
URL: http://svnweb.freebsd.org/changeset/doc/40367

Log:
  Merged /head/nl_NL.ISO8859-1:r39942-40365
   to translations/nl_NL.ISO8859-1

Modified:
  translations/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
  translations/nl_NL.ISO8859-1/articles/contributing/article.xml
  translations/nl_NL.ISO8859-1/books/Makefile
  translations/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
  translations/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
  translations/nl_NL.ISO8859-1/books/handbook/config/chapter.xml
  translations/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
  translations/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml
  translations/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
  translations/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml
  translations/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
  translations/nl_NL.ISO8859-1/books/handbook/jails/Makefile
  translations/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml
  translations/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
  translations/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml
  translations/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
  translations/nl_NL.ISO8859-1/htdocs/administration.xml
  translations/nl_NL.ISO8859-1/htdocs/art.xml
  translations/nl_NL.ISO8859-1/htdocs/index.xsl
  translations/nl_NL.ISO8859-1/htdocs/where.xml
  translations/nl_NL.ISO8859-1/share/xml/header.l10n.ent
  translations/nl_NL.ISO8859-1/share/xml/mailing-lists.ent
Directory Properties:
  translations/nl_NL.ISO8859-1/   (props changed)

Modified: translations/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
==============================================================================
--- translations/nl_NL.ISO8859-1/articles/contributing-ports/article.xml	Wed Dec 12 22:39:26 2012	(r40366)
+++ translations/nl_NL.ISO8859-1/articles/contributing-ports/article.xml	Wed Dec 12 22:39:39 2012	(r40367)
@@ -10,7 +10,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/articles/contributing-ports/article.xml
-     %SRCID%	39632
+     %SRCID%	39913
 -->
 
 <article lang="nl">
@@ -493,8 +493,8 @@
 	      portbouwcluster, <ulink
 		url="http://pointyhat.FreeBSD.org">pointyhat</ulink>,
 	      en de <ulink
-		url="http://www.portscout.org">
-		scanner voor distributiebestanden</ulink> om te zien
+		url="http://portscout.FreeBSD.org">scanner voor
+		distributiebestanden</ulink> om te zien
 	      of er ports zijn die u onderhoudt die er niet in slagen om
 	      gebouwd of opgehaald te worden (bekijk <link
 		linkend="resources">bronnen</link> voor meer informatie
@@ -841,8 +841,8 @@
       worden.</para>
 
     <para>De <ulink
-	url="http://www.portscout.org">scanner voor distributiebestanden voor
-	&os; ports</ulink> kan u ports laten zien waarvoor
+	url="http://portscout.FreeBSD.org">scanner voor distributiebestanden
+	voor &os; ports</ulink> kan u ports laten zien waarvoor
       de distributiebestanden niet kunnen worden opgehaald.  U kunt uw
       eigen ports controleren of u kunt het gebruiken om ports te vinden
       waarvan de <makevar>MASTER_SITES</makevar> moet worden

Modified: translations/nl_NL.ISO8859-1/articles/contributing/article.xml
==============================================================================
--- translations/nl_NL.ISO8859-1/articles/contributing/article.xml	Wed Dec 12 22:39:26 2012	(r40366)
+++ translations/nl_NL.ISO8859-1/articles/contributing/article.xml	Wed Dec 12 22:39:39 2012	(r40367)
@@ -10,7 +10,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/articles/contributing/article.xml
-     %SRCID%	39632
+     %SRCID%	40061
 -->
 
 <article lang="nl">
@@ -102,7 +102,7 @@
 	  <para>Lees regelmatig de FAQ en het Handboek door.  Laat het
 	    ons weten als er iets slecht is uitgelegd, is verlopen of
 	    gewoon helemaal verkeerd is.  Of stuur een reparatie in
-	    (SGML is niet moeilijk te leren, maar er is geen bezwaar
+	    (Docbook is niet moeilijk te leren, maar er is geen bezwaar
 	    tegen inzendingen in ASCII).</para>
 	</listitem>
 
@@ -248,7 +248,7 @@
       <title>Kies een van de punten van de <quote>Ideeën</quote>
 	pagina</title>
 
-      <para>De <ulink url="&url.base;/projects/ideas/">&os;-lijst van
+      <para>De <ulink url="http://wiki.freebsd.org/IdeasPage">&os;-lijst van
 	  projecten en ideeën voor vrijwilligers</ulink> is ook
 	beschikbaar voor mensen die aan het &os;-project willen
 	bijdragen.  Deze lijst wordt regelmatig bijgewerkt en bevat
@@ -360,38 +360,22 @@
 
       <para>Het geprefereerde &man.diff.1;-formaat voor het opsturen van
 	patches is het verenigde uitvoerformaat gegenereerd door
-	<command>diff -u</command>.  Echter, voor patches die
-	substantieel een gebied aan code wijzigen, kan een diff in
-	contextuitvoerformaat gegenereerd door
-	<command>diff -c</command> leesbaarder en dus verkiesbaar
-	zijn.</para>
+	<command>diff -u</command>.</para>
 
       <indexterm>
 	<primary><command>diff</command></primary>
       </indexterm>
 
-      <para>Bijvoorbeeld:</para>
-
-      <screen>&prompt.user; <userinput>diff -c oudbestand nieuwbestand</userinput></screen>
-
-      <para>of</para>
-
-      <screen>&prompt.user; <userinput>diff -c -r oudemap nieuwemap</userinput></screen>
-
-      <para>zal zo'n verzameling van contextdiffs aanmaken voor het gegeven
-	broncodebestand of maphiërarchie.</para>
-
-      <para>Evenzo zal</para>
-
       <screen>&prompt.user; <userinput>diff -u oudbestand nieuwbestand</userinput></screen>
 
       <para>of</para>
 
-      <screen>&prompt.user; <userinput>diff -u -r oudemap nieuwemap</userinput></screen>
+      <screen>&prompt.user; <userinput>diff -u -r -N oudemap nieuwemap</userinput></screen>
 
-      <para>hetzelfde doen, maar dan in het verenigde diff-formaat.</para>
+      <para>zouden een verzameling van verenigde diffs genereren voor het
+	gegeven bronbestand of maphiërarchie.</para>
 
-      <para>Zie de hulppagina van &man.diff.1; voor meer details.</para>
+      <para>Zie &man.diff.1; voor meer details.</para>
 
       <para>Als u eenmaal een verzameling aan diffs heeft (welke u kunt
 	testen met het commando &man.patch.1;), dient u ze op te sturen
@@ -418,11 +402,10 @@
 	&man.shar.1; zijn aangemaakt zijn ook welkom.</para>
 
       <para>Als uw verandering mogelijk gevoelig van aard is,
-	bijvoorbeeld als u onzeker bent over copyright-dingen die de
-	verdere distributie ervan dicteren of als u eenvoudigweg niet
-	klaar bent om het uit te geven zonder een voorafgaand nauwer
-	review, dan dient u het direct naar &a.core; te sturen in plaats
-	van het met &man.send-pr.1; op te sturen.  De &a.core; bereikt
+	bijvoorbeeld als u onzeker bent over copyright-zaken die de
+	verdere distributie ervan dicteren, dan dient u het direct naar
+	&a.core; te sturen in plaats
+	van het met &man.send-pr.1; op te sturen.  Het &a.core; bereikt
 	een veel kleinere groep mensen die veel dagelijks werk op &os;
 	doen.  Merk op dat deze groep het ook <emphasis>erg
 	  druk</emphasis> heeft, daarom dient u alleen mail naar hen te
@@ -528,7 +511,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-        &#36;Id&#36;</programlisting>
+        &dollar;Id&dollar;</programlisting>
 
       <para>Voor uw gemak staat een kopie van deze tekst in
 	<filename>/usr/share/examples/etc/bsd-style-copyright</filename>.</para>
@@ -589,16 +572,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
 	    url="&url.base;/donations/">Donations Liaison
 	    Office</ulink>.</para>
       </sect3>
-
-      <sect3>
-	<title>Internettoegang doneren</title>
-
-	<para>We kunnen altijd nieuwe spiegelsites voor FTP, WWW, of
-	  <command>cvsup</command> gebruiken.  Als u zo'n spiegel wilt
-	  hosten, bekijk dan het artikel <ulink
-	    url="&url.articles.hubs.en;/index.html">Mirroring &os;</ulink>
-	  voor meer informatie.</para>
-      </sect3>
     </sect2>
   </sect1>
 </article>

Modified: translations/nl_NL.ISO8859-1/books/Makefile
==============================================================================
--- translations/nl_NL.ISO8859-1/books/Makefile	Wed Dec 12 22:39:26 2012	(r40366)
+++ translations/nl_NL.ISO8859-1/books/Makefile	Wed Dec 12 22:39:39 2012	(r40367)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 #
 # %SOURCE%	en_US.ISO8859-1/books/Makefile
-# %SRCID%	38826
+# %SRCID%	40258
 #
 
 SUBDIR = handbook

Modified: translations/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
==============================================================================
--- translations/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Wed Dec 12 22:39:26 2012	(r40366)
+++ translations/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Wed Dec 12 22:39:39 2012	(r40367)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%  en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
-     %SRCID%   39824
+     %SRCID%   39902
 -->
 
 <chapter id="advanced-networking">
@@ -4695,9 +4695,9 @@ Received 264951 bytes in 0.1 seconds</sc
 	    toe om het root-bestandssysteem over NFS aan te koppelen:</para>
 
 	  <programlisting># Device                                            Mountpoint    FSType   Options  Dump Pass
-mijnhost.voorbeeld.com:/b/tftpboot/FreeBSD/install      /         nfs      ro        0    0</programlisting>
+mijnhost.example.com:/b/tftpboot/FreeBSD/install      /         nfs      ro        0    0</programlisting>
 
-	  <para>Vervang <replaceable>mijnhost.voorbeeld.com</replaceable> door
+	  <para>Vervang <replaceable>mijnhost.example.com</replaceable> door
 	    de hostnaam of het IP-adres van uw <acronym>NFS</acronym>-server.
 	    In dit voorbeeld wordt het root-bestandssysteem als alleen-lezen
 	    aangekoppeld om te voorkomen dat
@@ -4796,7 +4796,7 @@ mijnhost.voorbeeld.com:/b/tftpboot/FreeB
    option routers 192.168.0.1 ;
    option broadcast-address 192.168.0.255 ;
    option domain-name-server 192.168.35.35, 192.168.35.36 ;
-   option domain-name "voorbeeld.com";
+   option domain-name "example.com";
 
    # IP-adres van TFTP server
    next-server 192.168.0.1 ;

Modified: translations/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml
==============================================================================
--- translations/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml	Wed Dec 12 22:39:26 2012	(r40366)
+++ translations/nl_NL.ISO8859-1/books/handbook/basics/chapter.xml	Wed Dec 12 22:39:39 2012	(r40367)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/basics/chapter.xml
-     %SRCID%	39831
+     %SRCID%	39947
 -->
 
 <chapter id="basics">
@@ -2296,21 +2296,12 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <step>
 	<para>Eerst moet het proces ID worden opgezocht van het proces
 	  waar een signaal naar verzonden moeten worden.  Dit kan door
-	  &man.ps.1; en &man.grep.1; te gebruiken.  &man.grep.1; wordt
-	  gebruikt om in de uitvoer te zoeken en te kijken naar de
-	  string die de gebruiker opgeeft.  Dit commando wordt gedraaid
-	  als een normale gebruiker en &man.inetd.8; wordt gedraaid
-	  onder de gebruiker <username>root</username>, dus aan
-	  &man.ps.1; moet de optie <option>ax</option> meegegeven
-	  worden.</para>
+	  &man.pgrep.1; te gebruiken.</para>
 
-	<screen>&prompt.user; <userinput>ps -ax | grep inetd</userinput>
-  198  ??  IWs    0:00.00 inetd -wW</screen>
+	<screen>&prompt.user; <userinput>pgrep -l inetd</userinput>
+198  inetd -wW</screen>
 
-	<para>Dus PID van &man.inetd.8; is 198.  In sommige gevallen
-	  kan <literal>grep inetd</literal> ook voorkomen in de
-	  uitvoer.  Dit komt door de manier waarop &man.ps.1; de lijst
-	  van draaiende processen moet vinden.</para>
+	<para>Dus het PID van &man.inetd.8; is 198.</para>
       </step>
 
       <step>

Modified: translations/nl_NL.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- translations/nl_NL.ISO8859-1/books/handbook/config/chapter.xml	Wed Dec 12 22:39:26 2012	(r40366)
+++ translations/nl_NL.ISO8859-1/books/handbook/config/chapter.xml	Wed Dec 12 22:39:39 2012	(r40367)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/config/chapter.xml
-     %SRCID%	39873
+     %SRCID%	39914
 -->
 
 <chapter id="config-tuning">
@@ -312,11 +312,11 @@ defaultrouter="10.1.1.254"</programlisti
       <listitem>
 	<para><filename>/etc/rc.conf.local</filename>:</para>
 
-	<programlisting>hostname="node1.voorbeeld.org"
+	<programlisting>hostname="node1.example.org"
 ifconfig_fxp0="inet 10.1.1.1/8"</programlisting></listitem>
     </itemizedlist>
 
-    <para><filename>rc.conf</filename> kan naar elk systeem
+    <para><filename>rc.conf</filename> kan vervolgens naar elk systeem
       gedistribueerd worden met <command>rsync</command> of een
       gelijksoortig programma, terwijl <filename>rc.conf.local</filename>
       uniek blijft.</para>
@@ -544,7 +544,7 @@ run_rc_command "$1"</programlisting>
 
       <para><username>root</username> kan ook een gebruikerscrontab
 	aanleggen net als elke andere gebruiker.  Dit is niet dezelfde als
-	<filename>/etc/crontab</filename> (de systeemcrontab).  Omdat de
+	<filename>/etc/crontab</filename>, de systeemcrontab.  Omdat de
 	systeemcrontab in de praktijk de commando's als root uitvoert, is het
 	doorgaans niet nodig om een gebruikerscrontab voor
 	<username>root</username> te maken.</para>
@@ -570,8 +570,8 @@ HOME=/var/log
 
     <calloutlist>
       <callout arearefs="co-comments">
-	<para>Zoals in de meeste &os; instellingenbestanden gaat het
-	  karakter <literal>#</literal> vooraf aan commentaar.
+	<para>Zoals in de meeste instellingenbestanden van &os; zijn regels die
+	   met het karakter <literal>#</literal> beginnen commentaar.
 	  Commentaar wordt gebruikt als uitleg en geheugensteun.
 	  Commentaar dient niet vermengd te worden met commando's,
 	  anders wordt het commentaar opgevat als deel van het commando.

Modified: translations/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml
==============================================================================
--- translations/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml	Wed Dec 12 22:39:26 2012	(r40366)
+++ translations/nl_NL.ISO8859-1/books/handbook/disks/chapter.xml	Wed Dec 12 22:39:39 2012	(r40367)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/disks/chapter.xml
-     %SRCID%	39631
+     %SRCID%	39908
 -->
 
 <chapter id="disks">
@@ -2802,7 +2802,7 @@ sa0(ncr1:4:0):  Logical unit is in proce
 	  <application>ssh</application></title>
 
 	<screen>&prompt.root; <userinput>/sbin/dump -0uan -f - /usr | gzip -2 | ssh -c blowfish \
-	  doelgebruiker@doelmachine.voorbeeld.com dd of=/mijngrotebestanden/dump-usr-10.gz</userinput></screen>
+	  doelgebruiker@doelmachine.example.com dd of=/mijngrotebestanden/dump-usr-10.gz</userinput></screen>
       </example>
 
       <para>Ook kan de ingebouwde manier van <command>dump</command>
@@ -2814,7 +2814,7 @@ sa0(ncr1:4:0):  Logical unit is in proce
 	  <application>ssh</application> met ingestelde
 	  <envar>RSH</envar></title>
 
-	<screen>&prompt.root; <userinput>env RSH=/usr/bin/ssh /sbin/dump -0uan -f doelgebruiker@doelmachine.voorbeeld.com:/dev/sa0 /usr</userinput></screen>
+	<screen>&prompt.root; <userinput>env RSH=/usr/bin/ssh /sbin/dump -0uan -f doelgebruiker@doelmachine.example.com:/dev/sa0 /usr</userinput></screen>
       </example>
     </sect2>
 

Modified: translations/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml
==============================================================================
--- translations/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml	Wed Dec 12 22:39:26 2012	(r40366)
+++ translations/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.xml	Wed Dec 12 22:39:39 2012	(r40367)
@@ -12,7 +12,7 @@ that might make this chapter too large.
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/dtrace/chapter.xml
-     %SRCID%	39631
+     %SRCID%	39795
 -->
 
 <chapter id="dtrace">
@@ -213,17 +213,16 @@ options         DDB_CTF</programlisting>
     <para>Nadat opnieuw is opgestart en de nieuwe kernel in het geheugen
       is geladen, dient ondersteuning voor de Korn-shell te worden
       toegevoegd.  Dit is nodig omdat de verschillende hulpmiddelen van
-      &dtrace; in <command>ksh</command> zijn geschreven.  Installeer
+      &dtrace;Toolkit in <command>ksh</command> zijn geschreven.  Installeer
       <filename role="package">shells/ksh93</filename>.  Het is ook
       mogelijk om deze hulpmiddelen in <filename
 	role="package">shells/pdksh</filename> of <filename
 	role="package">shells/mksh</filename> te draaien.</para>
 
-    <para>Als laatste dient de huidige &dtrace;-gereedschapskist
-      verkregen te worden.  De huidige versie is beschikbaar op <ulink
-	url="http://www.opensolaris.org/os/community/dtrace/dtracetoolkit/"></ulink>.
-      Het bevat een installatiemechanisme; om gebruik te maken van de
-      bijgeleverde hulpmiddelen is installatie echter niet nodig.</para>
+    <para>Als laatste dient de huidige &dtrace;Toolkit verkregen te worden.
+      Indien u &os; 10 draait, vindt u de &dtrace;Toolkit in
+      <filename>/usr/share/dtrace</filename>.  In andere gevallen kunt u de
+      &dtrace;Toolkit installeren via de port <filename role="package">sysutils/DTraceToolkit</filename>.</para>
   </sect1>
 
   <sect1 id="dtrace-using">
@@ -288,7 +287,8 @@ options         DDB_CTF</programlisting>
       het normaal gedraaid wordt, zal het uitvoer die op de volgende
       lijkt produceren:</para>
 
-    <screen>&prompt.root; <userinput>./hotkernel</userinput>
+    <screen>&prompt.root; <userinput>cd /usr/share/dtrace/toolkit</userinput>
+&prompt.root; <userinput>./hotkernel</userinput>
 Sampling... Hit Ctrl-C to end.</screen>
 
     <para>De systeembeheerder moet de toetsencombinatie <keycombo

Modified: translations/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml
==============================================================================
--- translations/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml	Wed Dec 12 22:39:26 2012	(r40366)
+++ translations/nl_NL.ISO8859-1/books/handbook/eresources/chapter.xml	Wed Dec 12 22:39:39 2012	(r40367)
@@ -6,7 +6,7 @@
      Vertaald door: Siebrand Mazeland / Rene Ladan
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/eresources/chapter.xml
-     %SRCID%	39651
+     %SRCID%	40243
 -->
 
 <appendix id="eresources">
@@ -386,6 +386,12 @@
 	    </row>
 
 	    <row>
+	      <entry>&a.infiniband.name;</entry>
+
+	      <entry>Infiniband op &os;</entry>
+	    </row>
+
+	    <row>
 	      <entry>&a.ipfw.name;</entry>
 
 	      <entry>Technische discussie over het herontwerp van de
@@ -606,6 +612,12 @@
 	    </row>
 
 	    <row>
+	      <entry>&a.tcltk.name;</entry>
+
+	      <entry>&os;-specifieke discussies over Tcl/Tk</entry>
+	    </row>
+
+	    <row>
 	      <entry>&a.threads.name;</entry>
 
 	      <entry>Threading in &os;</entry>
@@ -1453,6 +1465,17 @@
 	</varlistentry>
 
 	<varlistentry>
+	  <term>&a.infiniband.name;</term>
+
+	  <listitem>
+	    <para><emphasis>Infiniband op &os;</emphasis></para>
+
+	    <para>Technische mailinglijst over Infiniband, OFED en OpenSM op
+	      &os;.</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
 	  <term>&a.ipfw.name;</term>
 
 	  <listitem>
@@ -2162,12 +2185,6 @@
 	      url="news:it.comp.os.freebsd">it.comp.os.freebsd</ulink>
 	    (Italiaans)</para>
 	</listitem>
-
-	<listitem>
-	  <para><ulink
-	      url="ews:tw.bbs.comp.386bsd">tw.bbs.comp.386bsd</ulink>
-	    (Traditioneel Chinees)</para>
-	</listitem>
       </itemizedlist>
     </sect2>
 
@@ -2226,16 +2243,6 @@
 
 	<listitem>
 	  <para><ulink
-	      url="news:comp.bugs.4bsd">comp.bugs.4bsd</ulink></para>
-	</listitem>
-
-	<listitem>
-	  <para><ulink
-	      url="news:comp.bugs.4bsd.ucb-fixes">comp.bugs.4bsd.ucb-fixes</ulink></para>
-	</listitem>
-
-	<listitem>
-	  <para><ulink
 	      url="news:comp.unix.bsd">comp.unix.bsd</ulink></para>
 	</listitem>
       </itemizedlist>

Modified: translations/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml
==============================================================================
--- translations/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml	Wed Dec 12 22:39:26 2012	(r40366)
+++ translations/nl_NL.ISO8859-1/books/handbook/filesystems/chapter.xml	Wed Dec 12 22:39:39 2012	(r40367)
@@ -4,7 +4,7 @@
      $FreeBSD$
 
      %SOURCE%   en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
-     %SRCID%    39631
+     %SRCID%    40252
 -->
 
 <chapter id="filesystems">
@@ -680,7 +680,7 @@ errors: No known data errors</screen>
 	  <listitem>
 	    <para><acronym role="System Identifier">SID</acronym>-naam
 	      (bijvoorbeeld
-	      <replaceable>jan.bloggs@voorbeeld.com</replaceable>).</para>
+	      <replaceable>jan.bloggs@example.com</replaceable>).</para>
 	  </listitem>
 	  <listitem>
 	    <para>Numeriek <acronym role="System Identifier">SID</acronym>-ID

Modified: translations/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml
==============================================================================
--- translations/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml	Wed Dec 12 22:39:26 2012	(r40366)
+++ translations/nl_NL.ISO8859-1/books/handbook/geom/chapter.xml	Wed Dec 12 22:39:39 2012	(r40367)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/geom/chapter.xml
-     %SRCID%	39631
+     %SRCID%	39988
 -->
 
 <chapter id="GEOM">
@@ -244,220 +244,586 @@ Done.</screen>
 
     <indexterm><primary>schijf spiegelen</primary></indexterm>
 
-    <para>Spiegelen (<quote>mirroring</quote>) is een technologie die
-      door veel bedrijven en thuisgebruikers wordt ingezet om gegevens
-      te back-uppen zonder onderbrekingen.  Als er een spiegel bestaat,
-      betekent dat eenvoudigweg dat schijfB een kopie is van schijfA,
-      of misschien zijn schijvenC+D een kopie van schijvenA+B.  Los van
-      de schijfinstellingen is het belangrijkste aspect dat de
-      gegevens van de ene schijf of partitie worden gerepliceerd naar
-      de andere.  Later kunnen die gegevens eenvoudiger worden hersteld
-      of geback-upped zonder dat dit leidt tot onderbrekingen in
-      dienstverlening of toegang tot gegevens en schijven kunnen zelfs
-      fysiek worden opgeslagen in een kluis.</para>
-
-    <para>Begin met een systeem dat twee schijven heeft van gelijke
-      grootte.  Deze oefeningen stellen dat het directe-toegang
-      (&man.da.4;) <acronym>SCSI</acronym>-schijven zijn.</para>
+    <indexterm><primary>RAID1</primary></indexterm>
 
-    <sect2>
-      <title>Primaire schijven spiegelen</title>
-
-      <para>Aannemende dat &os; op het eerste
-	<devicename>da0</devicename>-schijfapparaat is
-	geïnstalleerd, dient er aan &man.gmirror.8; verteld te
-	worden om daar de primaire gegevens op te slaan.</para>
-
-      <para>Voordat de mirror gebouwd wordt, dient aanvullende
-	debuginformatie en openingstoegang tot het apparaat aangezet te
-	worden door de &man.sysctl.8;-optie
-	<varname>kern.geom.debugflags</varname> op de volgende waarde in
-	te stellen:</para>
-
-      <screen>&prompt.root; <userinput>sysctl kern.geom.debugflags=17</userinput></screen>
-
-      <para>Maak nu de mirror aan.  Begin het proces door informatie
-	over metagegevens op het primaire schijfapparaat op te slaan,
-	waardoor effectief het apparaat <filename
-	  class="devicefile">/dev/mirror/gm</filename> aangemaakt
-	wordt met het volgende commando:</para>
-
-      <warning>
-	<para>Het creëeren van een mirror buiten de opstartschijf
-	  kan resulteren in gegevensverlies als er enige gegevens zijn
-	  opgeslagen op de laatste sector van de schijf.  Dit gevaar
-	  wordt verminderd als het creëeren van de mirror direct na
-	  een verse installatie van &os; wordt gedaan.  De volgende procedure
-	  werkt ook niet samen met de instellingen van de standaardinstallatie
-	  van &os;&nbsp;9.<replaceable>X</replaceable> dat het nieuwe
-	  partitieschema <acronym>GPT</acronym> gebruikt.  GEOM zal de
-	  metagegevens van <acronym>GPT</acronym> overschrijven, wat'
-	  gegevensverlies en mogelijk een onstartbaar systeem tot gevolg
-	  heeft.</para>
-      </warning>
-
-      <screen>&prompt.root; <userinput>gmirror label -vb round-robin gm0 /dev/da0</userinput></screen>
-
-      <para>Het systeem hoort te antwoorden met:</para>
+    <para><acronym>RAID1</acronym>, of <firstterm>spiegelen</firstterm>, is de
+      techniek om dezelfde gegevens naar meer dan één schijf te schrijven.
+      Spiegels worden normaliter gebruikt om tegen gegevensverlies te beschermen
+      indien een schijf kapot gaat.  Elke schijf in een spiegel bevat een
+      identieke kopie van de gegevens.  Wanneer een individuele schijf het
+      begeeft, blijft de spiegel functioneren, en levert het gegevens van de
+      schijven die nog wel functioneren.  De computer blijft draaien en de
+      beheerder heeft tijd om de kapotte schijf te vervangen zonder onderbreking
+      voor de gebruikers.</para>
+
+    <para>Twee veelvoorkomende situaties worden in deze voorbeelden getoond.
+      Het eerste is het maken van een spiegel van twee nieuwe schijven en het
+      als vervanging voor een bestaande enkele schijf te gebruiken.  Het tweede
+      voorbeeld maakt een spiegel op een enkele nieuwe schijf aan, kopieert de
+      gegevens van de oude schijf er naar toe, en plaatst daarna de oude schijf
+      in de spiegel.  Hoewel deze procedure iets moeilijker is, is er maar één
+      nieuwe schijf nodig.</para>
+
+    <para>Traditioneel zijn de twee schijven in een spiegel van hetzelfde model
+      en hebben ze dezelfde capaciteit, maar &man.gmirror.8; verplicht dit niet.
+      Spiegels die met ongelijke schijven zijn gemaakt zullen de capaciteit van
+      de kleinste schijf in de spiegel aannemen.  Extra schijfruimte op grotere
+      schijven zal ongebruikt blijven.  Schijven die later in de spiegel worden
+      geplaatst moeten tenminste evenveel capaciteit hebben als de kleinste
+      schijf die reeds in de spiegel zit.</para>
+
+    <warning>
+      <para>De procedures voor het spiegelen die hier getoond worden zijn
+	niet-destructief, maar maak zoals bij elke grote schijfoperatie eerst
+	een volledige back-up.</para>
+    </warning>
+
+    <sect2 id="GEOM-mirror-metadata">
+      <title>Kwesties met meta-gegevens</title>
+
+      <para>Veel schijfsystemen slaan meta-gegevens op aan het einde van elke
+	schijf.  Oude meta-gegevens dienen gewist te worden voordat de schijf
+	herbruikt wordt voor een spiegel.  De meeste problemen worden
+	veroorzaakt door twee soorten van achtergebleven meta-gegevens:
+	GPT-partitietabellen en oude meta-gegevens van &man.gmirror.8; van een
+	vorige spiegel.</para>
+
+      <para>GPT-meta-gegevens kunnen gewist worden met &man.gpart.8;.  Dit
+	voorbeeld wist zowel de primaire als de back-up GPT-partitietabellen van
+	schijf <devicename>ada8</devicename>:</para>
+
+      <screen>&prompt.root; <userinput>gpart destroy -F ada8</userinput></screen>
+      <para>&man.gmirror.8; kan in één stap een schijf uit een actieve spiegel
+	halen en de meta-gegevens wissen.  Hier wordt de voorbeeldschijf
+	<devicename>ada8</devicename> uit de actieve spiegel
+	<devicename>gm4</devicename> gehaald:</para>
+
+      <screen>&prompt.root; <userinput>gmirror remove gm4 ada8</userinput></screen>
+
+      <para>Gebruik, als de spiegel niet draait maar er nog oude meta-gegevens
+	van de spiegel op de schijf staan, <command>gmirror clear</command> om
+	deze te verwijderen:</para>
+
+      <screen>&prompt.root; <userinput>gmirror clear ada8</userinput></screen>
+
+      <para>&man.gmirror.8; slaat één blok aan meta-gegevens aan het einde van
+	de schijf op.  Omdat GPT-partitieschema's ook meta-gegevens aan het
+	einde van de schijf opslaan, wordt het spiegelen van volledige
+	GPT-schijven met &man.gmirror.8; niet aangeraden.  Hier wordt
+	MBR-partitionering gebruikt omdat het alleen een partitietabel aan het
+	begin van de schijf opslaat en niet conflicteert met
+	&man.gmirror.8;.</para>
+    </sect2>
 
-      <screen>Metadata value stored on /dev/da0.
-Done.</screen>
+    <sect2>
+      <title>Een spiegel met twee nieuwe schijven maken</title>
 
-      <para>Initialiseer GEOM, dit zal de kernelmodule
-	<filename>/boot/kernel/geom_mirror.ko</filename> laden:</para>
+      <para>In dit voorbeeld is &os; reeds op een enkele schijf
+	<devicename>ada0</devicename> geïnstalleerd.  Twee nieuwe schijven,
+	<devicename>ada1</devicename> en <devicename>ada2</devicename> zijn met
+	het systeem verbonden.  Er zal een nieuwe spiegel op deze twee schijven
+	aangemaakt worden die de oude enkele schijf zal vervangen.</para>
+
+      <para>&man.gmirror.8; heeft een kernelmodule
+	<filename>geom_mirror.ko</filename> nodig, ingebouwd in de kernel of
+	geladen tijdens het opstarten of draaien.  Laadt nu handmatig de
+	kernelmodule:</para>
 
       <screen>&prompt.root; <userinput>gmirror load</userinput></screen>
 
-      <note>
-	<para>Wanneer dit commando succesvol verloopt, maakt het het
-	  apparaatknooppunt <devicename>gm0</devicename> aan onder de
-	  map <filename class="directory">/dev/mirror</filename>.</para>
-      </note>
+      <para>Maak de spiegel aan met de twee nieuwe schijven:</para>
 
-      <para>Maak het mogelijk om de kernelmodule
-	<filename>geom_mirror.ko</filename> tijdens systeeminitialisatie
-	te laden:</para>
-
-      <screen>&prompt.root; <userinput>echo 'geom_mirror_load="YES"' &gt;&gt; /boot/loader.conf</userinput></screen>
-
-      <para>Bewerk het bestand <filename>/etc/fstab</filename>, waarbij
-	verwijzingen naar het oude <devicename>da0</devicename> worden
-	vervangen door de nieuwe apparaatknooppunten van het
-	mirrorapparaat <devicename>gm0</devicename>.</para>
+      <screen>&prompt.root; <userinput>gmirror label -v gm0 /dev/ada1 /dev/ada2</userinput></screen>
 
-      <note>
-	<para>Indien &man.vi.1; de geprefereerde tekstverwerker is, is
-	  het volgende een gemakkelijke manier om deze taak te
-	  volbrengen:</para>
-
-	<screen>&prompt.root; <userinput>vi /etc/fstab</userinput></screen>
-
-	<para>Maak een reservekopie van de huidige gegevens van
-	  <filename>fstab</filename> in &man.vi.1; door <userinput>:w
-	  /etc/fstab.bak</userinput> in te typen.  Vervang daarna alle
-	  oude verwijzingen naar <devicename>da0</devicename> door
-	  <devicename>gm0</devicename> door
-	  <userinput>:%s/da/mirror\/gm/g</userinput> in te typen.</para>
-      </note>
+      <para><devicename>gm0</devicename> is een door de gebruiker gekozen
+	apparaatnaam die aan de nieuwe spiegel wordt toegekend.  Nadat de
+	spiegel is gestart, zal deze apparaatnaam verschijnen in de map
+	<filename>/dev/mirror/</filename>.</para>
+
+      <para>Nu kunnen er met &man.gpart.8; MBR- en bsdlabel-partitietabellen op
+	de spiegel worden aangemaakt.  Hier wordt er een traditioneel schema
+	van een gesplitst bestandssysteem getoond, met partities voor
+	<filename>/</filename>, swap, <filename>/var</filename>,
+	<filename>/tmp</filename> en <filename>/usr</filename>.  Dit werkt ook
+	voor een enkel bestandssysteem met enkel <filename>/</filename> en
+	een wisselpartitie.</para>
+
+      <para>Partities op de spiegel hoeven niet dezelfde grootte te hebben als
+	die op de bestaande schijf, maar moeten groot genoeg zijn om alle
+	gegevens die reeds op <devicename>ada0</devicename> staan te kunnen
+	bevatten.</para>
+
+      <screen>&prompt.root; <userinput>gpart create -s MBR mirror/gm0</userinput>
+&prompt.root; <userinput>gpart add -t freebsd -a 4k mirror/gm0</userinput>
+&prompt.root; <userinput>gpart show mirror/gm0</userinput>
+=>       63  156301423  mirror/gm0  MBR  (74G)
+         63         63                    - free -  (31k)
+        126  156301299                 1  freebsd  (74G)
+  156301425         61                    - free -  (30k)</screen>
+
+      <screen>&prompt.root; <userinput>gpart create -s BSD mirror/gm0s1</userinput>
+&prompt.root; <userinput>gpart add -t freebsd-ufs  -a 4k -s 2g mirror/gm0s1</userinput>
+&prompt.root; <userinput>gpart add -t freebsd-swap -a 4k -s 4g mirror/gm0s1</userinput>
+&prompt.root; <userinput>gpart add -t freebsd-ufs  -a 4k -s 2g mirror/gm0s1</userinput>
+&prompt.root; <userinput>gpart add -t freebsd-ufs  -a 4k -s 1g mirror/gm0s1</userinput>
+&prompt.root; <userinput>gpart add -t freebsd-ufs  -a 4k       mirror/gm0s1</userinput>
+&prompt.root; <userinput>gpart show mirror/gm0s1</userinput>
+=>        0  156301299  mirror/gm0s1  BSD  (74G)
+          0          2                      - free -  (1.0k)
+          2    4194304                   1  freebsd-ufs  (2.0G)
+    4194306    8388608                   2  freebsd-swap  (4.0G)
+   12582914    4194304                   4  freebsd-ufs  (2.0G)
+   16777218    2097152                   5  freebsd-ufs  (1.0G)
+   18874370  137426928                   6  freebsd-ufs  (65G)
+  156301298          1                      - free -  (512B)</screen>
+
+      <para>Maak de spiegel opstartbaar door opstartcode in het MBR en bsdlabel
+	te installeren en de actieve slice in te stellen:</para>
+
+      <screen>&prompt.root; <userinput>gpart bootcode -b /boot/mbr mirror/gm0</userinput>
+&prompt.root; <userinput>gpart set -a active -i 1 mirror/gm0</userinput>
+&prompt.root; <userinput>gpart bootcode -b /boot/boot mirror/gm0s1</userinput></screen>
+
+      <para>Formatteer de bestandssystemen op de nieuwe spiegel en zet daarbij
+	soft-updates aan.</para>
+
+      <screen>&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1a</userinput>
+&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1d</userinput>
+&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1e</userinput>
+&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1f</userinput></screen>
+
+      <para>Bestandssystemen van de originele schijf
+	(<devicename>ada0</devicename>) kunnen nu met &man.dump.8; en
+	&man.restore.8; naar de spiegel gekopieerd worden:</para>
+
+      <screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt && restore -rf -)</userinput>
+&prompt.root; <userinput>mount /dev/mirror/gm0s1d /mnt/var</userinput>
+&prompt.root; <userinput>mount /dev/mirror/gm0s1e /mnt/tmp</userinput>
+&prompt.root; <userinput>mount /dev/mirror/gm0s1f /mnt/usr</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /var | (cd /mnt/var && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /tmp | (cd /mnt/tmp && restore -rf -)</userinput>
+&prompt.root; <userinput>dump -C16 -b64 -0aL -f - /usr | (cd /mnt/usr && restore -rf -)</userinput></screen>
+
+      <para><filename>/mnt/etc/fstab</filename> moet bewerkt worden om naar de
+	nieuwe bestandssystemen op de spiegel te wijzen:</para>
+
+      <programlisting># Device		Mountpoint	FStype	Options	Dump	Pass#
+/dev/mirror/gm0s1a	/		ufs	rw	1	1
+/dev/mirror/gm0s1b	none		swap	sw	0	0
+/dev/mirror/gm0s1d	/var		ufs	rw	2	2
+/dev/mirror/gm0s1e	/tmp		ufs	rw	2	2
+/dev/mirror/gm0s1f	/usr		ufs	rw	2	2</programlisting>
+
+      <para>Als de kernelmodule &man.gmirror.8; niet in de kernel is ingebouwd,
+	wordt <filename>/mnt/boot/loader.conf</filename> bewerkt om de module
+	tijdens het opstarten te laden:</para>
+
+      <programlisting>geom_mirror_load="YES"</programlisting>
+
+      <para>Herstart het systeem om de nieuwe spiegel te testen en te verifiëren
+	dat alle gegevens zijn gekopieerd.  Het BIOS zal de spiegel als twee
+	individuele schijven zien in plaats van als een spiegel.  Omdat de
+	schijven identiek zijn, maakt het niet uit vanaf welke schijf wordt
+	opgestart.</para>
+
+      <para>Bekijk de sectie <link linkend="gmirror-troubleshooting">Problemen
+	  oplossen</link> als er problemen zijn tijdens het opstarten.  Door de
+	originele <devicename>ada0</devicename> uit te schakelen en los te
+	koppelen kan het als offline back-up bewaard worden.</para>
 
-      <para>Het resulterende <filename>fstab</filename> zou er ongeveer
-	hetzelfde als het volgende uit moeten zien.  Het maakt niet uit
-	of de schijfstations <acronym>SCSI</acronym> of
-	<acronym>RAID</acronym> zijn, het
-	<acronym>RAID</acronym>-apparaat zal ongeacht hiervan
-	<devicename>gm</devicename> zijn.</para>
-
-      <programlisting># Device		Mountpoint	FStype	Options		Dump	Pass#
-/dev/mirror/gm0s1b	none		swap	sw		0	0
-/dev/mirror/gm0s1a	/		ufs	rw		1	1
-/dev/mirror/gm0s1d	/usr		ufs	rw		0	0
-/dev/mirror/gm0s1f	/home		ufs	rw		2	2
-#/dev/mirror/gm0s2d	/store		ufs	rw		2	2
-/dev/mirror/gm0s1e	/var		ufs	rw		2	2
-/dev/acd0		/cdrom		cd9660	ro,noauto	0	0</programlisting>
-
-      <para>Start het systeem opnieuw op:</para>
-
-      <screen>&prompt.root; <userinput>shutdown -r now</userinput></screen>
-
-      <para>Tijdens de systeeminitialisatie dient het apparaat
-	<devicename>gm0</devicename> in plaats van
-	<devicename>da0</devicename> gebruikt te worden.  Als het
-	systeem volledig is geïnitialiseerd, kan dit gecontroleerd
-	worden door de uitvoer van het commando <command>mount</command>
-	te inspecteren:</para>
-
-      <screen>&prompt.root; <userinput>mount</userinput>
-Filesystem         1K-blocks    Used    Avail Capacity  Mounted on
-/dev/mirror/gm0s1a   1012974  224604   707334    24%    /
-devfs                      1       1        0   100%    /dev
-/dev/mirror/gm0s1f  45970182   28596 42263972     0%    /home
-/dev/mirror/gm0s1d   6090094 1348356  4254532    24%    /usr
-/dev/mirror/gm0s1e   3045006 2241420   559986    80%    /var
-devfs                      1       1        0   100%    /var/named/dev</screen>
-
-      <para>De uitvoer ziet er als verwacht uit.  Plaats als laatste
-	stap, om synchronisatie te beginnen, de schijf
-	<devicename>da1</devicename> in de mirror met het volgende
-	commando:</para>
-
-      <screen>&prompt.root; <userinput>gmirror insert gm0 /dev/da1</userinput></screen>
-
-      <para>De status kan gecontroleerd worden tijdens het bouwen van de
-	mirror met het volgende commando:</para>
-
-      <screen>&prompt.root; <userinput>gmirror status</userinput></screen>
-
-      <para>Wanneer de mirror gebouwd is en alle huidige gegevens zijn
-	gesynchroniseerd, dient de uitvoer van het bovenstaande commando
-	er als volgt uit te zien:</para>
-
-      <screen>      Name    Status  Components
-mirror/gm0  COMPLETE  da0
-                      da1</screen>
-
-      <para>Als er problemen zijn, of als de mirror nog bezig is om het
-	bouwproces te voltooien, zal het voorbeeld
-	<literal>DEGRADED</literal> in plaats van
-	<literal>COMPLETE</literal> laten zien.</para>
+      <para>Tijdens het gebruik zal de spiegel zich net zoals de originele
+	enkele schijf gedragen.</para>
     </sect2>
 
     <sect2>
-      <title>Problemen oplossen</title>
+      <title>Een spiegel met een bestaande schijf aanmaken</title>
 
-      <sect3>
-	<title>Systeem weigert op te starten</title>
+      <para>In dit voorbeeld is &os; reeds geïnstalleerd op een enkele schijf,
+	<devicename>ada0</devicename>.  Een nieuwe schijf,
+	<devicename>ada1</devicename>, is met het systeem verbonden.  Er zal
+	een spiegel van één schijf worden aangemaakt op de nieuwe schijf, het
+	bestaande systeem zal ernaar worden gekopieerd, en daarna zal de oude
+	schijf in de spiegel worden geplaatst.  Deze enigszins complexe
+	procedure is nodig omdat &man.gmirror.8; een blok van 512 bytes aan
+	meta-gegevens aan het einde van elke schijf moet plaatsen en de
+	bestaande <devicename>ada0</devicename> meestal alle ruimte reeds heeft
+	toegewezen.</para>
 
-	<para>Als een systeem opstart in een prompt dat op het volgende
-	  lijkt:</para>
+      <para>Laadt de kernelmodule &man.gmirror.8;:</para>
 
-	<programlisting>ffs_mountroot: can't find rootvp
-Root mount failed: 6
-mountroot></programlisting>
+      <screen>&prompt.root; <userinput>gmirror load</userinput></screen>
 
-	<para>Herstart te machine met de aan/uit-schakelaar of met de
-	  resetknop.  Selecteer in het bootmenu optie zes (6).
-	  Hierdoor komt een systeem in een &man.loader.8; prompt.  Laad
-	  de kernelmodules handmatig:</para>
+      <para>Controleer de mediagrootte van de originele schijf met
+	&man.diskinfo.8;:</para>
 
-	<screen>OK? <userinput>load geom_mirror</userinput>
-OK? <userinput>boot</userinput></screen>
+      <screen>&prompt.root; <userinput>diskinfo -v ada0 | head -n3</userinput>
+/dev/ada0
+	512             # sectorsize
+	1000204821504   # mediasize in bytes (931G)</screen>
+
+      <para>Maak een spiegel aan op de nieuwe schijf.  Om er zeker van te zijn
+	dat de capaciteit van de spiegel niet groter is dan die van de originele
+	schijf, wordt &man.gnop.8; gebruikt om een nepschijf van precies
+	dezelfde grootte aan te maken.  Deze schijf slaat geen gegevens op, maar
+	wordt alleen gebruikt om de grootte van de spiegel te begrenzen.
+	Wanneer &man.gmirror.8; de spiegel aanmaakt, zal het de capaciteit
+	beperken tot de grootte van <devicename>gzero.nop</devicename> zelfs
+	als de nieuwe schijf (<devicename>ada1</devicename>) meer ruimte heeft.
+	Merk op dat de <replaceable>1000204821504</replaceable> op de tweede
+	regel gelijk moet zijn aan de mediagrootte van
+	<devicename>ada0</devicename> zoals hierboven door &man.diskinfo.8; is
+	getoond.</para>
+
+      <screen>&prompt.root; <userinput>geom zero load</userinput>
+&prompt.root; <userinput>gnop create -s 1000204821504 gzero</userinput>
+&prompt.root; <userinput>gmirror label -v gm0 gzero.nop ada1</userinput>
+&prompt.root; <userinput>gmirror forget gm0</userinput></screen>
+
+      <para><devicename>gzero.nop</devicename> slaat geen gegevens op, dus ziet
+	de spiegel het niet als verbonden.  De spiegel wordt verteld om
+	componenten die niet verbonden zijn te <quote>vergeten</quote>, waarbij
+	referenties naar <devicename>gzero.nop</devicename> worden verwijderd.
+	Het resultaat is een spiegelapparaat dat slechts één enkele schijf,
+	<devicename>ada1</devicename>, bevat.</para>
+
+      <para>Bekijk de partitietabel van <devicename>ada0</devicename> nadat
+	<devicename>gm0</devicename> is aangemaakt.</para>
+
+      <para>Deze uitvoer komt van een schijf van 1&nbsp;TB.  Als er wat
+	niet-toegewezen ruimte aanwezig is aan het einde van de schijf, kan de
+	inhoud direct van <devicename>ada0</devicename> naar de nieuwe spiegel
+	worden gekopieerd.</para>
+
+      <para>Als de uitvoer echter toont dat alle ruimte op de schijf is
+	toegewezen zoals in de volgende lijst, is er geen ruimte over voor de
+	512 bytes aan meta-gegevens van &man.gmirror.8; aan het einde van de
+	schijf.</para>
+
+      <screen>&prompt.root; <userinput>gpart show ada0</userinput>
+=>        63  1953525105        ada0  MBR  (931G)
+          63  1953525105           1  freebsd  [active]  (931G)</screen>
+
+      <para>In dit geval moet de partitietabel worden bewerkt om de capaciteit
+	op <devicename>mirror/gm0</devicename> met één sector te verminderen.
+	De procedure hiervoor wordt later uitgelegd.</para>
+
+      <para>In beide gevallen dienen de partitietabellen op de primaire schijf
+	eerst gekopieerd te worden.  Dit kan gedaan worden met de subcommando's
+	<command>backup</command> en <command>restore</command> van
+	&man.gpart.8;.</para>
+
+      <screen>&prompt.root; <userinput>gpart backup ada0 &gt; table.ada0</userinput>
+&prompt.root; <userinput>gpart backup ada0s1 &gt; table.ada0s1</userinput></screen>
+
+      <para>Deze subcommando's maken twee bestanden aan,
+	<filename>table.ada0</filename> en <filename>table.ada0s1</filename>.
+	Dit voorbeeld komt van een schijf van 1&nbsp;TB af:</para>
+
+      <screen>&prompt.root; <userinput>cat table.ada0</userinput>
+MBR 4
+1 freebsd         63 1953525105   [active]</screen>
+
+      <screen>&prompt.root; <userinput>cat table.ada0s1</userinput>
+BSD 8
+1  freebsd-ufs          0    4194304
+2 freebsd-swap    4194304   33554432
+4  freebsd-ufs   37748736   50331648
+5  freebsd-ufs   88080384   41943040
+6  freebsd-ufs  130023424  838860800
+7  freebsd-ufs  968884224  984640881</screen>
+
+      <para>Als de gehele schijf was gebruikt in de uitvoer van &man.gpart.8;
+	<command>show</command>, dan moet de capaciteit in deze partitietabellen
+	met één sector verminderd worden.  Bewerk de twee bestanden zodat de
+	grootte van zowel de slice als de laatste partitie met één verminderd
+	wordt.  Dit zijn de laatste getallen in elke lijst.</para>
+
+      <screen>&prompt.root; <userinput>cat table.ada0</userinput>
+MBR 4
+1 freebsd         63 <emphasis>1953525104</emphasis>   [active]</screen>
+
+      <screen>&prompt.root; <userinput>cat table.ada0s1</userinput>
+BSD 8
+1  freebsd-ufs          0    4194304
+2 freebsd-swap    4194304   33554432
+4  freebsd-ufs   37748736   50331648
+5  freebsd-ufs   88080384   41943040
+6  freebsd-ufs  130023424  838860800
+7  freebsd-ufs  968884224  <emphasis>984640880</emphasis></screen>
+
+      <para>Als er tenminste één sector aan het einde van de schijf niet was
+	toegewezen, kunnen deze twee bestanden ongewijzigd gebruikt worden.</para>
+      <para>Herstel nu de partitietabel naar
+	<devicename>mirror/gm0</devicename>.</para>
+
+      <screen>&prompt.root; <userinput>gpart restore mirror/gm0 &lt; table.ada0</userinput>
+&prompt.root; <userinput>gpart restore mirror/gm0s1 &lt; table.ada0s1</userinput></screen>
+
+      <para>Controleer de partitietabel met &man.gpart.8;
+	<command>show</command>.  Dit voorbeeld heeft
+	<devicename>gm0s1a</devicename> voor <filename>/</filename>,
+	<devicename>gm0s1d</devicename> voor <filename>/var</filename>,
+	<devicename>gm0s1e</devicename> voor <filename>/usr</filename>,
+	<devicename>gm0s1f</devicename> voor <filename>/data1</filename> en
+	<devicename>gm0s1g</devicename> voor <filename>/data2</filename>.</para>
+
+      <screen>&prompt.root; <userinput>gpart show mirror/gm0</userinput>
+=>        63  1953525104  mirror/gm0  MBR  (931G)
+          63  1953525042           1  freebsd  [active]  (931G)
+  1953525105          62              - free -  (31k)
+
+&prompt.root; <userinput>gpart show mirror/gm0s1</userinput>
+=>         0  1953525042  mirror/gm0s1  BSD  (931G)
+           0     2097152             1  freebsd-ufs  (1.0G)
+     2097152    16777216             2  freebsd-swap  (8.0G)
+    18874368    41943040             4  freebsd-ufs  (20G)
+    60817408    20971520             5  freebsd-ufs  (10G)
+    81788928   629145600             6  freebsd-ufs  (300G)
+   710934528  1242590514             7  freebsd-ufs  (592G)
+  1953525042          63                - free -  (31k)</screen>
+
+      <para>Zowel de slice als de laatste partitie dienen wat vrije ruimte aan
+	het einde van elke schijf te hebben.</para>
+
+      <para>Maak bestandssystemen aan op deze nieuwe partities.  Het aantal
+	partities zal variëren, overeenkomend met de partities op de originele
+	schijf, <devicename>ada0</devicename>.</para>
+
+      <screen>&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1a</userinput>
+&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1d</userinput>
+&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1e</userinput>
+&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1f</userinput>
+&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1g</userinput></screen>
+
+      <para>Maak de spiegel opstartbaar door opstartcode in het MBR en bsdlabel
+	te installeren en de actieve slice in te stellen:</para>
+
+      <screen>&prompt.root; <userinput>gpart bootcode -b /boot/mbr mirror/gm0</userinput>
+&prompt.root; <userinput>gpart set -a active -i 1 mirror/gm0</userinput>
+&prompt.root; <userinput>gpart bootcode -b /boot/boot mirror/gm0s1</userinput></screen>
+
+      <para>Pas <filename>/etc/fstab</filename> aan zodat het de nieuwe
+	partities op de spiegel gebruikt.  Maak eerst een kopie van dit bestand
+	als <filename>/etc/fstab.orig</filename>.</para>
+
+      <screen>&prompt.root; <userinput>cp /etc/fstab /etc/fstab.orig</userinput></screen>
+
+      <para>Wijzig <filename>/etc/fstab</filename> door
+	<devicename>/dev/ada0</devicename> door
+	<devicename>mirror/gm0</devicename> te vervangen.</para>
+
+      <programlisting># Device		Mountpoint	FStype	Options	Dump	Pass#
+/dev/mirror/gm0s1a	/		ufs	rw	1	1
+/dev/mirror/gm0s1b	none		swap	sw	0	0
+/dev/mirror/gm0s1d	/var		ufs	rw	2	2

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

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 22:39:57 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 08DB22B8;
 Wed, 12 Dec 2012 22:39:57 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DD6278FC08;
 Wed, 12 Dec 2012 22:39:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCMducI068249;
 Wed, 12 Dec 2012 22:39:56 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBCMdtQ4068240;
 Wed, 12 Dec 2012 22:39:55 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212122239.qBCMdtQ4068240@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 12 Dec 2012 22:39:55 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-translations@freebsd.org
Subject: svn commit: r40368 - in translations/en_US.ISO8859-1:
 articles/committers-guide articles/contributing articles/contributors
 articles/portbuild books books/arch-handbook/driverbasics books/arch-hand...
X-SVN-Group: doc-translations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 22:39:57 -0000

Author: gjb
Date: Wed Dec 12 22:39:55 2012
New Revision: 40368
URL: http://svnweb.freebsd.org/changeset/doc/40368

Log:
  Merged /projects/pkgng/en_US.ISO8859-1:r39915-40152
   to translations/en_US.ISO8859-1
  Merged /head/en_US.ISO8859-1:r39641,39937-40365
   to translations/en_US.ISO8859-1

Added:
  translations/en_US.ISO8859-1/htdocs/google6bb24ed0b804d5e9.html
     - copied unchanged from r40365, head/en_US.ISO8859-1/htdocs/google6bb24ed0b804d5e9.html
  translations/en_US.ISO8859-1/htdocs/news/2012-compromise/
     - copied from r40365, head/en_US.ISO8859-1/htdocs/news/2012-compromise/
  translations/en_US.ISO8859-1/htdocs/news/2012-compromise.xml
     - copied unchanged from r40365, head/en_US.ISO8859-1/htdocs/news/2012-compromise.xml
Deleted:
  translations/en_US.ISO8859-1/books/corp-net-guide/
Modified:
  translations/en_US.ISO8859-1/articles/committers-guide/article.xml
  translations/en_US.ISO8859-1/articles/contributing/article.xml
  translations/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
  translations/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
  translations/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
  translations/en_US.ISO8859-1/articles/portbuild/article.xml
  translations/en_US.ISO8859-1/books/Makefile
  translations/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml
  translations/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml
  translations/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
  translations/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml
  translations/en_US.ISO8859-1/books/faq/book.xml
  translations/en_US.ISO8859-1/books/handbook/basics/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/geom/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/mac/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/mail/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/ports/chapter.xml
  translations/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
  translations/en_US.ISO8859-1/books/porters-handbook/book.xml
  translations/en_US.ISO8859-1/htdocs/Makefile
  translations/en_US.ISO8859-1/htdocs/administration.xml
  translations/en_US.ISO8859-1/htdocs/art.xml
  translations/en_US.ISO8859-1/htdocs/cgi/cvsweb.cgi
  translations/en_US.ISO8859-1/htdocs/cgi/man.cgi
  translations/en_US.ISO8859-1/htdocs/cgi/ports.cgi
  translations/en_US.ISO8859-1/htdocs/developers/cvs.xml
  translations/en_US.ISO8859-1/htdocs/docs/books.xml
  translations/en_US.ISO8859-1/htdocs/donations/index.xml
  translations/en_US.ISO8859-1/htdocs/index.xsl
  translations/en_US.ISO8859-1/htdocs/internal/bylaws.xml
  translations/en_US.ISO8859-1/htdocs/internal/homepage.pl
  translations/en_US.ISO8859-1/htdocs/internal/i18n.xml
  translations/en_US.ISO8859-1/htdocs/layout/css/layout.css
  translations/en_US.ISO8859-1/htdocs/layout/js/google.js
  translations/en_US.ISO8859-1/htdocs/news/Makefile
  translations/en_US.ISO8859-1/htdocs/news/status/report-2001-08.xml
  translations/en_US.ISO8859-1/htdocs/news/status/report-2002-05-2002-06.xml
  translations/en_US.ISO8859-1/htdocs/platforms/arm.xml
  translations/en_US.ISO8859-1/htdocs/releng/charter.xml
  translations/en_US.ISO8859-1/htdocs/releng/index.xml
  translations/en_US.ISO8859-1/htdocs/search/sitemap.xml
  translations/en_US.ISO8859-1/htdocs/security/security.xml
  translations/en_US.ISO8859-1/htdocs/where.xml
  translations/en_US.ISO8859-1/share/xml/mailing-lists.ent
Directory Properties:
  translations/en_US.ISO8859-1/   (props changed)

Modified: translations/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- translations/en_US.ISO8859-1/articles/committers-guide/article.xml	Wed Dec 12 22:39:39 2012	(r40367)
+++ translations/en_US.ISO8859-1/articles/committers-guide/article.xml	Wed Dec 12 22:39:55 2012	(r40368)
@@ -370,7 +370,7 @@
     <sect2 id="svn-getting-started">
       <title>Getting Started</title>
 
-      <para>There are three ways to obtain a working copy of the tree
+      <para>There are a few ways to obtain a working copy of the tree
 	from Subversion.  This section will explain them.</para>
 
       <sect3>
@@ -466,119 +466,6 @@
 	  information on how to set one up.</para>
       </sect3>
 
-      <sect3>
-	<title>Checkout from a Local Mirror Using
-	  <acronym>SVK</acronym></title>
-
-	<para>The third alternative is to use <acronym>SVK</acronym>
-	  to maintain a local mirror.  It is a version control system
-	  build on top of Subversion's storage engine.  It is
-	  identical to Subversion in most respects, except that it
-	  allows for setting up parts of repositories as mirrors of
-	  other repositories, and keeping local branches for merging
-	  back into the upstream repositories.  There are extensions
-	  that allow <acronym>SVK</acronym> to mirror
-	  <acronym>CVS</acronym> and Perforce repositories in addition
-	  to Subversion ones.</para>
-
-	<para>Like everything, <acronym>SVK</acronym> has its
-	  disadvantages, one being that local revision numbers will
-	  not match upstream revision numbers.  This makes it
-	  difficult to <command>svk log</command>, <command>svk
-	    diff</command>, or <command>svk update</command> to an
-	  arbitrary upstream revision.</para>
-
-	<para>To set up a mirror of the &os; repository, do:</para>
-
-	<screen>&prompt.user; <userinput>svk mirror svn+ssh://svn.freebsd.org/base //freebsd/base</userinput></screen>
-
-	<para>The local <acronym>SVK</acronym> repository will be
-	  stored in <filename
-	    class="directory">~/.svk/local/</filename>, but can be
-	  moved to an alternate location.  If it is moved,
-	  <filename>~/.svk/config</filename> should be amended
-	  manually to reflect the move.</para>
-
-	<para>Any path can be used, not just the one in the example
-	  above.  A common pattern is to place mirrors under
-	  <literal>//mirror</literal>, e.g.,
-	  <filename
-	    class="directory">//mirror/freebsd/base/</filename>, and
-	  local branches under <literal>//local</literal>.</para>
-
-	<para>To pull down the contents of the repository to the
-	  mirror:</para>
-
-	<screen>&prompt.user; <userinput>svk sync //freebsd/base</userinput></screen>
-
-	<note>
-	  <para><command>svk sync</command> will take a very long
-	    time, possibly several days over a slow network
-	    connection.  &a.peter; has a tarball that can be used to
-	    jumpstart the mirror, but only if one does not exist
-	    already.</para>
-	</note>
-
-	<para>To use the tarball referenced above:</para>
-
-	<screen>&prompt.user; <userinput>cd ~</userinput>
-&prompt.user; <userinput>scp freefall:/home/peter/dot_svk_r179646.tbz2 .</userinput>
-&prompt.user; <userinput>tar xf dot_svk_r179646.tbz2</userinput></screen>
-
-	<para>Then edit <filename>~/.svk/config</filename> and replace
-	  <filename
-	    class="directory">/scratch/tmp/peter/.svk/local/</filename>
-	  with the equivalent of <filename
-	    class="directory">/home/<replaceable>jarjar</replaceable>/.svk/local/</filename>.</para>
-
-	<para>You can check out files directly from your mirror, once
-	  it has been created:</para>
-
-	<screen>&prompt.user; <userinput>svk checkout //freebsd/base/head /usr/src</userinput></screen>
-
-	<para>Unlike <acronym>SVN</acronym>, <acronym>SVK</acronym>
-	  does not store metadata or reference copies in the working
-	  copy.  All metadata is recorded in
-	  <filename>~/.svk/config</filename>; reference copies are not
-	  used at all because <acronym>SVK</acronym> always operates
-	  on a local repository.</para>
-
-	<para>When committing from a working copy like the one above,
-	  <acronym>SVN</acronym> will commit directly to the upstream
-	  repository, then synchronise the mirror.</para>
-
-	<para>However, the <quote>killer app</quote> for
-	  <acronym>SVK</acronym> is the ability to work without a
-	  network connection.  To do that, a local branch must be set
-	  up:</para>
-
-	<screen>&prompt.user; <userinput>svk mkdir //local/freebsd</userinput>
-&prompt.user; <userinput>svk copy //freebsd/base/head //local/freebsd/head</userinput></screen>
-
-	<para>Once again, any path can be used, it does not have to
-	  specifically be the one in the example.</para>
-
-	<para>Before use, the local branch has to be synchronized,
-	  like so:</para>
-
-	<screen>&prompt.user; <userinput>svk pull //local/freebsd/head</userinput></screen>
-
-	<para>Then check out from the newly created local
-	  branch:</para>
-
-	<screen>&prompt.user; <userinput>svk checkout //local/freebsd/head /usr/src</userinput></screen>
-
-	<para>The point of this exercise is showing that it is
-	  possible to commit work-in-progress to a local branch, and
-	  only push it to the upstream repository when work is
-	  complete.  The easy way to push is with <command>svk
-	    push</command>, but there is a serious disadvantage to it:
-	  it will push every single commit made to the local branch
-	  incrementally instead of lumping them all into a single
-	  commit.  Therefore, using <command>svk smerge</command> is
-	  preferable.</para>
-      </sect3>
-
       <sect3 id="subversion-primer-base-layout">
 	<title><literal>RELENG_*</literal> Branches and General
 	  Layout</title>
@@ -711,16 +598,6 @@
 	daily use, except for the revision renumbering mentioned
 	earlier.</para>
 
-      <note>
-	<para><acronym>SVN</acronym> and <acronym>SVK</acronym>
-	  commands that have direct <acronym>CVS</acronym> equivalents
-	  usually have the same name and abbreviations.  For example:
-	  <emphasis>checkout</emphasis> and <emphasis>co</emphasis>,
-	  <emphasis>update</emphasis> and <emphasis>up</emphasis>, and
-	  <emphasis>commit</emphasis> and
-	  <emphasis>ci</emphasis>.</para>
-      </note>
-
       <sect3>
 	<title>Help</title>
 
@@ -824,11 +701,7 @@
 
 	<screen>&prompt.user; <userinput>svn status</userinput></screen>
 
-	<para><acronym>CVS</acronym> has no direct equivalent of this
-	  command.  The nearest would be <command>cvs up -N</command>
-	  which shows local changes and files that are out-of-date.
-	  Doing this in <acronym>SVN</acronym> is possible too,
-	  however:</para>
+	<para>To show local changes and files that are out-of-date do:</para>
 
 	<screen>&prompt.user; <userinput>svn status --show-updates</userinput></screen>
       </sect3>
@@ -836,7 +709,7 @@
       <sect3>
 	<title>Editing and Committing</title>
 
-	<para>Like <acronym>CVS</acronym> but unlike Perforce,
+	<para>Unlike Perforce,
 	  <acronym>SVN</acronym> and <acronym>SVK</acronym> do not
 	  need to be told in advance about file editing.</para>
 
@@ -882,7 +755,7 @@
 	    </para>
 	</note>
 
-	<para>As with <acronym>CVS</acronym>, files are added to a
+	<para>Files are added to a
 	  <acronym>SVN</acronym> repository with <command>svn
 	    add</command>.  To add a file named
 	  <emphasis>foo</emphasis>, edit it, then:</para>
@@ -910,10 +783,9 @@
 
 	<screen>&prompt.user; <userinput>svn mkdir <replaceable>bar</replaceable></userinput></screen>
 
-	<para>In <acronym>CVS</acronym>, the directory is immediately
-	  created in the repository when you <command>cvs
-	    add</command> it; this is not the case in Subversion.
-	  Furthermore, unlike <acronym>CVS</acronym>, Subversion
+	<para>The directory is not immediately
+	  created in the repository when you use <command>svn
+	    mkdir</command>.  Subversion
 	  allows directories to be removed using <command>svn
 	    rm</command>, however there is no <command>svn
 	    rmdir</command>:</para>
@@ -938,9 +810,6 @@
 
 	<screen>&prompt.user; <userinput>svn copy <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput>
 &prompt.user; <userinput>svn remove <replaceable>foo.c</replaceable></userinput></screen>
-
-	<para>Neither of these operations have equivalents in
-	  <acronym>CVS</acronym>.</para>
       </sect3>
 
       <sect3>
@@ -965,11 +834,11 @@
 
 	<para><command>svn diff</command> displays changes to the
 	  working copy of the repository.  Diffs generated by
-	  <acronym>SVN</acronym> are unified by default, unlike
-	  <acronym>CVS</acronym>, and include new files by default
+	  <acronym>SVN</acronym> are unified
+	  and include new files by default
 	  in the diff output.</para>
 
-	<para>As with <acronym>CVS</acronym>, <command>svn
+	<para><command>svn
 	    diff</command> can show the changes between two revisions
 	  of the same file:</para>
 
@@ -987,8 +856,8 @@
 	<title>Reverting</title>
 
 	<para>Local changes (including additions and deletions) can be
-	  reverted using <command>svn revert</command>.  Unlike
-	  <command>cvs up -C</command>, it does not update out-of-date
+	  reverted using <command>svn revert</command>.
+	  It does not update out-of-date
 	  files&mdash;it just replaces them with pristine copies of
 	  the original version.</para>
       </sect3>
@@ -1877,8 +1746,8 @@ U    stable/9/share/man/man4/netmap.4
 	  of <command>svn status</command> and <command>svn
 	    diff</command> before committing.</para>
 
-	<para>Mistakes will happen, but, unlike with
-	  <acronym>CVS</acronym>, they can generally be fixed without
+	<para>Mistakes will happen but,
+	  they can generally be fixed without
 	  disruption.</para>
 
 	<para>Take a case of adding a file in the wrong location.  The
@@ -2014,37 +1883,20 @@ U    stable/9/share/man/man4/netmap.4
       <para>Don't remove and re-add the same file in a single commit
 	as this will break the CVS exporter.</para>
 
-      <para>Speeding up checkouts and minimising network traffic is
-	possible with the following recipe:</para>
+      <para>Speeding up svn is
+	possible by adding the following to <filename>~/.ssh/config</filename>:</para>
+
+      <screen>Host *
+ControlPath ~/.ssh/sockets/master-%l-%r@%h:%p
+ControlMaster auto
+ControlPersist yes</screen>
 
-      <screen>&prompt.user; <userinput>svn co --depth=empty svn+ssh://svn.freebsd.org/base fbsvn</userinput>
-&prompt.user; <userinput>cd fbsvn</userinput>
-&prompt.user; <userinput>svn up --depth=empty stable</userinput>
-&prompt.user; <userinput>svn up head</userinput>
-&prompt.user; <userinput>cd stable</userinput>
-&prompt.user; <userinput>cp -r ../head/ 7</userinput>
-&prompt.user; <userinput>cd 7</userinput>
-&prompt.user; <userinput>svn switch svn+ssh://svn.freebsd.org/base/stable/7</userinput>
-&prompt.user; <userinput>cd ..</userinput>
-&prompt.user; <userinput>cp -r 7/ 6</userinput>
-&prompt.user; <userinput>cd 6</userinput>
-&prompt.user; <userinput>svn switch svn+ssh://svn.freebsd.org/base/stable/6</userinput></screen>
-
-      <para>What this bit of evil does is check out head, stable/7 and
-	stable/6.  We create the empty checkout directories under
-	<acronym>SVN</acronym>'s control.  In <acronym>SVN</acronym>,
-	subtrees are self identifying, like in <acronym>CVS</acronym>.
-	We check out head and clone it as stable/7.  Except we don't
-	want the head version so we <quote>switch</quote> it to the
-	7.x tree location.  <acronym>SVN</acronym> downloads diffs to
-	convert the <quote>head</quote> files to
-	<quote>stable/7</quote> instead of doing a fresh checkout.
-	The same goes for stable/6.  This does, however, definitely
-	count as abuse of the working copy client code!</para>
+	<para>and then typing</para>
+	<screen><userinput>mkdir ~/.ssh/sockets</userinput></screen>
 
       <para>Checking out a working copy with a stock Subversion client
 	without &os;-specific patches
-	(<makevar>WITH_FREEBSD_TEMPLATE</makevar>) will mean that
+	(<makevar>OPTIONS_SET=FREEBSD_TEMPLATE</makevar>) will mean that
 	<literal>&dollar;FreeBSD&dollar;</literal> tags will not be
 	expanded.  Once the correct version has been installed, trick
 	Subversion into expanding them like so:</para>
@@ -2052,8 +1904,7 @@ U    stable/9/share/man/man4/netmap.4
       <screen>&prompt.user; <userinput>svn propdel -R svn:keywords .</userinput>
 &prompt.user; <userinput>svn revert -R .</userinput></screen>
 
-      <para>This is not a good idea if uncommitted patches exist,
-	however.</para>
+      <para>This will wipe out uncommitted patches.</para>
     </sect2>
   </sect1>
 
@@ -2081,7 +1932,7 @@ U    stable/9/share/man/man4/netmap.4
     <itemizedlist>
       <listitem>
 	<para>Add your author entity to
-	  <filename>head/en_US.ISO8859-1/share/xml/authors.ent</filename>;
+	  <filename>head/share/xml/authors.ent</filename>;
 	  this should be done first since an omission of this commit will
 	  cause the next commits to break the doc/ build.</para>
 
@@ -2594,14 +2445,13 @@ U    stable/9/share/man/man4/netmap.4
 	<term>&a.committers;</term>
 
 	<listitem>
-	  <para>cvs-committers is the entity that the version control system uses to send you all your
-	    commit messages.  You should <emphasis>never</emphasis> send email
-	    directly to this list.  You should only send replies to this list
-	    when they are short and are directly related to a commit.</para>
-
-	  <para>There is a similar list, svn-committers, which has a
-	    similar purpose but is a normal list, i.e., you are free to
-	    send any suitable message to this list.</para>
+	  <para>&a.svn-src-all.name;, &a.svn-ports-all.name; and
+	    &a.svn-doc-all.name; are the mailing lists that the
+	    version control system uses to send commit messages to.
+	    You should <emphasis>never</emphasis> send email directly
+	    to these lists.  You should only send replies to this list
+	    when they are short and are directly related to a
+	    commit.</para>
 	</listitem>
       </varlistentry>
 
@@ -4074,57 +3924,11 @@ U    stable/9/share/man/man4/netmap.4
 		</step>
 
 		<step>
-		  <para>Update the instructions for &man.cvsup.1;:</para>
-
-		  <itemizedlist>
-		    <listitem>
-		      <para>
-			add the category to
-			<filename>distrib/cvsup/sup/README</filename>
-		      </para>
-		    </listitem>
-
-		    <listitem>
-		      <para>
-			adding the following files into
-			<filename>distrib/cvsup/sup/ports-<replaceable>categoryname</replaceable></filename>:
-			<filename>list.cvs</filename> and
-			<filename>releases</filename>.</para>
-		    </listitem>
-
-		    <listitem>
-		      <para>
-			add the category to
-			<filename>src/share/examples/cvsup/ports-supfile</filename>
-		      </para>
-		    </listitem>
-		  </itemizedlist>
-
-		  <para>
-		    (Note: these are
-		    in the src, not the ports, repository).  If you
-		    are not a src committer, you will need to submit
-		    a PR for this.</para>
-		</step>
-
-		<step>
-		  <para>
-		    Update the list of categories used by &man.sysinstall.8;
-		    in <filename>src/usr.sbin/sysinstall</filename>.</para>
-		</step>
-
-		<step>
 		  <para>Update the documentation by modifying the
 		    following:</para>
 
 		  <itemizedlist>
 		    <listitem>
-		      <para>the section of the Handbook that lists the
-			<ulink url="&url.books.handbook;/cvsup.html#CVSUP-COLLEC">
-			cvsup collections</ulink>.</para>
-		    </listitem>
-
-		    <listitem>
 		      <para>the
 		    <ulink url="&url.books.porters-handbook;/makefile-categories.html#PORTING-CATEGORIES">
 		    list of categories</ulink> in the Porter's Handbook</para>
@@ -4174,10 +3978,6 @@ U    stable/9/share/man/man4/netmap.4
 
 	    <itemizedlist>
 	      <listitem>
-		<para><filename>src/usr.sbin/sysinstall</filename></para>
-	      </listitem>
-
-	      <listitem>
 		<para>the
 		  <ulink url="&url.books.porters-handbook;/makefile-categories.html#PORTING-CATEGORIES">
 		  list of categories</ulink> in the Porter's Handbook</para>

Modified: translations/en_US.ISO8859-1/articles/contributing/article.xml
==============================================================================
--- translations/en_US.ISO8859-1/articles/contributing/article.xml	Wed Dec 12 22:39:39 2012	(r40367)
+++ translations/en_US.ISO8859-1/articles/contributing/article.xml	Wed Dec 12 22:39:55 2012	(r40368)
@@ -234,7 +234,8 @@
       <title>Pick one of the items from the <quote>Ideas</quote>
 	page</title>
 
-      <para>The <ulink url="&url.base;/projects/ideas/">&os; list of
+      <para>The <ulink url="http://wiki.freebsd.org/IdeasPage">&os;
+	  list of
 	  projects and ideas for volunteers</ulink> is also available
 	for people willing to contribute to the &os; project.  The
 	list is being regularly updated and contains items for both
@@ -342,39 +343,22 @@
 
       <para>The preferred &man.diff.1; format for submitting patches
 	is the unified output format generated by <command>diff
-	  -u</command>.  However, for patches that substantially
-	change a region of code, a context output format diff
-	generated by <command>diff -c</command> may be more readable
-	and thus preferable.</para>
+	  -u</command>.</para>
 
       <indexterm>
 	<primary><command>diff</command></primary>
       </indexterm>
 
-      <para>For example:</para>
-
-      <screen>&prompt.user; <userinput>diff -c oldfile newfile</userinput></screen>
-
-      <para>or</para>
-
-      <screen>&prompt.user; <userinput>diff -c -r olddir newdir</userinput></screen>
-
-      <para>would generate such a set of context diffs for the given
-	source file or directory hierarchy.</para>
-
-      <para>Likewise,</para>
-
       <screen>&prompt.user; <userinput>diff -u oldfile newfile</userinput></screen>
 
       <para>or</para>
 
-      <screen>&prompt.user; <userinput>diff -u -r olddir newdir</userinput></screen>
+      <screen>&prompt.user; <userinput>diff -u -r -N olddir newdir</userinput></screen>
 
-      <para>would do the same, except in the unified diff
-	format.</para>
+      <para>would generate a set of unified diffs for the given source
+	file or directory hierarchy.</para>
 
-      <para>See the manual page for &man.diff.1; for more
-	details.</para>
+      <para>See &man.diff.1; for more information.</para>
 
       <para>Once you have a set of diffs (which you may test with the
 	&man.patch.1; command), you should submit them for inclusion
@@ -400,9 +384,8 @@
 	welcome.</para>
 
       <para>If your change is of a potentially sensitive nature,
-	e.g. you are unsure of copyright issues governing its further
-	distribution or you are simply not ready to release it without
-	a tighter review first, then you should send it to &a.core;
+	such as if you are unsure of copyright issues governing its further
+	distribution then you should send it to &a.core;
 	directly rather than submitting it with &man.send-pr.1;.  The
 	&a.core; reaches a much smaller group of people who
 	do much of the day-to-day work on FreeBSD.  Note that this
@@ -506,7 +489,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-        &#36;Id&#36;</programlisting>
+        &dollar;&os;&dollar;</programlisting>
 
       <para>For your convenience, a copy of this text can be found in
 	<filename>/usr/share/examples/etc/bsd-style-copyright</filename>.</para>

Modified: translations/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
==============================================================================
--- translations/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Wed Dec 12 22:39:39 2012	(r40367)
+++ translations/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Wed Dec 12 22:39:55 2012	(r40368)
@@ -1144,11 +1144,6 @@
     </listitem>
 
     <listitem>
-      <para>Barbara</para>
-	<!-- (rene@) No email address per request. -->
-    </listitem>
-
-    <listitem>
       <para>Barry Bierbauch
 	<email>pivrnec@vszbr.cz</email></para>
     </listitem>
@@ -1722,6 +1717,11 @@
     </listitem>
 
     <listitem>
+      <para>Christian Heckendorf
+	<email>heckend@bu.edu</email></para>
+    </listitem>
+
+    <listitem>
       <para>Christian Lackas
 	<email>delta@lackas.net</email></para>
     </listitem>

Modified: translations/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
==============================================================================
--- translations/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Wed Dec 12 22:39:39 2012	(r40367)
+++ translations/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Wed Dec 12 22:39:55 2012	(r40368)
@@ -500,6 +500,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.bar;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.jmg;</para>
     </listitem>
 
@@ -1524,6 +1528,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.bryanv;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.avilla;</para>
     </listitem>
 
@@ -1638,4 +1646,8 @@
     <listitem>
       <para>&a.az;</para>
     </listitem>
+
+    <listitem>
+      <para>&a.syuu;</para>
+    </listitem>
   </itemizedlist>

Modified: translations/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml
==============================================================================
--- translations/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml	Wed Dec 12 22:39:39 2012	(r40367)
+++ translations/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml	Wed Dec 12 22:39:55 2012	(r40368)
@@ -3,6 +3,10 @@
 
   <itemizedlist>
     <listitem>
+      <para>&a.attilio; (2012)</para>
+    </listitem>
+
+    <listitem>
       <para>&a.wilko; (2006 - 2012)</para>
     </listitem>
 

Modified: translations/en_US.ISO8859-1/articles/portbuild/article.xml
==============================================================================
--- translations/en_US.ISO8859-1/articles/portbuild/article.xml	Wed Dec 12 22:39:39 2012	(r40367)
+++ translations/en_US.ISO8859-1/articles/portbuild/article.xml	Wed Dec 12 22:39:55 2012	(r40368)
@@ -66,19 +66,23 @@
       otherwise specified, all paths will be relative to
       this location.  <replaceable>${arch}</replaceable> will
       be used to specify one of the package architectures
-      (amd64, &i386;, ia64, powerpc, and &sparc64;), and
+      (e.g., amd64, arm, &i386;, ia64, powerpc, &sparc64;), and
       <replaceable>${branch}</replaceable> will be used
-      to specify the build branch (7, 7-exp, 8, 8-exp, 9, 9-exp, 10, 10-exp).
+      to specify the build branch (e.g., 7, 7-exp, 8, 8-exp, 9, 9-exp, 10, 10-exp).
+      The set of branches that <username>portmgr</username> currently
+      supports is the same as those that the &os;
+      <ulink url="http://www.freebsd.org/security/index.html#supported-branches">security team</ulink>
+      supports.
     </para>
 
     <note>
-      <para>Packages are no longer built for Releases 4, 5, or 6, nor
+      <para>Packages are no longer built for branches 4, 5, or 6, nor
 	for the alpha architecture.</para>
     </note>
 
     <para>The scripts that control all of this live in
       <filename class="directory">/var/portbuild/scripts/</filename>.
-      These are the checked-out copies from the Subversion repository
+      These are the checked-out copies from the Subversion repository at
       <ulink url="http://svnweb.freebsd.org/base/projects/portbuild/scripts/">
       <filename class="directory">base/projects/portbuild/scripts/</filename>
       </ulink>.</para>
@@ -95,16 +99,19 @@
 	<literal>-CURRENT</literal>
 	</para></listitem>
 
-      <listitem><para>for experimental builds</para></listitem>
+      <listitem><para>for experimental (<literal>"exp-"</literal>) builds</para></listitem>
+
     </itemizedlist>
 
+    <para>Packages from experimental builds are not uploaded.</para>
+
     </sect2>
 
     <sect2 id="codebase-notes">
       <title>Notes on the codebase</title>
 
       <para>Until mid-2010, the scripts were completely specific to
-	<hostid>pointyhat</hostid> as the head (dispatch) node.  During
+	<hostid>pointyhat.FreeBSD.org</hostid> as the head (dispatch) node.  During
 	the summer of 2010, a significant rewrite was done in order to allow
 	for other hosts to be head nodes.  Among the changes were:</para>
 
@@ -136,9 +143,11 @@
 	to <literal>old codebase:</literal>.</para>
 
       <note>
-	<para>As of December 2010, <hostid>pointyhat</hostid> is still
-	  running on the old codebase, until the new codebase is considered
-	  rock-solid.</para>
+	<para>Up until November 2012, <hostid>pointyhat</hostid> had still
+	  been running the old codebase.  That installation has now been
+	  permanently offlined.  Therefore, all the instructions having
+	  to do with the old codebase are <emphasis>obsolete</emphasis>,
+	  and will be removed in the near future.</para>
       </note>
 
       <note>
@@ -167,7 +176,7 @@
       interesting data (ports and src trees, bindist tarballs,
       scripts, etc.) to disconnected nodes during the node-setup
       phase.  Then, the disconnected portbuild directory is
-      nullfs-mounted for chroot builds.</para>
+      nullfs-mounted for jail builds.</para>
 
     <para>The
       <username>ports-<replaceable>${arch}</replaceable></username>
@@ -179,41 +188,32 @@
     <para>The <command>scripts/allgohans</command> script can
       be used to run a command on all of the
       <replaceable>${arch}</replaceable> clients.</para>
-
-    <para>The <command>scripts/checkmachines</command> script
-      is used to monitor the load on all the nodes of the
-      build cluster, and schedule which nodes build which ports.
-      This script is not very robust, and has a tendency to die.
-      It is best to start up this script on the build master
-      (e.g. <hostid>pointyhat</hostid>)
-      after boot time using a &man.while.1; loop.
-    </para>
   </sect1>
 
   <sect1 id="setup">
-    <title>Chroot Build Environment Setup</title>
+    <title>Jail Build Environment Setup</title>
 
     <para>Package builds are performed in a
-      <literal>chroot</literal> populated by the
+      <literal>jail</literal> populated by the
       <filename>portbuild</filename> script using the
       <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable>/bindist.tar</filename>
       file.</para>
 
-    <para>The following command builds a world from the
+    <para>The <command>makeworld</command> command builds a world from the
       <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable>/src/</filename>
       tree and installs it into
-      <replaceable>${worlddir}</replaceable>.  The tree will
-      be updated first unless <literal>-nocvs</literal> is
-      specified.</para>
+      <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable>/bindist.tar</filename>.
+      The tree will
+      be updated first unless <literal>-novcs</literal> is
+      specified.  It should be run as <username>root</username>:</para>
 
-    <screen>/var/portbuild&prompt.root; <userinput>scripts/makeworld <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> [-nocvs]</userinput></screen>
+    <screen>&prompt.root; <userinput>/var/portbuild/scripts/makeworld <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> [-novcs]</userinput></screen>
 
     <para>The <filename>bindist.tar</filename> tarball is created from the
       previously installed world by the <command>mkbindist</command>
-      script.  It should be run as <username>root</username> with the following
-      command:</para>
+      script.  It should be also be run as <username>root</username>:</para>
 
-    <screen>/var/portbuild&prompt.root; <userinput>scripts/mkbindist <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable></userinput></screen>
+    <screen>&prompt.root; <userinput>/var/portbuild/scripts/mkbindist <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable></userinput></screen>
 
     <para>The per-machine tarballs are located in
       <filename><replaceable>${arch}</replaceable>/clients</filename>.</para>
@@ -280,7 +280,7 @@
       <para>(For this case, the contents are identical for both server
 	and client.)</para>
 
-      <screen>RUBY_DEFAULT_VER= 1.9</screen>
+      <programlisting>RUBY_DEFAULT_VER= 1.9</programlisting>
     </example>
 
     <example>
@@ -291,7 +291,7 @@
       <para>(For this case, the contents are also identical for both
 	server and client.)</para>
 
-      <screen>
+      <programlisting>
 .if !defined(CC) || ${CC} == "cc"
 CC=clang
 .endif
@@ -301,44 +301,45 @@ CXX=clang++
 .if !defined(CPP) || ${CPP} == "cpp"
 CPP=clang-cpp
 .endif
-# Don't die on warnings
+# Do not die on warnings
 NO_WERROR=
 WERROR=
-</screen>
+</programlisting>
     </example>
 
     <example>
       <title>Sample <filename>make.conf.server</filename> for
 	<application>pkgng</application></title>
 
-      <screen>WITH_PKGNG=yes
-PKG_BIN=/usr/local/sbin/pkg</screen>
+      <programlisting>WITH_PKGNG=yes
+PKG_BIN=/usr/local/sbin/pkg</programlisting>
     </example>
 
     <example>
       <title>Sample <filename>make.conf.client</filename> for
 	<application>pkgng</application></title>
 
-      <screen>WITH_PKGNG=yes</screen>
+      <programlisting>WITH_PKGNG=yes</programlisting>
     </example>
 
     <example>
       <title>Sample <filename>src.conf.server</filename>
 	to test new <application>sort</application> codebase</title>
 
-      <screen>WITH_BSD_SORT=yes</screen>
+      <programlisting>WITH_BSD_SORT=yes</programlisting>
     </example>
   </sect1>
 
   <sect1 id="starting">
     <title>Starting the Build</title>
 
-    <para>Several separate builds for each architecture - branch combination
+    <para>Separate builds for various combinations of architecture and branch
       are supported.  All data private to a build (ports tree, src tree,
-      packages, distfiles, log files, bindist, Makefile, etc) are located under
-      <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable></filename>.
-      The last created build can be alternatively referenced under buildid
-      <literal>latest</literal>, the one before is called
+      packages, distfiles, log files, bindist, Makefile, etc) are located under the
+      <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable>/</filename>
+      directory.
+      The most recently created build can be alternatively referenced using buildid
+      <literal>latest</literal>, and the one before using
       <literal>previous</literal>.</para>
 
     <para>New builds are cloned from the <literal>latest</literal>, which is
@@ -425,7 +426,7 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
       <para>The symlinks go away, and you just use
         <command>dopackages.wrapper</command> directly.  For example:</para>
 
-    <screen><command>dopackages.wrapper <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> <literal>[-options]</literal></command></screen>
+    <screen>&prompt.root; <userinput>dopackages.wrapper <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> <literal>[-options]</literal></userinput></screen>
 
     </sect3>
 
@@ -443,7 +444,7 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
 	<para><literal>-keep</literal> - Do not delete this build in the
 	  future, when it would be normally deleted as part of the
 	  <literal>latest</literal> - <literal>previous</literal> cycle.
-	  Don't forget to clean it up manually when you no longer need it.
+	  Do not forget to clean it up manually when you no longer need it.
 	</para>
       </listitem>
 
@@ -451,8 +452,8 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
 	<para><literal>-nofinish</literal> - Do not perform
 	  post-processing once the build is complete.  Useful
 	  if you expect that the build will need to be restarted
-	  once it finishes.  If you use this option, don't forget to cleanup
-	  the clients when you don't need the build anymore.
+	  once it finishes.  If you use this option, do not forget to cleanup
+	  the clients when you do not need the build any more.
 	</para>
       </listitem>
 
@@ -519,7 +520,7 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
       <listitem>
 	<para><literal>-noduds</literal> - Do not rebuild the
 	  <filename>duds</filename> file (ports that are never
-	  built, e.g.  those marked <literal>IGNORE</literal>,
+	  built, e.g., those marked <literal>IGNORE</literal>,
 	  <literal>NO_PACKAGE</literal>, etc.) during
 	  preprocessing.
 	</para>
@@ -558,9 +559,9 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
       </listitem>
 
       <listitem>
-	<para><literal>-srccvs</literal> - Do not update the
+	<para><literal>-srcvcs</literal> - Do not update the
 	  <literal>src</literal> tree from the ZFS snapshot, update it with
-	  <literal>cvs update</literal> instead.
+	  a fresh checkout instead.
 	</para>
       </listitem>
 
@@ -572,9 +573,9 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
       </listitem>
 
       <listitem>
-	<para><literal>-portscvs</literal> - Do not update the
+	<para><literal>-portsvcs</literal> - Do not update the
 	  <literal>ports</literal> tree from the ZFS snapshot, update it with
-	  <literal>cvs update</literal> instead.
+	  a fresh checkout instead.
 	</para>
       </listitem>
 
@@ -600,7 +601,7 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
       <listitem>
 	<para><literal>-fetch-original</literal> - Fetch the
 	  distfile from the original <literal>MASTER_SITES</literal>
-	  rather than <hostid>ftp-master</hostid>.
+	  rather than any cache such as on <hostid>ftp-master</hostid>.
 	</para>
       </listitem>
 
@@ -628,9 +629,9 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
       <literal>-nocleanup</literal>, you need to clean up clients by running
     </para>
 
-    <para><command>build cleanup <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> -full</command></para>
+    <para>&prompt.user; <userinput>build cleanup <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> -full</userinput></para>
 
-    <para><filename>errors/</filename>,
+    <para>When a new build is created, the directories <filename>errors/</filename>,
       <filename>logs/</filename>, <filename>packages/</filename>, and so
       forth, are cleaned by the scripts.  If you are short of space,
       you can also clean out <filename>ports/distfiles/</filename>.
@@ -653,7 +654,7 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
 
     <note><para>The actual package build itself occurs in two
       identical phases.  The reason for this is that sometimes
-      transient problems (e.g. NFS failures, FTP sites being
+      transient problems (e.g., NFS failures, FTP sites being
       unreachable, etc.) may halt a build.  Doing things
       in two phases is a workaround for these types of
       problems.</para></note>
@@ -664,10 +665,10 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
       process encounters an empty subdirectory, both package build
       phases will stop short, and an error similar to the following
       will be written to
-      <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/make.[0|1]</filename>:
+      <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/journal</filename>:
     </para>
 
-    <screen><literal>don't know how to make dns-all(continuing)</literal></screen>
+    <programlisting><literal>don't know how to make dns-all(continuing)</literal></programlisting>
 
     <para>To correct this problem, simply comment out or remove
       the <literal>SUBDIR</literal> entries that point to empty
@@ -685,22 +686,22 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
     <example>
       <title>Update the i386-7 tree and do a complete build</title>
 
-      <para><command>dopackages.7 i386 -nosrc -norestr -nofinish</command></para>
-      <para><command>dopackages.wrapper i386 7 -nosrc -norestr -nofinish</command></para>
+      <screen>&prompt.user; <userinput>dopackages.7 i386 -nosrc -norestr -nofinish</userinput>
+&prompt.user; <userinput>dopackages.wrapper i386 7 -nosrc -norestr -nofinish</userinput></screen>
     </example>
 
     <example>
       <title>Restart an interrupted amd64-8 build without updating</title>
 
-      <para><command>dopackages.8 amd64 -nosrc -noports -norestr -continue -noindex -noduds -nofinish</command></para>
-      <para><command>dopackages.wrapper amd64 8 -nosrc -noports -norestr -continue -noindex -noduds -nofinish</command></para>
+      <screen>&prompt.user; <userinput>dopackages.8 amd64 -nosrc -noports -norestr -continue -noindex -noduds -nofinish</userinput>
+&prompt.user; <userinput>dopackages.wrapper amd64 8 -nosrc -noports -norestr -continue -noindex -noduds -nofinish</userinput></screen>
     </example>
 
     <example>
       <title>Post-process a completed sparc64-7 tree</title>
 
-      <para><command>dopackages.7 sparc64 -finish</command></para>
-      <para><command>dopackages.wrapper sparc64 7 -finish</command></para>
+      <screen>&prompt.user; <userinput>dopackages.7 sparc64 -finish</userinput>
+&prompt.user; <userinput>dopackages.wrapper sparc64 7 -finish</userinput></screen>
     </example>
 
     <para>Hint: it is usually best to run the <command>dopackages</command>
@@ -741,7 +742,7 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
 	  <para><literal>build srcupdate <replaceable>arch</replaceable>
 	    <replaceable>branch</replaceable>
 	    <replaceable>buildid</replaceable></literal> - Replaces the src
-	    tree with a new ZFS snapshot.  Don't forget to use
+	    tree with a new ZFS snapshot.  Do not forget to use
 	    <literal>-nosrc</literal> flag to <command>dopackages</command>
 	    later!
 	  </para>
@@ -751,7 +752,7 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
 	  <para><literal>build portsupdate <replaceable>arch</replaceable>
 	    <replaceable>branch</replaceable>
 	    <replaceable>buildid</replaceable></literal> - Replaces the ports
-	    tree with a new ZFS snapshot.  Don't forget to use
+	    tree with a new ZFS snapshot.  Do not forget to use
 	    <literal>-noports</literal> flag to <command>dopackages</command>
 	    later!
 	  </para>
@@ -767,7 +768,7 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
 	package set.  This can be accomplished with the following
 	invocation:</para>
 
-      <para><command><replaceable>path</replaceable>/qmanager/packagebuild <replaceable>amd64</replaceable> <replaceable>7-exp</replaceable> <replaceable>20080904212103</replaceable> <replaceable>aclock-0.2.3_2.tbz</replaceable></command></para>
+      <para>&prompt.root; <command><replaceable>path</replaceable>/qmanager/packagebuild <replaceable>amd64</replaceable> <replaceable>7-exp</replaceable> <replaceable>20080904212103</replaceable> <replaceable>aclock-0.2.3_2.tbz</replaceable></command></para>
     </sect2>
   </sect1>
 
@@ -846,9 +847,9 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
       <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/journal</filename> (new codebase).
       Individual ports will write
       their build logs to
-      <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/logs</filename>
+      <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/logs/</filename>
       and their error logs to
-      <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/errors</filename>.
+      <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/errors/</filename>.
     </para>
 
     <para>Formerly the docs tree was also checked out, however, it has
@@ -886,7 +887,7 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
       identify the tty in which it's running (either record the output
       of &man.tty.1; when you start the build, or use <command>ps x</command>
       to identify it.  You need to make sure that nothing else important
-      is running in this tty, e.g. <command>ps -t p1</command> or whatever.
+      is running in this tty, e.g., <command>ps -t p1</command> or whatever.
       If there is not, you can just kill off the whole term easily with
       <command>pkill -t pts/1</command>; otherwise issue a
       <command>kill -HUP</command> in there by, for example,
@@ -911,11 +912,11 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
     <title>Cleaning up a Build</title>
 
     <para>To free up resources, you will need to clean up client machines by
-      running <command>build cleanup</command> command.  For example:
-      <screen>&prompt.user; <userinput>/var/portbuild/scripts/build cleanup i386 8-exp 20080714120411 -full</userinput></screen></para>
+      running <command>build cleanup</command> command.  For example:</para>
+      <screen>&prompt.user; <userinput>/var/portbuild/scripts/build cleanup i386 8-exp 20080714120411 -full</userinput></screen>
 
     <para>If you forget to do this, then the old build
-      <literal>chroot</literal>s will not be cleaned up for 24 hours, and no
+      <literal>jail</literal>s will not be cleaned up for 24 hours, and no
       new jobs will be dispatched in their place since
       <hostid>pointyhat</hostid> thinks the job slot is still occupied.</para>
 
@@ -924,21 +925,21 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
       it thinks is running, and this should be roughly concordant
       with the load average.  <literal>loads</literal> is refreshed
       every 2 minutes.  If you do <command>ps x | grep pdispatch</command>
-      and it's less than the number of jobs that <literal>loads</literal>
-      thinks are in use, you're in trouble.</para>
+      and it is less than the number of jobs that <literal>loads</literal>
+      thinks are in use, you are in trouble.</para>
 
     <para>You may have problem with the <command>umount</command>
       commands hanging.  If so, you are going to have to use the
       <command>allgohans</command> script to run an &man.ssh.1;
-      command across all clients for that buildenv.  For example:
-<screen>ssh -l root gohan24 df</screen>
+      command across all clients for that buildenv.  For example:</para>
+<screen>&prompt.user; ssh gohan24 df</screen>
 
-      will get you a df, and
+    <para>will get you a df, and</para>
 
-<screen>allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports"
-allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/src"</screen>
+<screen>&prompt.user; allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports"
+&prompt.user; allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/src"</screen>
 
-      are supposed to get rid of the hanging mounts.  You will have to
+    <para>are supposed to get rid of the hanging mounts.  You will have to
       keep doing them since there can be multiple mounts.</para>
 
     <note>
@@ -949,8 +950,8 @@ umount: pointyhat.freebsd.org:/var/portb
 umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
 /x/tmp/8-exp/chroot/53837/compat/linux/proc: not a file system root directory</screen>
 
-      The former 2 mean that that client did not have those mounted;
-      the latter 2 are a bug.</para>
+      The former two mean that the client did not have those mounted;
+      the latter two are a bug.</para>
 
       <para>You may also see messages about <literal>procfs</literal>.</para>
     </note>
@@ -1006,8 +1007,8 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5
     <para>You can use <command>qclient</command> command to monitor the status
       of build nodes, and to list the currently scheduled jobs:</para>
 
-    <para><command>python <replaceable>path</replaceable>/qmanager/qclient jobs</command></para>
-    <para><command>python <replaceable>path</replaceable>/qmanager/qclient status</command></para>
+    <screen>&prompt.user; <command>python <replaceable>path</replaceable>/qmanager/qclient jobs</command>
+&prompt.user; <command>python <replaceable>path</replaceable>/qmanager/qclient status</command></screen>
 
     <para>The
       <command>scripts/stats <replaceable>${branch}</replaceable></command>

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

From owner-svn-doc-all@FreeBSD.ORG  Wed Dec 12 23:41:55 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id BF168893;
 Wed, 12 Dec 2012 23:41:55 +0000 (UTC)
 (envelope-from r.c.ladan@gmail.com)
Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com
 [209.85.212.174])
 by mx1.freebsd.org (Postfix) with ESMTP id B98EA8FC0A;
 Wed, 12 Dec 2012 23:41:54 +0000 (UTC)
Received: by mail-wi0-f174.google.com with SMTP id hm9so3552251wib.13
 for <multiple recipients>; Wed, 12 Dec 2012 15:41:54 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=message-id:date:from:user-agent:mime-version:to:cc:subject
 :references:in-reply-to:x-enigmail-version:content-type
 :content-transfer-encoding;
 bh=I/3rBJNaJyhYrkWna51BMNsqCoQnocai1cUDwI88VuQ=;
 b=jpKjl8H9vCwkVKY3Aghjp/dsmW2DX9tIp8/TwcttSpd3Ro/tN+cUd4VxIHBzePAUiX
 Vf2oe8x7xjrtBiXgv89RgdtVdMYjgN2xACCHjvGo5Vc5d47RnJodu1m1CzP66FzL2mX2
 dsI4oHBhol1FrUEqHOPSejLf3PRIcqUIfNLiTKqn8Ns7d3MCgqUBAjN515+0f2MJrSZ6
 hcZzNEfaGC+f6uGzQwmch+uK6CnSM7NmWFDOCev3iHyQxoLfyzHoLEUScMpNzzSNXNF1
 +kZ0vsyhitWMNSYVaIKibrrUCxVEQF7bamqLsicmTZML/WiTmmFG5c9O5HGWu7lpGEze
 9pMg==
Received: by 10.180.81.41 with SMTP id w9mr15654664wix.18.1355355713990;
 Wed, 12 Dec 2012 15:41:53 -0800 (PST)
Received: from ?IPv6:2001:980:d7ed:1:70fb:d2f:cada:643e?
 ([2001:980:d7ed:1:70fb:d2f:cada:643e])
 by mx.google.com with ESMTPS id i6sm5239746wix.5.2012.12.12.15.41.51
 (version=SSLv3 cipher=OTHER); Wed, 12 Dec 2012 15:41:52 -0800 (PST)
Message-ID: <50C9163D.8080207@gmail.com>
Date: Thu, 13 Dec 2012 00:41:49 +0100
From: =?UTF-8?B?UmVuw6kgTGFkYW4=?= <r.c.ladan@gmail.com>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:17.0) Gecko/17.0 Thunderbird/17.0
MIME-Version: 1.0
To: Eitan Adler <eadler@FreeBSD.org>
Subject: Re: svn commit: r40258 - in head/en_US.ISO8859-1/books: .
 corp-net-guide
References: <201212031627.qB3GRg7h072751@svn.freebsd.org>
In-Reply-To: <201212031627.qB3GRg7h072751@svn.freebsd.org>
X-Enigmail-Version: 1.4.6
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 23:41:56 -0000

On 03-12-2012 17:27, Eitan Adler wrote:
> Author: eadler
> Date: Mon Dec  3 16:27:42 2012
> New Revision: 40258
> URL: http://svnweb.freebsd.org/changeset/doc/40258
> 
> Log:
>   The corp-net-guide book is drastically out of date.
>   Topics that would be covered in a modern version are already
>   explained in the normal handbook.
>   
>   Discussed on:	-doc
>   Approved by:	bcr
> 
> Deleted:
>   head/en_US.ISO8859-1/books/corp-net-guide/
> Modified:
>   head/en_US.ISO8859-1/books/Makefile
>
Note that head/share/images/books/corp-net-guide still exists
(containing .eps files), should that be removed too?

René

From owner-svn-doc-all@FreeBSD.ORG  Thu Dec 13 00:17:09 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 70B7A45C
 for <svn-doc-all@freebsd.org>; Thu, 13 Dec 2012 00:17:09 +0000 (UTC)
 (envelope-from lists@eitanadler.com)
Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com
 [209.85.217.182])
 by mx1.freebsd.org (Postfix) with ESMTP id CF0158FC15
 for <svn-doc-all@freebsd.org>; Thu, 13 Dec 2012 00:17:08 +0000 (UTC)
Received: by mail-lb0-f182.google.com with SMTP id go10so1253422lbb.13
 for <svn-doc-all@freebsd.org>; Wed, 12 Dec 2012 16:17:07 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=eitanadler.com; s=0xdeadbeef;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type
 :content-transfer-encoding;
 bh=vsOu0vpDi1ql5uQyWwQPqJnkB0mUJgm8A0s6NW2AoBE=;
 b=aDY+z74+VWHbWWRKIKOKNXPaj4dh0+7tpnVsdvOcznCuW3QPHODUoESLD0fO+U3J8W
 U7HLaOxxcAnnYlmtl9q6Wwb+51xTBSKEnn9qFewMDTyF0UbFtyCGiyI+dYrAb0Q6fP2o
 M+7C0bkKRqhnGCCR/FAsmXOpr2jeOVu5ep9Yc=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type
 :content-transfer-encoding:x-gm-message-state;
 bh=vsOu0vpDi1ql5uQyWwQPqJnkB0mUJgm8A0s6NW2AoBE=;
 b=TbSyQQT4mdDEPowr7O443J1PhtfN/yQbgyl2VpttCqjV7Wwevh6YAfEahXVNzwHVdr
 g3v68nDrAEFAb9ljTSWOjXO4VQn27Zo/FBNqnvAveciBVHIcdSLtJyrCqaHTQ8suPjkr
 VhhFvDLZhhvbLuD6Hi931+z+ezTVdpCHGBEYKw1EwPPe223A+q3ArW6t/vMWJKdrkHbY
 Sjxc6MZMjKOkbJDDuCq2lMAaUUEbN2Ipl8yzUoXyNzvB2EETfSsl3d4xSu08N1X9Z+Qi
 kXc5XkVgWCnz4DJoqURQItjEf3yoFVApDRwoAg1l07ToXstXHEyqEaPNu3dfj6DYi4Bu
 dEDQ==
Received: by 10.152.148.40 with SMTP id tp8mr6519lab.30.1355357827709; Wed, 12
 Dec 2012 16:17:07 -0800 (PST)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.112.149.225 with HTTP; Wed, 12 Dec 2012 16:16:36 -0800 (PST)
In-Reply-To: <50C9163D.8080207@gmail.com>
References: <201212031627.qB3GRg7h072751@svn.freebsd.org>
 <50C9163D.8080207@gmail.com>
From: Eitan Adler <eadler@freebsd.org>
Date: Wed, 12 Dec 2012 19:16:36 -0500
X-Google-Sender-Auth: 1_bslaZWJGE2bfJ-Su5vHMQd1WY
Message-ID: <CAF6rxgkYELF63+CotHVnSF-qsM4Z_tY-z-WwbbfPx1WxROfL7g@mail.gmail.com>
Subject: Re: svn commit: r40258 - in head/en_US.ISO8859-1/books: .
 corp-net-guide
To: =?UTF-8?Q?Ren=C3=A9_Ladan?= <r.c.ladan@gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Gm-Message-State: ALoCoQn6vEZxBDFMBaCxbw3S6MsNzuqy1rLBzjrZ1Zfo+KnafhergcQN2iKM6WLBxPnXs/cFTwoi
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Dec 2012 00:17:09 -0000

On 12 December 2012 18:41, Ren=C3=A9 Ladan <r.c.ladan@gmail.com> wrote:
> On 03-12-2012 17:27, Eitan Adler wrote:
>> Author: eadler
>> Date: Mon Dec  3 16:27:42 2012
>> New Revision: 40258
>> URL: http://svnweb.freebsd.org/changeset/doc/40258
>>
>> Log:
>>   The corp-net-guide book is drastically out of date.
>>   Topics that would be covered in a modern version are already
>>   explained in the normal handbook.
>>
>>   Discussed on:       -doc
>>   Approved by:        bcr
>>
>> Deleted:
>>   head/en_US.ISO8859-1/books/corp-net-guide/
>> Modified:
>>   head/en_US.ISO8859-1/books/Makefile
>>
> Note that head/share/images/books/corp-net-guide still exists
> (containing .eps files), should that be removed too?

When all the translations are deleted, probably?


--=20
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams

From owner-svn-doc-all@FreeBSD.ORG  Thu Dec 13 02:14:17 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B3532F1B;
 Thu, 13 Dec 2012 02:14:17 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 971D58FC13;
 Thu, 13 Dec 2012 02:14:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBD2EHXE013232;
 Thu, 13 Dec 2012 02:14:17 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBD2EH4U013231;
 Thu, 13 Dec 2012 02:14:17 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212130214.qBD2EH4U013231@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 13 Dec 2012 02:14:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40373 - head/en_US.ISO8859-1/htdocs/layout/css
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Dec 2012 02:14:17 -0000

Author: gjb
Date: Thu Dec 13 02:14:17 2012
New Revision: 40373
URL: http://svnweb.freebsd.org/changeset/doc/40373

Log:
  Increase padding, in case page is viewed with smaller DPI.
  
  Submitted by:	bdrewery

Modified:
  head/en_US.ISO8859-1/htdocs/layout/css/layout.css

Modified: head/en_US.ISO8859-1/htdocs/layout/css/layout.css
==============================================================================
--- head/en_US.ISO8859-1/htdocs/layout/css/layout.css	Wed Dec 12 23:38:31 2012	(r40372)
+++ head/en_US.ISO8859-1/htdocs/layout/css/layout.css	Thu Dec 13 02:14:17 2012	(r40373)
@@ -437,7 +437,7 @@
   margin-top: 10px;
   padding: 0;
   /*padding-right: 30px;*/
-  width: 150px;
+  width: 180px;
   height: 25px;
   background-color: white;
   -moz-border-radius: 10px;

From owner-svn-doc-all@FreeBSD.ORG  Thu Dec 13 02:16:02 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 04E4FFAF;
 Thu, 13 Dec 2012 02:16:02 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DCCDC8FC08;
 Thu, 13 Dec 2012 02:16:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBD2G1ba013633;
 Thu, 13 Dec 2012 02:16:01 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBD2G1WY013632;
 Thu, 13 Dec 2012 02:16:01 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212130216.qBD2G1WY013632@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 13 Dec 2012 02:16:01 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40374 - head/en_US.ISO8859-1/htdocs/layout/css
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Dec 2012 02:16:02 -0000

Author: gjb
Date: Thu Dec 13 02:16:01 2012
New Revision: 40374
URL: http://svnweb.freebsd.org/changeset/doc/40374

Log:
  Remove a comment left in by accident.

Modified:
  head/en_US.ISO8859-1/htdocs/layout/css/layout.css

Modified: head/en_US.ISO8859-1/htdocs/layout/css/layout.css
==============================================================================
--- head/en_US.ISO8859-1/htdocs/layout/css/layout.css	Thu Dec 13 02:14:17 2012	(r40373)
+++ head/en_US.ISO8859-1/htdocs/layout/css/layout.css	Thu Dec 13 02:16:01 2012	(r40374)
@@ -436,7 +436,6 @@
 .frontdonateroundbox {
   margin-top: 10px;
   padding: 0;
-  /*padding-right: 30px;*/
   width: 180px;
   height: 25px;
   background-color: white;

From owner-svn-doc-all@FreeBSD.ORG  Thu Dec 13 09:38:24 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 4F98F604;
 Thu, 13 Dec 2012 09:38:24 +0000 (UTC)
 (envelope-from r.c.ladan@gmail.com)
Received: from mail-la0-f54.google.com (mail-la0-f54.google.com
 [209.85.215.54])
 by mx1.freebsd.org (Postfix) with ESMTP id E0CCC8FC18;
 Thu, 13 Dec 2012 09:38:22 +0000 (UTC)
Received: by mail-la0-f54.google.com with SMTP id j13so1538284lah.13
 for <multiple recipients>; Thu, 13 Dec 2012 01:38:21 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject
 :references:in-reply-to:x-enigmail-version:content-type
 :content-transfer-encoding;
 bh=56/9Y6pYXlRO7utSrsvwtm77Ecwd9bDU37YV+qavllU=;
 b=h2nm1Yk+iQquyuY4QICGeS/W8GRZF7CbPYhHLq7sZm9FxfVq9tz5f4HUKCOpGv+GjT
 Vn0K2yhP/La2YGND5wrK0L7iOEAzT7OsJnrk6caV+/i0i4TZn0NNUTFw5KX3+S/jDK7f
 /CyFha5Zvz+8jxW5waHubw5+nIgEfMKDmCYvXaiLv563ZQhGeKGH+8WcidFo0LapU6cY
 bZuGZQzn1NL8nUy3Y6rH/TfHCSRhibN2Lnd0vMvGNchscYfjM6fghqinqIsB4cwUVO5j
 5mA04WLdmAwb2LxvZ2nTojIhsMRX0wP+xyOX6xBNYfXVCwS+pFOYVpmQyIDA5VFjFaEt
 pRcA==
Received: by 10.152.124.226 with SMTP id ml2mr299017lab.46.1355391501578;
 Thu, 13 Dec 2012 01:38:21 -0800 (PST)
Received: from ?IPv6:2001:980:d7ed:1:70fb:d2f:cada:643e?
 ([2001:980:d7ed:1:70fb:d2f:cada:643e])
 by mx.google.com with ESMTPS id ml1sm362470lab.15.2012.12.13.01.38.18
 (version=SSLv3 cipher=OTHER); Thu, 13 Dec 2012 01:38:20 -0800 (PST)
Sender: =?UTF-8?Q?Ren=C3=A9_Ladan?= <r.c.ladan@gmail.com>
Message-ID: <50C9A208.2080408@freebsd.org>
Date: Thu, 13 Dec 2012 10:38:16 +0100
From: =?UTF-8?B?UmVuw6kgTGFkYW4=?= <rene@freebsd.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:17.0) Gecko/17.0 Thunderbird/17.0
MIME-Version: 1.0
To: Eitan Adler <eadler@freebsd.org>
Subject: Re: svn commit: r40258 - in head/en_US.ISO8859-1/books: .
 corp-net-guide
References: <201212031627.qB3GRg7h072751@svn.freebsd.org>
 <50C9163D.8080207@gmail.com>
 <CAF6rxgkYELF63+CotHVnSF-qsM4Z_tY-z-WwbbfPx1WxROfL7g@mail.gmail.com>
In-Reply-To: <CAF6rxgkYELF63+CotHVnSF-qsM4Z_tY-z-WwbbfPx1WxROfL7g@mail.gmail.com>
X-Enigmail-Version: 1.4.6
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Dec 2012 09:38:24 -0000

On 13-12-2012 01:16, Eitan Adler wrote:
> On 12 December 2012 18:41, René Ladan <r.c.ladan@gmail.com> wrote:
>> On 03-12-2012 17:27, Eitan Adler wrote:
>>> Author: eadler
>>> Date: Mon Dec  3 16:27:42 2012
>>> New Revision: 40258
>>> URL: http://svnweb.freebsd.org/changeset/doc/40258
>>>
>>> Log:
>>>   The corp-net-guide book is drastically out of date.
>>>   Topics that would be covered in a modern version are already
>>>   explained in the normal handbook.
>>>
>>>   Discussed on:       -doc
>>>   Approved by:        bcr
>>>
>>> Deleted:
>>>   head/en_US.ISO8859-1/books/corp-net-guide/
>>> Modified:
>>>   head/en_US.ISO8859-1/books/Makefile
>>>
>> Note that head/share/images/books/corp-net-guide still exists
>> (containing .eps files), should that be removed too?
> 
> When all the translations are deleted, probably?
> 
I just checked in my full head/ checkout and there are none.

René

From owner-svn-doc-all@FreeBSD.ORG  Thu Dec 13 10:47:10 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 92D1560C;
 Thu, 13 Dec 2012 10:47:10 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 761C98FC19;
 Thu, 13 Dec 2012 10:47:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBDAlAnm013024;
 Thu, 13 Dec 2012 10:47:10 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBDAlAnB013023;
 Thu, 13 Dec 2012 10:47:10 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212131047.qBDAlAnB013023@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 13 Dec 2012 10:47:10 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40375 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Dec 2012 10:47:10 -0000

Author: gjb
Date: Thu Dec 13 10:47:09 2012
New Revision: 40375
URL: http://svnweb.freebsd.org/changeset/doc/40375

Log:
  s/CVS/Subversion

Modified:
  head/share/xml/header.ent

Modified: head/share/xml/header.ent
==============================================================================
--- head/share/xml/header.ent	Thu Dec 13 02:16:01 2012	(r40374)
+++ head/share/xml/header.ent	Thu Dec 13 10:47:09 2012	(r40375)
@@ -194,4 +194,4 @@
 <!-- macro for webbuild paper -->
 <!ENTITY webbuild '
 <p xmlns="http://www.w3.org/1999/xhtml">This document describes how to build and update
-the FreeBSD Web pages from the CVS repository by hand.</p>'>
+the FreeBSD Web pages from the Subversion repository by hand.</p>'>

From owner-svn-doc-all@FreeBSD.ORG  Thu Dec 13 11:29:37 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 57DD2935;
 Thu, 13 Dec 2012 11:29:37 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3BB948FC0A;
 Thu, 13 Dec 2012 11:29:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBDBTbns020195;
 Thu, 13 Dec 2012 11:29:37 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBDBTaHS020192;
 Thu, 13 Dec 2012 11:29:36 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201212131129.qBDBTaHS020192@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Thu, 13 Dec 2012 11:29:36 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40376 - in head/ja_JP.eucJP: htdocs 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Dec 2012 11:29:37 -0000

Author: ryusuke
Date: Thu Dec 13 11:29:36 2012
New Revision: 40376
URL: http://svnweb.freebsd.org/changeset/doc/40376

Log:
  - Merge the following from the English version:
  
  	r40335 -> r40361	head/ja_JP.eucJP/htdocs/index.xsl
  	r40313 -> r40361	head/ja_JP.eucJP/share/xml/header.l10n.ent

Modified:
  head/ja_JP.eucJP/htdocs/index.xsl
  head/ja_JP.eucJP/share/xml/header.l10n.ent

Modified: head/ja_JP.eucJP/htdocs/index.xsl
==============================================================================
--- head/ja_JP.eucJP/htdocs/index.xsl	Thu Dec 13 10:47:09 2012	(r40375)
+++ head/ja_JP.eucJP/htdocs/index.xsl	Thu Dec 13 11:29:36 2012	(r40376)
@@ -5,7 +5,7 @@
 ]>
 
 <!-- $FreeBSD$ -->
-<!-- Original revision: r40335 -->
+<!-- Original revision: r40361 -->
 
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -63,7 +63,7 @@
 			</div> <!-- TXTFRONTFEATURELINK -->
 
 			<div
-			  style="width:550px; margin: 16px 16px 16px 32px; auto">
+			  style="width:640px; margin: 16px 16px 16px 32px; auto">
 
 			  <h1>Security Notice</h1>
 
@@ -187,14 +187,6 @@
 		      <div class="frontnewroundbox">
 			<div class="frontnewtop"><div>&#160;</div>&#160;</div>
 			<div class="frontnewcontent">
-			  <a href="http://www.FreeBSDFoundation.org/donate/">FreeBSD ¤Ø¤Î´óÉí</a>
-			</div> <!-- frontnewcontent -->
-			<div class="frontnewbot"><div><b style="display: none">.</b></div></div>
-		      </div> <!-- frontnewroundbox -->
-
-		      <div class="frontnewroundbox">
-			<div class="frontnewtop"><div><b style="display: none">.</b></div></div>
-			<div class="frontnewcontent">
 			  <a href="&base;/projects/newbies.html">FreeBSD ¤¬½é¤á¤Æ¤È¤¤¤¦Êý¤Ï¡¢¤³¤Á¤é¤Ø¤É¤¦¤¾</a>
 			</div> <!-- frontnewcontent -->
 			<div class="frontnewbot"><div>&#160;</div>&#160;</div>
@@ -332,4 +324,15 @@
 		</div> <!-- FRONTMAIN -->
 	      </div> <!-- FRONTCONTAINER -->
   </xsl:template>
+
+  <xsl:template name="process.footer">
+	&copyright;
+
+	The mark FreeBSD is a registered trademark of The FreeBSD
+	Foundation and is used by The FreeBSD Project with the
+	permission of <a
+	  href="http://www.freebsdfoundation.org/documents/Guidelines.shtml">The
+	FreeBSD Foundation</a>.
+	<a href="&base;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a>
+  </xsl:template>
 </xsl:stylesheet>

Modified: head/ja_JP.eucJP/share/xml/header.l10n.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/header.l10n.ent	Thu Dec 13 10:47:09 2012	(r40375)
+++ head/ja_JP.eucJP/share/xml/header.l10n.ent	Thu Dec 13 11:29:36 2012	(r40376)
@@ -5,7 +5,7 @@
 <!-- PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN" -->
 
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r40313 -->
+<!-- Original revision: r40361 -->
 
 <!ENTITY copyright '<span xmlns="http://www.w3.org/1999/xhtml"><a href="&base;/search/index-site.html">¥µ¥¤¥È¥Þ¥Ã¥×</a> |
   <a href="&base;/copyright/">ÃÎŪºâ»º¸¢¤Ë¤Ä¤¤¤Æ</a> | <!-- &copy; -->(C) 1995&ndash;2012 The FreeBSD Project.
@@ -16,6 +16,17 @@
 <!ENTITY header2.word.donate '´óÉÕ¡¦´ó£'>
 <!ENTITY header2.word.contact 'Ï¢ÍíÀè'>
 
+<!ENTITY header2.donatebutton '
+  <div xmlns="http://www.w3.org/1999/xhtml" class="frontdonateroundbox">
+    <div class="frontdonatetop"><div><b style="display: none;">.</b></div></div>
+      <div class="frontdonatecontent">
+	<a
+	  href="http://www.FreeBSDFoundation.org/donate/">FreeBSD ¤Ø¤Î´óÉÕ</a>
+      </div>
+    <div class="frontdonatebot"><div><b style="display: none;">.</b></div></div>
+  </div>
+'>
+
 <!ENTITY header2.topnav '
   <div xmlns="http://www.w3.org/1999/xhtml" id="menu">
     <ul class="first">
@@ -93,9 +104,9 @@
 <!ENTITY header2.searchnav '
       <div xmlns="http://www.w3.org/1999/xhtml" id="searchnav">
         <ul id="searchnavlist">
-          <li><a href="&enbase;/donations/" title="&header2.word.donate;">&header2.word.donate;</a></li>
+	<!--<li><a href="&enbase;/donations/" title="&header2.word.donate;">&header2.word.donate;</a></li>-->
 
-          <li class="last-child"><a href="&base;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a></li>
+	<!--<li class="last-child"><a href="&base;/mailto.html" title="&header2.word.contact;">&header2.word.contact;</a></li>-->
         </ul>
       </div> <!-- SEARCHNAV -->
 '>
@@ -103,5 +114,5 @@
 <!ENTITY lastmod 'ºÇ½ª¹¹¿·Æü: '>
 
 <!ENTITY webbuild '
-<p xmlns="http://www.w3.org/1999/xhtml">¤³¤Îʸ½ñ¤Ï¡¢FreeBSD Web ¥Ú¡¼¥¸¤ò¼êÆ°¤Ç CVS
+<p xmlns="http://www.w3.org/1999/xhtml">¤³¤Îʸ½ñ¤Ï¡¢FreeBSD Web ¥Ú¡¼¥¸¤ò¼êÆ°¤Ç Subversion
 ¥ê¥Ý¥¸¥È¥ê¤«¤é¹½ÃÛ¤·¤Æ¹¹¿·¤¹¤ëÊýË¡¤ò²òÀ⤷¤Æ¤¤¤Þ¤¹¡£</p>'>

From owner-svn-doc-all@FreeBSD.ORG  Thu Dec 13 12:04:49 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id EB68B6A4;
 Thu, 13 Dec 2012 12:04:49 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D085C8FC16;
 Thu, 13 Dec 2012 12:04:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBDC4n4B026856;
 Thu, 13 Dec 2012 12:04:49 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBDC4nFm026855;
 Thu, 13 Dec 2012 12:04:49 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201212131204.qBDC4nFm026855@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Thu, 13 Dec 2012 12:04:49 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40377 - head/nl_NL.ISO8859-1/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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Dec 2012 12:04:50 -0000

Author: rene
Date: Thu Dec 13 12:04:49 2012
New Revision: 40377
URL: http://svnweb.freebsd.org/changeset/doc/40377

Log:
  MFen r40361 -> r40375

Modified:
  head/nl_NL.ISO8859-1/share/xml/header.l10n.ent

Modified: head/nl_NL.ISO8859-1/share/xml/header.l10n.ent
==============================================================================
--- head/nl_NL.ISO8859-1/share/xml/header.l10n.ent	Thu Dec 13 11:29:36 2012	(r40376)
+++ head/nl_NL.ISO8859-1/share/xml/header.l10n.ent	Thu Dec 13 12:04:49 2012	(r40377)
@@ -2,7 +2,7 @@
 
 <!-- $FreeBSD$
      %SOURCE%	share/xml/header.ent
-     %SRCID%	40361
+     %SRCID%	40375
  -->
 
 <!-- FreeBSD HTML Header Entiteiten -->
@@ -120,4 +120,4 @@
 <!-- macro voor het webbuild artikel -->
 <!ENTITY webbuild '
 <p xmlns="http://www.w3.org/1999/xhtml">Dit document beschrijft hoe de &os; webpagina&qout;s met de hand vanuit
-   het CVS reservoir te bouwen en actueel te houden.</p>'>
+   het Subversion reservoir te bouwen en actueel te houden.</p>'>

From owner-svn-doc-all@FreeBSD.ORG  Thu Dec 13 13:07:13 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9F4EEBD2;
 Thu, 13 Dec 2012 13:07:13 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6B5B98FC14;
 Thu, 13 Dec 2012 13:07:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBDD7DDa038900;
 Thu, 13 Dec 2012 13:07:13 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBDD7D13038899;
 Thu, 13 Dec 2012 13:07:13 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212131307.qBDD7D13038899@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 13 Dec 2012 13:07:13 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40378 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Dec 2012 13:07:13 -0000

Author: eadler
Date: Thu Dec 13 13:07:12 2012
New Revision: 40378
URL: http://svnweb.freebsd.org/changeset/doc/40378

Log:
  Minor wording fixes for the recently committed ZFS section.
  
  Reviewed by:	bjk
  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	Thu Dec 13 12:04:49 2012	(r40377)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Thu Dec 13 13:07:12 2012	(r40378)
@@ -4833,7 +4833,8 @@ C:\="DOS"</programlisting>
 	      are bundled up into transaction groups
 	      and written to disk when filled (<quote>Transaction Group
 		Commit</quote>).  However syscalls like &man.fsync.2;
-	      require a commitment to stable storage before returning.
+	      require a commitment that the data is written to stable
+	      storage before returning.
 	      The ZIL is needed for writes that have been acknowledged
 	      as written but which are not yet on disk as part of a
 	      transaction.  The transaction groups are timestamped.
@@ -4893,10 +4894,10 @@ C:\="DOS"</programlisting>
 	      very heavily duplicated (such as virtual machine images,
 	      or user backups) it is possible that deduplication will
 	      do more harm than good.  Another consideration is the
-	      inability to revert deduplication status.  If
-	      deduplication is enabled, data written, and then dedup
-	      is disabled, those blocks which were deduplicated will
-	      not be duplicated until they are next modified.</para>
+	      inability to revert deduplication status.  If data is
+	      written when deduplication is enabled, disabling dedup
+	      will not cause those blocks which were deduplicated to
+	      be replicated until they are next modified.</para>
 
 	    <para>Deduplication can also lead to some unexpected
 	      situations.  In particular deleting files may become much

From owner-svn-doc-all@FreeBSD.ORG  Thu Dec 13 14:10:41 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D63CA950;
 Thu, 13 Dec 2012 14:10:41 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BB9168FC0C;
 Thu, 13 Dec 2012 14:10:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBDEAftH049315;
 Thu, 13 Dec 2012 14:10:41 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBDEAfgx049314;
 Thu, 13 Dec 2012 14:10:41 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212131410.qBDEAfgx049314@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 13 Dec 2012 14:10:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40379 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Dec 2012 14:10:41 -0000

Author: gjb
Date: Thu Dec 13 14:10:41 2012
New Revision: 40379
URL: http://svnweb.freebsd.org/changeset/doc/40379

Log:
  Add the latest Foundation blog post regarding donations to the
  Project.

Modified:
  head/share/xml/news.xml

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Thu Dec 13 13:07:12 2012	(r40378)
+++ head/share/xml/news.xml	Thu Dec 13 14:10:41 2012	(r40379)
@@ -34,6 +34,22 @@
 	<name>12</name>
 
       <day>
+	<name>12</name>
+
+	<event>
+	  <title>Stunning News Website Fundraising
+	    Contribution:&nbsp;Over
+	    650 new donations raise $43,200 in three days!</title>
+
+	  <p>Astute readers of our blog know that The
+	    &os;&nbsp;Foundation's annual year-end fundraising  drive
+	    began last week.  Every year over 50% of our donations
+	    arrive during this campaign.  <a
+		href="http://freebsdfoundation.blogspot.com/2012/12/stunning-news-website-fundraising.html">Read more...</a></p>
+	</event>
+      </day>
+
+      <day>
 	<name>10</name>
 
 	<event>

From owner-svn-doc-all@FreeBSD.ORG  Thu Dec 13 15:39:50 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5C86C854
 for <svn-doc-all@freebsd.org>; Thu, 13 Dec 2012 15:39:50 +0000 (UTC)
 (envelope-from lists@eitanadler.com)
Received: from mail-la0-f54.google.com (mail-la0-f54.google.com
 [209.85.215.54])
 by mx1.freebsd.org (Postfix) with ESMTP id C3B178FC16
 for <svn-doc-all@freebsd.org>; Thu, 13 Dec 2012 15:39:49 +0000 (UTC)
Received: by mail-la0-f54.google.com with SMTP id j13so1883965lah.13
 for <svn-doc-all@freebsd.org>; Thu, 13 Dec 2012 07:39:48 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=eitanadler.com; s=0xdeadbeef;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type
 :content-transfer-encoding;
 bh=UoQoggACO9o5GVCENsZEHCysiKTZkfOqUqhZ2Z0Snqk=;
 b=cKQnOVwd+yTdrROFnyBdM4OC8fwzbsRX0sgYPk6fKpTNv2TKXaINcFiZomME4tH6gn
 1QGBD+42T59RTzhg9NOr8URreJqcA9FoaTwtTPNqYt77ndcEEEcw4Q4xC5stafSkwZ56
 pDGju3N73FLBXwDfBfzBiBSKibJT9hdEmAf+8=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type
 :content-transfer-encoding:x-gm-message-state;
 bh=UoQoggACO9o5GVCENsZEHCysiKTZkfOqUqhZ2Z0Snqk=;
 b=m39y9H4dvsmBJDYBr9n6vbU6D9Ll0uFCZHQ80pSvcKzvrgiq5AYdLIcb8i37PIrUw2
 JpbwUwcFdAKBJ2DLfjzONdmVpnkGrQPPFnv14hKFygqLebVCfZcHyN4GOvG9Pl+P5/Nk
 03GkzxUdknFkRkuWr8QldW32zVqbkUyCbojaj2hZJ/wnqFrzfQr+iy5jpjWhqFYHN3Mb
 uEUIWDHKbwo6MUAphecRWXrOQpGJfn/VaOF+VpCbgANKVY9ty2/eEqJqwaPNZtj+P24X
 wTHbNb+ACSdlcivxDLkVitrSIPHKBQd378RMDQNeKiE2YptorD3Qkom7aZbL0gDcjTpK
 uLPw==
Received: by 10.152.108.42 with SMTP id hh10mr204670lab.4.1355413188589; Thu,
 13 Dec 2012 07:39:48 -0800 (PST)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.112.149.225 with HTTP; Thu, 13 Dec 2012 07:39:18 -0800 (PST)
In-Reply-To: <50C9A208.2080408@freebsd.org>
References: <201212031627.qB3GRg7h072751@svn.freebsd.org>
 <50C9163D.8080207@gmail.com>
 <CAF6rxgkYELF63+CotHVnSF-qsM4Z_tY-z-WwbbfPx1WxROfL7g@mail.gmail.com>
 <50C9A208.2080408@freebsd.org>
From: Eitan Adler <eadler@freebsd.org>
Date: Thu, 13 Dec 2012 10:39:18 -0500
X-Google-Sender-Auth: CmA-ULRNPPsD6w2S7qmVVMNP2HI
Message-ID: <CAF6rxgnmuBaXT5Etb13u5qDD936iZbTzgiAZz3qO8ZqyhL7e7g@mail.gmail.com>
Subject: Re: svn commit: r40258 - in head/en_US.ISO8859-1/books: .
 corp-net-guide
To: =?UTF-8?Q?Ren=C3=A9_Ladan?= <rene@freebsd.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-Gm-Message-State: ALoCoQkvH1wlpBJYyVpzrtjm3TNsRbZxivd3qLNaqJYQ49KaOoStHxeMMaxvZmXbhlAOkkr8xXT4
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Dec 2012 15:39:50 -0000

On 13 December 2012 04:38, Ren=C3=A9 Ladan <rene@freebsd.org> wrote:
> On 13-12-2012 01:16, Eitan Adler wrote:
>> On 12 December 2012 18:41, Ren=C3=A9 Ladan <r.c.ladan@gmail.com> wrote:
>>> On 03-12-2012 17:27, Eitan Adler wrote:
>>>> Author: eadler
>>>> Date: Mon Dec  3 16:27:42 2012
>>>> New Revision: 40258
>>>> URL: http://svnweb.freebsd.org/changeset/doc/40258
>>>>
>>>> Log:
>>>>   The corp-net-guide book is drastically out of date.
>>>>   Topics that would be covered in a modern version are already
>>>>   explained in the normal handbook.
>>>>
>>>>   Discussed on:       -doc
>>>>   Approved by:        bcr
>>>>
>>>> Deleted:
>>>>   head/en_US.ISO8859-1/books/corp-net-guide/
>>>> Modified:
>>>>   head/en_US.ISO8859-1/books/Makefile
>>>>
>>> Note that head/share/images/books/corp-net-guide still exists
>>> (containing .eps files), should that be removed too?
>>
>> When all the translations are deleted, probably?
>>
> I just checked in my full head/ checkout and there are none.

Okay. I'll remove it.




--=20
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams

From owner-svn-doc-all@FreeBSD.ORG  Thu Dec 13 16:15:09 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3D43C54C;
 Thu, 13 Dec 2012 16:15:09 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 03EFA8FC17;
 Thu, 13 Dec 2012 16:15:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBDGF86e069780;
 Thu, 13 Dec 2012 16:15:08 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBDGF88H069779;
 Thu, 13 Dec 2012 16:15:08 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212131615.qBDGF88H069779@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 13 Dec 2012 16:15:08 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40380 - head/share/images/books/corp-net-guide
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Dec 2012 16:15:09 -0000

Author: eadler
Date: Thu Dec 13 16:15:08 2012
New Revision: 40380
URL: http://svnweb.freebsd.org/changeset/doc/40380

Log:
  Now that the corp-net-guide has been removed, remove its images as well.
  
  Requested by:	rene
  Approved by:	bcr (mentor)

Deleted:
  head/share/images/books/corp-net-guide/

From owner-svn-doc-all@FreeBSD.ORG  Thu Dec 13 17:06:42 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 32B6653B;
 Thu, 13 Dec 2012 17:06:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 170EE8FC08;
 Thu, 13 Dec 2012 17:06:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBDH6fkp078631;
 Thu, 13 Dec 2012 17:06:41 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBDH6fGv078630;
 Thu, 13 Dec 2012 17:06:41 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212131706.qBDH6fGv078630@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 13 Dec 2012 17:06:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40381 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Dec 2012 17:06:42 -0000

Author: gjb
Date: Thu Dec 13 17:06:41 2012
New Revision: 40381
URL: http://svnweb.freebsd.org/changeset/doc/40381

Log:
  Attempt to resolve a CSS caching issue introduced with recent changes.
  
  Reported by:	eadler, brooks, rwatson, gibbs, many others I am
  		forgetting

Modified:
  head/share/xml/header.ent

Modified: head/share/xml/header.ent
==============================================================================
--- head/share/xml/header.ent	Thu Dec 13 16:15:08 2012	(r40380)
+++ head/share/xml/header.ent	Thu Dec 13 17:06:41 2012	(r40381)
@@ -17,7 +17,7 @@
 <!ENTITY author '<a href="&base;/index.html">home</a> &nbsp; | &nbsp; <a href="&base;/mailto.html">contact</a> &nbsp; | &nbsp; <a href="&base;/copyright/index.html">legal</a> &nbsp; | &nbsp; &copyright;'>
 <!ENTITY home '<a href="&base;/index.html"><img src"&enbase;/gifs/home.gif"
   alt="FreeBSD Home Page" border="0" align="right" width="101" height="33"></a>'>
-<!ENTITY stylesheet '&enbase;/layout/css/fixed.css?20060509'>
+<!ENTITY stylesheet '&enbase;/layout/css/fixed.css?20121213'>
 
 <!-- Standard headers and footers -->
 

From owner-svn-doc-all@FreeBSD.ORG  Thu Dec 13 22:12:47 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id DD9F8FC3;
 Thu, 13 Dec 2012 22:12:47 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C183F8FC16;
 Thu, 13 Dec 2012 22:12:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBDMClfD024583;
 Thu, 13 Dec 2012 22:12:47 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBDMClTk024582;
 Thu, 13 Dec 2012 22:12:47 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201212132212.qBDMClTk024582@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Thu, 13 Dec 2012 22:12:47 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40382 - head/nl_NL.ISO8859-1/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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Dec 2012 22:12:47 -0000

Author: rene
Date: Thu Dec 13 22:12:47 2012
New Revision: 40382
URL: http://svnweb.freebsd.org/changeset/doc/40382

Log:
  MFen r40375 -> r40381

Modified:
  head/nl_NL.ISO8859-1/share/xml/header.l10n.ent

Modified: head/nl_NL.ISO8859-1/share/xml/header.l10n.ent
==============================================================================
--- head/nl_NL.ISO8859-1/share/xml/header.l10n.ent	Thu Dec 13 17:06:41 2012	(r40381)
+++ head/nl_NL.ISO8859-1/share/xml/header.l10n.ent	Thu Dec 13 22:12:47 2012	(r40382)
@@ -2,7 +2,7 @@
 
 <!-- $FreeBSD$
      %SOURCE%	share/xml/header.ent
-     %SRCID%	40375
+     %SRCID%	40381
  -->
 
 <!-- FreeBSD HTML Header Entiteiten -->
@@ -23,7 +23,7 @@
 <!ENTITY date ''>
 <!ENTITY home '<a href="&base;/index.html"><img src"&enbase;/gifs/home.gif"
   alt="&os; homepage" border="0" align="right" width="101" height="33"></a>'>
-<!ENTITY stylesheet '&enbase;/layout/css/fixed.css?20060509'>
+<!ENTITY stylesheet '&enbase;/layout/css/fixed.css?20121213'>
 <!ENTITY stylesheetlarge '&enbase;/layout/css/fixed_large.css'>
 <!ENTITY nav ''>
 

From owner-svn-doc-all@FreeBSD.ORG  Fri Dec 14 11:34:08 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E607EB43;
 Fri, 14 Dec 2012 11:34:08 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C985D8FC08;
 Fri, 14 Dec 2012 11:34:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBEBY8LZ050985;
 Fri, 14 Dec 2012 11:34:08 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBEBY8Sr050984;
 Fri, 14 Dec 2012 11:34:08 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201212141134.qBEBY8Sr050984@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 14 Dec 2012 11:34:08 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40383 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Dec 2012 11:34:09 -0000

Author: ryusuke
Date: Fri Dec 14 11:34:08 2012
New Revision: 40383
URL: http://svnweb.freebsd.org/changeset/doc/40383

Log:
  - Merge the following from the English version:
  
  	r39727 -> r40082	head/ja_JP.eucJP/books/handbook/ports/chapter.sgml

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 Dec 13 22:12:47 2012	(r40382)
+++ head/ja_JP.eucJP/books/handbook/ports/chapter.xml	Fri Dec 14 11:34:08 2012	(r40383)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40082
+     Original revision: r40153
      $FreeBSD$
 -->
 
@@ -357,8 +357,9 @@ Port:   lsof-4.87.a,7
 Path:   /usr/ports/sysutils/lsof
 Info:   Lists information about open files (similar to fstat(1))</screen>
 
+
 	<para>¤â¤Ã¤È¾Ü¤·¤¯¸¡º÷¤¹¤ë¤Ë¤Ï¡¢
-	  <command>make <maketarget>search</maketarget>
+          <command>make <maketarget>search</maketarget>
 	  key=<replaceable>string</replaceable></command> ¤Þ¤¿¤Ï
 	  <command>make <maketarget>quicksearch</maketarget>
 	  key=<replaceable>string</replaceable></command>
@@ -633,6 +634,415 @@ docbook                     =
     </sect2>
   </sect1>
 
+  <sect1 id="pkgng-intro">
+    <title><application>pkgng</application> ¤Ë¤è¤ë¥Ð¥¤¥Ê¥ê
+      package ¤Î´ÉÍý</title>
+
+    <para><application>pkgng</application> ¤Ï¡¢ÅÁÅýŪ¤Ê &os; ¤Î
+      <application>pkg_install</application> package
+      ´ÉÍý¥Ä¡¼¥ë¤ÎÃÖ¤­´¹¤¨¤È¤Ê¤ë¤â¤Î¤Ç¤¢¤ê¡¢
+      ¥Ð¥¤¥Ê¥ê packages ¤ò¤è¤êÁ᤯¡¢
+      ¤è¤ê´Êñ¤Ë´ÉÍý¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¿ô¿¤¯¤Îµ¡Ç½¤òÄ󶡤·¤Þ¤¹¡£
+      <application>pkgng</application> ¤ÎºÇ½é¤Î¥ê¥ê¡¼¥¹¤Ï
+      2012 ǯ 8 ·î¤Ë¹Ô¤ï¤ì¤Þ¤·¤¿¡£</para>
+
+    <para><application>pkgng</application> ¤Ï <filename
+	role="package">ports-mgmt/portmaster</filename> ¤ä <filename
+	role="package">ports-mgmt/portupgrade</filename> ¤Ê¤É¤Î
+      port ´ÉÍý¥Ä¡¼¥ë¤ÎÃÖ¤­´¹¤¨¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+      <filename role="package">ports-mgmt/portmaster</filename> ¤ª¤è¤Ó
+      <filename role="package">ports-mgmt/portupgrade</filename> ¤Ï¡¢
+      ¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥½¥Õ¥È¥¦¥§¥¢¤ò¥Ð¥¤¥Ê¥ê packages ¤ª¤è¤Ó 
+      Ports Collection ¤ÎξÊý¤Î·Á¼°¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¤¬¡¢
+      <application>pkgng</application> ¤Ï¥Ð¥¤¥Ê¥ê packages ¤Î¤ß¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
+
+    <sect2 id="pkgng-initial-setup">
+      <title><application>pkgng</application> ÆþÌç</title>
+
+      <para>&os;&nbsp;9.1 °Ê¹ß¤Ç¤Ï¡¢
+	<application>pkgng</application> ¤Î¤¿¤á¤Î &quot;¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×&quot;
+	¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+	¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï <application>pkgng</application>
+	¤ò¥À¥¦¥ó¥í¡¼¥É¤·¡¢¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
+
+      <para>¥·¥¹¥Æ¥à¤ò¥Ö¡¼¥È¥¹¥È¥é¥Ã¥×¤¹¤ë¤¿¤á¤Ë¤Ï¡¢
+	°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <screen>&prompt.root; <userinput>/usr/sbin/pkg</userinput></screen>
+
+      <para>¤³¤ì¤è¤êÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤Î &os; ¤Ç¤Ï¡¢Ports Collection
+	¤Þ¤¿¤Ï packages ¤òÍѤ¤¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
+
+      <para><application>pkgng</application> port
+	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <screen>&prompt.root; <userinput>cd /usr/ports/ports-mgmt/pkg</userinput>
+&prompt.root; <userinput>make</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+      <para>package ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <screen>&prompt.root; <userinput>pkg_add -r pkg</userinput></screen>
+
+      <note>
+	<para><application>pkgng</application> package ´ÉÍý¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¡¢
+	  &os;&nbsp;7.<replaceable>X</replaceable> ¤ª¤è¤Ó
+	  &os;&nbsp;8.0 ¤Ë¤ÏÂбþ¤·¤Æ¤¤¤Þ¤»¤ó¡£</para>
+      </note>
+
+      <para>&os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤¬¤¹¤Ç¤Ë¹Ô¤ï¤ì¤Æ¤¤¤ë¤è¤¦¤Ê¥·¥¹¥Æ¥à¤Ç¤Ï¡¢
+	<application>pkg_install</application> package
+	¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Õ¥©¡¼¥Þ¥Ã¥È¤ØÊÑ´¹¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+	ÊÑ´¹¤ò¹Ô¤¦¤Ë¤Ï°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <screen>&prompt.root; <userinput>pkg2ng</userinput></screen>
+
+      <para>¤³¤Î¥¹¥Æ¥Ã¥×¤Ï¡¢
+	¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥½¥Õ¥È¥¦¥§¥¢¤¬¤Þ¤À¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ê¤¤¤è¤¦¤Ê¡¢
+	¿·¤·¤¯¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿Ä¾¸å¤Î¥·¥¹¥Æ¥à¤Ç¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£</para>
+
+      <important>
+	<para>¤³¤Î¥¹¥Æ¥Ã¥×¤ÏÈó²ÄµÕ¤Ç¤¹¡£
+	  °ìÅÙ package ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò <application>pkgng</application>
+	  ¥Õ¥©¡¼¥Þ¥Ã¥È¤Ø¤ÈÊÑ´¹¤·¤¿¤é¡¢<application>pkg_install</application>
+	  ¥Ä¡¼¥ë¤ò»È¤¦¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
+      </important>
+
+      <note>
+	<para>package ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÊÑ´¹¤Ç¤Ï¡¢
+	  ¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Ø¤Î¥Ç¡¼¥¿ÊÑ´¹¤Ëȼ¤¤¥¨¥é¡¼¤¬½ÐÎϤµ¤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
+	  Ä̾¤³¤ì¤é¤Î¥¨¥é¡¼¤Ï̵»ë¤·¤Æ¹½¤¤¤Þ¤»¤ó¤¬¡¢
+	  <command>pkg2ng</command> ½ªÎ»¸å¤Ëɽ¼¨¤µ¤ì¤ë¡¢
+	  ÊÑ´¹¤Ë¼ºÇÔ¤·¤¿¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥½¥Õ¥È¥¦¥§¥¢¤Î°ìÍ÷¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	  ¤³¤ì¤é¤Î¥½¥Õ¥È¥¦¥§¥¢¤ò¼êÆ°¤Ç½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
+      </note>
+
+      <para>&os; ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬
+	10.<replaceable>X</replaceable> ¤è¤êÁ°¤Ç¤¢¤ì¤Ð¡¢
+	°Ê²¼¤Î¹Ô¤ò <filename>/etc/make.conf</filename> ¤ËÄɲ䷤ơ¢
+	&os;&nbsp;Ports Collection ¤¬¥½¥Õ¥È¥¦¥§¥¢¤ÎÅÐÏ¿¤Ë¡¢
+	<application>pkg_install</application>
+	¤Ç¤Ï¤Ê¤¯ <application>pkgng</application>
+	¤òÍѤ¤¤ë¤è¤¦¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <programlisting>WITH_PKGNG=	yes</programlisting>
+    </sect2>
+
+    <sect2 id="pkgng-pkg-conf">
+      <title><application>pkgng</application> ´Ä¶­¤ÎÀßÄê</title>
+
+      <para><application>pkgng</application> package ´ÉÍý¥·¥¹¥Æ¥à¤Ç¤Ï¡¢
+	¤Û¤È¤ó¤É¤Î¥³¥Þ¥ó¥É¤ËÂФ·¤Æ¡¢package ¥ê¥Ý¥¸¥È¥ê¤ò»È¤¤¤Þ¤¹¡£
+	¥Ç¥Õ¥©¥ë¥È¤Î package ¥ê¥Ý¥¸¥È¥ê¤Ï
+	<filename>/usr/local/etc/pkg.conf</filename>¡¢¤Þ¤¿¤Ï
+	<envar>PACKAGESITE</envar> ´Ä¶­ÊÑ¿ô¤ÇÄêµÁ¤µ¤ì¤Þ¤¹¡£
+	¤³¤Î´Ä¶­ÊÑ¿ô¤Ï¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤·¤Þ¤¹¡£</para>
+
+      <para>¤½¤Î¾¤Î <application>pkgng</application>
+	¤ÎÀßÄꥪ¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	pkg.conf(5) ¤Ëµ­½Ò¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+    </sect2>
+
+    <sect2 id="pkgng-basic-usage">
+      <title>´ðËÜŪ¤Ê <application>pkgng</application> ¤ÎÁàºî</title>
+
+      <para><application>pkgng</application> ¤ÎÍøÍѾðÊó¤Ï¡¢
+	man.pkg(8) ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ä¡¢
+	<command>pkg</command> ¤ò°ú¿ô¤Ê¤·¤Ë¼Â¹Ô¤¹¤ë¤Èɽ¼¨¤µ¤ì¤Þ¤¹¡£</para>
+
+      <para>³Æ <application>pkgng</application> ¥³¥Þ¥ó¥É¤Î°ú¿ô¤Ï¡¢
+	¥³¥Þ¥ó¥É¤Ë¸ÇÍ­¤Ê¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ëµ­½Ò¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+	¤¿¤È¤¨¤Ð¡¢<command>pkg install</command> ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤òÆɤà¤Ë¤Ï¡¢
+	°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <screen>&prompt.root; <userinput>pkg help install</userinput></screen>
+
+      <screen>&prompt.root; <userinput>man pkg-install</userinput></screen>
+
+      <sect3 id="pkgng-pkg-info">
+	<title><application>pkgng</application> ¤ò»È¤Ã¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿
+	  package ¤Î¾ðÊó¤òÆÀ¤ë¤Ë¤Ï</title>
+
+	<para><command>pkg info</command> ¤ò¼Â¹Ô¤¹¤ë¤È¡¢
+	  ¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë package ¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£
+	  &man.pkg.info.1; ƱÍÍ¡¢¤¹¤Ù¤Æ¤Î package ¤Î¥Ð¡¼¥¸¥ç¥ó¡¢
+	  ¤ª¤è¤ÓÀâÌÀ¤Î°ìÍ÷¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£</para>
+
+	<para>¤¢¤ëÆÃÄê¤Î package ¤Î¾ðÊó¤¬É¬ÍפǤ¢¤ì¤Ð¡¢
+	  °Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+	<screen>&prompt.root; <userinput>pkg info <replaceable>packagename</replaceable></userinput></screen>
+
+	<para>¤¿¤È¤¨¤Ð¡¢¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë
+	  <application>pkgng</application> ¤Î¾ðÊó¤òÄ´¤Ù¤ë¤Ë¤Ï¡¢
+	  °Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+	<screen>&prompt.root; <userinput>pkg info pkg</userinput>
+pkg-1.0.2			New generation package manager</screen>
+      </sect3>
+
+      <sect3 id="pkgng-installing-deinstalling">
+	<title><application>pkgng</application>
+	  ¤òÍѤ¤¤¿ packages ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Èºï½ü</title>
+
+	<para>Ä̾¤Û¤È¤ó¤É¤Î &os; ¥æ¡¼¥¶¤Ï¡¢¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò
+	  <command>pkg install
+	    <replaceable>packagename</replaceable></command>
+	  ¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤Ç¤·¤ç¤¦¡£</para>
+
+	<screen>&prompt.root; <userinput>pkg install <replaceable>packagename</replaceable></userinput></screen>
+
+	<para><xref linkend="pkgng-pkg-conf"/> ¤ÇÀâÌÀ¤·¤¿Ä̤ꡢ
+	  <command>pkg install</command> ¤Ï¥ê¥Ý¥¸¥È¥ê¥Ç¡¼¥¿¤ò»ÈÍѤ·¤Þ¤¹¡£
+	  ¤³¤ì¤È¤ÏÈ¿ÂФˡ¢pkg-add(8) ¤Ç¤Ï¥ê¥Ý¥¸¥È¥ê¥Ç¡¼¥¿¤ÏÍѤ¤¤é¤ì¤Ê¤±¤ì¤Ð¡¢
+	  ÄêµÁ¤µ¤ì¤Æ¤¤¤ë <envar>PACKAGESITE</envar> ¤â»È¤ï¤ì¤Þ¤»¤ó¡£
+	  ¤½¤Î¤¿¤á¡¢°Í¸´Ø·¸¤ÏŬÀڤˤÏÄÉÀפµ¤ì¤º¡¢Â­¤ê¤Ê¤¤°Í¸¤Ë¤Ä¤¤¤Æ¤â¥ê¥â¡¼¥È¥Û¥¹¥È¤«¤é¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤³¤È¤â¤¢¤ê¤Þ¤»¤ó¡£
+	  ¤³¤ÎÀá¤Ç¤Ï¡¢<command>pkg install</command> ¤Î»ÈÍÑÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
+	  <command>pkg add</command> ¤Î»ÈÍÑÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï pkg-add(8)
+	  ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+
+	<para>ÄɲäΥХ¤¥Ê¥ê package ¤Ï¡¢
+	  <command>pkg install</command> ¤Ë¤è¤ê¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£
+	  ¤¿¤È¤¨¤Ð¡¢
+	  <application>curl</application> ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+	  <screen>&prompt.root; <userinput>pkg install curl</userinput>
+Updating repository catalogue
+Repository catalogue is up-to-date, no need to fetch fresh copy
+The following packages will be installed:
+
+	Installing ca_root_nss: 3.13.5
+	Installing curl: 7.24.0
+
+The installation will require 4 MB more space
+
+1 MB to be downloaded
+
+Proceed with installing packages [y/N]: <userinput>y</userinput>
+ca_root_nss-3.13.5.txz		100%	255KB 	255.1KB/s 255.1KB/s	00:00
+curl-7.24.0.txz			100%	1108KB	1.1MB/s	1.1MB/s		00:00
+Checking integrity... done
+Installing ca_root_nss-3.13.5... done
+Installing curl-7.24.0... done</screen>
+
+	<para>¿·¤·¤¤ package ¤È°Í¸´Ø·¸¤«¤éÄɲ䵤줿 package ¤Ï¡¢
+	  ¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß package °ìÍ÷¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£</para>
+
+	<screen>&prompt.root; <userinput>pkg info</userinput>
+ca_root_nss-3.13.5	The root certificate bundle from the Mozilla Project
+curl-7.24.0	Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers
+pkg-1.0.2	New generation package manager</screen>
+
+	<para>ɬÍפΤʤ¯¤Ê¤Ã¤¿ packages ¤Ï¡¢
+	  <command>pkg delete</command> ¤ò»È¤Ã¤Æºï½ü¤Ç¤­¤Þ¤¹¡£
+	  ¤¿¤È¤¨¤Ð¡¢<application>curl</application> ¤¬É¬Íפʤ¯¤Ê¤Ã¤¿¤é¡¢
+	  °Ê²¼¤Î¤è¤¦¤Ë¤·¤Æºï½ü¤Ç¤­¤Þ¤¹¡£</para>
+
+	<screen>&prompt.root; <userinput>pkg delete curl</userinput>
+The following packages will be deleted:
+
+	curl-7.24.0_1
+
+The deletion will free 3 MB
+
+Proceed with deleting packages [y/N]: <userinput>y</userinput>
+Deleting curl-7.24.0_1... done</screen>
+      </sect3>
+
+      <sect3 id="pkgng-upgrading">
+	<title><application>pkgng</application> ¤Ë¤è¤ë package
+	  ¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É</title>
+
+	<para><command>pkg version</command>
+	  ¤òÍѤ¤¤Æ¸Å¤¯¤Ê¤Ã¤¿ packages ¤ò¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+	  ¥í¡¼¥«¥ë¤Ë ports ¥Ä¥ê¡¼¤¬¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢
+	  pkg-version(8) ¤Ï¡¢¥ê¥â¡¼¥È¥ê¥Ý¥¸¥È¥ê¤Î¥«¥¿¥í¥°¤òÍøÍѤ·¤Þ¤¹¡£
+	  ¤½¤¦¤Ç¤Ê¤±¤ì¤Ð¡¢¥í¡¼¥«¥ë¤Î ports ¥Ä¥ê¡¼¤ò»È¤Ã¤Æ
+	  package ¤Î¥Ð¡¼¥¸¥ç¥ó¤òƱÄꤷ¤Þ¤¹¡£</para>
+
+	<para><application>pkgng</application> ¤òÍѤ¤¤Æ¡¢
+	  package ¤ò¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ç¤­¤Þ¤¹¡£
+	  <application>curl</application>
+	  ¤Î¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤¬¥ê¥ê¡¼¥¹¤µ¤ì¤¿¾ì¹ç¤Ë¡¢¥í¡¼¥«¥ë package
+	  ¤ò°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ç¤­¤Þ¤¹¡£</para>
+
+	<screen>&prompt.root; <userinput>pkg upgrade</userinput>
+Updating repository catalogue
+repo.txz		100%	297KB 296.5KB/s 296.5KB/s	00:00
+The following packages will be upgraded:
+
+	Upgrading curl: 7.24.0 -> 7.24.0_1
+
+1 MB to be downloaded
+
+Proceed with upgrading packages [y/N]: <userinput>y</userinput>
+curl-7.24.0_1.txz	100% 1108KB	1.1MB/s	1.1MB/s		00:00
+Checking integrity... done
+Upgrading curl from 7.24.0 to 7.24.0_1... done</screen>
+      </sect3>
+
+      <sect3 id="pkgng-auditing">
+	<title><application>pkgng</application> ¤Ë¤è¤ë package
+	  ¤Î¸¡¾Ú</title>
+
+	<para>»þÀÞ¡¢Ports Collection
+	  ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¥½¥Õ¥È¥¦¥§¥¢¤ËÀȼåÀ­¤¬¸«¤Ä¤«¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
+	  <application>pkgng</application> ¤Ï¡¢<filename
+	    role="package">ports-mgmt/portaudit</filename> package
+	  ƱÍͤθ¡¾Úµ¡Ç½¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
+	  ¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥½¥Õ¥È¥¦¥§¥¢¤ò¸¡¾Ú¤¹¤ë¤Ë¤Ï¡¢
+	  °Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+ 	<screen>&prompt.root; <userinput>pkg audit -F</userinput></screen>
+      </sect3>
+    </sect2>
+
+    <sect2 id="pkgng-advanced-usage">
+      <title>¹âÅÙ¤Ê <application>pkgng</application> ¤ÎÍøÍÑ</title>
+
+      <sect3 id="pkgng-autoremove">
+	<title> <application>pkgng</application> ¤Ë¤è¤ë¥ê¡¼¥Õ°Í¸ ports
+	¤Î¼«Æ°ºï½ü</title>
+
+	<para>package ¤òºï½ü¤¹¤ë¤È¡¢ÉÔɬÍפʰ͸ ports¡¢¤¿¤È¤¨¤Ð¾å¤ÎÎã¤Ç¤Ï
+	  <filename role="package">security/ca_root_nss</filename>
+	  ¤¬»Ä¤µ¤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
+	  ¤³¤ì¤é¤Î packages ¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¤Þ¤Þ¤Ç¡¢
+	  ¤É¤³¤«¤é¤â°Í¸¤µ¤ì¤Þ¤»¤ó¡£
+	  °Í¸¤Î¤¿¤á¤ËƳÆþ¤µ¤ì¡¢¸½ºß¤ÏÉÔɬÍפˤʤä¿ package ¤Ï¡¢
+	  °Ê²¼¤Î¤è¤¦¤Ë¤¹¤ë¤È¼«Æ°Åª¤Ë¸¡½Ð¤µ¤ì¡¢ºï½ü¤µ¤ì¤Þ¤¹¡£</para>
+
+	<screen>&prompt.root; <userinput>pkg autoremove</userinput>
+Packages to be autoremoved:
+	ca_root_nss-3.13.5
+
+The autoremoval will free 723 kB
+
+Proceed with autoremoval of packages [y/N]: <userinput>y</userinput>
+Deinstalling ca_root_nss-3.13.5... done</screen>
+      </sect3>
+
+      <sect3 id="pkgng-backup">
+	<title><application>pkgng</application> package
+	  ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×</title>
+
+	<para><application>pkg_install</application> 
+	  package ´ÉÍý¥·¥¹¥Æ¥à¤È¤Ï°Û¤Ê¤ê¡¢
+	  <application>pkgng</application> ¤Ë¤Ï package
+	  ¥Ç¡¼¥¿¥Ù¡¼¥¹¥Ð¥Ã¥¯¥¢¥Ã¥×¤Î¥á¥«¥Ë¥º¥à¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
+	  package ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÆâÍƤò¼êÆ°¤Ç¥Ð¥Ã¥¯¥¢¥Ã¥×¤¹¤ë¤Ë¤Ï¡¢
+	  °Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+	<screen>&prompt.root; <userinput>pkg backup -d <replaceable>pkgng.db</replaceable></userinput></screen>
+
+	<note>
+	  <para>¥Õ¥¡¥¤¥ë̾¤Î <replaceable>pkgng.db</replaceable>
+	    ¤òŬÀڤʥե¡¥¤¥ë̾¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
+	</note>
+
+	<para>¤µ¤é¤Ë¡¢<application>pkgng</application> ¤Ï
+	  package ¥Ç¡¼¥¿¥Ù¡¼¥¹¤òËèÆü¼«Æ°Åª¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤¹¤ë
+	  &man.periodic.8; ¥¹¥¯¥ê¥×¥È¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
+	  &man.periodic.conf.5; ¤ÎÃæ¤Ç¡¢
+	  <literal>daily_backup_pkgng_enable</literal> ¤ò
+	  <literal>YES</literal> ¤ËÀßÄꤹ¤ë¤È¥Ð¥Ã¥¯¥¢¥Ã¥×¤µ¤ì¤Þ¤¹¡£</para>
+
+	<tip>
+	  <para><application>pkg_install</application>
+	    ¤ÎÄê´üŪ¤Ê¥¹¥¯¥ê¥×¥È¤¬¡¢
+	    package ¥Ç¡¼¥¿¥Ù¡¼¥¹¤òƱÍͤ˥Х寥¢¥Ã¥×¤¹¤ë¤³¤È¤òÈò¤±¤ë¤¿¤á¤Ë¤Ï¡¢
+	    &man.periodic.conf.5; ¤ÎÃæ¤Ç¡¢
+	    <literal>daily_backup_pkgdb_enable</literal> ¤ò
+	    <literal>NO</literal> ¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
+	</tip>
+
+	<para>²áµî¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤·¤¿ package
+	  ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÃæ¿È¤ò¥ê¥¹¥È¥¢¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+	<screen>&prompt.root; <userinput>pkg backup -r <replaceable>/path/to/pkgng.db</replaceable></userinput></screen>
+      </sect3>
+
+      <sect3 id="pkgng-clean">
+	<title>¸Å¤¯¤Ê¤Ã¤¿ <application>pkgng</application> package
+	  ¤Îºï½ü</title>
+
+	<para>¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢<application>pkgng</application>
+	  ¤Ï¥­¥ã¥Ã¥·¥å¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥Ð¥¤¥Ê¥ê packages ¤òÊݸ¤·¤Þ¤¹¡£
+	  ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢pkg.conf(5) ¤Î
+	  <envar>PKG_CACHEDIR</envar> ÊÑ¿ô¤ÇÄêµÁ¤µ¤ì¤Þ¤¹¡£
+	  <command>pkg upgrade</command> ¤ò»È¤Ã¤Æ packages
+	  ¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ëºÝ¤Ë¤Ï¡¢
+	  ¥¢¥Ã¥×¥°¥ì¡¼¥É¤µ¤ì¤¿ package
+	  ¤Î¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Ï¼«Æ°Åª¤Ë¤Ïºï½ü¤µ¤ì¤Þ¤»¤ó¡£</para>
+
+	<para>¥·¥¹¥Æ¥à¤«¤é¸Å¤¤¥Ð¥¤¥Ê¥ê package ¤òºï½ü¤¹¤ë¤Ë¤Ï¡¢
+	  °Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+	<screen>&prompt.root; <userinput>pkg clean</userinput></screen>
+      </sect3>
+
+      <sect3 id="pkgng-set">
+	<title><application>pkgng</application> package
+	  ¥á¥¿¥Ç¡¼¥¿¤ÎÊѹ¹</title>
+
+	<para>Îò»ËŪ¤Ë &os;&nbsp;Ports Collection
+	  ¤Ï¡¢¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ÎÊѹ¹¤ËÂбþ¤Ç¤­¤Þ¤¹¡£
+	  <application>pkg_install</application> ¤È¤Ï°Û¤Ê¤ê¡¢
+	  <application>pkgng</application> ¤Ë¤Ï¡¢
+	  package ¤Î¾ðÊó¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¥³¥Þ¥ó¥É¤¬ÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
+	  ¤¿¤È¤¨¤Ð¡¢<filename
+	    role="package">lang/php5</filename> ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬¡¢¤â¤È¤â¤È¤Ï
+	  <literal>5.3</literal> ¤Ç¤·¤¿¤¬¡¢<literal>5.4</literal>
+	  ¤¬¥ê¥ê¡¼¥¹¤µ¤ì¤¿¤³¤È¤Ëȼ¤¤
+	  <filename role="package">lang/php53</filename>
+	  ¤Ø¤È̾Á°¤¬Êѹ¹¤µ¤ì¤ë¾ì¹ç¡¢
+	  <application>pkg_install</application> ¤Ç¤Ï¡¢
+	  package ¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¡¢
+	  ¤É¤Î port ¤¬¥¤¥ó¥¹¥È¡¼¥ë¸µ¤Ç¤¢¤Ã¤¿¤«¤È¤¤¤¦¾ðÊó¤òÊѹ¹¤¹¤ë¤¿¤á¤Ë
+	  <filename role="package">ports-mgmt/portmaster</filename>
+	  ¤Î¤è¤¦¤ÊÊ̤Υ½¥Õ¥È¥¦¥§¥¢¤òɬÍפȤ·¤Þ¤¹¡£</para>
+
+	<para><filename
+	    role="package">ports-mgmt/portmaster</filename> ¤ª¤è¤Ó
+	  <filename role="package">ports-mgmt/portupgrade</filename>
+	  ports ¤È¤Ï°Û¤Ê¤ê¡¢°ú¿ô¤ËÍ¿¤¨¤ë¥Ð¡¼¥¸¥ç¥ó¤Î¿·¡¢µì¤Î½çÈ֤ϰۤʤê¤Þ¤¹¡£
+	  <application>pkgng</application> ¤Ç¤Î¹½Ê¸¤Ï¡¢<command>pkg set -o
+	    <replaceable>category/oldport</replaceable>:<replaceable>category/newport</replaceable></command> ¤È¤Ê¤ê¤Þ¤¹¡£</para>
+
+	<para>¤¿¤È¤¨¤Ð¡¢¾åµ­¤ÎÎã¤Î package ¤Î¾ðÊó¤òÊѹ¹¤¹¤ë¤Ë¤Ï¡¢
+	  °Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+	<screen>&prompt.root; <userinput>pkg set -o lang/php5:lang/php53</userinput></screen>
+
+	<para>Ê̤ÎÎã¤È¤·¤Æ¡¢<filename
+	    role="package">lang/ruby18</filename> ¤ò <filename
+	    role="package">lang/ruby19</filename> ¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤Ë¤Ï¡¢
+	  °Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+	<screen>&prompt.root; <userinput>pkg set -o lang/ruby18:lang/ruby19</userinput></screen>
+
+	<para>ºÇ¸å¤ÎÎã¤È¤·¤Æ¡¢
+	  <filename>libglut</filename> ¶¦Í­¥é¥¤¥Ö¥é¥ê¤Î¾ðÊó¤ò <filename
+	    role="package">graphics/libglut</filename> ¤«¤é <filename
+	    role="package">graphics/freeglut</filename> ¤Ø¤ÈÊѹ¹¤¹¤ë¤Ë¤Ï¡¢
+	  °Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+	<screen>&prompt.root; <userinput>pkg set -o graphics/libglut:graphics/freeglut</userinput></screen>
+
+	<note>
+	  <para>package ¤Î¾ðÊó¤òÊѹ¹¤·¤¿¤é¡¢Â¿¤¯¤Î¾ì¹ç¡¢
+	    ¾ðÊó¤¬Êѹ¹¤µ¤ì¤¿ package ¤Ë°Í¸¤·¤Æ¤¤¤ë
+	    packages ¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬½ÅÍפȤʤê¤Þ¤¹¡£
+	    °Í¸ packages ¤òºÆ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
+	    °Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+	  <screen>&prompt.root; <userinput>pkg install -Rf <replaceable>graphics/freeglut</replaceable></userinput></screen>
+
+	</note>
+      </sect3>
+    </sect2>
+  </sect1>
+
   <sect1 id="ports-using">
     <title>Ports Collection ¤ÎÍøÍÑ</title>
 

From owner-svn-doc-all@FreeBSD.ORG  Sat Dec 15 07:24:40 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 099E5ED1;
 Sat, 15 Dec 2012 07:24:40 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E2CAC8FC0C;
 Sat, 15 Dec 2012 07:24:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBF7OdYh090054;
 Sat, 15 Dec 2012 07:24:39 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBF7Odgo090053;
 Sat, 15 Dec 2012 07:24:39 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201212150724.qBF7Odgo090053@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 15 Dec 2012 07:24:39 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40384 - head/ja_JP.eucJP/books/handbook/cutting-edge
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Dec 2012 07:24:40 -0000

Author: ryusuke
Date: Sat Dec 15 07:24:39 2012
New Revision: 40384
URL: http://svnweb.freebsd.org/changeset/doc/40384

Log:
  - Merge the following from the English version:
  
  	r39752 -> r40050	head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Fri Dec 14 11:34:08 2012	(r40383)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Sat Dec 15 07:24:39 2012	(r40384)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r39752
+     Original revision: r40050
      $FreeBSD$
 -->
 
@@ -68,6 +68,7 @@
 
       <listitem>
 	<para><application>freebsd-update</application>,
+	  <application>Subversion</application>,
 	  <application>CVSup</application>,
 	  <application>CVS</application> ¤â¤·¤¯¤Ï
 	  <application>CTM</application>
@@ -79,7 +80,7 @@
       </listitem>
 
       <listitem>
-	<para><application>CVSup</application>
+	<para><application>Subversion</application>
 	  ¤Þ¤¿¤Ï¥É¥­¥å¥á¥ó¥ÈÍѤΠports<!-- and
 	  <application>Docsnap</application>--> ¤ò»È¤Ã¤Æ¡¢
 	  ¥É¥­¥å¥á¥ó¥È¤òºÇ¿·¤Î¤â¤Î¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëÊýË¡¡£</para>
@@ -109,16 +110,10 @@
     <note>
       <para>¤³¤Î¾Ï¤òÄ̤¸¤Æ¡¢
 	&os; ¤Î¥½¡¼¥¹¥³¡¼¥É¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤¿¤ê¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤Î¤Ë
-	<command>cvsup</command> ¥³¥Þ¥ó¥É¤¬ÍѤ¤¤é¤ì¤Þ¤¹¡£
+	<command>svn</command> ¥³¥Þ¥ó¥É¤¬ÍѤ¤¤é¤ì¤Þ¤¹¡£
 	¤³¤Î¥³¥Þ¥ó¥É¤ò»È¤¦¤Ë¤Ï¡¢<filename
-	role="package">net/cvsup</filename> port ¤Þ¤¿¤Ï package
-	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹
-	(¥°¥é¥Õ¥£¥«¥ë¤Ê <command>cvsup</command>
-	¥¯¥é¥¤¥¢¥ó¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤¯¤Ê¤±¤ì¤Ð¡¢
-	<filename role="package">net/cvsup-without-gui</filename> port
-	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤)¡£
-	¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤ÎÃæ¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ë &man.csup.1;
-	¤ò¤«¤ï¤ê¤Ë»È¤Ã¤Æ¤âÎɤ¤¤Ç¤·¤ç¤¦¡£</para>
+	role="package">devel/subversion</filename> port ¤Þ¤¿¤Ï package
+	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para>
     </note>
   </sect1>
 
@@ -1404,11 +1399,14 @@ Fetching 133 new ports or files... done.
           </listitem>
 
           <listitem>
-	    <para>&os; <link linkend="mirrors">¥ß¥é¡¼¥µ¥¤¥È</link> ¤«
-	      ¤é¤Î¥½¡¼¥¹¤ÎÆþ¼ê¡£°Ê²¼¤Î 2 ¤Ä¤ÎÊýË¡¤Î¤¤¤º¤ì¤«¤Ç¤Ç¤­¤Þ¤¹¡£</para>
+	    <para>&os; <link linkend="mirrors">¥ß¥é¡¼¥µ¥¤¥È</link>
+	      ¤«¤é¤Î¥½¡¼¥¹¤ÎÆþ¼ê¡£°Ê²¼¤Î 3 ¤Ä¤ÎÊýË¡¤Î¤¤¤º¤ì¤«¤Ç¤Ç¤­¤Þ¤¹¡£</para>
 
             <orderedlist>
               <indexterm>
+		<primary><command>svn</command></primary>
+	      </indexterm>
+	      <indexterm>
                 <primary><command>cvsup</command></primary>
               </indexterm>
               <indexterm>
@@ -1420,20 +1418,35 @@ Fetching 133 new ports or files... done.
 	      </indexterm>
 
 	      <listitem>
+		<para><link linkend="svn">svn</link> ¥×¥í¥°¥é¥à¤ò»È¤Ã¤Æ¡¢
+		  ´õ˾¤¹¤ë³«È¯¥Ö¥é¥ó¥Á¡¢
+		  ¤â¤·¤¯¤Ï¥ê¥ê¡¼¥¹¥Ö¥é¥ó¥Á¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¤Æ¤¯¤À¤µ¤¤¡£
+		  ¤³¤ÎÊýË¡¤Ï¡¢³«È¯Ãæ¤Î &os; ¥ê¥Ý¥¸¥È¥ê¤Ø¤Î¥¢¥¯¥»¥¹¤òÄ󶡤·¤Æ¤ª¤ê¡¢
+		  ¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+		  <application>Subversion</application> ¤ò»È¤Ã¤Æ
+		  -CURRENT ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤¹¤ëºÝ¤Î
+		  URL ¤Î¥×¥ì¥Õ¥£¥Ã¥¯¥¹¤Ï¡¢
+		  <literal>http://svn.freebsd.org/base/head/</literal>
+		  ¤Ç¤¹¡£
+		  ¥ê¥Ý¥¸¥È¥ê¥µ¥¤¥º¤Î´ÑÅÀ¤«¤é¡¢
+		  ´õ˾¤¹¤ë¥µ¥Ö¥Ä¥ê¡¼¤Î¤ß¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤¹¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Þ¤¹¡£</para>
+	      </listitem>
+
+	      <listitem>
 		<para><link linkend="cvsup">cvsup</link> ¤ò
 		  <filename>/usr/share/examples/cvsup</filename> ¤Ë¤¢¤ë
 		  <filename>standard-supfile</filename> ¤È¤¤¤¦Ì¾¾Î¤Î
 		  <filename>supfile</filename> ¤È¹ç¤ï¤»¤Æ»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
-		  ¤³¤ì¤¬¤â¤Ã¤È¤â¿ä¾©¤µ¤ì¤ëÊýË¡¤Ç¤¹¡£
-                  ¤Ê¤¼¤Ê¤é¡¢<command>cvsup</command> ¤Ë¤è¤Ã¤Æ°ìÅÙÁ´ÂΤòÆþ¼ê¤·¡¢
-                  ¸å¤ÏÊѹ¹¤µ¤ì¤¿¤È¤³¤í¤À¤±¤òÆþ¼ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤«¤é¤Ç¤¹¡£
-		  ¿¤¯¤Î¿Í¤¬ <command>cvsup</command> ¤ò
-		  <command>cron</command> ¤«¤éµ¯Æ°¤·¤Æ¡¢¼«Æ°Åª¤Ë¥½¡¼¥¹¥³¡¼
-		  ¥É¤òºÇ¿·¤Î¤â¤Î¤ËÊݤäƤ¤¤Þ¤¹¡£
-		  ¾å¤Ëµó¤²¤¿¸«ËܤΠ<filename>supfile</filename> ¤ò¥«¥¹
-		  ¥¿¥Þ¥¤¥º¤¹¤ë¤È¤È¤â¤Ë¡¢¤¢¤Ê¤¿¤Î´Ä¶­¤Ë¹ç¤ï¤»¤Æ <link
+		  ¾å¤Ëµó¤²¤¿¸«ËܤΠ<filename>supfile</filename>
+		  ¤ò¥«¥¹¥¿¥Þ¥¤¥º¤¹¤ë¤È¤È¤â¤Ë¡¢¤¢¤Ê¤¿¤Î´Ä¶­¤Ë¹ç¤ï¤»¤Æ <link
 		  linkend="cvsup">cvsup</link> ¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
 
+		<warning>
+		  <para><command>cvsup</command> ¤Ï¡¢
+		  ¥×¥í¥¸¥§¥¯¥È¤Ë¤ª¤¤¤ÆÇѻߤµ¤ì¤¿¤Î¤Ç¡¢
+		  ¸½ºß¤Ç¤Ï¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£</para>
+		</warning>
+
 		<note>
 		  <para>¥µ¥ó¥×¥ë¥Õ¥¡¥¤¥ë¤Î <filename>standard-supfile</filename>
 		    ¤Ï¡¢&os; ¤ÎÆÃÄê¤Î¥»¥­¥å¥ê¥Æ¥£¥Ö¥é¥ó¥Á¤òÄɤ¤¤«¤±¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¢¤ê¡¢
@@ -1467,8 +1480,8 @@ Fetching 133 new ports or files... done.
                   ¤½¤Î¤¿¤á¡¢ºÇ¶á¤Ç¤Ï¤¢¤Þ¤ê»È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤Æ¤ª¤ê¡¢
                   Ť¤´Ö»ÈÍѤǤ­¤Ê¤¯¤Ê¤Ã¤Æ¤·¤Þ¤¦»öÂÖ¤¬È¯À¸¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹
                   (ÌõÃí: Êݼ餹¤ë¿Í¤¬¾¯¤Ê¤¤¤¿¤á¤Ç¤¹)¡£
-                  9600&nbsp;bps °Ê¾å¤Î®ÅÙ¤ÇÀܳ¤·¤Æ¤¤¤ë¤Ê¤é¡¢
-		  <application><link linkend="cvsup">CVSup</link></application>
+		  ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤ËÀܳ¤·¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤Ç¤¢¤ì¤Ð¡¢
+		  <application><link linkend="svn">Subversion</link></application>
                   ¤òÍøÍѤµ¤ì¤ë¤³¤È¤ò¿ä¾©¤·¤Þ¤¹¡£
                 </para>
               </listitem>
@@ -1596,8 +1609,8 @@ Fetching 133 new ports or files... done.
 
 	    <para>Äɤ¤¤«¤±¤Æ¤¤¤ë¥Ö¥é¥ó¥Á¤Ë´ØÏ¢¤¹¤ë <application>SVN</application>
 	      ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë»²²Ã¤·¤Æ¤¯¤À¤µ¤¤¡£
-	      ¤¿¤È¤¨¤Ð¡¢7-STABLE ¥Ö¥é¥ó¥Á¤òÄɤ¤¤«¤±¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
-	      &a.svn-src-stable-7.name; ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë»²²Ã¤·¤Æ¤¯¤À¤µ¤¤¡£
+	      ¤¿¤È¤¨¤Ð¡¢9-STABLE ¥Ö¥é¥ó¥Á¤òÄɤ¤¤«¤±¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
+	      &a.svn-src-stable-9.name; ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë»²²Ã¤·¤Æ¤¯¤À¤µ¤¤¡£
 	      Êѹ¹¤¬¤Ê¤µ¤ì¤ë¤´¤È¤ËºîÀ®¤µ¤ì¤ë commit log ¤ä¤½¤ì¤Ëȼ¤¦
 	      µ¯¤³¤ê¤¦¤ëÉûºîÍѤˤĤ¤¤Æ¤Î¾ðÊó¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
 
@@ -1620,12 +1633,14 @@ Fetching 133 new ports or files... done.
 
             <para>¤â¤·¡¢´û¤Ë &os; ¤Î°ÊÁ°¤Î¥ê¥ê¡¼¥¹¤¬Æ°¤¤¤Æ¤¤¤ë¾ì¹ç¤Ç¡¢
               ¤³¤ì¤ò¥½¡¼¥¹¤«¤é¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤è¤¦¤È¤¹¤ë¤Ê¤é¤Ð¡¢
-	      &os; <link linkend="mirrors">¥ß¥é¡¼¥µ¥¤¥È</link> ¤«¤é´Ê
-	      ñ¤Ë¹Ô¤¨¤Þ¤¹¡£¤³¤ì¤Ë¤Ï¼¡¤Î 2 ¤Ä¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£
+	      &os; <link linkend="mirrors">¥ß¥é¡¼¥µ¥¤¥È</link>
+	      ¤«¤é´Êñ¤Ë¹Ô¤¨¤Þ¤¹¡£¤³¤ì¤Ë¤Ï¼¡¤Î 3 ¤Ä¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£
             </para>
 
             <orderedlist>
-	      <listitem>
+	      <indexterm>
+		<primary><command>svn</command></primary>
+	      </indexterm>
 	      <indexterm>
 		<primary><command>cvsup</command></primary>
 	      </indexterm>
@@ -1634,22 +1649,44 @@ Fetching 133 new ports or files... done.
 	      </indexterm>
 	      <indexterm>
 	        <primary>-STABLE</primary>
-		<secondary><application>CVSup</application> ¤ò»È¤Ã¤¿Æ±´ü</secondary>
+		<secondary><application>Subversion</application>
+		  ¤ò»È¤Ã¤¿Æ±´ü</secondary>
 	      </indexterm>
+
+	      <listitem>
+		<para><link linkend="svn">svn</link> ¥×¥í¥°¥é¥à¤ò»È¤Ã¤Æ¡¢
+		  ´õ˾¤¹¤ë³«È¯¥Ö¥é¥ó¥Á¡¢
+		  ¤â¤·¤¯¤Ï¥ê¥ê¡¼¥¹¥Ö¥é¥ó¥Á¤ò¥Á¥§¥Ã¥¯¥¢¥¦¤·¤Æ¤¯¤À¤µ¤¤¡£
+		  ¤³¤ÎÊýË¡¤Ï¡¢³«È¯Ãæ¤Î &os; ¥ê¥Ý¥¸¥È¥ê¤Ø¤Î¥¢¥¯¥»¥¹¤òÄ󶡤·¤Æ¤ª¤ê¡¢
+		  ¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+		  ¥Ö¥é¥ó¥Á̾¤Ë¤Ä¤¤¤Æ¤Ï¡¢¸½ºß¤Î³«È¯¤Î¥Ø¥Ã¥É¥Ö¥é¥ó¥Á¤Ï
+		  <literal>head</literal>¡¢¤ª¤è¤Ó <ulink
+		  url="&url.base;/releng/"/> ¤ÎÆÃÄê¤Î¥Ö¥é¥ó¥Á¤Ç¤Ï
+                  <literal>stable/9</literal>¡¢¤Þ¤¿¤Ï
+                  <literal>stable/9.0</literal> ¤È¤Ê¤ê¤Þ¤¹¡£
+		  <application>Subversion</application>
+		  ¤ò»È¤Ã¤Æ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤¹¤ëºÝ¤Î
+		  URL ¤Î¥×¥ì¥Õ¥£¥Ã¥¯¥¹¤Ï¡¢
+		  <literal>http://svn.freebsd.org/base/</literal>
+		  ¤È¤Ê¤ê¤Þ¤¹¡£
+		  ¥ê¥Ý¥¸¥È¥ê¥µ¥¤¥º¤Î´ÑÅÀ¤«¤é¡¢
+		  ´õ˾¤¹¤ë¥µ¥Ö¥Ä¥ê¡¼¤Î¤ß¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤¹¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Þ¤¹¡£</para>
+	      </listitem>
+
+	      <listitem>
 		<para><link linkend="cvsup">cvsup</link> ¤ò
 		  <filename>/usr/share/examples/cvsup</filename> ¤Ë¤¢¤ë
 		  <filename>stable-supfile</filename> ¤È¤¤¤¦Ì¾¾Î¤Î
 		  <filename>supfile</filename> ¤È¹ç¤ï¤»¤Æ»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
-		  ¤³¤ì¤¬¤â¤Ã¤È¤â¿ä¾©¤µ¤ì¤ëÊýË¡¤Ç¤¹¡£
-		  ¤Ê¤¼¤Ê¤é¡¢<command>cvsup</command> ¤Ë¤è¤Ã¤Æ°ìÅÙÁ´ÂΤòÆþ¼ê¤·¡¢
-		  ¸å¤ÏÊѹ¹¤µ¤ì¤¿¤È¤³¤í¤À¤±¤òÆþ¼ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤«¤é¤Ç¤¹¡£
-		  ¿¤¯¤Î¿Í¤¬ <command>cvsup</command> ¤ò
-		  <command>cron</command> ¤«¤éµ¯Æ°¤·¤Æ¡¢¼«Æ°Åª¤Ë¥½¡¼¥¹¥³¡¼
-		  ¥É¤òºÇ¿·¤Î¤â¤Î¤ËÊݤäƤ¤¤Þ¤¹¡£
-		  ¾å¤Ëµó¤²¤¿¸«ËܤΠ<filename>supfile</filename> ¤ò¥«¥¹
-		  ¥¿¥Þ¥¤¥º¤¹¤ë¤È¤È¤â¤Ë¡¢¤¢¤Ê¤¿¤Î´Ä¶­¤Ë¹ç¤ï¤»¤Æ <link
-		  linkend="cvsup">cvsup</link> ¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ
-		  ¤¹¡£</para>
+		  ¾å¤Ëµó¤²¤¿¸«ËܤΠ<filename>supfile</filename>
+		  ¤ò¥«¥¹¥¿¥Þ¥¤¥º¤¹¤ë¤È¤È¤â¤Ë¡¢¤¢¤Ê¤¿¤Î´Ä¶­¤Ë¹ç¤ï¤»¤Æ <link
+		  linkend="cvsup">cvsup</link> ¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
+
+		<warning>
+		  <para><command>cvsup</command> ¤Ï¡¢
+		  ¥×¥í¥¸¥§¥¯¥È¤Ë¤ª¤¤¤ÆÇѻߤµ¤ì¤¿¤Î¤Ç¡¢
+		  ¸½ºß¤Ç¤Ï¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£</para>
+		</warning>
 	      </listitem>
 
 	      <listitem>
@@ -1706,7 +1743,8 @@ Fetching 133 new ports or files... done.
       ¤¢¤Ê¤¿¤Î¶½Ì£¤ÎÂоݤˤè¤Ã¤Æ &os;
       ¥×¥í¥¸¥§¥¯¥È¤Î¥½¡¼¥¹¤Î¤¢¤ë°ìÉôʬ¤Þ¤¿¤ÏÁ´ÂΤκǿ·¤ò
       Äɤ¤¤«¤±¤ëÊýË¡¤Ï¿§¡¹¤¢¤ê¤Þ¤¹¡£
-      »ä¤¿¤Á¤¬Ä󶡤·¤Æ¤¤¤ë´ðËÜŪ¤Ê¥µ¡¼¥Ó¥¹¤Ï  <link
+      »ä¤¿¤Á¤¬Ä󶡤·¤Æ¤¤¤ë´ðËÜŪ¤Ê¥µ¡¼¥Ó¥¹¤Ï <link
+	linkend="svn">Subversion</link>¡¢<link
 	linkend="anoncvs">Anonymous CVS</link>¡¢<link
 	linkend="cvsup">CVSup</link> ¤È <link linkend="ctm">CTM</link>
       ¤Ç¤¹:</para>
@@ -1729,28 +1767,25 @@ Fetching 133 new ports or files... done.
       <secondary>anonymous</secondary>
     </indexterm>
 
-    <para><application>Anonymous CVS</application> ¤È
+    <para><application>Subversion</application>,
+      <application>Anonymous CVS</application> ¤È
       <application>CVSup</application> ¤Ï <emphasis>pull</emphasis>
       Ʊ´ü¥â¥Ç¥ë¤òºÎÍѤ·¤Æ¤¤¤Þ¤¹¡£
-      <application>CVSup</application> ¤Î¾ì¹ç¡¢¥æ¡¼¥¶
-      (¤Þ¤¿¤Ï <command>cron</command> ¥¹¥¯¥ê¥×¥È) ¤¬ <command>cvsup</command>
-      ¤òµ¯Æ°¤·¡¢¤É¤³¤«¤Ë¤¢¤ë <command>cvsupd</command>
-      ¥µ¡¼¥Ð¤È¤ä¤ê¤È¤ê¤·¤Æ¥Õ¥¡¥¤¥ë¤ò
-      ºÇ¿·¾õÂ֤ˤ·¤Þ¤¹¡£
+      <application>Subversion</application> ¤Î¾ì¹ç¡¢¥æ¡¼¥¶
+      (¤Þ¤¿¤Ï <command>cron</command> ¥¹¥¯¥ê¥×¥È) ¤¬ <command>svn</command>
+      ¤òµ¯Æ°¤·¡¢¥Õ¥¡¥¤¥ë¤òºÇ¿·¾õÂ֤ˤ·¤Þ¤¹¡£
+      <application>Subversion</application> ¤Ï¡¢
+      ¥í¡¼¥«¥ë¤Î¥½¡¼¥¹¥Ä¥ê¡¼¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëºÇ¤â¹¥¤Þ¤·¤¤ÊýË¡¤Ç¤¹¡£
+      <command>cvsup</command> ¤ª¤è¤Ó <command>cvs</command> ¤âƱÍͤθ¶Íý¤ÇÆ°ºî¤·¤Þ¤¹¤¬¡¢
+      Subversion ¤Ø¤Î°Ü¹Ô¤Ëȼ¤¤Çѻߤµ¤ì¤Þ¤·¤¿¡£
       ÆϤ±¤é¤ì¤ë¹¹¿·¾ðÊó¤Ï¤½¤Î»þÅÀ¤ÎºÇ¿·¤Î¤â¤Î¤Ç¤¢¤ê¡¢
       ¤Þ¤¿É¬Íפʻþ¤Ë¤À¤±¼è¤ê´ó¤»¤é¤ì¤Þ¤¹¡£
-      ¶½Ì£¤Î¤¢¤ëÆÃÄê¤Î¥Õ¥¡¥¤¥ë¤ä¥Ç¥£¥ì¥¯¥È¥ê¤Ë
-      ¸ÂÄꤷ¤Æ¹¹¿·¤¹¤ë¤³¤È¤â´Êñ¤Ë¤Ç¤­¤Þ¤¹¡£
+      ¶½Ì£¤Î¤¢¤ëÆÃÄê¤Î¥Õ¥¡¥¤¥ë¤ä¥Ç¥£¥ì¥¯¥È¥ê¤Ë¸ÂÄꤷ¤Æ¹¹¿·¤¹¤ë¤³¤È¤â´Êñ¤Ë¤Ç¤­¤Þ¤¹¡£
       ¥¯¥é¥¤¥¢¥ó¥È¦¤Î¥½¡¼¥¹¥Ä¥ê¡¼¤Î¾õÂÖ¡¦
-      ÀßÄê¥Õ¥¡¥¤¥ë¤Î»ØÄê¤Ë½¾¤¤¡¢¥µ¡¼¥Ð¤Ë¤è¤Ã¤Æ¹¹¿·¾ðÊó¤¬
-      ÁÇÁ᤯À¸À®¤µ¤ì¤Þ¤¹¡£
-      <application>Anonymous CVS</application> ¤Ï¡¢
-      ¤³¤Î¥×¥í¥°¥é¥à¤¬¥ê¥â¡¼¥È¤Î CVS ¥ê¥Ý¥¸¥È¥ê¤«¤éľÀÜÊѹ¹ÅÀ¤ò
-      pull ¤Ç¤­¤ë¤è¤¦¤Ë¤·¤¿ &man.cvs.1; ¤Ø¤Î³ÈÄ¥¤Ç¤¢¤ë¤È¤¤¤¦ÅÀ¤Ç¡¢
-      <application>CVSup</application> ¤è¤ê¤â¤º¤Ã¤Èñ½ã¤Ç¤¹¡£
-      <application>CVSup</application>
-      ¤Ï¸úΨ¤ÎÅÀ¤Ç¤Ï¤ë¤«¤Ë¤Þ¤µ¤Ã¤Æ¤¤¤Þ¤¹¤¬¡¢
-      <application>Anonymous CVS</application> ¤ÎÊý¤¬´Êñ¤ËÍøÍѤǤ­¤Þ¤¹¡£
+      ÀßÄê¥Õ¥¡¥¤¥ë¤Î»ØÄê¤Ë½¾¤¤¡¢¥µ¡¼¥Ð¤Ë¤è¤Ã¤Æ¹¹¿·¾ðÊó¤¬ÁÇÁ᤯À¸À®¤µ¤ì¤Þ¤¹¡£
+      ËÜÅö¤Ë¤ä¤à¤òÆÀ¤Ê¤¤Íýͳ¤¬¤Ê¤¤¸Â¤ê¡¢Æ±´ü¥·¥¹¥Æ¥à¤È¤·¤Æ¡¢
+      <application>Subversion</application> ¤òÍѤ¤¤ë¤Ù¤­¤Ç¤¹¡£
+      ¾¤ÎƱ´ü¥á¥«¥Ë¥º¥à¤ÏÇѻߤµ¤ì¤Æ¤ª¤ê¡¢¾­ÍèÄä»ß¤¹¤ëͽÄê¤Ç¤¹¡£
     </para>
 
     <indexterm>

From owner-svn-doc-all@FreeBSD.ORG  Sat Dec 15 13:59:59 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 122BAF92;
 Sat, 15 Dec 2012 13:59:59 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D1FCC8FC0A;
 Sat, 15 Dec 2012 13:59:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBFDxwTS072576;
 Sat, 15 Dec 2012 13:59:58 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBFDxwZZ072575;
 Sat, 15 Dec 2012 13:59:58 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212151359.qBFDxwZZ072575@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 15 Dec 2012 13:59:58 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40385 - head/ja_JP.eucJP/books/handbook/cutting-edge
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Dec 2012 13:59:59 -0000

Author: gjb
Date: Sat Dec 15 13:59:58 2012
New Revision: 40385
URL: http://svnweb.freebsd.org/changeset/doc/40385

Log:
  Fix build (I hope).

Modified:
  head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Sat Dec 15 07:24:39 2012	(r40384)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Sat Dec 15 13:59:58 2012	(r40385)
@@ -1418,7 +1418,7 @@ Fetching 133 new ports or files... done.
 	      </indexterm>
 
 	      <listitem>
-		<para><link linkend="svn">svn</link> ¥×¥í¥°¥é¥à¤ò»È¤Ã¤Æ¡¢
+		<para><command>svn</command> ¥×¥í¥°¥é¥à¤ò»È¤Ã¤Æ¡¢
 		  ´õ˾¤¹¤ë³«È¯¥Ö¥é¥ó¥Á¡¢
 		  ¤â¤·¤¯¤Ï¥ê¥ê¡¼¥¹¥Ö¥é¥ó¥Á¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¤Æ¤¯¤À¤µ¤¤¡£
 		  ¤³¤ÎÊýË¡¤Ï¡¢³«È¯Ãæ¤Î &os; ¥ê¥Ý¥¸¥È¥ê¤Ø¤Î¥¢¥¯¥»¥¹¤òÄ󶡤·¤Æ¤ª¤ê¡¢
@@ -1481,7 +1481,7 @@ Fetching 133 new ports or files... done.
                   Ť¤´Ö»ÈÍѤǤ­¤Ê¤¯¤Ê¤Ã¤Æ¤·¤Þ¤¦»öÂÖ¤¬È¯À¸¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹
                   (ÌõÃí: Êݼ餹¤ë¿Í¤¬¾¯¤Ê¤¤¤¿¤á¤Ç¤¹)¡£
 		  ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤ËÀܳ¤·¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤Ç¤¢¤ì¤Ð¡¢
-		  <application><link linkend="svn">Subversion</link></application>
+		  <application>Subversion</application>
                   ¤òÍøÍѤµ¤ì¤ë¤³¤È¤ò¿ä¾©¤·¤Þ¤¹¡£
                 </para>
               </listitem>
@@ -1654,7 +1654,7 @@ Fetching 133 new ports or files... done.
 	      </indexterm>
 
 	      <listitem>
-		<para><link linkend="svn">svn</link> ¥×¥í¥°¥é¥à¤ò»È¤Ã¤Æ¡¢
+		<para><command>svn</command> ¥×¥í¥°¥é¥à¤ò»È¤Ã¤Æ¡¢
 		  ´õ˾¤¹¤ë³«È¯¥Ö¥é¥ó¥Á¡¢
 		  ¤â¤·¤¯¤Ï¥ê¥ê¡¼¥¹¥Ö¥é¥ó¥Á¤ò¥Á¥§¥Ã¥¯¥¢¥¦¤·¤Æ¤¯¤À¤µ¤¤¡£
 		  ¤³¤ÎÊýË¡¤Ï¡¢³«È¯Ãæ¤Î &os; ¥ê¥Ý¥¸¥È¥ê¤Ø¤Î¥¢¥¯¥»¥¹¤òÄ󶡤·¤Æ¤ª¤ê¡¢
@@ -1743,8 +1743,8 @@ Fetching 133 new ports or files... done.
       ¤¢¤Ê¤¿¤Î¶½Ì£¤ÎÂоݤˤè¤Ã¤Æ &os;
       ¥×¥í¥¸¥§¥¯¥È¤Î¥½¡¼¥¹¤Î¤¢¤ë°ìÉôʬ¤Þ¤¿¤ÏÁ´ÂΤκǿ·¤ò
       Äɤ¤¤«¤±¤ëÊýË¡¤Ï¿§¡¹¤¢¤ê¤Þ¤¹¡£
-      »ä¤¿¤Á¤¬Ä󶡤·¤Æ¤¤¤ë´ðËÜŪ¤Ê¥µ¡¼¥Ó¥¹¤Ï <link
-	linkend="svn">Subversion</link>¡¢<link
+      »ä¤¿¤Á¤¬Ä󶡤·¤Æ¤¤¤ë´ðËÜŪ¤Ê¥µ¡¼¥Ó¥¹¤Ï
+	<application>Subversion</application>¡¢<link
 	linkend="anoncvs">Anonymous CVS</link>¡¢<link
 	linkend="cvsup">CVSup</link> ¤È <link linkend="ctm">CTM</link>
       ¤Ç¤¹:</para>

From owner-svn-doc-all@FreeBSD.ORG  Sat Dec 15 15:31:58 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 61B4751D;
 Sat, 15 Dec 2012 15:31:58 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2DAD08FC0A;
 Sat, 15 Dec 2012 15:31:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBFFVwfM087737;
 Sat, 15 Dec 2012 15:31:58 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBFFVwF3087736;
 Sat, 15 Dec 2012 15:31:58 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212151531.qBFFVwF3087736@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 15 Dec 2012 15:31:58 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40386 - head/en_US.ISO8859-1/htdocs/snapshots
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Dec 2012 15:31:58 -0000

Author: gjb
Date: Sat Dec 15 15:31:57 2012
New Revision: 40386
URL: http://svnweb.freebsd.org/changeset/doc/40386

Log:
  Resurrect the snapshots page.
  
   - Uncomment and reword necessary parts of the paragraph
     providing information about where snapshots can be found.
  
   - While here, remove a stray comment.

Modified:
  head/en_US.ISO8859-1/htdocs/snapshots/index.xml

Modified: head/en_US.ISO8859-1/htdocs/snapshots/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/snapshots/index.xml	Sat Dec 15 13:59:58 2012	(r40385)
+++ head/en_US.ISO8859-1/htdocs/snapshots/index.xml	Sat Dec 15 15:31:57 2012	(r40386)
@@ -25,7 +25,6 @@
       These snapshots will be very similar to full releases,
       except that they might not include all the bits included in a
       full release (such as packages and updated documentation).</p>
--->
 
     <h2>Getting Snapshots</h2>
 
@@ -39,24 +38,18 @@
     <p>Please note that sometimes the snapshots available to download
       may be somewhat outdated.</p>
 
-<!--
     <p>Currently the snapshots of
       <a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#CURRENT">&rel.head.major;-CURRENT</a>,
       <a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#STABLE">&rel.current.major;-STABLE</a>,
       and
       <a href="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#STABLE">&rel2.current.major;-STABLE</a>,
-      are released monthly in directories whose URLs have the format
-      <tt>&url.snapshots;/&lt;year&gt;&lt;month&gt;/</tt>
-      where <tt>&lt;year&gt;</tt> is the four-digit year and
-      <tt>&lt;month&gt;</tt> is the two-digit month in which the snapshot was released.
+      are available in directories whose URLs have the format
+      <tt>&url.snapshots;/&lt;target&gt;/&lt;target_arch&gt;/</tt>
+      where <tt>&lt;target&gt;</tt> and <tt>&lt;target_arch&gt;</tt>
+      represent the architecture for which the snapshot was built.
       For each supported platform, the snapshot includes ISO images of
       the <tt>bootonly</tt>,
-      <tt>disc1</tt>, and <tt>disc2</tt> disks (plus
-      the separate <tt>livefs</tt> disk on platforms where this is
-      applicable).
-      Each snapshot directory might contain a <tt>RELNOTES.TXT</tt>
-      file which outlines the changes for the particular snapshot.</p>
--->
+      <tt>release</tt>, and <tt>memstick</tt> images.</p>
 
     <h2>Things You Might Want to Know</h2>
 

From owner-svn-doc-all@FreeBSD.ORG  Sat Dec 15 15:50:37 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 23EBD83A;
 Sat, 15 Dec 2012 15:50:37 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E35708FC0A;
 Sat, 15 Dec 2012 15:50:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBFFoajH090030;
 Sat, 15 Dec 2012 15:50:36 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBFFoaJU090028;
 Sat, 15 Dec 2012 15:50:36 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212151550.qBFFoaJU090028@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 15 Dec 2012 15:50:36 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40387 - in head/en_US.ISO8859-1:
 books/handbook/eresources 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Dec 2012 15:50:37 -0000

Author: gjb
Date: Sat Dec 15 15:50:36 2012
New Revision: 40387
URL: http://svnweb.freebsd.org/changeset/doc/40387

Log:
  Add -snapshots@ list.
  
  PR:		174454
  Submitted by:	David Wolfskill

Modified:
  head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
  head/en_US.ISO8859-1/share/xml/mailing-lists.ent

Modified: head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml	Sat Dec 15 15:31:57 2012	(r40386)
+++ head/en_US.ISO8859-1/books/handbook/eresources/chapter.xml	Sat Dec 15 15:50:36 2012	(r40387)
@@ -490,6 +490,11 @@
 	    </row>
 
 	    <row>
+	      <entry>&a.snapshots.name;</entry>
+	      <entry>&os; Development Snapshot Announcements</entry>
+	    </row>
+
+	    <row>
 	      <entry>&a.sparc.name;</entry>
 	      <entry>Porting FreeBSD to &sparc; based systems</entry>
 	    </row>
@@ -1660,6 +1665,19 @@
 	</varlistentry>
 
 	<varlistentry>
+	  <term>&a.snapshots.name;</term>
+
+	  <listitem>
+	    <para><emphasis>&os; Development Snapshot
+	      Announcements</emphasis></para>
+
+	    <para>This list will notify you about the availablity
+	      of new &os; development snapshots for the head/ and
+	      stable/ branches.</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
 	  <term>&a.stable.name;</term>
 
 	  <listitem>

Modified: head/en_US.ISO8859-1/share/xml/mailing-lists.ent
==============================================================================
--- head/en_US.ISO8859-1/share/xml/mailing-lists.ent	Sat Dec 15 15:31:57 2012	(r40386)
+++ head/en_US.ISO8859-1/share/xml/mailing-lists.ent	Sat Dec 15 15:50:36 2012	(r40387)
@@ -393,6 +393,10 @@
 <!ENTITY a.small "<ulink url='&a.small.url;'>FreeBSD-small mailing list</ulink>">
 <!ENTITY a.small.name "<ulink url='&a.small.url;'>freebsd-small</ulink>">
 
+<!ENTITY a.snapshots.url "&a.mailman.listinfo;/freebsd-snapshots">
+<!ENTITY a.snapshots "<ulink url='&a.snapshots.url;'>FreeBSD Development Snapshot Announcements</ulink>">
+<!ENTITY a.snapshots.name "<ulink url='&a.snapshots.url;'>freebsd-snapshots</ulink>">
+
 <!ENTITY a.sparc.url "&a.mailman.listinfo;/freebsd-sparc64">
 <!ENTITY a.sparc "<ulink url='&a.sparc.url;'>FreeBSD SPARC porting mailing list</ulink>">
 <!ENTITY a.sparc.name "<ulink url='&a.sparc.url;'>freebsd-sparc64</ulink>">

From owner-svn-doc-all@FreeBSD.ORG  Sat Dec 15 20:49:43 2012
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 033D4178;
 Sat, 15 Dec 2012 20:49:43 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DBBF98FC13;
 Sat, 15 Dec 2012 20:49:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBFKngRd033940;
 Sat, 15 Dec 2012 20:49:42 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBFKngtT033939;
 Sat, 15 Dec 2012 20:49:42 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212152049.qBFKngtT033939@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 15 Dec 2012 20:49:42 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40388 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Dec 2012 20:49:43 -0000

Author: gjb
Date: Sat Dec 15 20:49:42 2012
New Revision: 40388
URL: http://svnweb.freebsd.org/changeset/doc/40388

Log:
  Update FAQ entry for snapshot releases.

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	Sat Dec 15 15:50:36 2012	(r40387)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sat Dec 15 20:49:42 2012	(r40388)
@@ -390,7 +390,7 @@
 	    People that use &os.current; are expected to be able to
 	    analyze, debug, and report problems.</para>
 
-	  <para>Every month, <ulink
+	  <para>&os;<ulink
 	      url="&url.base;/snapshots/">snapshot</ulink>
 	    releases are made based on the current state of the
 	    <emphasis>-CURRENT</emphasis> and
@@ -435,11 +435,8 @@
 	  <para>Snapshot releases are directly available from <ulink
 	      url="&url.base;/snapshots/">snapshot</ulink>.</para>
 
-	  <para>Official snapshots are generated each month on a regular
-	    basis for all actively developed branches.  There are also
-	    daily snapshot builds of the popular &arch.i386; and
-	    &arch.amd64; branches, hosted on <ulink
-	      url="http://snapshots.us.freebsd.org/"></ulink>.</para>
+	  <para>Official snapshots are generated on a regular
+	    basis for all actively developed branches.</para>
 	</answer>
       </qandaentry>