From owner-svn-doc-all@FreeBSD.ORG  Sun Feb  2 18:06:40 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E1F46F65;
 Sun,  2 Feb 2014 18:06:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CAB3810B1;
 Sun,  2 Feb 2014 18:06:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s12I6ehq065558;
 Sun, 2 Feb 2014 18:06:40 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s12I6e4v065557;
 Sun, 2 Feb 2014 18:06:40 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201402021806.s12I6e4v065557@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Sun, 2 Feb 2014 18:06:40 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43727 - 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.17
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, 02 Feb 2014 18:06:41 -0000

Author: pluknet
Date: Sun Feb  2 18:06:40 2014
New Revision: 43727
URL: http://svnweb.freebsd.org/changeset/doc/43727

Log:
  Fix typo.

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 Feb  1 18:51:59 2014	(r43726)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Sun Feb  2 18:06:40 2014	(r43727)
@@ -5157,7 +5157,7 @@ PORTVERSION=	1.0</programlisting>
 	  tree from <varname>WRKSRC</varname> to a target directory
 	  under <varname>PREFIX</varname>.  Note that
 	  <varname>PREFIX</varname>, <varname>EXAMPLESDIR</varname>,
-	  <varname>DATADIR</varname>, and other path varialbes must
+	  <varname>DATADIR</varname>, and other path variables must
 	  always be prepended with <varname>STAGEDIR</varname> to
 	  respect staging (see <xref linkend="staging"/>).</para>
 

From owner-svn-doc-all@FreeBSD.ORG  Mon Feb  3 00:04:24 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E79404D8;
 Mon,  3 Feb 2014 00:04:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B991A13CC;
 Mon,  3 Feb 2014 00:04:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s1304O90019025;
 Mon, 3 Feb 2014 00:04:24 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s1304Ou6019024;
 Mon, 3 Feb 2014 00:04:24 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201402030004.s1304Ou6019024@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 3 Feb 2014 00:04:24 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43728 -
 head/en_US.ISO8859-1/books/fdp-primer/docbook-markup
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.17
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, 03 Feb 2014 00:04:25 -0000

Author: wblock
Date: Mon Feb  3 00:04:24 2014
New Revision: 43728
URL: http://svnweb.freebsd.org/changeset/doc/43728

Log:
  Add description of "username" class to systemitem, sort classes
  alphabetically.

Modified:
  head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml

Modified: head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml	Sun Feb  2 18:06:40 2014	(r43727)
+++ head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml	Mon Feb  3 00:04:24 2014	(r43728)
@@ -1655,24 +1655,23 @@ This is the file called 'foo2'</screen>
 
       <variablelist>
 	<varlistentry>
-	  <term><literal>class="systemname"</literal></term>
+	  <term><literal>class="domainname"</literal></term>
 
 	  <listitem>
-	    <para>With <literal>class="systemname"</literal>
-	      the marked up information is the simple hostname, such
-	      as <literal>freefall</literal> or
-	      <literal>wcarchive</literal>.</para>
+	    <para>The text is a domain name, such as
+	      <literal>FreeBSD.org</literal> or
+	      <literal>ngo.org.uk</literal>.  There is no hostname
+	      component.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term><literal>class="domainname"</literal></term>
+	  <term><literal>class="etheraddress"</literal></term>
 
 	  <listitem>
-	    <para>The text is a domain name, such as
-	      <literal>FreeBSD.org</literal> or
-	      <literal>ngo.org.uk</literal>.  There is no hostname
-	      component.</para>
+	    <para>The text is an Ethernet <acronym>MAC</acronym>
+	      address, expressed as a series of 2 digit hexadecimal
+	      numbers separated by colons.</para>
 	  </listitem>
 	</varlistentry>
 
@@ -1706,12 +1705,22 @@ This is the file called 'foo2'</screen>
 	</varlistentry>
 
 	<varlistentry>
-	  <term><literal>class="etheraddress"</literal></term>
+	  <term><literal>class="systemname"</literal></term>
 
 	  <listitem>
-	    <para>The text is an Ethernet <acronym>MAC</acronym>
-	      address, expressed as a series of 2 digit hexadecimal
-	      numbers separated by colons.</para>
+	    <para>With <literal>class="systemname"</literal>
+	      the marked up information is the simple hostname, such
+	      as <literal>freefall</literal> or
+	      <literal>wcarchive</literal>.</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term><literal>class="username"</literal></term>
+
+	  <listitem>
+	    <para>The text is a username, like
+	    <literal>root</literal>.</para>
 	  </listitem>
 	</varlistentry>
       </variablelist>

From owner-svn-doc-all@FreeBSD.ORG  Mon Feb  3 00:15:54 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 054EF5C8;
 Mon,  3 Feb 2014 00:15:54 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E531D14F3;
 Mon,  3 Feb 2014 00:15:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s130FrxZ023365;
 Mon, 3 Feb 2014 00:15:53 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s130FrjY023364;
 Mon, 3 Feb 2014 00:15:53 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201402030015.s130FrjY023364@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 3 Feb 2014 00:15:53 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43729 -
 head/en_US.ISO8859-1/books/fdp-primer/docbook-markup
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.17
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, 03 Feb 2014 00:15:54 -0000

Author: wblock
Date: Mon Feb  3 00:15:53 2014
New Revision: 43729
URL: http://svnweb.freebsd.org/changeset/doc/43729

Log:
  Correct systemitem class to from ipaddr to ipaddress.

Modified:
  head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml

Modified: head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml	Mon Feb  3 00:04:24 2014	(r43728)
+++ head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml	Mon Feb  3 00:15:53 2014	(r43729)
@@ -1685,7 +1685,7 @@ This is the file called 'foo2'</screen>
 	</varlistentry>
 
 	<varlistentry>
-	  <term><literal>class="ipaddr"</literal></term>
+	  <term><literal>class="ipaddress"</literal></term>
 
 	  <listitem>
 	    <para>The text is an <acronym>IP</acronym> address,

From owner-svn-doc-all@FreeBSD.ORG  Mon Feb  3 00:18:59 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A8A93D86;
 Mon,  3 Feb 2014 00:18:59 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 948DD15BC;
 Mon,  3 Feb 2014 00:18:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s130IxPD023716;
 Mon, 3 Feb 2014 00:18:59 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s130IxOm023715;
 Mon, 3 Feb 2014 00:18:59 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201402030018.s130IxOm023715@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 3 Feb 2014 00:18:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43730 -
 head/en_US.ISO8859-1/books/fdp-primer/docbook-markup
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.17
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, 03 Feb 2014 00:18:59 -0000

Author: wblock
Date: Mon Feb  3 00:18:59 2014
New Revision: 43730
URL: http://svnweb.freebsd.org/changeset/doc/43730

Log:
  Fix the literal example for <systemitem class="ipaddress">.

Modified:
  head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml

Modified: head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml	Mon Feb  3 00:15:53 2014	(r43729)
+++ head/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml	Mon Feb  3 00:18:59 2014	(r43730)
@@ -1732,7 +1732,7 @@ This is the file called 'foo2'</screen>
 
 	<programlisting><tag class="starttag">para</tag>The local machine can always be referred to by the
   name <tag class="starttag">systemitem class="systemname"</tag>localhost<tag class="endtag">systemitem</tag>, which will have the IP
-  address <tag class="starttag">systemitem class="ipaddr"</tag>127.0.0.1<tag class="endtag">systemitem</tag>.<tag class="endtag">para</tag>
+  address <tag class="starttag">systemitem class="ipaddress"</tag>127.0.0.1<tag class="endtag">systemitem</tag>.<tag class="endtag">para</tag>
 
 <tag class="starttag">para</tag>The <tag class="starttag">systemitem class="domainname"</tag>FreeBSD.org<tag class="endtag">systemitem</tag>
   domain contains a number of different hosts, including

From owner-svn-doc-all@FreeBSD.ORG  Mon Feb  3 03:39:03 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C5D247AE;
 Mon,  3 Feb 2014 03:39:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id AFBA31653;
 Mon,  3 Feb 2014 03:39:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s133d3Ir004073;
 Mon, 3 Feb 2014 03:39:03 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s133d3S2004072;
 Mon, 3 Feb 2014 03:39:03 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201402030339.s133d3S2004072@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 3 Feb 2014 03:39:03 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43731 -
 head/en_US.ISO8859-1/books/handbook/advanced-networking
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.17
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, 03 Feb 2014 03:39:03 -0000

Author: wblock
Date: Mon Feb  3 03:39:03 2014
New Revision: 43731
URL: http://svnweb.freebsd.org/changeset/doc/43731

Log:
  Restore <replaceable> tags in the wireless network section that were
  lost in the DocBook 5 conversion.

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

Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Mon Feb  3 00:18:59 2014	(r43730)
+++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Mon Feb  3 03:39:03 2014	(r43731)
@@ -1293,8 +1293,8 @@ wlan0: flags=8843&lt;UP,BROADCAST,RUNNIN
 	      after &man.wpa.supplicant.8; has authenticated the
 	      station:</para>
 
-	    <screen>&prompt.root; <userinput>ifconfig wlan0 inet 192.168.0.100 netmask 255.255.255.0</userinput>
-&prompt.root; <userinput>ifconfig wlan0</userinput>
+	    <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> inet <replaceable>192.168.0.100</replaceable> netmask <replaceable>255.255.255.0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
 wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
       ether 00:11:95:d5:43:62
       inet 192.168.0.100 netmask 0xffffff00 broadcast 192.168.0.255
@@ -1310,8 +1310,8 @@ wlan0: flags=8843&lt;UP,BROADCAST,RUNNIN
 	      default gateway and the nameserver also have to be
 	      manually set:</para>
 
-	    <screen>&prompt.root; <userinput>route add default your_default_router</userinput>
-&prompt.root; <userinput>echo "nameserver your_DNS_server" &gt;&gt; /etc/resolv.conf</userinput></screen>
+	    <screen>&prompt.root; <userinput>route add default <replaceable>your_default_router</replaceable></userinput>
+&prompt.root; <userinput>echo "nameserver <replaceable>your_DNS_server</replaceable>" &gt;&gt; /etc/resolv.conf</userinput></screen>
 	  </sect5>
 
 	  <sect5 xml:id="network-wireless-wpa-eap-tls">
@@ -1679,9 +1679,9 @@ wlan0: flags=8843&lt;UP,BROADCAST,RUNNIN
 	  <para><acronym>WEP</acronym> can be set up using
 	    &man.ifconfig.8;:</para>
 
-	  <screen>&prompt.root; <userinput>ifconfig wlan0 create wlandev ath0</userinput>
-&prompt.root; <userinput>ifconfig wlan0 inet 192.168.1.100 netmask 255.255.255.0 \
-	    ssid my_net wepmode on weptxkey 3 wepkey 3:0x3456789012</userinput></screen>
+	  <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> inet <replaceable>192.168.1.100</replaceable> netmask <replaceable>255.255.255.0</replaceable> \
+	    ssid <replaceable>my_net</replaceable> wepmode on weptxkey <replaceable>3</replaceable> wepkey <replaceable>3:0x3456789012</replaceable></userinput></screen>
 
 	  <itemizedlist>
 	    <listitem>
@@ -1729,7 +1729,7 @@ wlan0: flags=8843&lt;UP,BROADCAST,RUNNIN
 
 	  <para>Then:</para>
 
-	  <screen>&prompt.root; <userinput>wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf</userinput>
+	  <screen>&prompt.root; <userinput>wpa_supplicant -i <replaceable>wlan0</replaceable> -c /etc/wpa_supplicant.conf</userinput>
 Trying to associate with 00:13:46:49:41:76 (SSID='dlinkap' freq=2437 MHz)
 Associated with 00:13:46:49:41:76</screen>
 	</sect4>
@@ -1748,9 +1748,9 @@ Associated with 00:13:46:49:41:76</scree
 
       <para>On <systemitem>A</systemitem>:</para>
 
-      <screen>&prompt.root; <userinput>ifconfig wlan0 create wlandev ath0 wlanmode adhoc</userinput>
-&prompt.root; <userinput>ifconfig wlan0 inet 192.168.0.1 netmask 255.255.255.0 ssid freebsdap</userinput>
-&prompt.root; <userinput>ifconfig wlan0</userinput>
+      <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable> wlanmode adhoc</userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable> ssid <replaceable>freebsdap</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
   wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; metric 0 mtu 1500
 	  ether 00:11:95:c3:0d:ac
 	  inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255
@@ -1766,8 +1766,8 @@ Associated with 00:13:46:49:41:76</scree
       <para><systemitem>B</systemitem> should now be able to detect
 	<systemitem>A</systemitem>:</para>
 
-      <screen>&prompt.root; <userinput>ifconfig wlan0 create wlandev ath0 wlanmode adhoc</userinput>
-&prompt.root; <userinput>ifconfig wlan0 up scan</userinput>
+      <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable> wlanmode adhoc</userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> up scan</userinput>
   SSID/MESH ID    BSSID              CHAN RATE   S:N     INT CAPS
   freebsdap       02:11:95:c3:0d:ac    2   54M -64:-96  100 IS   WME</screen>
 
@@ -1776,8 +1776,8 @@ Associated with 00:13:46:49:41:76</scree
 	<systemitem>B</systemitem> with a different <acronym>IP</acronym>
 	address:</para>
 
-      <screen>&prompt.root; <userinput>ifconfig wlan0 inet 192.168.0.2 netmask 255.255.255.0 ssid freebsdap</userinput>
-&prompt.root; <userinput>ifconfig wlan0</userinput>
+      <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> inet <replaceable>192.168.0.2</replaceable> netmask <replaceable>255.255.255.0</replaceable> ssid <replaceable>freebsdap</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
   wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; metric 0 mtu 1500
 	  ether 00:11:95:d5:43:62
 	  inet 192.168.0.2 netmask 0xffffff00 broadcast 192.168.0.255
@@ -1821,8 +1821,8 @@ Associated with 00:13:46:49:41:76</scree
 	  the wireless device supports the host-based access point
 	  mode, also known as hostap mode:</para>
 
-	<screen>&prompt.root; <userinput>ifconfig wlan0 create wlandev ath0</userinput>
-&prompt.root; <userinput>ifconfig wlan0 list caps</userinput>
+	<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> list caps</userinput>
 drivercaps=6f85edc1&lt;STA,FF,TURBOP,IBSS,HOSTAP,AHDEMO,TXPMGT,SHSLOT,SHPREAMBLE,MONITOR,MBSS,WPA1,WPA2,BURST,WME,WDS,BGSCAN,TXFRAG&gt;
 cryptocaps=1f&lt;WEP,TKIP,AES,AES_CCM,TKIPMIC&gt;</screen>
 
@@ -1838,18 +1838,18 @@ cryptocaps=1f&lt;WEP,TKIP,AES,AES_CCM,TK
 	  during the creation of the network pseudo-device, so a
 	  previously created device must be destroyed first:</para>
 
-	<screen>&prompt.root; <userinput>ifconfig wlan0 destroy</userinput></screen>
+	<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> destroy</userinput></screen>
 
 	<para>then regenerated with the correct option before setting
 	  the other parameters:</para>
 
-	<screen>&prompt.root; <userinput>ifconfig wlan0 create wlandev ath0 wlanmode hostap</userinput>
-&prompt.root; <userinput>ifconfig wlan0 inet 192.168.0.1 netmask 255.255.255.0 ssid freebsdap mode 11g channel 1</userinput></screen>
+	<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable> wlanmode hostap</userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable> ssid <replaceable>freebsdap</replaceable> mode 11g channel 1</userinput></screen>
 
 	<para>Use &man.ifconfig.8; again to see the status of the
 	  <filename>wlan0</filename> interface:</para>
 
-	<screen>&prompt.root; <userinput>ifconfig wlan0</userinput>
+	<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
   wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; metric 0 mtu 1500
 	  ether 00:11:95:c3:0d:ac
 	  inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255
@@ -1886,16 +1886,16 @@ ifconfig_wlan0="inet <replaceable>192.16
 	  a scan from another wireless machine to find the
 	  <acronym>AP</acronym>:</para>
 
-	<screen>&prompt.root; <userinput>ifconfig wlan0 create wlandev ath0</userinput>
-&prompt.root; <userinput>ifconfig wlan0 up scan</userinput>
+	<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> up scan</userinput>
 SSID/MESH ID    BSSID              CHAN RATE   S:N     INT CAPS
 freebsdap       00:11:95:c3:0d:ac    1   54M -66:-96  100 ES   WME</screen>
 
 	<para>The client machine found the <acronym>AP</acronym> and
 	  can be associated with it:</para>
 
-	<screen>&prompt.root; <userinput>ifconfig wlan0 inet 192.168.0.2 netmask 255.255.255.0 ssid freebsdap</userinput>
-&prompt.root; <userinput>ifconfig wlan0</userinput>
+	<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> inet <replaceable>192.168.0.2</replaceable> netmask <replaceable>255.255.255.0</replaceable> ssid <replaceable>freebsdap</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
   wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; metric 0 mtu 1500
 	  ether 00:11:95:d5:43:62
 	  inet 192.168.0.2 netmask 0xffffff00 broadcast 192.168.0.255
@@ -2031,7 +2031,7 @@ wpa_pairwise=CCMP TKIP <co xml:id="co-ap
 
 	  <screen>&prompt.root; <userinput>service hostapd forcestart</userinput></screen>
 
-	  <screen>&prompt.root; <userinput>ifconfig wlan0</userinput>
+	  <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
   wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 2290
 	  inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255
 	  inet6 fe80::211:95ff:fec3:dac%ath0 prefixlen 64 scopeid 0x4
@@ -2065,9 +2065,9 @@ wpa_pairwise=CCMP TKIP <co xml:id="co-ap
 	  configured with the correct <acronym>SSID</acronym> and
 	  <acronym>IP</acronym> address:</para>
 
-	<screen>&prompt.root; <userinput>ifconfig wlan0 create wlandev ath0 wlanmode hostap</userinput>
-&prompt.root; <userinput>ifconfig wlan0 inet 192.168.0.1 netmask 255.255.255.0 \
-	ssid freebsdap wepmode on weptxkey 3 wepkey 3:0x3456789012 mode 11g</userinput></screen>
+	<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable> wlanmode hostap</userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> inet <replaceable>192.168.0.1</replaceable> netmask <replaceable>255.255.255.0</replaceable> \
+	ssid <replaceable>freebsdap</replaceable> wepmode on weptxkey <replaceable>3</replaceable> wepkey <replaceable>3:0x3456789012</replaceable> mode 11g</userinput></screen>
 
 	<itemizedlist>
 	  <listitem>
@@ -2092,7 +2092,7 @@ wpa_pairwise=CCMP TKIP <co xml:id="co-ap
 	<para>Use &man.ifconfig.8; to see the status of the
 	  <filename>wlan0</filename> interface:</para>
 
-	<screen>&prompt.root; <userinput>ifconfig wlan0</userinput>
+	<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
   wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; metric 0 mtu 1500
 	  ether 00:11:95:c3:0d:ac
 	  inet 192.168.0.1 netmask 0xffffff00 broadcast 192.168.0.255
@@ -2105,8 +2105,8 @@ wpa_pairwise=CCMP TKIP <co xml:id="co-ap
 	<para>From another wireless machine, it is now possible to
 	  initiate a scan to find the <acronym>AP</acronym>:</para>
 
-	<screen>&prompt.root; <userinput>ifconfig wlan0 create wlandev ath0</userinput>
-&prompt.root; <userinput>ifconfig wlan0 up scan</userinput>
+	<screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
+&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> up scan</userinput>
 SSID            BSSID              CHAN RATE  S:N   INT CAPS
 freebsdap       00:11:95:c3:0d:ac    1   54M 22:1   100 EPS</screen>
 
@@ -2181,7 +2181,7 @@ freebsdap       00:11:95:c3:0d:ac    1  
 	    scanning for access points and the 802.11 protocol
 	    handshakes required to arrange communication:</para>
 
-	  <screen>&prompt.root; <userinput>wlandebug -i ath0 +scan+auth+debug+assoc</userinput>
+	  <screen>&prompt.root; <userinput>wlandebug -i <replaceable>ath0</replaceable> +scan+auth+debug+assoc</userinput>
   net.wlan.0.debug: 0 =&gt; 0xc80000&lt;assoc,auth,scan&gt;</screen>
 
 	  <para>Many useful statistics are maintained by

From owner-svn-doc-all@FreeBSD.ORG  Mon Feb  3 15:30:15 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CE32B585;
 Mon,  3 Feb 2014 15:30:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B96501396;
 Mon,  3 Feb 2014 15:30:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s13FUFCV034901;
 Mon, 3 Feb 2014 15:30:15 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s13FUFD2034899;
 Mon, 3 Feb 2014 15:30:15 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201402031530.s13FUFD2034899@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 3 Feb 2014 15:30:15 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43733 - 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.17
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, 03 Feb 2014 15:30:15 -0000

Author: mat (ports committer)
Date: Mon Feb  3 15:30:15 2014
New Revision: 43733
URL: http://svnweb.freebsd.org/changeset/doc/43733

Log:
  Try and complete the missing USES that exist.
  
  Sponsored by:	Absolight

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/book.xml	Mon Feb  3 09:09:52 2014	(r43732)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Mon Feb  3 15:30:15 2014	(r43733)
@@ -5854,6 +5854,36 @@ IGNORE=	may not be redistributed because
 	  </tgroup>
 	</table>
 
+	<table frame="none">
+	  <title>Variables the Users can define for
+	    <command>cmake</command> builds</title>
+
+	  <tgroup cols="2">
+	    <thead>
+	      <row>
+		<entry>Variable</entry>
+		<entry>Means</entry>
+	      </row>
+	    </thead>
+
+	    <tbody>
+	      <row>
+		<entry><varname>CMAKE_VERBOSE</varname></entry>
+		<entry>Enable verbose build output.  Default not set,
+		  unless <varname>BATCH</varname> or
+		  <varname>PACKAGE_BUILDING</varname> are set.</entry>
+	      </row>
+
+	      <row>
+		<entry><varname>CMAKE_NOCOLOR</varname></entry>
+		<entry>Disables colour build output.  Default not set,
+		  unless <varname>BATCH</varname> or
+		  <varname>PACKAGE_BUILDING</varname> are set.</entry>
+	      </row>
+	    </tbody>
+	  </tgroup>
+	</table>
+
 	<para><application>CMake</application> supports the following
 	  build profiles: <literal>Debug</literal>,
 	  <literal>Release</literal>,

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses.xml	Mon Feb  3 09:09:52 2014	(r43732)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses.xml	Mon Feb  3 15:30:15 2014	(r43733)
@@ -57,11 +57,14 @@
 <row>
   <entry><literal>cmake</literal></entry>
 
-  <entry>(none), <literal>outsource</literal></entry>
+  <entry>(none), <literal>outsource</literal>,
+    <literal>run</literal></entry>
 
   <entry>Uses <application>CMake</application> for configuring and
     building.  With the <literal>outsource</literal> argument, an
-    out-of-source build will be performed.  For more information see
+    out-of-source build will be performed.  With the
+    <literal>run</literal> argument, a run-time dependency is
+    registered.  For more information see
     <xref linkend="using-cmake"/>.</entry>
 </row>
 
@@ -132,16 +135,6 @@
 </row>
 
 <row>
-  <entry><literal>desthack</literal></entry>
-
-  <entry>(none)</entry>
-
-  <entry>Changes the behavior of GNU configure to properly support
-    <varname>DESTDIR</varname> in case the original software does
-    not.</entry>
-</row>
-
-<row>
   <entry><literal>desktop-file-utils</literal></entry>
 
   <entry>(none)</entry>
@@ -156,9 +149,19 @@
 </row>
 
 <row>
+  <entry><literal>desthack</literal></entry>
+
+  <entry>(none)</entry>
+
+  <entry>Changes the behavior of GNU configure to properly support
+    <varname>DESTDIR</varname> in case the original software does
+    not.</entry>
+</row>
+
+<row>
   <entry><literal>display</literal></entry>
 
-  <entry>(none), <literal>ARGS</literal></entry>
+  <entry>(none), ARGS</entry>
 
   <entry>Set up a virtual display environment.  If the environment
     variable <varname>DISPLAY</varname> is not set, then
@@ -241,15 +244,15 @@
 <row>
   <entry><literal>gettext</literal></entry>
 
-  <entry>(none), <literal>lib</literal>, <literal>build</literal>,
-    <literal>run</literal></entry>
+  <entry>(none), <literal>lib</literal> (default),
+    <literal>build</literal>, <literal>run</literal></entry>
 
   <entry>Uses <package role="port">devel/gettext</package>.  By
     default, with no arguments or with the <literal>lib</literal>
-    argument, implies <command>gettext</command> with build-time and
-    run-time dependencies.  <literal>build</literal> implies a
-    build-time dependency, and <literal>run</literal> implies a
-    run-time dependency.</entry>
+    argument, implies a library dependency on
+    <filename>libintl.so</filename>.  <literal>build</literal> and
+    <literal>run</literal> implies, respectively a build-time and a
+    run-time dependency on <filename>xgettext</filename>.</entry>
 </row>
 
 <row>
@@ -258,7 +261,9 @@
   <entry>(none)</entry>
 
   <entry>Uses <package role="port">devel/gmake</package> as a
-    build-time dependency.</entry>
+    build-time dependency and sets up the environment to use
+    <command>gmake</command> as the default <command>make</command>
+    for the build.</entry>
 </row>
 
 <row>
@@ -283,10 +288,14 @@
 <row>
   <entry><literal>imake</literal></entry>
 
-  <entry>(none)</entry>
+  <entry>(none), <literal>env</literal>,
+    <literal>notall</literal></entry>
 
   <entry>Uses <package role="port">devel/imake</package> as
-    build-time dependency.</entry>
+    build-time dependency.  If the <literal>env</literal> argument is
+    given, only setup the environment and do not define any target.
+    If the <literal>notall</literal> argument is given does not pass
+    <literal>-a</literal> to <command>xmkmf</command>.</entry>
 </row>
 
 <row>
@@ -335,6 +344,15 @@
 </row>
 
 <row>
+  <entry><literal>libtool</literal></entry>
+
+  <entry>(none)</entry>
+
+  <entry>Patches <command>libtool</command> scripts.  This should be
+    added to all ports that use <command>libtool</command>.</entry>
+</row>
+
+<row>
   <entry><literal>lua</literal></entry>
 
   <entry>(none), <literal>XY+</literal>, <literal>XY</literal>,
@@ -353,11 +371,11 @@
 
   <entry>(none)</entry>
 
-  <entry>Uses <package role="port">devel/open-motif</package> as a
-    library dependency.  End users can set
+  <entry>Uses <package role="port">x11-toolkits/open-motif</package>
+    as a library dependency.  End users can set
     <varname>WANT_LESSTIF</varname> for the dependency to be on
-    <package role="port">devel/lesstif</package> instead of
-    <package role="port">devel/open-motif</package>.</entry>
+    <package role="port">x11-toolkits/lesstif</package> instead of
+    <package role="port">x11-toolkits/open-motif</package>.</entry>
 </row>
 
 <row>
@@ -456,10 +474,29 @@
 </row>
 
 <row>
+  <entry><literal>pgsql</literal></entry>
+
+  <entry>(none), <literal>X.Y</literal>, <literal>X.Y+</literal>,
+    <literal>X.Y-</literal></entry>
+
+  <entry>
+    <para>Provide support for PostgreSQL.  Maintainer can set version
+      required.  Minimum and maximum versions can be specified; e.g.,
+      9.0-, 8.4+.</para>
+
+    <para>Add PostgreSQL component dependency, using
+      <literal>WANT_PGSQL=component[:target]</literal>.  e.g.,
+      <literal>WANT_PGSQL=server:configure pltcl plperl</literal> For
+      the full list use <command>make -V
+	_USE_PGSQL_DEP</command>.</para>
+  </entry>
+</row>
+
+<row>
   <entry><literal>pkgconfig</literal></entry>
 
-  <entry>(none), <literal>build</literal>, <literal>run</literal>,
-    <literal>both</literal></entry>
+  <entry>(none), <literal>build</literal> (default),
+    <literal>run</literal>, <literal>both</literal></entry>
 
   <entry>Uses <package role="port">devel/pkgconf</package>.  With no
     arguments or with the <literal>build</literal> argument, it
@@ -499,7 +536,8 @@
 <row>
   <entry><literal>qmake</literal></entry>
 
-  <entry>(none), <literal>norecursive</literal></entry>
+  <entry>(none), <literal>norecursive</literal>,
+    <literal>outsource</literal></entry>
 
   <entry>Uses <application>QMake</application> for configuring.  For
     more information see <xref linkend="using-qmake"/>.</entry>
@@ -508,11 +546,22 @@
 <row>
   <entry><literal>readline</literal></entry>
 
-  <entry>(none), port</entry>
+  <entry>(none), <literal>port</literal></entry>
 
   <entry>Uses <application>readline</application> as library
     dependency, and sets <varname>CPPFLAGS</varname> and
-    <varname>LDFLAGS</varname> as necessary.</entry>
+    <varname>LDFLAGS</varname> as necessary.  If the
+    <literal>port</literal> argument is used, force the use of
+    <package role="port">devel/readline</package></entry>
+</row>
+
+<row>
+  <entry><literal>scons</literal></entry>
+
+  <entry>(none)</entry>
+
+  <entry>Provide support for the use of
+    <package role="port">devel/scons</package></entry>
 </row>
 
 <row>
@@ -662,6 +711,39 @@
 </row>
 
 <row>
+  <entry><literal>uniquefiles</literal></entry>
+
+  <entry>(none), <literal>dirs</literal></entry>
+
+  <entry>
+    Make files or directories 'unique', by adding a prefix or suffix.
+    If the <literal>dirs</literal> argument is used, the port needs a
+    prefix (a only a prefix) based on <varname>UNIQUE_PREFIX</varname>
+    for standard directories <varname>DOCSDIR</varname>,
+    <varname>EXAMPLESDIR</varname>, <varname>DATADIR</varname>,
+    <varname>WWWDIR</varname>, <varname>ETCDIR</varname>.  The
+    following variables are available for ports:
+    <itemizedlist>
+      <listitem><para><varname>UNIQUE_PREFIX</varname>: The prefix to
+	be used for directories and files.  Default:
+	<varname>${PKGNAMEPREFIX}</varname>.</para></listitem>
+
+      <listitem><para><varname>UNIQUE_PREFIX_FILES</varname>: A list
+	of files that need to be prefixed.  Default:
+	empty.</para></listitem>
+
+      <listitem><para><varname>UNIQUE_SUFFIX</varname>: The suffix to
+	be used for files.  Default:
+	<varname>${PKGNAMESUFFIX}</varname>.</para></listitem>
+
+      <listitem><para><varname>UNIQUE_SUFFIX_FILES</varname>: A list
+	of files that need to be suffixed.  Default:
+	empty.</para></listitem>
+    </itemizedlist>
+  </entry>
+</row>
+
+<row>
   <entry><literal>webplugin</literal></entry>
 
   <entry>(none), <literal>ARGS</literal></entry>

From owner-svn-doc-all@FreeBSD.ORG  Mon Feb  3 16:17:36 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4F62FE2;
 Mon,  3 Feb 2014 16:17:36 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3B4B617F5;
 Mon,  3 Feb 2014 16:17:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s13GHaaw053089;
 Mon, 3 Feb 2014 16:17:36 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s13GHa3w053088;
 Mon, 3 Feb 2014 16:17:36 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201402031617.s13GHa3w053088@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 3 Feb 2014 16:17:36 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43734 -
 head/en_US.ISO8859-1/books/fdp-primer/writing-style
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.17
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, 03 Feb 2014 16:17:36 -0000

Author: wblock
Date: Mon Feb  3 16:17:35 2014
New Revision: 43734
URL: http://svnweb.freebsd.org/changeset/doc/43734

Log:
  Add sample markup for stdin, stdout, and stderr.

Modified:
  head/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml

Modified: head/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml	Mon Feb  3 15:30:15 2014	(r43733)
+++ head/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml	Mon Feb  3 16:17:35 2014	(r43734)
@@ -527,6 +527,21 @@ GB.  Hardware compression &hellip;</lite
 	  </row>
 
 	  <row>
+	    <entry>stdin</entry>
+	    <entry><tag class="starttag">varname</tag>stdin<tag class="endtag">varname</tag></entry>
+	  </row>
+
+	  <row>
+	    <entry>stdout</entry>
+	    <entry><tag class="starttag">varname</tag>stdout<tag class="endtag">varname</tag></entry>
+	  </row>
+
+	  <row>
+	    <entry>stderr</entry>
+	    <entry><tag class="starttag">varname</tag>stderr<tag class="endtag">varname</tag></entry>
+	  </row>
+
+	  <row>
 	    <entry>Subversion</entry>
 
 	    <entry><tag class="starttag">application</tag><literal>Subversion</literal><tag class="endtag">application</tag></entry>

From owner-svn-doc-all@FreeBSD.ORG  Mon Feb  3 17:35:21 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CAF12DBA;
 Mon,  3 Feb 2014 17:35:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B6CEC1FB7;
 Mon,  3 Feb 2014 17:35:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s13HZLni082237;
 Mon, 3 Feb 2014 17:35:21 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s13HZLsB082236;
 Mon, 3 Feb 2014 17:35:21 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201402031735.s13HZLsB082236@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 3 Feb 2014 17:35:21 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43735 - 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.17
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, 03 Feb 2014 17:35:21 -0000

Author: gjb
Date: Mon Feb  3 17:35:21 2014
New Revision: 43735
URL: http://svnweb.freebsd.org/changeset/doc/43735

Log:
  releng/10.0 has been turned over to secteam.
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

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	Mon Feb  3 16:17:35 2014	(r43734)
+++ head/en_US.ISO8859-1/htdocs/releng/index.xml	Mon Feb  3 17:35:21 2014	(r43735)
@@ -92,7 +92,7 @@
     <tr>
       <td><tt>releng/10.0</tt></td>
       <td>Frozen</td>
-      <td>&contact.re;</td>
+      <td>&contact.so;</td>
       <td>FreeBSD 10.0 supported errata fix branch.</td>
     </tr>
 

From owner-svn-doc-all@FreeBSD.ORG  Mon Feb  3 18:54:03 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D9DDA6F8;
 Mon,  3 Feb 2014 18:54:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B760D17BE;
 Mon,  3 Feb 2014 18:54:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s13Is3xi011811;
 Mon, 3 Feb 2014 18:54:03 GMT (envelope-from trhodes@svn.freebsd.org)
Received: (from trhodes@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s13Is3vb011810;
 Mon, 3 Feb 2014 18:54:03 GMT (envelope-from trhodes@svn.freebsd.org)
Message-Id: <201402031854.s13Is3vb011810@svn.freebsd.org>
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Mon, 3 Feb 2014 18:54:03 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43736 - head/en_US.ISO8859-1/books/handbook/basics
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.17
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, 03 Feb 2014 18:54:03 -0000

Author: trhodes
Date: Mon Feb  3 18:54:03 2014
New Revision: 43736
URL: http://svnweb.freebsd.org/changeset/doc/43736

Log:
  Add a small section on shell redirection and piping.
  Fix two sentences to not start with a lower case command.
  
  Reviewed by:	bcr, wblock

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

Modified: head/en_US.ISO8859-1/books/handbook/basics/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Mon Feb  3 17:35:21 2014	(r43735)
+++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Mon Feb  3 18:54:03 2014	(r43736)
@@ -917,8 +917,8 @@ Other information:</screen>
 	</example>
 
 	<note>
-	  <para>&man.chfn.1; and &man.chsh.1; are links to
-	    &man.chpass.1;, as are &man.ypchpass.1;, &man.ypchfn.1;,
+	  <para>The commands &man.chfn.1; and &man.chsh.1; are links
+	    to &man.chpass.1;, as are &man.ypchpass.1;, &man.ypchfn.1;,
 	    and &man.ypchsh.1;.  Since <acronym>NIS</acronym> support
 	    is automatic, specifying the <literal>yp</literal> before
 	    the command is not necessary.  How to configure NIS is
@@ -987,7 +987,7 @@ passwd: done</screen>
 	  <primary><command>pw</command></primary>
 	</indexterm>
 
-	<para>&man.pw.8; is a command line utility to create, remove,
+	<para>The &man.pw.8; utility can create, remove,
 	  modify, and display users and groups.  It functions as a
 	  front end to the system user and group files.  &man.pw.8;
 	  has a very powerful set of command line options that make it
@@ -3432,6 +3432,80 @@ Swap: 2048M Total, 2048M Free
 	<para>Then, rerun &man.chsh.1;.</para>
       </note>
     </sect2>
+
+    <sect2>
+      <info>
+	<title>Advanced Shell Techniques</title>
+
+	<authorgroup>
+	  <author>
+	    <personname>
+	      <firstname>Tom</firstname>
+	      <surname>Rhodes</surname>
+	    </personname>
+	    <contrib>Written by </contrib>
+	  </author>
+	</authorgroup>
+      </info>
+
+      <para>The &unix; shell is not just a command interpreter, it
+	acts as a powerful tool which allows users to execute commands,
+	redirect their output, redirect their input and chain commands
+	together to improve the final command output.  When this functionality
+	is mixed with built in commands, the user is provided with
+	an environment that can maximize efficiency.</para>
+
+      <para>Shell redirection is the action of sending the output
+	or the input of a command into another command or into a
+	file.  To capture the output of the &man.ls.1; command, for
+	example, into a file, simply redirect the output:</para>
+
+      <screen>&prompt.user; <userinput>ls &gt; directory_listing.txt</userinput></screen>
+
+      <para>The <filename>directory_listing.txt</filename> file will
+	now contain the directory contents.  Some commands allow you
+	to read input in a similar one, such as &man.sort.1;.  To sort
+	this listing, redirect the input:</para>
+
+      <screen>&prompt.user; <userinput>sort &lt; directory_listing.txt</userinput></screen>
+
+      <para>The input will be sorted and placed on the screen.  To
+	redirect that input into another file, one could redirect
+	the output of &man.sort.1; by mixing the direction:</para>
+
+      <screen>&prompt.user; <userinput>sort &lt; directory_listing.txt &gt; sorted.txt</userinput></screen>
+
+      <para>In all of the previous examples, the commands are performing
+	redirection using file descriptors.  Every unix system has file
+	descriptors; however, here we will focus on three, so named as
+	Standard Input, Standard Output, and Standard Error.  Each one
+	has a purpose, where input could be a keyboard or a mouse,
+	something that provides input.  Output could be a screen or
+	paper in a printer for example.  And error would be anything
+	that is used for diagnostic or error messages.  All three
+	are considered <acronym>I/O</acronym> based file descriptors
+	and sometimes considered streams.</para>
+
+     <para>Through the use of these descriptors, short named
+	stdin, stdout, and stderr, the shell allows output and
+	input to be passed around through various commands and
+	redirected to or from a file.  Another method of redirection
+	is the pipe operator.</para>
+
+      <para>The &unix; pipe operator, <quote>|</quote> allows the
+	output of one command to be directly passed, or directed
+	to another program.  Basically a pipe will allow the
+	standard output of a command to be passed as standard
+	input to another command, for example:</para>
+
+      <screen>&prompt.user; <userinput>cat directory_listing.txt | sort | less</userinput></screen>
+
+      <para>In that example, the contents of
+	<filename>directory_listing.txt</filename> will be sorted and
+	the output passed to &man.less.1;.  This allows the user
+	to scroll through the output at their own pace and prevent
+	it from scrolling off the screen.</para>
+    </sect2>
   </sect1>
 
   <sect1 xml:id="editors">

From owner-svn-doc-all@FreeBSD.ORG  Mon Feb  3 19:42:21 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A3D10B27;
 Mon,  3 Feb 2014 19:42:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8387D1C83;
 Mon,  3 Feb 2014 19:42:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s13JgLJp030957;
 Mon, 3 Feb 2014 19:42:21 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s13JgL8x030956;
 Mon, 3 Feb 2014 19:42:21 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201402031942.s13JgL8x030956@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Mon, 3 Feb 2014 19:42:21 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43737 - 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.17
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, 03 Feb 2014 19:42:21 -0000

Author: rene
Date: Mon Feb  3 19:42:21 2014
New Revision: 43737
URL: http://svnweb.freebsd.org/changeset/doc/43737

Log:
  Replace kwm's key with a new one, signed with my key and verified in person.

Modified:
  head/share/pgpkeys/kwm.key

Modified: head/share/pgpkeys/kwm.key
==============================================================================
--- head/share/pgpkeys/kwm.key	Mon Feb  3 18:54:03 2014	(r43736)
+++ head/share/pgpkeys/kwm.key	Mon Feb  3 19:42:21 2014	(r43737)
@@ -1,39 +1,100 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh kwm F95426DA;
+sh addkey.sh kwm BF4E2D5B3B9D8847 ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub  1024D/F95426DA 2004-09-10 Koop Mast <kwm@rainbow-runner.nl>
-     Key fingerprint = C66F 1835 0548 3440 8576  0FFE 6879 B7CD F954 26DA
-uid                            Koop Mast <kwm@FreeBSD.org>
-sub  1024g/A782EEDD 2004-09-10
+pub   4096R/BF4E2D5B3B9D8847 2014-01-31 [expires: 2016-01-31]
+      Key fingerprint = F986 EDE2 B3EC 4098 7820  E1D7 BF4E 2D5B 3B9D 8847
+uid                          Koop Mast <kwm@FreeBSD.org>
+uid                          Koop Mast <kwm@rainbow-runner.nl>
+sub   4096R/19C3701D1BE7F671 2014-01-31 [expires: 2016-01-31]
+
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.6 (FreeBSD)
 
-mQGiBEFCGHYRBACI9ERMi5j2009Juy2kpXS860i9tJJ10mM9TNuCZVYcPRRTiSWe
-Q+YySmBtR9TA3OZfd6BA9EqusEgcwUJpxjZ8zjGzirj/OjcPtKwM9ZO6dadeMNaE
-wT32bJDUw//2ky2xflJCsjg+TSO7PxQi3g/YEWfau6Istg8PKfzHQan0EwCgxwrV
-6JijZQ85jIgQoceJjkwBLHsD+gKeeSUG7g2CO+NJf2d0tBj+l22QzmeAtlnuUskd
-nHKDAzzty80e4HXkUYw8IMueR7Fe2Tjx20OvVSkzMwiZYqevIJHVhiouCFZxYpSa
-JQHPYLpMXMVZ1X8d17tjbFRBXWmNrDcEhb4m3WoDKfQD/qbMCwBErsQ0t15dddnQ
-BVyqA/93dSzMYRC+Zm6Hzfk5Dz2MsvsxEE30ysSwFjIZ06RtYPKlN0x3ABCGba8f
-o5H0P6+gobJRLTQfK4xDS4J3G/d7TWO1bZGk9MPEzCJDexTt5yfKsY2jZRVRrikE
-fIbdSUgLnczBdUno5qC9IyMhGNa8O92GsjleDm7D+p+wkkoyCrQbS29vcCBNYXN0
-IDxrd21ARnJlZUJTRC5vcmc+iF4EExECAB4FAkFCGHYCGwMGCwkIBwMCAxUCAwMW
-AgECHgECF4AACgkQaHm3zflUJtqlWgCfWKIRLzsvZjBjuck31Ep8sEDP0GgAn17m
-X0hYq8W+2gbHbmYeqIFefHs9tCFLb29wIE1hc3QgPGt3bUByYWluYm93LXJ1bm5l
-ci5ubD6IXgQTEQIAHgUCQUK9MgIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRBo
-ebfN+VQm2sH2AKCnwIQ3C8+62/uQh05mqXqdzAaU8gCdEkRN+L9HY1OwFlSDi6Tc
-OAWLTPG5AQ0EQUIYdxAEAItGBQMO4f4rHYh9zc4fd62RhBfMHJpY1ex6HeiHt3pb
-i6KfBUai1zRYxgq9F+8qR9WgBLF1VhA4O0nCU9/FKOChc19W7xKa2auvE22Kq1ta
-xjCszahtPTDGIBs4K8u0fH/Gx4VSikQcfIGNd3IK4vALbLfH+iK/1RJNXPzQ9A4H
-AAMFA/4+UBNqZPucstZgmEwVB2H1Bt671fQqODpWj2eOMIYJWXKraUxdIjUqzm9K
-QhC7LBj9ihsn+LRsO49oWIAv5bks4zC0STACJ+Lx+FMb1i5ayAp/03DoZyrjRnGb
-SIY8Dtqonut2nic0NQ4XD5uqTkx2t7xlKJay/n4Nop2uqwajOYhJBBgRAgAJBQJB
-Qhh3AhsMAAoJEGh5t835VCbaOZEAn3wkQ7xISlGUox1/aiPU1CafRrZyAKCXgDLa
-wlCa23ftqh2DPxkAXtCnEA==
-=FIQv
+mQINBFLsFsABEADV9Kl6eyA4rGA00DLIZfF5BzElKYMox42JSJEk6ICVIUFsBBUh
+M6m/iKkXQXOIKUq3Ra6VErMu8+kdSFu7kglKtvA7QAplaVBjGDv86F8dhekbl6hu
++Jq6JojN61j4XD3Hn+83Ryxs+TWNNCkNQuWwB8V7Qz7VWGedWamkTn7RLVOKMMef
+E4qjmvk4aVE5wVuxjIQlSDDEx8fMDaX+XuH0JwbVxYAd1J7kHzohC8OqXyoKHz8o
++3SiRXd0z3g+EekHD+7cCZMkeedWh2+l+W9eqH8Q3sOYH332DQWvWx42TTLVDzsN
+3aUqzjXHJTFFqPPOJQjjYKcZzYCp1i9+UFyADG7imhinpoSMDfZORdZiRd1KUaLT
+fN+qe16XwLpygtPCJATcQbZsO6dNDBbRBtW+seE+7N7zsiPa6tZEI8ALr7hBSHBv
+MgXdVuEeFpBOzp1QneMMY+jfeLtQExpM1KQz4TLlWfr/2jO/PdTKl71mf1K8KFuS
+8OoILDJ4Nda0WUQ2U66Zvot0EvVCp9qb6q0vVilHflVMp4dtfqbcefrN1rnFfRRm
+Mm2+2qEOe5L2Em7XJosb0lcoN4mZcgIldNC1lzVIZQ22Df5DzfbGP/CUeFtQ0HP8
+w5BgqkUzd+VZhiVEWWrVRFAWmsk4kay/QFbjGBV268UJZkhoIiwzZw5NTQARAQAB
+tBtLb29wIE1hc3QgPGt3bUBGcmVlQlNELm9yZz6JAj0EEwEKACcFAlLsGGICGwMF
+CQPCZwAFCwkIBwMFFQoJCAsFFgMCAQACHgECF4AACgkQv04tWzudiEdcrBAArbzN
+T0EOJfKUZTo2ECGUB4LoPkyZ+LOJbjE2hyxfekEsNZniK271bwTHW0uosAKzULZC
+8R+47601N0ud7494KQonwv23002NUFrSe/SMKz25b9TsKRPaa1ZNsCLPReyk2Pax
+VXIJbdOv6DTt2Qspurx6izG92qXcb/iFZraWnIFjZtG4z+W2HGNg2Lm3ohtd1W/o
+Aa4VkVYN65o249w9v4jr4M6YeaPjJpVQw4y2RdaU11IgOJcSEvMFs/uh031Wq0yc
+j61eRTxLAIqqjp8Ewqdti86qKxYiQhgIfuistplpjPTEsc0j6Oep5A1EKuGFthO9
+OjHt0ELeVTpbAT0sSEXOCiH0vowD1YBMzJ9uhsQakFfglQYpmmc8R4PBB7ETEhEJ
+GQgJWQTXs/7MylsPVPvR7O1iyqSbS+gg/icPmJ39WXQzuGNkbRL1WJkCqSrrcRp2
+D2gv3VZKChOGDQRyvwOiVdS4+JB/EgnrTb/8GXU1bnbzq/3klAyoFPmeC1x3LxeL
+bmI06AaznN3Ab3LGRsGFSQROOeZltoPHchSeKa4IKXx5FvM4CIqlW6RbkmwWiW68
+P9lcEr8QatH+k2mHb/tz0wIAdpxSwRjr8BVoLWUVXjaMZDGiQyPLo70OqKrooWdP
+DUuBIS2Q/67FenfHOYQUldRpimcT6r269XVwVOiJAhwEEAEKAAYFAlLsGoYACgkQ
+rbv4YQo3ibe/mA//T31rVpeR5uOqtTrgtrD8u8dLwkGgeGnPp7fyLHgwxFwtxAOc
+Gnvq4I0FCI1qM/IwEREBkMon/e9AQXq1rnKaADlksFCqftCe1hr3IyJefMnqfCqH
+COOJLqetx//JDbWDkv2MKlz0CIMst8ZQHvTISugmiXlCnq+tbHRDzSYSUWoQBNuv
+en6ssAdQDbxketCOO8rhe+MlCqXZa5RYVZ6QUka8qzGOlsf4xayG5dHG52FTcphz
+kd6nfQ5/7Bw/RoNlZYN7B3cfzWpBfj4UYjbyjxh2YFWUZgUrPDvl42YfAGEoPWlG
+xOcR+k67oofs33PilFlsvvYKhChLNjCfqNdtx8CGnQPbA1GVKaQvYyJ4aql6G0ka
+hM13GLn1yRbQefg2qA7XQfb4qkuoLLfGehcirKR5nRrGj8bewIJUZ4LU23+E3uFy
+tM38J15Orq1GRgkDLUcd6e6sdzlCDkHGUJBVrm4aU0EIKP6nCP2Y2W5thcxu88XY
+9RKz28eDHKKvr7UwiDIb0hKm6jVPr7vptgGK2PNtQ7AhboyU560lLch8ClDYRKE6
+2omfS1dRrG3UB9zcRXBbDUth6y1tbUcLLAa1EEo6+QoqD9LFamZJ3FdjyKqIv9YI
+PENuYXqZ7N4TWP63eFq6lgVt8x9rp10KPF20+UOh0KaDZClCeBoNl6l1a2q0IUtv
+b3AgTWFzdCA8a3dtQHJhaW5ib3ctcnVubmVyLm5sPokCPQQTAQoAJwUCUuwWwAIb
+AwUJA8JnAAULCQgHAwUVCgkICwUWAwIBAAIeAQIXgAAKCRC/Ti1bO52IR5T0D/9J
+NAR34Wx2qFFLGTlzZE5AEuMYicTitjncrvdCxE0uC9ilpB4w3dMYaBgn9QRQb5Q0
+tJLTODgrrsBT5cADORs46DV3qIBcx7mqZiEjXE9D5SAXXIS+pkg5L3KareqN35j8
+emVB9gVTaJmIIlipH21cef+VcXWcrTrl4beTseh1SW1MO5138nRbO7kbx9/NuOO2
+ckwDD6dnGdNBkfTSXp6zG5Au4fGn3XBWT4OjvnMM7/3Xai6SsRSTrznsH7lDbWfY
+KHGFk7wAunRKznwvPHt1PXQ9n1Xq7fKCAE6B/Gxc2BWAB8eY7q1yT0nI6iV37NDX
+e/S/PV7tvMclGhPu/Yd/e4/Nq9pY9kHHE2SqrJiKTWaAuxVf+z9p5v2XKF9DfN8f
+2G4A2INWI0iZujWPjVew3xCrJURjXWQ6HJtfiwSygKZHMLwFAdG5a/yLkCc+sB+T
+WzQlamt0U/oAB0FJLjF5V3Og4S881XZlErtIbIuDRL6mdqUFs6tJpptLWzuqh0tm
+kmnvzgR1foNzEBjQIhEh2GfmJ7pAraXZ2vFTMPTKSqlv2bzw3noOLUHXjdNOia4g
+hRocHMX49/Uf1BCu7G6OZkBPJnubozTDgl1fFCUEEf2MrQcDfr0yAyzrFbI+fRtd
+fA4NvkANbnczYAxn65fcyH6k8UkO2gSOHBg/B1bIxIkCHAQQAQoABgUCUuwahgAK
+CRCtu/hhCjeJtxYXD/9NH/mjMAOEQQJMqiEvzyG3G/Wucj1CR8qf69MKj/F3Apg7
+mDVKqgcOcyLT6UWXqHbwV56tj3FGGS+X+BY1+tVwtFcFkC3tYZV4MMk8DXRl/lbq
+kV3KewX2wVzUPrj5Tp5mHj0xk+T5Pct9wJbLvEw3AdhampKL+Wb2MDUaq3dBTJ0b
+44va9+4S3oA9I3Hey0b1hvkvoBQeB6iCFYbmiq7/9HeE4beI2VMti3PTZb7msFOA
+xI4lLb7JVgBQuO5wRNKtyOjyAYTQemN08K+UpSVTOqmLpdSj11CqsizvVoB56qZY
+IoBIyUMgv9MtMr3MCKQ6vbr31rN/ERRoFRuCv/f7ydVyYh92GZJL6lfutqrrx131
+Cwet8zuvlGZw1NkW6WloOB+c/vSfnhV5HkWTzKJh5Gr+3zlhAAQ5ZZ2NScXgjPvf
+U+3/jEZSUUOhlJMuUo1sA49Kol3vrBkiPXclHVDVwGYzlAhiRA49V8w09r5ZhstM
+HT/Jx2453sRubnkTq4u0duS+pdmYKloyK6L9jUCnBhQXNfC2m02bXK3n/76kz612
+jfwPOClFdNixdcgzt9GL8IxcJBLb/3bLdzL0hSs8d6sGlp0W05+kO0GglV74Xok+
+iLjDJwkR/Biqo3so8w0qk5olRSNzaLSZQTcpgMSbKQqTmL4QDd8pYhshc/ZaKrkC
+DQRS7BhoARAAtAu0T99iYJLArbCaNQXxm/lclOzFBKqMUDXzxEOQIAG3CfySHqOJ
+wtWwihvnPTSeaLOHazPgBh3KFo5jBIj4UCOwNMT7nptWUu1BKjZLtKXRuCXGU1ia
+7RiBfAEzqO286P4b1Mzp0En6qEkkbp036///aTgxnijc+o1XHJe2D7EoeuSt9be0
+OfUSNAqSmiLBcowvQSyA849aNAddFu9KTaL2hgDr82bFpCSrHTiK21hLYhg54vG9
+oEUEgOnKnuaKlyH+1sjsOW9Pf6qh/AzoY9U9cl/v1/wbLJ1LxO8E8oQfh1//PXYj
+ZzlJYRrHD4GDxeJtJonmBKt1QQVrtx/2OE3a3ISPyAGiATIraTSui7/FQROCDgVK
+OMhgrMlGmLXkfF5sMDiqSM/vi7bkLnFIObRJTI8IJi+c1r4112vpsecNMyba1bRN
+7fFn8iNs79YBVWXbvWNOHAC3Ehag61t9SoPHDF1dkxY2x0IajavGEIYuI9jQ27yk
+IB1E3w6EwQxxrqnvtc3+vQba4eVKmt6s9b5yr3UwopeUC4kWYOUOwTMkpn3TiXub
+e0wVdE+XchnXhyDglpMX/DCeIcGGr3xbURXtz+gUHI1MSQ4Ay3vmkTE+zgWM3PJ/
++i0392ZLygb2ULUOWQUWKr87LYILLP1eq8WAnJOuWBypdhq83fylslEAEQEAAYkC
+JQQYAQoADwUCUuwYaAIbDAUJA8JnAAAKCRC/Ti1bO52IR8hGD/490ne6U/TCN+UL
+EzkzwfY4RG7qmDMObh7tv3wsfl27LXgX16wo+Dh3p66swdYv58ovRlRCvjg0guaJ
+5yYjCqK/Hj6M/ktJlrPHlYyFahPcDJvCO6Yzc4eYjcgNrEV/BFa8tUB/+lqCm0i/
+/5/B7MUEgaxO/8kWFkNCuhmMosMkmlJ/qpo/Zh3E20hKJD9dGOz+PCjTLGDKHOQR
+N7ykWrKJb+y8v9yMzOpQ8ryMeBp5jguo4d7oUCkdt2numtlIZJVXyYnf4LL1ls96
+VokAAGqW4VPq3q58xAz009tWALIQkgauQj2+bQNnzJmMnnll4263AfIh4+uV4xBK
+517LqBH/i3JrfYZqMQ55ucIe6D8xd4Qda1YPNSC08YfntAQ/ZIU5Mb+QiW4YseSR
+3XUY6kmrNPBmzARdo38O0sajZ8H4mZpAOiOkbZh4mIMwpp1T+HqJUXJh8wtAUtTA
+I+qupOs45Os+ft5XN+0/q+gJ02C6h74TLKvAkAIjLAzfnGLnVGvPJfHGAHvxzkQX
+9jn21JdUrAm5iQWTm1IiQ4GjmoAOl6NTL4UXY7enWjr/TjNiLeKsi56qHBxkdDDa
+nEw60/yy/py+iK9GbDL8p4EX/9Fw+MzsyRc4zxSd14gZZ+oHalVreHTYYaQ9LD92
+xc/1gnP81Zu1PqPlTGWJKtzL4XjcSA==
+=hB1P
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

From owner-svn-doc-all@FreeBSD.ORG  Mon Feb  3 20:29:27 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 21621909;
 Mon,  3 Feb 2014 20:29:27 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 013AA10E7;
 Mon,  3 Feb 2014 20:29:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s13KTQ3U047633;
 Mon, 3 Feb 2014 20:29:26 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s13KTQPq047632;
 Mon, 3 Feb 2014 20:29:26 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201402032029.s13KTQPq047632@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Mon, 3 Feb 2014 20:29:26 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43738 - 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.17
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, 03 Feb 2014 20:29:27 -0000

Author: adamw (ports committer)
Date: Mon Feb  3 20:29:26 2014
New Revision: 43738
URL: http://svnweb.freebsd.org/changeset/doc/43738

Log:
  Correctly generate a usable PGP key, using wblock's excellent guide.

Modified:
  head/share/pgpkeys/adamw.key

Modified: head/share/pgpkeys/adamw.key
==============================================================================
--- head/share/pgpkeys/adamw.key	Mon Feb  3 19:42:21 2014	(r43737)
+++ head/share/pgpkeys/adamw.key	Mon Feb  3 20:29:26 2014	(r43738)
@@ -1,55 +1,51 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh adamw C57CF3A8;
+sh addkey.sh adamw 1CCD0A5830E59D2B ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-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
+pub   2048R/1CCD0A5830E59D2B 2014-02-03 [expires: 2017-02-02]
+      Key fingerprint = F95F 60DB 115C EA59 2FED  E1FB 1CCD 0A58 30E5 9D2B
+uid                          Adam Weinberger <adamw@FreeBSD.org>
+uid                          Adam Weinberger <adamw@adamw.org>
+sub   2048R/92C1C8A42BDE2CCE 2014-02-03 [expires: 2017-02-02]
+
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQMuBFCkUjkRCACqWld1dYoNJjLlFZW1xjt524wQNaeDzl3GdNX81kkGUzsyseYg
-mmtlLXRSd2OqNHsTDwSqD9AmNErnn7tsOQL7bbUTxMdO3EOptiNwE9Xj9WKTuTSE
-Vy+jXusZAcBsg3TO4jccawanbbjOLUzi5X79J491/sr7dcTsJXcvkmAJWSeD7ho+
-U8HKFlXfU8qqWi2tkCVYJJlLUFBzuN3V6i4x0odTxDMKYUQ4dFx/96cwTbSHF92V
-3/jqeZMTglv8gKFHpK69M+uXN7/luRvj7mJ2e+kPFrBlC5dt13y2Q9PA328dqHBT
-dJMYS2oA5tSoTKWLLPIJYKGmEiEo8Qz+EQ4nAQCyuaILVdoSQLxJfU9hjkv3e4Ik
-9NjWOtUz3YdzLyRg8Qf+KjZj5e1k2MHnk0UJKLwCaeXaRfVpA9KpcJk/uUek6VSs
-aYWp92IHshvaDVyb8DfpSAbgtu+jvafbXDy87Wwp1Da+O9GV1pHqhNNLA4lrgDjF
-JkScn7M24x+y8dRbXy4gMe3/j+qdtDrhYoUicoQYHW6S/UrJg2p3QrN5V9aZj8Dj
-xY4xbURtzve9sSz5oeDjnQsJaDgLxX6UOn6JUMgV7pCCgfknw5nfGZBdzsOPz1da
-v9Gwh4QvMVx6O0JNfrkYI45xJ8AAWTRAlycTFifPmt+9niWmYFUAlKXtRbW+FPym
-cTQIsK3t0vxrOaBH1ml4uMTbrET8eJlLflfr3cJSkAf+NQ5JQe6vlr4+9AOTf8Q+
-h7KktDsscdCMYjjQ4aoCDuVfZQHXABeicgB1s9Cklha/QNy4VG43dkwIL8FWwGyc
-ueqnu9tlxY16sT/P6vk9/yTsRMVcKEBAKEtXQuTq04WD4Id1gkzbBD0wzwCbEo/F
-CjI/SxWMH/j0lVixcJYIpKgGj633rFOtUSoLsOWeJzNOIhcHIdz/qwlby14+Vd6u
-uzt3cDQ9SEd3G9DZQYIW2//ZkUnvxD3qK+sJIjJmL+ZU9eUXD8vvE79tDAOtknLw
-BbdLzwmJtNfP3v5DIWSmBYZfRTNRE7/W3Hn5cNe/DLO7hSQ5brWDmjMfXq9ovsRX
-j7QtQWRhbSBXZWluYmVyZ2VyIChhZGFtdy5vcmcpIDxhZGFtd0BhZGFtdy5vcmc+
-iHoEExEIACIFAlCkUjkCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPSL
-sZXFfPOoM24A/ielXNpbFz2W4YDt5b6tR7cDzGuDHSQeqVlXpJ9zhLc5AP98s/06
-OkAXtmf98/FLU3NdouT7fIIm0Op19zfwEPxat7QtQWRhbSBXZWluYmVyZ2VyIChG
-cmVlQlNEKSA8YWRhbXdARnJlZUJTRC5vcmc+iHoEExEIACIFAlCkUysCGwMGCwkI
-BwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPSLsZXFfPOoo94BAJkElhY9dt+9lk4Q
-AE5EjqxRvO1y8DFFb02qzphA68bVAQCAAeMt3ywQ9xPqPEal2IafGv4zF9CIJjFM
-r0HQMuD+HbkCDQRQpFI5EAgA+tX4pvhc37IfSmy4fYdxjbjB/B0s8me2nZn1kMHj
-+uJmUB+7WZUVrCXZwmsn4byN6i1jThQXvrZ+dLvUfxaQD6jOaiW81QwxeNYt1VJ0
-+8011m/eBw5xuu/Ozk07SChGLvg8Xhf4yryOgOpxEc83QXPGDbBGKhMhHecvCai0
-1/S+/VSPrx2fYSGiPqnWVpE1EqhaOSZ/iEpMDQhQF9nCbmeP5xJAUKIv3vv/82CP
-5b6eeHLaNCsvIrDYQha2d6mJewiiZnpnwkARwJMJRje6WCMrs/g/CUgeTHeyhScK
-E2iZk8DgIS0Cqr6DY6yjZLGkjLmUpLuzAFCFDac5sT8I2wADBgf+N1t6ab7/OYmh
-vVex7CjPuqmK9FFUiZj7CstKltjOBajRKh7oz6KqDGcXwjRCWA4cuU/7I7q6IaIS
-L5+hWwzrK5Y63YxA8/csZ41wTGQSVoD4blCEFqdhCaR/J0kz4KQqIGM9OmT3zi8R
-+H+gb4e1oXApX20j5lxeQifHTI9KTbB/SFd1GAIZBLfWRO6I1vqQtuqFVOvKZeIk
-kIErHBdQnhGsAaEPKdxqaEUaqMUmM+/3dLhj0qw06+KKpRU9FF02ADRDwfIYP2Tr
-v7QJOn5Dn/TIJVq1gpPLu+lBUKugezwnabkFZuB26gJQ3Aaqnb0W/rdRlMtmxXCw
-jRujwCiTGIhhBBgRCAAJBQJQpFI5AhsMAAoJEPSLsZXFfPOosIUA/3Rt/SEgBJdJ
-E8fbDlkdsC8RMIQLJ9lbBjP4EF6HQPsyAQCm7eszYZZzL7nRse7NVQop+HPULeox
-IpuNrKfM7zuBiw==
-=yHIG
+mQENBFLv+J4BCADlYTfsxRr0B2OhwhNeIHeG+9pX5Qrf2xeKtOaqCS7uBhgm6lMF
+zvWy3lZJpf+s8bd+nkLqDQFpdZG97I2IPOyu9PPAo1Z+GMAGE+R1KjwsdewXI2oF
+/k9yfiqjrwKXsLVM5D4u3gZb3TAW9re0P0ny/u4X6YiYnRUe4aSKMKBIioG6Oleh
+No/nQJSKoM2JLul/YXXiocJWmAdwneF3t+n7xK2oXxb1A83IB4+HfLpKLN6b4XK0
+FhfFXQ9CMW90ZOKVnbeza27UUY3d5YOoawypa/Q58GH/luYNncTmKrvL3GDZxs53
+RGNLOuOcNvhXRd+8l+vNuGMlB4WvYxWuD6CnABEBAAG0IUFkYW0gV2VpbmJlcmdl
+ciA8YWRhbXdAYWRhbXcub3JnPokBPQQTAQoAJwUCUu/4ngIbAwUJBaOagAULCQgH
+AwUVCgkICwUWAwIBAAIeAQIXgAAKCRAczQpYMOWdK44qB/wODepi0dMOgcbbrEZa
+2t0NS3tauKrpwHAMr8/TH7NKZanrawmQgquHsUHbgzW6WfnsqHm7Zf6zMkklIj+1
+BWU2pwHyPNFxFJpG4+gwotEYE7gxxHNjHC9U9YkZV1tgzakRG1XU4Su06vff5vBQ
+UM3ofB6f1wusPYAmxvedT6TJseYi1MTCWlqNZrIWInUr8ZxFnI//5e6k9QtJupTo
+gu+pfWxWAxANcs/T1i+BKu0PSmtKgMzTn+s/rk9AWGMYqIyfn+ntq6sCsNYCCzGM
+BwQ6vVHTzIClaf6u9QMXdDrSBzU4WfV+dZY5fhTwslUlBp2c5GScAGBAoR+rWrZz
+rMj2tCNBZGFtIFdlaW5iZXJnZXIgPGFkYW13QEZyZWVCU0Qub3JnPokBPQQTAQoA
+JwUCUu/5JQIbAwUJBaOagAULCQgHAwUVCgkICwUWAwIBAAIeAQIXgAAKCRAczQpY
+MOWdKzVdCACuP3z/odWmjgshOu8j/bUXl3XDOH/1iw4frGhk1i5ajbtTI0TUbOfh
+GifGwZEiXNExAj/JO2Fm3oK2z9Grn9SqVmrOqobe5gnfE6VXPbqh2MgmRiLhHaAq
+2zzjGvegQydNK8fqwSzrN/6SRvcVwl3THy6yfXe4Q25/l3jXZfqb1lGBvvcawDh4
+4+2jvE5m97vx+gKP4vQJH7kr5k+xWUPxE2AG44eZcKD9P0DfAQ5lv6MWUIW21EV+
+UN/210Lez4n3Gi31gTMiAHF74+sXdbTV29I3AiQ5zOOJvzzQ1ktJYFAAqGRhHFZL
+IWE9nVxQ0NxxLp1xjYg0zkOUKc/Ig23WuQENBFLv+J4BCADeL3+4Gei2lXSDrLj6
+WsrRvY4/uES6Mc4xA0HWzh242b8IJEJRg112A6vgmfemhigtipvTeFG22yrm/1i1
+MlMTy6dUgHcu35iQIM+udqjqEV1K+uBvZeBb07iouVPYlwuW7YpxCnf5alT+VFsL
+gRhi+B3J88wh/9XjQpJd7m+E1Gyv8PRi2hq+wxKZ00+1WCJbvnb0g7fo6oI4z4nz
+h8BbUFGnLoCTpT9wTmYSn5TUtbosiPb8GSy8Hzggv4m+wKYGJQccPnG5otsQe1jJ
+4hiKLA4unEoTU4LJSHiiAQ8JJTUjmFuxuk02FvsIAsVW7WipvUWegNa4ApS7J7ta
+Jt6LABEBAAGJASUEGAEKAA8FAlLv+J4CGwwFCQWjmoAACgkQHM0KWDDlnSuE+Qf9
+Hz+tSA66LJ1A/J9vGVKvrBLV+K8yYd5WdReX4nE1hhSWDu2xFDoMl+KxQcbWyZFc
+MBVL1koMcsLGtLZmOUEUu0KDK7tSmjHNdR3yO2DZKB66dporv2O3nzjqcRyu3wUz
+Q5reSwrvgHqCX2wJxsvyt5epxvF7mfezwgnqmoOgnzlV0/tgXQT4TBWg68JI0wNI
+5dVoTdYBmGi+1UBi4Pc5rOiWTt1VBFkWsm2i78XufQ43usifjbUtGzTcwtjbHAzj
+4jowSl78rksjs6arIX4ZmmiXUowIoMHytgj7mgGn0FHEUDGAuAyaFfXxPwbxquH0
+sBubp36SuO2WuMa1ke1Ygw==
+=QzLu
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

From owner-svn-doc-all@FreeBSD.ORG  Mon Feb  3 20:34:30 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CC7329FA;
 Mon,  3 Feb 2014 20:34:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B8FD31183;
 Mon,  3 Feb 2014 20:34:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s13KYUID050911;
 Mon, 3 Feb 2014 20:34:30 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s13KYUrc050910;
 Mon, 3 Feb 2014 20:34:30 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201402032034.s13KYUrc050910@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Mon, 3 Feb 2014 20:34:30 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43739 - 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.17
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, 03 Feb 2014 20:34:31 -0000

Author: rene
Date: Mon Feb  3 20:34:30 2014
New Revision: 43739
URL: http://svnweb.freebsd.org/changeset/doc/43739

Log:
  kwm signed my key as well, so update it.

Modified:
  head/share/pgpkeys/rene.key

Modified: head/share/pgpkeys/rene.key
==============================================================================
--- head/share/pgpkeys/rene.key	Mon Feb  3 20:29:26 2014	(r43738)
+++ head/share/pgpkeys/rene.key	Mon Feb  3 20:34:30 2014	(r43739)
@@ -23,54 +23,90 @@ tjdev+saeNdfqFnJSx84tg6yrv11GMiqagFdvuUF
 PsgaPDzFkKm6gkLKDmJVXrYUJYvyYxUasMO/LRD4CXsH06KtF6l/wQEAyEQRXFn4
 0TnhDNvzT/c3GM3jFoR7rfesyRWqEat1YaI56rEc5TJTv/OlDzSjABZ7qZUhpukE
 NDQGlWAQbxWTfdUCE7Tvq94jG5Nz+OtN6H5sYK2aUdKsDoYkCa1eK8dQHQARAQAB
-tB5SZW7DqSBMYWRhbiA8cmVuZUBmcmVlYnNkLm9yZz6JAj4EEwEKACgCGwMGCwkI
-BwMCBhUIAgkKCwQWAgMBAh4BAheABQJSvgtYBQkHuFNRAAoJEK27+GEKN4m3PrEP
-/3ooAjUlsfC8NQVIEbqx4Hw/0g5dPxpUPoBR7AkSElV2mIlKmieG1aFPphbnT+w0
-la5r2iYDeo4bJHpLIopAm7HT59JM8HVQwver5kCBi8QDo1UDYUOFK77UebRiVrJw
-EMUTw1IG/yVcc7MnMiqqwSLxVX22oAqLe37aVOf/ipggn5HVJ4p5qRniziLm6lKh
-4cRE/IRGn+MYUSH+6bm/yyjB1px3gFuHthumJdcsMnyUBVf5zt7mq4k6VpO8YQ5F
-QkULaSlZWYAfahV4fcNj1YCvA7izKfWpGqZCFB+cnK4fT8ZHinOxl3fP8RP632EU
-2CQD7m1/0mFlTx1YrGvrStJQU089dq5C8e+C/qdwh+kG2Ymu51VhRySTZxPR9JDb
-Z8e9CzXyYyTQDXjhFFNJOZUiQugEoNsIna3ycZyJRUMq4Kj19eFX+D/HoC89JB0A
-5jvoy52xnXX6XRuSTQF1rDaOL/nigudu8zDm1Pr4xoD2wgo/KXEJlUgoT+VGLOvI
-WZkiRRXadHicwI7S2LnL+jwi/M4H94Ae/J0M01VrpS8WTOTVLcN6d6Z6vnZTFHjo
-5ww7tzsVW0ivBfxHAe7b0G8pFOqBnqtT6wnwSQQ8hMA4TxPDnLyQ5rcEpBV5eRXV
-PrR9NIy0eqmrNtWFraQjJZnwDextZzuoYadKHQAoBrZ3iEYEEBECAAYFAlCpWAQA
-CgkQjJ5keuVkK/xR0QCfTgWGJ2jvWobVNz7GAz7O2nzYovMAnRf9Ig3UsQYfh1Vz
-tDWI75scvxdCiQIcBBABCAAGBQJQqdM9AAoJEKnIbI3Tro06gRUP/iEZflr8Vqnb
-jeDBBYKXt35SWp4ymSIe7DrDFYSk3ZQqtPXO0q+GsUD7JQb5pJbzuSGjjGk4MW+3
-6O3ao64WKMxNjFhB3+6k2tk0Bv2VPbATNFvruxmwWPFgKJCInapuBXMT6p3iRoht
-+Hm7b/iN2T8CiZ/9AMLw5ZhtKDjZuiX7SYoMZ5dnbMRuTx2LRLdBbabDdA+HxpP1
-QJZQsiJ/AT9M8ZNyDq5SUCrIQ9Ioob1kt5ZjeEdzzlbzjeq4YuOZqyj9ZiVP2xeD
-uJRAKdt1m7xICZEtJpDVqL+0U1mrWzVCrRZL/cTN46n1EJ3hljYvbR5qUZY5DSqs
-1U56rSrg0DF0ZkIqeH+ZER66QoP6tGn/AZ5/Z5KNaQ/3ZSGNrgv6/XbfTitZ2ExA
-ixjtTlaprcbyENZx7d/Uu9adL5iI3kPXjCLXrRbJ+5l5qAgHQN+9Qg3fHULABFgU
-j6QNseLT1k0yJl/J+WrD2pw5F5z62LGjUi8KzBaZFx40iW9toL6lT/NuqVV31QdW
-d8rVe1/UebExYVpHJL+TVhgGTwXykdFzDkITeH42PYCdV2qGcqOQYVHjiYCilSSE
-V5OF54PlJy03hzyqJzKFhK4OXPSTF239JLn0faV3Mvhyj4J843Nb6aF4gvQUs9lt
-rKjkuO/nYDQfywWkXDaarsqvqO8qHBkyuQINBFCpUocBEACd0U3FCpxiWZz187gN
-wN7Fm4dSV60JN0ZrDQWynNoONqapjiNIgG1vdiC+TsEC+Rzoy7HfaFS9N8YEPepm
-EULrP8IQ8geV86AJHbhhTDlMHpalGwJnjTgRvUXllKImbIDX7sbgFrPLFg5RHFl+
-d8fazE/CKXeZ5QZ8IZnjV45Jmz1s+6OJ8ZgVaoH+VyWpy6HEoTseKmEC2ERDX8y5
-NPDEvPkjVoH+nttOL2qHxsCwoHxPdDAHuVZtpH1DBEXHXLyLBTgTUj88CqHGyJMC
-Ehtt7IcMIqe2XeGoLTwRL30n4cYN4mBMRU2gAg8mko+nsNKQ9lCYk7j7vyxuxlrs
-6a5hBOIYbf61Z+mULKnFdYNDM+u52Ne2a1bWfLUwjYxXEg67T8zOPn6XKASF+6tj
-tucKzjMyOxIDn1M06su02Uwq/f0UDQZNeTdiUP7kdE0W+OwaIboBbOXdM9bE4t5F
-l1jQStFFe3Ciadpq5PI8bShqYWET+19PSjJJY0ILPMiX1TuiN7ErIXZ7d9MKPwCb
-X9YBggrkoGXYv43MGBUHkdvHP3ZS6cPOuLyUfrlmZ8X4mz2YyfjD0KqGumLoTpCQ
-IPnX8MJDhAyAA4TH4gaz0TEU4SFhuOgVy2hAa1oCJG7UJ15mAz6c+WriVWkZCD2T
-PgZ50JKGzDcEOfvpt01SneEE+QARAQABiQIfBBgBAgAJBQJQqVKHAhsMAAoJEK27
-+GEKN4m32ngQAI74KZiHjG8yivuidS2BqkzamBr047BjZMIJN5Jwgs9R6ojTWqxc
-j1IkNkeKqewmJkBlCGfaXQkNdgKwwno4qthdEJIOj6NmzrdlFHrhq+FX9xz3DdV2
-KO6l/sTafVCGkKXBVLueEUZQ5pKv/++HPUsVC/n3OtVD6ZtlbkSrCkjwRtovniQs
-SqfoH5iFgRwOTU5uhQMC/9ckwSqd8DPb2kE7rm/GFtJmub3tC5BfNBEOG1wlE329
-BdlPe+LtsvUq5S3puWn96zh+qFGbIr215xEN1aALjezrnIV7R/5KgpwqTZZp35EG
-zSLwITKy4B92Tm46FXtD11OEf5eM6vMlpsbd5gTSMvl4RgBpHWFrr6Mb6AMLNjDS
-D1QDafttay7ZvOx95rCU3lCbJfovE59i8v8WR1yNMXwe6/v7ZGeGFpatVbx+kXSg
-IkHiCFbGOtv1aFXuophuIYHmYMO3sxYtR3Eqjlv5rFtv8eA/oYvXDeh7DwQhMJ3C
-y9yvbz/NzaH+fyDizSnCgFWm0XBgCEeYErpsegcqhFtbuJRF0FdP7OhrSgGgYSOs
-sRzeOhTbcafbPlt/ngEleSYRQXKnFfomz4fcGjZjVcLMiJDm6A2Dvii36jGjeU61
-W6DaS7ILqMvdjSUnO6+eUuUY8DygHQ/SHnxO1mCp/Oz6KhHd/Yhg+jM6
-=xO5M
+tB5SZW7DqSBMYWRhbiA8cmVuZUBmcmVlYnNkLm9yZz6JAkEEEwEKACsCGwMGCwkI
+BwMCBhUIAgkKCwQWAgMBAh4BAheABQkHuFNRBQJS7BohAhkBAAoJEK27+GEKN4m3
+dGIP/0UGzQMN4bEaGJLnFn+7gkOMwug0i+7FTOj4voB0lOHpx0mq+IjwE8+E47Wi
+uc0PqeY3KsR7e6X9chvIdugw6o2kb1DRhRnJvjTKj7Q/LsWnPWu0JN0BhiyGBK8/
+77p6tTehdlBFQrmL9wAZf3B5IN6mVtPf9wNKl4vpPrQW5CpfUHQF8Jgfg0kV0qQa
+FXD85SO4G6yPHcvueyhwb0GweDpuQqJlIxCYQjap74/F4vHhPfbHk6lc2q5RjdMR
+tv+lXzp8U0rP8FjweOB4F0yx51BMVUumUCB6JrcbCqLxHMXde2Xc0RAMSTCt/C83
+TCL4KljJdWeHPjg395tBwonozgFhtm0WJGO31cvRJ7NjTqvfvMHcekqxQLeaDzzG
+EoVKusuEjRgNm1v0UPBujM0edgJid6VZZRRsLfNDdcPLuZzohTtWV8WiB3c2UiRa
+glE2no5Dy/4B/VEl0N1zc10VPuKXiRH1Cvp9HIjv3HjSCnZWjPZSnfcSCrdH1goD
+H43w95OODruHjHggTBd5UG6KYS7gwssYbyQsU1N4mv6+UtH/UEUWXg2SFAQrnZHc
+nc0yvAxnKS/FCFdeI3IlYUZpS5HPWtfV5stDi4R2ghrfb7WEFqWwbkCEIylhbEOw
+LsxRiXY4Dw/73L1QaUu4aEhSGvnSamQv1rkfVfZH6Rb/FTOZiEYEEBECAAYFAlCp
+WAQACgkQjJ5keuVkK/xR0QCfTgWGJ2jvWobVNz7GAz7O2nzYovMAnRf9Ig3UsQYf
+h1VztDWI75scvxdCiQIcBBABCAAGBQJQqdM9AAoJEKnIbI3Tro06gRUP/iEZflr8
+VqnbjeDBBYKXt35SWp4ymSIe7DrDFYSk3ZQqtPXO0q+GsUD7JQb5pJbzuSGjjGk4
+MW+36O3ao64WKMxNjFhB3+6k2tk0Bv2VPbATNFvruxmwWPFgKJCInapuBXMT6p3i
+Roht+Hm7b/iN2T8CiZ/9AMLw5ZhtKDjZuiX7SYoMZ5dnbMRuTx2LRLdBbabDdA+H
+xpP1QJZQsiJ/AT9M8ZNyDq5SUCrIQ9Ioob1kt5ZjeEdzzlbzjeq4YuOZqyj9ZiVP
+2xeDuJRAKdt1m7xICZEtJpDVqL+0U1mrWzVCrRZL/cTN46n1EJ3hljYvbR5qUZY5
+DSqs1U56rSrg0DF0ZkIqeH+ZER66QoP6tGn/AZ5/Z5KNaQ/3ZSGNrgv6/XbfTitZ
+2ExAixjtTlaprcbyENZx7d/Uu9adL5iI3kPXjCLXrRbJ+5l5qAgHQN+9Qg3fHULA
+BFgUj6QNseLT1k0yJl/J+WrD2pw5F5z62LGjUi8KzBaZFx40iW9toL6lT/NuqVV3
+1QdWd8rVe1/UebExYVpHJL+TVhgGTwXykdFzDkITeH42PYCdV2qGcqOQYVHjiYCi
+lSSEV5OF54PlJy03hzyqJzKFhK4OXPSTF239JLn0faV3Mvhyj4J843Nb6aF4gvQU
+s9ltrKjkuO/nYDQfywWkXDaarsqvqO8qHBkyiQI4BBMBAgAiBQJQqVKHAhsDBgsJ
+CAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCtu/hhCjeJtxfWEADOeoLUBZVNMSc7
+bWgQo0jjTVmKac+kXYq8LLeLVHnBbGqcYzzdIxKYsaZg0bKZ2bhuZDfW6rP1JVLs
+gytqRPtpmCvDY+xvu78gHw5i4IX/3//MpKGfJDlhO3gOIe8nM+HmwIJZZXhcCKEn
+/EHBlRVr6OwWlytMNWiq0j8SV2s4UfnJhfGnbNn6iZVeAP0au+BnwqCLyLsiM4eL
+RtUoqqzhuvXbUFML5a4rTNy/pNFsW9VoNokrbf80EkaYkvZTOz72CmWSZF0R3w2V
+o3IKhsdwKdXeX8N0UvRfoTH9Y1Kf3ddLXIDT3tE8rR8Vv0YJnO7vDw23WdWBL6W1
+kLuRgRmw+uc43K/pqtHk/PK4zsgMI3tjIjPlxd161TDNXzXvtqDHsswNgYDxRuOp
+zl3RI3OLgwAoH72+SXn35wTLZwUE5jumEPqIEuV+2/EFHYeiUJTXPE24NY0G7WFG
+Dq6jvSqUZkEfKGp5vbi7pfBBRoU8JVHwZIGN5LLYib4rEkJsFXYL+jGLnqEbz3/4
+sFowvAKbJbD2OPdurqP9TBeUYichkdsMYTTcV0ActFoiKsjhmwnK7FJMel6+PGjb
+sP8sR6EYl/GxpINJvzQR1J/xvLy09izuo5HEly55SJSmP5VqCMEJzF1fMyp6/FsX
+BnY2ehP9laJi0EMdI2+Go/ZqdemA04kCPgQTAQoAKAIbAwYLCQgHAwIGFQgCCQoL
+BBYCAwECHgECF4AFAlK+C1gFCQe4U1EACgkQrbv4YQo3ibc+sQ//eigCNSWx8Lw1
+BUgRurHgfD/SDl0/GlQ+gFHsCRISVXaYiUqaJ4bVoU+mFudP7DSVrmvaJgN6jhsk
+eksiikCbsdPn0kzwdVDC96vmQIGLxAOjVQNhQ4UrvtR5tGJWsnAQxRPDUgb/JVxz
+sycyKqrBIvFVfbagCot7ftpU5/+KmCCfkdUninmpGeLOIubqUqHhxET8hEaf4xhR
+If7pub/LKMHWnHeAW4e2G6Yl1ywyfJQFV/nO3uariTpWk7xhDkVCRQtpKVlZgB9q
+FXh9w2PVgK8DuLMp9akapkIUH5ycrh9PxkeKc7GXd8/xE/rfYRTYJAPubX/SYWVP
+HVisa+tK0lBTTz12rkLx74L+p3CH6QbZia7nVWFHJJNnE9H0kNtnx70LNfJjJNAN
+eOEUU0k5lSJC6ASg2widrfJxnIlFQyrgqPX14Vf4P8egLz0kHQDmO+jLnbGddfpd
+G5JNAXWsNo4v+eKC527zMObU+vjGgPbCCj8pcQmVSChP5UYs68hZmSJFFdp0eJzA
+jtLYucv6PCL8zgf3gB78nQzTVWulLxZM5NUtw3p3pnq+dlMUeOjnDDu3OxVbSK8F
+/EcB7tvQbykU6oGeq1PrCfBJBDyEwDhPE8OcvJDmtwSkFXl5FdU+tH00jLR6qas2
+1YWtpCMlmfAN7G1nO6hhp0odACgGtneJAhwEEAEKAAYFAlLsHI4ACgkQv04tWzud
+iEed+g/+PoaKg5PPKybwE3eiKTb/ImPD2cUBJxyjyaPAHUIZnSzdx6AmqEV+fCAk
+KMlSLqCbd0/5lqtjf/FnyY6I/PvmpzwZwXYdrztAP4RnaBK4+Z5ycp2N/YqAv9+M
+5BV/ZSPwTPjOYt0mgQ4rJlfT81lWi4sBH2MVVc/M6ntxiPqxMfBWqm6xSN8nrylS
+DduP9dvCvWs/hklt/YdlKzrotyieXJcuSQ5zrwnYlCgyMFtzxLwScyJJr7PnkVOM
+oQqjEuslhBuU7qFCxjcYxl1jkzscqCgazp7+GzL9mEJvZcrAUI9g4g8NHskvjd44
+YyeNNVBGVyIQxnAgNBXPARmDjp4of8FJTvZJ95Kck7s35Vi6nd3tjboRveUQZ42w
+4Z2Pz33D4EeZg+BpY9H3UVsT0E21BD2y9j24eGNYob8w8lYSbP0mDc4alh68YBy+
+dtov1Mg2fHOG7bOfaK1E+/ubwDWFuf6JY6LtE1ZNyW497sJOM3ySul2XjYrVOs4J
+0WiUYmepBz8DnNEbpU9OGDDQDwXbTEF9NokoH+7HfUUcPUblZTmdzWrjF8XBJnMs
+SlSzI9YR/u6LgfSRJ6CruhwiEaUUo41gvfvSjrH3TR6J9vJIHqncNXK5ZZhVU1pt
+UDaUTeV3sAujUGXJ75P5GSEhIKGM9LNhjt+6kiuQQVD7ciqkDXa5Ag0EUKlShwEQ
+AJ3RTcUKnGJZnPXzuA3A3sWbh1JXrQk3RmsNBbKc2g42pqmOI0iAbW92IL5OwQL5
+HOjLsd9oVL03xgQ96mYRQus/whDyB5XzoAkduGFMOUwelqUbAmeNOBG9ReWUoiZs
+gNfuxuAWs8sWDlEcWX53x9rMT8Ipd5nlBnwhmeNXjkmbPWz7o4nxmBVqgf5XJanL
+ocShOx4qYQLYRENfzLk08MS8+SNWgf6e204vaofGwLCgfE90MAe5Vm2kfUMERcdc
+vIsFOBNSPzwKocbIkwISG23shwwip7Zd4agtPBEvfSfhxg3iYExFTaACDyaSj6ew
+0pD2UJiTuPu/LG7GWuzprmEE4hht/rVn6ZQsqcV1g0Mz67nY17ZrVtZ8tTCNjFcS
+DrtPzM4+fpcoBIX7q2O25wrOMzI7EgOfUzTqy7TZTCr9/RQNBk15N2JQ/uR0TRb4
+7BohugFs5d0z1sTi3kWXWNBK0UV7cKJp2mrk8jxtKGphYRP7X09KMkljQgs8yJfV
+O6I3sSshdnt30wo/AJtf1gGCCuSgZdi/jcwYFQeR28c/dlLpw864vJR+uWZnxfib
+PZjJ+MPQqoa6YuhOkJAg+dfwwkOEDIADhMfiBrPRMRThIWG46BXLaEBrWgIkbtQn
+XmYDPpz5auJVaRkIPZM+BnnQkobMNwQ5++m3TVKd4QT5ABEBAAGJAh8EGAECAAkF
+AlCpUocCGwwACgkQrbv4YQo3ibfaeBAAjvgpmIeMbzKK+6J1LYGqTNqYGvTjsGNk
+wgk3knCCz1HqiNNarFyPUiQ2R4qp7CYmQGUIZ9pdCQ12ArDCejiq2F0Qkg6Po2bO
+t2UUeuGr4Vf3HPcN1XYo7qX+xNp9UIaQpcFUu54RRlDmkq//74c9SxUL+fc61UPp
+m2VuRKsKSPBG2i+eJCxKp+gfmIWBHA5NTm6FAwL/1yTBKp3wM9vaQTuub8YW0ma5
+ve0LkF80EQ4bXCUTfb0F2U974u2y9SrlLem5af3rOH6oUZsivbXnEQ3VoAuN7Ouc
+hXtH/kqCnCpNlmnfkQbNIvAhMrLgH3ZObjoVe0PXU4R/l4zq8yWmxt3mBNIy+XhG
+AGkdYWuvoxvoAws2MNIPVANp+21rLtm87H3msJTeUJsl+i8Tn2Ly/xZHXI0xfB7r
++/tkZ4YWlq1VvH6RdKAiQeIIVsY62/VoVe6imG4hgeZgw7ezFi1HcSqOW/msW2/x
+4D+hi9cN6HsPBCEwncLL3K9vP83Nof5/IOLNKcKAVabRcGAIR5gSumx6ByqEW1u4
+lEXQV0/s6GtKAaBhI6yxHN46FNtxp9s+W3+eASV5JhFBcqcV+ibPh9waNmNVwsyI
+kOboDYO+KLfqMaN5TrVboNpLsguoy92NJSc7r55S5RjwPKAdD9IefE7WYKn87Poq
+Ed39iGD6Mzo=
+=aOqd
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

From owner-svn-doc-all@FreeBSD.ORG  Mon Feb  3 21:47:48 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B50521B3;
 Mon,  3 Feb 2014 21:47:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 94F6E180B;
 Mon,  3 Feb 2014 21:47:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s13Llm46078502;
 Mon, 3 Feb 2014 21:47:48 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s13Llmjq078501;
 Mon, 3 Feb 2014 21:47:48 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402032147.s13Llmjq078501@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Mon, 3 Feb 2014 21:47:48 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43740 -
 head/en_US.ISO8859-1/books/handbook/network-servers
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.17
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, 03 Feb 2014 21:47:48 -0000

Author: dru
Date: Mon Feb  3 21:47:48 2014
New Revision: 43740
URL: http://svnweb.freebsd.org/changeset/doc/43740

Log:
  Remove ntpdate.
  Re-clarify servers' response section.
  
  Submitted by: bjk, imp
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Mon Feb  3 20:34:30 2014	(r43739)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Mon Feb  3 21:47:48 2014	(r43740)
@@ -5266,31 +5266,18 @@ Starting smbd.</screen>
 
       <indexterm><primary>NTP</primary>
 	<secondary>ntp.conf</secondary>
-	<tertiary>ntpdate</tertiary>
       </indexterm>
 
-      <para>To only synchronize the clock when a system boots, use
-	&man.ntpdate.8;.  This alone can be appropriate for desktops
-	which are frequently rebooted.  However, most systems should
-	run <application>ntpdate</application> at boot time as well as
-	configure <application>ntpd</application>.  This is because
-	<application>ntpd</application> changes the clock gradually,
-	whereas <application>ntpdate</application> sets the clock, no
-	matter how great the difference between a machine's current
-	clock setting and the correct time.</para>
-
-      <para>To enable <application>ntpdate</application> at boot time,
-	add <literal>ntpdate_enable="YES"</literal> to
-	<filename>/etc/rc.conf</filename>.  To also enable
-	<application>ntpd</application>, add the
-	<literal>ntpd_enable="YES"</literal> entry to
+      <para>On &os;, the built-in <application>ntpd</application> can
+	be used to synchronize a system's clock.  To enable <application>ntpd</application> at boot time,
+	add <literal>ntpd_enable="YES"</literal> to
 	<filename>/etc/rc.conf</filename>.  Additional variables can
 	be specified in <filename>/etc/rc.conf</filename>.  Refer to
-	&man.rc.conf.5;, &man.ntpdate.8;, and &man.ntpd.8; for
+	&man.rc.conf.5; and &man.ntpd.8; for
 	details.</para>
 
-      <para>Both applications read <filename>/etc/ntp.conf</filename>
-	to determine which servers to query.  Here is a simple example
+      <para>This application reads <filename>/etc/ntp.conf</filename>
+      to determine which <acronym>NTP</acronym> servers to query.  Here is a simple example
 	of an <filename>/etc/ntp.conf</filename>:</para>
 
       <example>
@@ -5309,7 +5296,7 @@ driftfile /var/db/ntp.drift</programlist
 	entry includes <literal>prefer</literal>, that server is
 	preferred over other servers.  A response from a preferred
 	server will be discarded if it differs significantly from
-	responses; otherwise it will be used.  The
+	other servers' responses; otherwise it will be used.  The
 	<literal>prefer</literal> argument should only be used for
 	<acronym>NTP</acronym> servers that are known to be highly
 	accurate, such as those with special time monitoring

From owner-svn-doc-all@FreeBSD.ORG  Mon Feb  3 21:50:25 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2FC51260;
 Mon,  3 Feb 2014 21:50:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1BB3C1878;
 Mon,  3 Feb 2014 21:50:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s13LoOPx078865;
 Mon, 3 Feb 2014 21:50:24 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s13LoOuO078864;
 Mon, 3 Feb 2014 21:50:24 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402032150.s13LoOuO078864@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Mon, 3 Feb 2014 21:50:24 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43741 -
 head/en_US.ISO8859-1/books/handbook/network-servers
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.17
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, 03 Feb 2014 21:50:25 -0000

Author: dru
Date: Mon Feb  3 21:50:24 2014
New Revision: 43741
URL: http://svnweb.freebsd.org/changeset/doc/43741

Log:
  Whitespace fix only. Translators can ignore.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Mon Feb  3 21:47:48 2014	(r43740)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Mon Feb  3 21:50:24 2014	(r43741)
@@ -5269,16 +5269,18 @@ Starting smbd.</screen>
       </indexterm>
 
       <para>On &os;, the built-in <application>ntpd</application> can
-	be used to synchronize a system's clock.  To enable <application>ntpd</application> at boot time,
-	add <literal>ntpd_enable="YES"</literal> to
+	be used to synchronize a system's clock.  To enable
+	<application>ntpd</application> at boot time, add
+	<literal>ntpd_enable="YES"</literal> to
 	<filename>/etc/rc.conf</filename>.  Additional variables can
 	be specified in <filename>/etc/rc.conf</filename>.  Refer to
 	&man.rc.conf.5; and &man.ntpd.8; for
 	details.</para>
 
       <para>This application reads <filename>/etc/ntp.conf</filename>
-      to determine which <acronym>NTP</acronym> servers to query.  Here is a simple example
-	of an <filename>/etc/ntp.conf</filename>:</para>
+	to determine which <acronym>NTP</acronym> servers to query.
+	Here is a simple example of an
+	<filename>/etc/ntp.conf</filename>:</para>
 
       <example>
 	<title> Sample <filename>/etc/ntp.conf</filename></title>

From owner-svn-doc-all@FreeBSD.ORG  Mon Feb  3 22:01:03 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 40CCB9BA;
 Mon,  3 Feb 2014 22:01:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2A26218F0;
 Mon,  3 Feb 2014 22:01:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s13M13Zr083611;
 Mon, 3 Feb 2014 22:01:03 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s13M104l083582;
 Mon, 3 Feb 2014 22:01:00 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201402032201.s13M104l083582@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Mon, 3 Feb 2014 22:01:00 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43742 - in head/en_US.ISO8859-1/htdocs: releases/10.0R
 releases/6.4R releases/7.1R releases/7.2R releases/7.3R releases/7.4R
 releases/8.0R releases/8.1R releases/8.2R releases/9.0R rel...
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.17
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, 03 Feb 2014 22:01:03 -0000

Author: pluknet
Date: Mon Feb  3 22:01:00 2014
New Revision: 43742
URL: http://svnweb.freebsd.org/changeset/doc/43742

Log:
  Update links with MFC glossary anchor.

Modified:
  head/en_US.ISO8859-1/htdocs/releases/10.0R/schedule.xml
  head/en_US.ISO8859-1/htdocs/releases/6.4R/schedule.xml
  head/en_US.ISO8859-1/htdocs/releases/7.1R/schedule.xml
  head/en_US.ISO8859-1/htdocs/releases/7.2R/schedule.xml
  head/en_US.ISO8859-1/htdocs/releases/7.3R/schedule.xml
  head/en_US.ISO8859-1/htdocs/releases/7.4R/schedule.xml
  head/en_US.ISO8859-1/htdocs/releases/8.0R/schedule.xml
  head/en_US.ISO8859-1/htdocs/releases/8.1R/schedule.xml
  head/en_US.ISO8859-1/htdocs/releases/8.2R/schedule.xml
  head/en_US.ISO8859-1/htdocs/releases/9.0R/schedule.xml
  head/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.xml
  head/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml
  head/en_US.ISO8859-1/htdocs/releng/index.xml

Modified: head/en_US.ISO8859-1/htdocs/releases/10.0R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/10.0R/schedule.xml	Mon Feb  3 21:50:24 2014	(r43741)
+++ head/en_US.ISO8859-1/htdocs/releases/10.0R/schedule.xml	Mon Feb  3 22:01:00 2014	(r43742)
@@ -28,7 +28,7 @@
   <p>General discussions about the pending release and known issues should be
     sent to the public
     <a href="mailto:FreeBSD-stable@FreeBSD.org">freebsd-stable</a> mailing list.
-    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#MFC-GLOSSARY">MFC</a>
+    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#mfc-glossary">MFC</a>
     requests should be sent to
     <a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.</p>
 

Modified: head/en_US.ISO8859-1/htdocs/releases/6.4R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/6.4R/schedule.xml	Mon Feb  3 21:50:24 2014	(r43741)
+++ head/en_US.ISO8859-1/htdocs/releases/6.4R/schedule.xml	Mon Feb  3 22:01:00 2014	(r43742)
@@ -26,7 +26,7 @@
   <p>General discussions about the release engineering process or
     quality assurance issues should be sent to the public
     <a href="mailto:FreeBSD-qa@FreeBSD.org">freebsd-qa</a> mailing list.
-    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#MFC-GLOSSARY">MFC</a>
+    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#mfc-glossary">MFC</a>
     requests should be sent to
     <a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.</p>
 

Modified: head/en_US.ISO8859-1/htdocs/releases/7.1R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/7.1R/schedule.xml	Mon Feb  3 21:50:24 2014	(r43741)
+++ head/en_US.ISO8859-1/htdocs/releases/7.1R/schedule.xml	Mon Feb  3 22:01:00 2014	(r43742)
@@ -26,7 +26,7 @@
   <p>General discussions about the release engineering process or
     quality assurance issues should be sent to the public
     <a href="mailto:FreeBSD-qa@FreeBSD.org">freebsd-qa</a> mailing list.
-    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#MFC-GLOSSARY">MFC</a>
+    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#mfc-glossary">MFC</a>
     requests should be sent to
     <a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.</p>
 

Modified: head/en_US.ISO8859-1/htdocs/releases/7.2R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/7.2R/schedule.xml	Mon Feb  3 21:50:24 2014	(r43741)
+++ head/en_US.ISO8859-1/htdocs/releases/7.2R/schedule.xml	Mon Feb  3 22:01:00 2014	(r43742)
@@ -26,7 +26,7 @@
   <p>General discussions about the pending release and known issues should be
     sent to the public
     <a href="mailto:FreeBSD-stable@FreeBSD.org">freebsd-stable</a> mailing list.
-    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#MFC-GLOSSARY">MFC</a>
+    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#mfc-glossary">MFC</a>
     requests should be sent to
     <a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.</p>
 

Modified: head/en_US.ISO8859-1/htdocs/releases/7.3R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/7.3R/schedule.xml	Mon Feb  3 21:50:24 2014	(r43741)
+++ head/en_US.ISO8859-1/htdocs/releases/7.3R/schedule.xml	Mon Feb  3 22:01:00 2014	(r43742)
@@ -27,7 +27,7 @@
   <p>General discussions about the pending release and known issues should be
     sent to the public
     <a href="mailto:FreeBSD-stable@FreeBSD.org">freebsd-stable</a> mailing list.
-    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#MFC-GLOSSARY">MFC</a>
+    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#mfc-glossary">MFC</a>
     requests should be sent to &contact.re;.</p>
 
   <h1>Schedule</h1>

Modified: head/en_US.ISO8859-1/htdocs/releases/7.4R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/7.4R/schedule.xml	Mon Feb  3 21:50:24 2014	(r43741)
+++ head/en_US.ISO8859-1/htdocs/releases/7.4R/schedule.xml	Mon Feb  3 22:01:00 2014	(r43742)
@@ -26,7 +26,7 @@
   <p>General discussions about the pending release and known issues should be
     sent to the public
     <a href="mailto:FreeBSD-stable@FreeBSD.org">freebsd-stable</a> mailing list.
-    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#MFC-GLOSSARY">MFC</a>
+    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#mfc-glossary">MFC</a>
     requests should be sent to
     <a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.</p>
 

Modified: head/en_US.ISO8859-1/htdocs/releases/8.0R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/8.0R/schedule.xml	Mon Feb  3 21:50:24 2014	(r43741)
+++ head/en_US.ISO8859-1/htdocs/releases/8.0R/schedule.xml	Mon Feb  3 22:01:00 2014	(r43742)
@@ -26,7 +26,7 @@
   <p>General discussions about the pending release and known issues should be
     sent to the public
     <a href="mailto:FreeBSD-current@FreeBSD.org">freebsd-current</a> mailing list.
-    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#MFC-GLOSSARY">MFC</a>
+    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#mfc-glossary">MFC</a>
     requests should be sent to
     <a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.</p>
 

Modified: head/en_US.ISO8859-1/htdocs/releases/8.1R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/8.1R/schedule.xml	Mon Feb  3 21:50:24 2014	(r43741)
+++ head/en_US.ISO8859-1/htdocs/releases/8.1R/schedule.xml	Mon Feb  3 22:01:00 2014	(r43742)
@@ -26,7 +26,7 @@
   <p>General discussions about the pending release and known issues should be
     sent to the public
     <a href="mailto:FreeBSD-current@FreeBSD.org">freebsd-current</a> mailing list.
-    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#MFC-GLOSSARY">MFC</a>
+    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#mfc-glossary">MFC</a>
     requests should be sent to
     <a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.</p>
 

Modified: head/en_US.ISO8859-1/htdocs/releases/8.2R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/8.2R/schedule.xml	Mon Feb  3 21:50:24 2014	(r43741)
+++ head/en_US.ISO8859-1/htdocs/releases/8.2R/schedule.xml	Mon Feb  3 22:01:00 2014	(r43742)
@@ -26,7 +26,7 @@
   <p>General discussions about the pending release and known issues should be
     sent to the public
     <a href="mailto:FreeBSD-stable@FreeBSD.org">freebsd-stable</a> mailing list.
-    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#MFC-GLOSSARY">MFC</a>
+    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#mfc-glossary">MFC</a>
     requests should be sent to
     <a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.</p>
 

Modified: head/en_US.ISO8859-1/htdocs/releases/9.0R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/9.0R/schedule.xml	Mon Feb  3 21:50:24 2014	(r43741)
+++ head/en_US.ISO8859-1/htdocs/releases/9.0R/schedule.xml	Mon Feb  3 22:01:00 2014	(r43742)
@@ -26,7 +26,7 @@
   <p>General discussions about the pending release and known issues should be
     sent to the public
     <a href="mailto:FreeBSD-stable@FreeBSD.org">freebsd-stable</a> mailing list.
-    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#MFC-GLOSSARY">MFC</a>
+    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#mfc-glossary">MFC</a>
     requests should be sent to
     <a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.</p>
 

Modified: head/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.xml	Mon Feb  3 21:50:24 2014	(r43741)
+++ head/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.xml	Mon Feb  3 22:01:00 2014	(r43742)
@@ -27,7 +27,7 @@
   <p>General discussions about the pending release and known issues should be
     sent to the public
     <a href="mailto:FreeBSD-stable@FreeBSD.org">freebsd-stable</a> mailing list.
-    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#MFC-GLOSSARY">MFC</a>
+    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#mfc-glossary">MFC</a>
     requests should be sent to
     <a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.</p>
 

Modified: head/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml	Mon Feb  3 21:50:24 2014	(r43741)
+++ head/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml	Mon Feb  3 22:01:00 2014	(r43742)
@@ -27,7 +27,7 @@
   <p>General discussions about the pending release and known issues should be
     sent to the public
     <a href="mailto:FreeBSD-stable@FreeBSD.org">freebsd-stable</a> mailing list.
-    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#MFC-GLOSSARY">MFC</a>
+    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#mfc-glossary">MFC</a>
     requests should be sent to
     <a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.</p>
 

Modified: head/en_US.ISO8859-1/htdocs/releng/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releng/index.xml	Mon Feb  3 21:50:24 2014	(r43741)
+++ head/en_US.ISO8859-1/htdocs/releng/index.xml	Mon Feb  3 22:01:00 2014	(r43742)
@@ -435,7 +435,7 @@
   <h2><a name="team" id="team">Release Engineering Team</a></h2>
 
   <p>The primary release engineering team is responsible for approving
-    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#MFC-GLOSSARY">MFC</a>
+    <a href="&base;/doc/en_US.ISO8859-1/books/handbook/freebsd-glossary.html#mfc-glossary">MFC</a>
     requests during code freezes, setting release schedules, and all of
     the other responsibilities laid out in our <a
       href="&base;/releng/charter.html">charter</a>.</p>

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 00:16:13 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5788E43E;
 Tue,  4 Feb 2014 00:16:13 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3893F178D;
 Tue,  4 Feb 2014 00:16:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s140GDkh061925;
 Tue, 4 Feb 2014 00:16:13 GMT (envelope-from zi@svn.freebsd.org)
Received: (from zi@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s140GDO5061924;
 Tue, 4 Feb 2014 00:16:13 GMT (envelope-from zi@svn.freebsd.org)
Message-Id: <201402040016.s140GDO5061924@svn.freebsd.org>
From: Ryan Steinmetz <zi@FreeBSD.org>
Date: Tue, 4 Feb 2014 00:16:13 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43743 - 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.17
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, 04 Feb 2014 00:16:13 -0000

Author: zi (ports committer)
Date: Tue Feb  4 00:16:12 2014
New Revision: 43743
URL: http://svnweb.freebsd.org/changeset/doc/43743

Log:
  - Update my PGP key

Modified:
  head/share/pgpkeys/zi.key   (contents, props changed)

Modified: head/share/pgpkeys/zi.key
==============================================================================
--- head/share/pgpkeys/zi.key	Mon Feb  3 22:01:00 2014	(r43742)
+++ head/share/pgpkeys/zi.key	Tue Feb  4 00:16:12 2014	(r43743)
@@ -1,80 +1,64 @@
 <!-- $FreeBSD$ -->
 <!--
-sh ./addkey.sh zi 7AD7FAF2;
+sh addkey.sh zi 1EF8BA6BD02846D7 ;
 -->
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
-pub   1024D/7AD7FAF2 2004-01-21
-      Key fingerprint = EF36 D45A 5CA9 28B1 A550  18CD A43C D111 7AD7 FAF2
-uid                  Ryan Steinmetz <zi@FreeBSD.org>
-uid                  Ryan Steinmetz <rpsfa@rit.edu>
-uid                  Ryan Steinmetz <zi@zi0r.com>
-sub   1024g/058BC057 2004-01-21
-sub   4096g/0EB108D2 2006-02-27
-sub   1024D/FEF36DD7 2006-02-27
+pub   2048R/1EF8BA6BD02846D7 2014-02-03 [expires: 2019-02-02]
+      Key fingerprint = 9079 51A3 34EF 0CD4 F228  EDC6 1EF8 BA6B D028 46D7
+uid                          Ryan Steinmetz <zi@zi0r.com>
+uid                          Ryan Steinmetz <rsteinme@cisco.com>
+uid                          Ryan Steinmetz <zi@FreeBSD.org>
+sub   2048R/A8A08AA9D827E5F8 2014-02-03 [expires: 2019-02-02]
+
 ]]></programlisting>
 <programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQGiBEAO4+ARBACIMxKRWYAPaeAW2k6Qqlf1mWoRkJV+FWxFrrkPM1z6FWsiBFWc
-ZNWYAQ5BvtY+5qtga1FHBMhExINCcgtJf+NQh+U38OjfpIOnTZXku+Sw1Gll1fH2
-Ws+v/wwgC/SCh3RtUSYc1u7oa3i1QTvi2Dnk57AIfvVUv2hm9f4bg83/iwCg9yVU
-QkFFxz0TYPQmTUE98bxy//cD/ijSfviyGs+QyDpCB7l8I03VeZqZlk4zct/wNGeh
-DuYITyMzb5eqhffvo9LrovAPbuEc2voPmYdRXhW/kEXc6PLu+84mY73A1EQSKPje
-R1iQ4ska23zu/hNGLhQYQwX6kVX9PzG30X1MLuVFn3rEy9FxS6CpY+36x1U3zmnr
-lYHBA/sHE0Zrvm2fE+F0BKyEhZJ7+Vj3hwqtpkKdFW9+4xgPXUylFtMMhB5cgFSY
-R/LEqAqmJmPOdgs/961yFrDZliLtvjVrfpOOQ78JbkO01WF7EdARrdV6ii9VaQ6D
-sbZFrX976wqzDGdLvQIOGjGMILO7bxCs3k3dGdD5WyxJQusANrQeUnlhbiBTdGVp
-bm1ldHogPHJwc2ZhQHJpdC5lZHU+iGAEExECACAFAkQChWECGwMGCwkIBwMCBBUC
-CAMEFgIDAQIeAQIXgAAKCRCkPNERetf68mWkAJ9F+kZDo7hh/zf9vaIzFIJP20Gs
-aQCdEtZrQIm/2mxcXY4abobIVk3XCC60HFJ5YW4gU3RlaW5tZXR6IDx6aUB6aTBy
-LmNvbT6IXgQTEQIAHgUCQA7o7QIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCk
-PNERetf68jeoAJ9I2uKiZnKtElTpIrGZhPFpU2iZYwCghNN3q8Qrcn4bRj/bo/UL
-LA0wUNO0H1J5YW4gU3RlaW5tZXR6IDx6aUBGcmVlQlNELm9yZz6IYgQTEQIAIgUC
-Th+NnwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQpDzREXrX+vKSiQCg
-rkCRl23wMtHw3Q36BsDCJ/4UMs0An3Nfjjgg/+PC8TQmaL/mnATr0PDbuQENBEAO
-4/AQBAC1qtLY3Zx/gesnPL7Rm9kCE7L5YP1heENlm0FWSzd0zCH4qHjqzSGRVyb+
-0s+ZRRW4heECpF1+eS4W2f2PX8siVrm+hg1q+Tx5Ag1q2Qf8MaQU2nmk9FBWUhCS
-83EK/a7DGAELezGIZ3wKR6MQwZty7+oasM2XKfqIzd+c73375wADBwP+M7AQzrba
-JtrPooPANNO7a1i7gxU9Yz9UmQTYJbiq8GRExMpFJU7l0UkiiT5vN2q+rSBpIobg
-/bADCqODiV0QkqhQ6ASQiUK4ZGvy8Xn+QOQQJtM4YfSUl5bUapRGPND9LgxcCEk7
-Ts2EA916rQf06qCi0tgBf1FNTT1LIjoQdxaISQQYEQIACQUCQA7j8AIbDAAKCRCk
-PNERetf68jxHAJ9xEUFCrSG9NHMTwqXDIe4qkC7SGQCgjRZlBZUz7kXN0TFj3olD
-TJbmAAW5BA0ERAKKIBAQAKTtcqjWCqgwrXL8goWyb2G9a/DvVSj1iYXpXz1O0neO
-BF+Vd8+S0/6XW4bHCMhqWKNAbq4LSUsukxpHcGtMTdAu51/dhyFd97exGNYFFa0y
-7jeQNkkMoElia9s7/SZjfLkdoWr/ULCfSvwuhlO2KzynVffrskJzrG6XeCZZWnHP
-7/YVl2BjOxLj0hQDMgy9me4QMEwBwO37p8y/j+6ckZ8+6tw9GckWq/mvfZSAvWNO
-HIt23jt6AGmfvYu3NWbAnBMHOOtqfZEHlp70ST3Ss8pMjBYTy4vdBJk6aJfzPdF/
-lyoSna1tAu3PteM50h1y/iz1RnzTOJ6X+80nR3jDRRsT/SskZ6c/jmBpLT4f4eBU
-uuOLd/pBwkLKlsBVDzszQJIMNNpsptt/t280aJ5w+qbwD8RkG1bSTI7lLzk/++b4
-qqwkcjlHAxKpL5BrI0iiKgpQv051b3YKD5YBj/oBTSLuPapABiIOWJeWNPEg7A7m
-z036iQjlTKSw0DToT2FuwkDNs4vrI+ZKVxXdOnSjP2Do2scVz+Xi1s1X/U+1UgBp
-j+RWQv3dRXQedhUU/OtLf6tV0z86nALFw3DTW6bYEy4OzO+JB6erBBvbmjZrmeZf
-Tc7sfvK6ObnEfHHOxLMhONv2rjwISeor0SrfaYRxSiJmUHL3bwjcERuJd4eZe/FH
-AAQLD/4gTmCxHIAuMhieUzmLxe3SFDI3yhOq83lhiH4vTnAGkC5flgi9NizOPjci
-FeeUCBXF2STNfprqT/1539RII3PBEdIjGaNTTSui7AEaoox/2yG3UxVUU7UwIliH
-CtqEQAv4vva1TSp+dz7yiDVFYdCSyc6oXzwk0JlI3rZYo/TqGL5AdO53XsWvHHQZ
-jN2NkFJ5n8EuT2ZrDZPlCYsj+pGfdLR3jhC5M+vf+pFSZQF1R47oG2gC+I7z3W+U
-d0FYjSVscBFNDoUu6eBewsklN0RFsi119lCT4HDt7DX75mjDyjh65neR+nBlLDKo
-Bf5J9TKmTZZH0HCVWFwuKGTDpkgfWpeXk92HJTdmUZGCAs11GbQVQrEZOHNrm6UV
-Ie95E58NhYm6QmQI89BAHFl7ALdNSJ4IphJtcdpOK4iGH1ST7twviXaeppf0d9H2
-Bel7se+CRgnRWNxlSuyvvO0IHH0DvPdakMe7orY7cf247J+cRFLCDZkTmEjLdWF9
-WPgq3lGbVujO3WB/AIL1c5lHt8tRDMVE6xY2m18Qk7Cpn86l4d7jk5WIn9yT7/kw
-I7LTREviKwpBtxHPg69ezvk+pLsgtzPXZG05wAAiCWPn806JZsydV/M2QeHifpjC
-MxfCGjtqGkxHInlHorwQWqzBsrzAGJ/X1pvnrly3kdAtpIIt5YhJBBgRAgAJBQJE
-AoogAhsMAAoJEKQ80RF61/ryIdAAoNFlpXW7Ppd8VTNDlIlDyOt+AbarAJ9DDpM2
-igWchUGfMc58ROj90F+UL7kBogREAopcEQQAoerIQGAyddxqLupWOIO2Qhcwrwyl
-yF8LBL3JnTCcGamKHN9d72hIHZdyb5lAI+f5LKbozE3Eew23WaVWNRnonkTpVVKu
-x8n50O2O7zD/cVgJ+b8rWCkoUX41GhTX+IZOJoNRqhxA7VG20hmH8320T3DJmhpR
-PtshG2GkKlpdaLcAoPhJo8KXeaTisvCDiWXYxrVWV6hJA/9SEDTAgHH6Hejb4URi
-REoYswQ+WLFBhcT43iZyrZFodsc0B0gY2jGdJMcELDrLaTqwsotDD/5NMvDfOVww
-zw/ci6vTC+2q1kpvu7tcVYvUdSI3kr2zjW+7sZIKdoZYegxK3CmKsjOY4W+u8JlK
-tzAHPLzvHM9f/jVCiQWSJGBfPAQAg/iM1PZOZqs4M+WgcpxMrgLSLhLAL1tZD0gs
-BBBOtOQArt7DSojzlKGjpkClnkuBO5GU2jkqejAorI+WWoZ49gjkaXsqoHG0lH0H
-vhuH59NEAzT8fUg4oVmoOs2lf+hW8sEpXEvD+aZNaiiYOyWDPX0m4YSmvQJzSqN1
-/b1VJ1SIkQQYEQIACQIbAgUCTgfd1ABSRyAEGRECAAYFAk4H3c8ACgkQ0sPSsv7z
-bdd7IwCaAgx3ViZioKiAwMTsKZayZk9RTmQAoKRETnJf1b9965mcbGSQ3f+dz/TE
-CRCkPNERetf68pz3AKDInU4gBEw57s2XC3trJMB8HpYTWwCgsuZ8XADa3kCnjG8Z
-ZTV4zXhavRs=
-=wi3x
+mQENBFLwJ9kBCADEb6YrpU2WUj6ZMPKtubBQSb3gDk4U1KMj8fIOkbLIMt9um1A1
+br2tGVNr+Kd3k9ulYynfXD0JYzjeUMInWAe5ABjDxOLOoB+bO3fQvxZBomCyfZRW
+HMz8V/tNIbr4ybqs130HwgbWuj3/yn1u7MxpfJOWAnbLE+btEWhOMNoi0EY/dFmh
+whusRSsouJvmlKdaWgmjsDRoOJaeUq43mFYQV2y6qtf7KJBXWP9YfvHYNFZtg/O0
+37/LzhjnFFCzdEKRGNIIdhrJbf6ZJoCfIIggxpKkSmoPiPvLlv481nBuGN+k2QRk
+nZUux7qqWCA0cos0X2agyBlfY8RuRrKb2vrbABEBAAG0I1J5YW4gU3RlaW5tZXR6
+IDxyc3RlaW5tZUBjaXNjby5jb20+iQE9BBMBCgAnBQJS8CiMAhsDBQkJZgGABQsJ
+CAcDBRUKCQgLBRYDAgEAAh4BAheAAAoJEB74umvQKEbXB9EH/0bTDz+4lnWflgNQ
+Qzj5awBznHTe/nJkPd8/kh/wkyv7LN0Kw8Oc9s0YVPLWQGE2TSMi4QD0YIP2D9X6
+K3hRUz2ZmRhUlSXCcICxenTT/L/1FUIt2au0eqzyaR8WqkR8GkNVKWYEgIAnW2j+
+Gr9EEOOp5xqvlrqGibctkia/Lfer2lLAc13GJNmXK1rdBl7AVOoWdU0ukmn4z9qY
+w6N6DlDXCIY9Z/5w+zkGKIShywlLaHamQbovH57/eiRYcFtec8wzRAie1nduK2rB
+nH+86/AOOlkzW+TigcqHdCyifnXIzYq0Q9OamUVvJw9RrgmalX+unA231Cy7b0l0
+L9Tlau+IRgQQEQoABgUCUvApHAAKCRCkPNERetf68reHAKDBZC1pxmEsiHVEKrPq
+koUW9ceCkgCeJETt4qmZcgxk0JmRrgf3F4iHv0S0H1J5YW4gU3RlaW5tZXR6IDx6
+aUBGcmVlQlNELm9yZz6JAT0EEwEKACcFAlLwKDECGwMFCQlmAYAFCwkIBwMFFQoJ
+CAsFFgMCAQACHgECF4AACgkQHvi6a9AoRtfZuwf/YD9Lwb7fZMbXgKvRTgCcQGC/
+6GdS2sKjie3wQEtNJbi5JSVzCzeNGouM7EEkmpgOCEPEAd/OdJi32BFuroyXLoAD
+LMS42ZcP/G7xccGffIQDuwPBzLb6TY2aNh7hKEXVY9pY992OraPJUn0QFCvDQabA
+4D0Gb+LnVyqfiG+kNO43EfkUDff9XoxNyNHQiIZwezC1nUb/YxtdgKERywgtHRwI
+gNlvrNAXCj7LkwSdtckEzhD5X4oA2SBPoWVEzuRVZQLn+abeo9EvdNjxUbW+zGj1
+fjkMfVeGFRpFUaRLwBNHhN6bq1JU3FO+FC2ux2fQz5/fuF/dBFLJyOkvZlegz4hG
+BBARCgAGBQJS8CknAAoJEKQ80RF61/ryUQIAn00QfNKlmw42g2qZy/0teSWqJg+d
+AKDiBAhgBJSKxMVvf4xjbGhAye5lHLQcUnlhbiBTdGVpbm1ldHogPHppQHppMHIu
+Y29tPokBQAQTAQoAKgIbAwUJCWYBgAULCQgHAwUVCgkICwUWAwIBAAIeAQIXgAUC
+UvAqTgIZAQAKCRAe+Lpr0ChG18jsB/0fnTDCwmpQm6AUP/qg+No5PDW4fx0Wtht7
+scxdRSaC46FV+hLV3xto0vY3p4ZwM0M+kt8MpP0xG8QqpBfAJvW/kKi6r9KySBXe
+09OEuUl7iISM32292DBCaFYakF/6XWlTTZRiDA/QVLVmcYOmc6d0R7jJPCWslrVD
+XK+G/a0u6IMwRUAOFI9Vkwx1zMYh0+hiLwEdGsJJRft9U09dGMclPBi7hLdBmnAi
+wJfJJKSY3cwL+C2iUz2Tp33p5FJF26Z30SS7vRTyf5zIPxzN4FSPfLkRGv8PzFYS
+Zz84cxpqQMAWMI9caFegXSlj/Q2pW4D5YjZIOsO+/x2RYYstYq+wiEYEEBEKAAYF
+AlLwKScACgkQpDzREXrX+vLYgQCgm4Mo8xmJ4ujOuPd6aX2prIe265gAoPGatEe+
+cJYOJYJcl42ZI1I7aq/yuQENBFLwJ9kBCADTb86C0YYbaDGHAsgDaLbnN2TV5Td0
+zExRHwou8+X2RJX47rbRsS7AflJwGFTtGJ6jJtfyzciZTz9v4GWu2CZzHShn+Oxc
+JgQ2Y/dJsXkrFM42iMB4f8BTL5OEOxr6nmOrbmhHz6BEJwORIhGKZGTLtruQyeS6
+EEtMhZuT86qOt2HzGiFRimMUxbDcQcPS3/140deZKYwq2gaF+DofxRTzZjsBkwC5
+aHddjr9xu1ODldZ5lBxX2zZrcGCkBIwm6/oIvu9YwrQkhvgc/W9eBkucj68rl4wJ
+ua4MMuNJHbdrZhZFyXvkHCUaN2Ac8GcSrR+DCI/TzdTOOscIXE6EMZZ5ABEBAAGJ
+ASUEGAEKAA8FAlLwJ9kCGwwFCQlmAYAACgkQHvi6a9AoRtdRkgf+JgbQUfCEhi8V
+pMvLSryN951LBu+XxHkLkQS7h9HwT2KeiZs3bt1UkLkg2GJ/gwJCRbLNEdZa9A1q
+4Z8eEsDwR8LLgDcpugz9IrMQlSHBACZJpHK4c1bsOTt26KQ/wgBLLnaJDUYDDscy
+0jdezYF+w/0TWwm+2lDKFctetSzuBvBhlbLPE2o9tCrC+NPjznmyDgBVm+3aqkYz
+CWl4js4NypaHNfmHah0WiFX2EHXe2fiH04cvAa05nxprTRrEJWMpNzhGdifnLc2r
+SJlsF/+2OTuy9eZ4AK8/ynFCycspLnDHthmSHVGWcYmce9KAxJZEv3Ua5ggmN/Yq
+wvaUH/0vUg==
+=Joy5
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 00:31:28 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5B109669;
 Tue,  4 Feb 2014 00:31:28 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 467B418E8;
 Tue,  4 Feb 2014 00:31:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s140VSZW067350;
 Tue, 4 Feb 2014 00:31:28 GMT (envelope-from trhodes@svn.freebsd.org)
Received: (from trhodes@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s140VSd1067313;
 Tue, 4 Feb 2014 00:31:28 GMT (envelope-from trhodes@svn.freebsd.org)
Message-Id: <201402040031.s140VSd1067313@svn.freebsd.org>
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Tue, 4 Feb 2014 00:31:28 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43744 - head/en_US.ISO8859-1/books/handbook/security
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.17
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, 04 Feb 2014 00:31:28 -0000

Author: trhodes
Date: Tue Feb  4 00:31:27 2014
New Revision: 43744
URL: http://svnweb.freebsd.org/changeset/doc/43744

Log:
  Rewrite the front of the security section.  This version
  adds a small discussion on using sudo, shows and example
  of using an IDS rather than just discussing what they are,
  update of threats, discussion on rootkits and back doors,
  adds more sysctls and more.

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

Modified: head/en_US.ISO8859-1/books/handbook/security/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/security/chapter.xml	Tue Feb  4 00:16:12 2014	(r43743)
+++ head/en_US.ISO8859-1/books/handbook/security/chapter.xml	Tue Feb  4 00:31:27 2014	(r43744)
@@ -7,8 +7,13 @@
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="security">
   <info><title>Security</title>
     <authorgroup>
-      <author><personname><firstname>Matthew</firstname><surname>Dillon</surname></personname><contrib>Much of this chapter has been taken from the
-	  security(7) manual page by </contrib></author>
+      <author>
+	<personname>
+	  <firstname>Tom</firstname>
+	  <surname>Rhodes</surname>
+	</personname>
+	<contrib>Rewritten by </contrib>
+      </author>
     </authorgroup>
   </info>
 
@@ -19,17 +24,17 @@
   <sect1 xml:id="security-synopsis">
     <title>Synopsis</title>
 
-    <para>This chapter provides a basic introduction to system
-      security concepts, some general good rules of thumb, and some
-      advanced topics under &os;.  Many of the topics covered here
-      can be applied to system and Internet security in general.
-      Securing a system is imperative to protect data, intellectual
-      property, time, and much more from the hands of hackers and the
-      like.</para>
-
-    <para>&os; provides an array of utilities and mechanisms to
-      protect the integrity and security of the system and
-      network.</para>
+    <para>Security, whether physical or virtual, is a topic
+      so broad that an entire industry has grown up around it.
+      Hundreds of standard practices have been authored about
+      how to secure systems and networks, and as a user of &os;,
+      understanding how to protect against attacks and intruders
+      is a must.</para>
+
+    <para>In this chapter, several fundamentals and techniques will
+      be discussed.  The &os; system comes with multiple layers of
+      security, and many more third party utilities may be added to
+      enhance security.</para>
 
     <para>After reading this chapter, you will know:</para>
 
@@ -108,341 +113,357 @@
   <sect1 xml:id="security-intro">
     <title>Introduction</title>
 
-    <para>Security is a function that begins and ends with the system
-      administrator.  While &os; provides some inherent security, the
-      job of configuring and maintaining additional security
-      mechanisms is probably one of the single largest undertakings of
-      the sysadmin.</para>
-
-    <para>System security also pertains to dealing with various forms
-      of attack, including attacks that attempt to crash, or otherwise
-      make a system unusable, but do not attempt to compromise the
-      <systemitem class="username">root</systemitem> account.  Security concerns can be
-      split up into several categories:</para>
-
-    <orderedlist>
-      <listitem>
-	<para>Denial of service attacks.</para>
-      </listitem>
-
-      <listitem>
-	<para>User account compromises.</para>
-      </listitem>
-
-      <listitem>
-	<para>Root compromise through accessible services.</para>
-      </listitem>
-
-      <listitem>
-	<para>Root compromise via user accounts.</para>
-      </listitem>
-
-      <listitem>
-	<para>Backdoor creation.</para>
-      </listitem>
-    </orderedlist>
-
-    <indexterm>
-      <primary>DoS attacks</primary>
-      <see>Denial of Service (DoS)</see>
-    </indexterm>
-    <indexterm>
-      <primary>security</primary>
-      <secondary>DoS attacks</secondary>
-      <see>Denial of Service (DoS)</see>
-    </indexterm>
-    <indexterm><primary>Denial of Service (DoS)</primary></indexterm>
-
-    <para>A Denial of Service <acronym>DoS</acronym> attack is an
-      action that deprives the machine of needed resources.
-      Typically, <acronym>DoS</acronym> attacks are brute-force
-      mechanisms that attempt to crash or otherwise make a machine
-      unusable by overwhelming its services or network stack.  Attacks
-      on servers can often be fixed by properly specifying options to
-      limit the load the servers incur on the system under adverse
-      conditions.  Brute-force network attacks are harder to deal
-      with.  This type of attack may not be able to take the machine
-      down, but it can saturate the Internet connection.</para>
-
-    <indexterm>
-      <primary>security</primary>
-      <secondary>account compromises</secondary>
-    </indexterm>
-
-    <para>A user account compromise is more common than a
-      <acronym>DoS</acronym> attack.  Many sysadmins still run
-      unencrypted services, meaning that users logging into the
-      system from a remote location are vulnerable to having their
-      password sniffed.  The attentive sysadmin analyzes the remote
-      access logs looking for suspicious source addresses and
-      suspicious logins.</para>
-
-    <para>In a well secured and maintained system, access to a user
-      account does not necessarily give the attacker access to
-      <systemitem class="username">root</systemitem>.  Without <systemitem class="username">root</systemitem>
-      access, the attacker cannot generally hide his tracks and may,
-      at best, be able to do nothing more than mess with the user's
-      files or crash the machine.  User account compromises are common
-      because users tend not to take the precautions that sysadmins
-      take.</para>
-
-    <indexterm>
-      <primary>security</primary>
-      <secondary>backdoors</secondary>
-    </indexterm>
-
-    <para>There are potentially many ways to break
-      <systemitem class="username">root</systemitem>:  the attacker may know the
-      <systemitem class="username">root</systemitem> password, the attacker may exploit a
-      bug in a service which runs as <systemitem class="username">root</systemitem>, or the
-      attacker may know of a bug in a SUID-root program.  An attacker
-      may utilize a program known as a backdoor to search for
-      vulnerable systems, take advantage of unpatched exploits to
-      access a system, and hide traces of illegal activity.</para>
-
-    <para>Security remedies should always be implemented with a
-      multi-layered <quote>onion peel</quote> approach and can be
-      categorized as follows:</para>
-
-    <orderedlist>
-      <listitem>
-	<para>Secure <systemitem class="username">root</systemitem> and staff
-	  accounts.</para>
-      </listitem>
-
-      <listitem>
-	<para>Secure <systemitem class="username">root</systemitem>&ndash;run servers
-	  and SUID/SGID binaries.</para>
-      </listitem>
-
-      <listitem>
-	<para>Secure user accounts.</para>
-      </listitem>
-
-      <listitem>
-	<para>Secure the password file.</para>
-      </listitem>
-
-      <listitem>
-	<para>Secure the kernel core, raw devices, and
-	  filesystems.</para>
-      </listitem>
-
-      <listitem>
-	<para>Quick detection of inappropriate changes made to the
-	  system.</para>
-      </listitem>
-
-      <listitem>
-	<para>Paranoia.</para>
-      </listitem>
-    </orderedlist>
-
-    <para>The next section covers these items in greater depth.</para>
-  </sect1>
-
-  <sect1 xml:id="securing-freebsd">
-    <title>Securing &os;</title>
-
-    <indexterm>
-      <primary>security</primary>
-      <secondary>securing &os;</secondary>
-    </indexterm>
-
-    <para>This section describes methods for securing a &os; system
-      against the attacks that were mentioned in the <link linkend="security-intro">previous section</link>.</para>
+    <para>Security is everyone's responsibility.  A weak entry point
+      in any system could allow intruders to gain access to critical
+      information and cause havoc on an entire network.  In most
+      security training, they discuss the security triad
+      <acronym>CIA</acronym> which stands for the confidentiality,
+      integrity, and availability of information systems.</para>
+
+    <para>The <acronym>CIA</acronym> triad is a bedrock concept of
+      computer security, customers and end users expect privacy
+      of their data.  They expect orders they place to not be changed
+      or their information altered behind the scenes. They also expect
+      access to information at all times.  Together they make up the
+      confidentiality, integrity, and availability of the
+      system.</para>
 
-    <sect2 xml:id="securing-root-and-staff">
-      <title>Securing the <systemitem class="username">root</systemitem> Account</title>
+    <para>To protect <acronym>CIA</acronym>, security professionals
+      apply a defense in depth strategy.  The idea of defense in
+      depth is to add several layers of security to prevent one single
+      layer failing and the entire security system collapsing.  A
+      systems administrator cannot simply turn on a firewall and
+      consider the network or system secure, they must audit accounts,
+      check the integrity of binaries, and ensure malicious tools are
+      not installed.  To do this, they must understand what the
+      threats are.</para>
+
+    <sect2 xml:id="security-threats">
+      <title>Threats</title>
+
+      <para>What is a threat as pertaining to computer security?  For
+	years it was assumed that threats are remote attackers, people
+	whom will attempt to access the system without permission, from
+	a remote location.  In today's world, this definition has been
+	expanded to include employees, malicious software, rogue
+	network devices, natural disasters, security vulnerabilities,
+	and even competing corporations.</para>
+
+      <para>Every day thousands of systems and networks are attacked and
+	several hundred are accessed without permission.  Sometimes
+	by simple accident, others by remote attackers, and in some
+	cases, corporate espionage or former employees.  As a system
+	user, it is important to prepare for and admit when a mistake
+	has lead to a security breach and report possible issues to
+	the security team.  As an administrator, it is important to
+	know of the threats and be prepared to mitigate them.</para>
+      </sect2>
+
+    <sect2 xml:id="security-groundup">
+      <title>A Ground Up Approach</title>
+
+      <para>In security, it is sometimes best to take a ground up
+	approach, whereas the administrator begins with the basic
+	accounts, system configuration, and then begins to work with
+	third party utilities and work up to the network layer.  It
+	is in these latter configuration aspects that system policy
+	and procedures should take place.</para>
+
+      <para>Many places of business already have a security policy that
+	covers the configuration technology devices in use.  They
+	should contain, at minimal, the security configuration of end
+	user workstations and desktops, mobile devices such as phones
+	and laptops, and both production and development servers.  In
+	many cases, when applying computer security, standard operating
+	procedures (<acronym>SOP</acronym>s) already exist.  When in
+	doubt, ask the security team.</para>
+    </sect2>
+
+    <sect2 xml:id="security-accounts">
+      <title>System and User Accounts</title>
+
+      <para>In securing a system, the best starting point is auditing
+	accounts.  Ensure that the root account has a strong password,
+	disable accounts that do not need shell access, for users who
+	need to augment their privileges, install the
+	<package>security/sudo</package> and only allow them access
+	to applications they need.  The root user password should
+	never be shared.</para>
 
-      <indexterm>
-	<primary>&man.su.1;</primary>
-      </indexterm>
-
-      <para>Most
-	systems have a password assigned to the
-	<systemitem class="username">root</systemitem> account.  Assume that this password
-	is <emphasis>always</emphasis> at risk of being compromised.
-	This does not mean that the password should be disabled as the
-	password is almost always necessary for console access to the
-	machine.  However, it should not be possible to use this
-	password outside of the console or possibly even with
-	&man.su.1;.  For example, setting the entries in
-	<filename>/etc/ttys</filename> to <literal>insecure</literal>
-	prevents <systemitem class="username">root</systemitem> logins to the specified
-	terminals.  In &os;, <systemitem class="username">root</systemitem> logins using
-	&man.ssh.1; are disabled by default as
-	<literal>PermitRootLogin</literal> is set to
-	<literal>no</literal> in
-	<filename>/etc/ssh/sshd_config</filename>.  Consider every
-	access method as services such as FTP often fall through the
-	cracks.  Direct <systemitem class="username">root</systemitem> logins should only
-	be allowed via the system console.</para>
-
-      <indexterm>
-	<primary><systemitem class="groupname">wheel</systemitem></primary>
-      </indexterm>
-
-      <para>Since a sysadmin needs access to
-	<systemitem class="username">root</systemitem>, additional password verification
-	should be configured.  One method is to add appropriate user
-	accounts to <systemitem class="groupname">wheel</systemitem> in
-	<filename>/etc/group</filename>.  Members of
-	<systemitem class="groupname">wheel</systemitem> are allowed to &man.su.1; to
-	<systemitem class="username">root</systemitem>.  Only those users who actually need
-	to have <systemitem class="username">root</systemitem> access should be placed in
-	<systemitem class="groupname">wheel</systemitem>.  When using Kerberos for
-	authentication, create a <filename>.k5login</filename> in
-	the home directory of <systemitem class="username">root</systemitem> to allow
-	&man.ksu.1; to be used without having to place anyone in
-	<systemitem class="groupname">wheel</systemitem>.</para>
-
-      <para>To lock an account completely, use &man.pw.8;:</para>
-
-      <screen>&prompt.root; <userinput>pw lock staff</userinput></screen>
-
-      <para>This will prevent the specified user from logging in using
-	any mechanism, including &man.ssh.1;.</para>
-
-      <para>Another method of blocking access to accounts would be to
-	replace the encrypted password with a single
-	<quote><literal>*</literal></quote> character.  This character
-	would never match the encrypted password and thus blocks user
-	access.  For example, the entry for the following
+      <para>To deny access to accounts, two methods exist.  The first
+	one is to lock an account, for example, to lock the toor
 	account:</para>
 
-      <programlisting>foobar:R9DT/Fa1/LV9U:1000:1000::0:0:Foo Bar:/home/foobar:/usr/local/bin/tcsh</programlisting>
+      <screen>&prompt.root; <userinput>pw lock toor</userinput></screen>
 
-      <para>could be changed to this using &man.vipw.8;:</para>
+      <para>This command will change the account from this
+	<quote>toor:*:0:0::0:0:Bourne-again Superuser:/root:</quote>
+	to <quote>toor:*LOCKED**:0:0::0:0:Bourne-again
+	Superuser:/root:</quote></para>
+
+      <para>In some cases, this is not possible, perhaps because of
+	an additional service.  In those cases, login access
+	could be prevented by changing the shell to /sbin/nologin
+	like in this example:</para>
 
-      <programlisting>foobar:*:1000:1000::0:0:Foo Bar:/home/foobar:/usr/local/bin/tcsh</programlisting>
+      <screen>&prompt.root; <userinput>chsh -s /usr/sbin/nologin toor</userinput></screen>
 
-      <para>This prevents <systemitem class="username">foobar</systemitem> from logging in
-	using conventional methods.  This method for access
-	restriction is flawed on sites using
-	<application>Kerberos</application> or in situations where the
-	user has set up keys with &man.ssh.1;.</para>
-
-      <para>These security mechanisms assume that users are logging
-	in from a more restrictive server to a less restrictive
-	server.  For example, if the server is running network
-	services, the workstation should not be running any.  In
-	order for a workstation to be reasonably secure, run zero or
-	as few services as possible and run a password-protected
-	screensaver.  Of course, given physical access to any system,
-	an attacker can break any sort of security.  Fortunately,
-	many break-ins occur remotely, over a network, from people who
-	do not have physical access to the system.</para>
-
-      <para>Using Kerberos provides the ability to disable or change
-	the password for a user in one place, and have it immediately
-	affect all the machines on which the user has an account.  If
-	an account is compromised, the ability to instantly change the
-	associated password on all machines should not be underrated.
-	Additional restrictions can be imposed with Kerberos:  a
-	Kerberos ticket can be configured to timeout and the Kerberos
-	system can require that the user choose a new password after a
-	configurable period of time.</para>
-    </sect2>
-
-    <sect2>
-      <title>Securing Root-run Servers and SUID/SGID Binaries</title>
-
-      <indexterm>
-	<primary>sandboxes</primary>
-      </indexterm>
-      <indexterm>
-	<primary>&man.sshd.8;</primary>
-      </indexterm>
-
-      <para>The prudent sysadmin only enables required services and is
-	aware that third party servers are often the most bug-prone.
-	Never run a server that has not been checked out carefully.
-	Think twice before running any service as
-	<systemitem class="username">root</systemitem> as many daemons can be run as a
-	separate service account or can be started in a
-	<firstterm>sandbox</firstterm>.  Do not activate insecure
-	services such as &man.telnetd.8; or &man.rlogind.8;.</para>
-
-      <para>Another potential security hole is SUID-root and SGID
-	binaries.  Most of these binaries, such as &man.rlogin.1;,
-	reside in <filename>/bin</filename>,
-	<filename>/sbin</filename>, <filename>/usr/bin</filename>, or <filename>/usr/sbin</filename>.  While nothing is
-	100% safe, the system-default SUID and SGID binaries can be
-	considered reasonably safe.  It is recommended to restrict
-	SUID binaries to a special group that only staff can access,
-	and to delete any unused SUID binaries.  SGID binaries can be
-	almost as dangerous.  If an intruder can break an SGID-kmem
-	binary, the intruder might be able to read
-	<filename>/dev/kmem</filename> and thus read the encrypted
-	password file, potentially compromising user accounts.
-	Alternatively, an intruder who breaks group
-	<literal>kmem</literal> can monitor keystrokes sent through
-	ptys, including ptys used by users who login through secure
-	methods.  An intruder that breaks the
-	<systemitem class="groupname">tty</systemitem> group can write to almost any
-	user's tty.  If a user is running a terminal program or
-	emulator with a keyboard-simulation feature, the intruder can
-	potentially generate a data stream that causes the user's
-	terminal to echo a command, which is then run as that
-	user.</para>
-    </sect2>
-
-    <sect2 xml:id="secure-users">
-      <title>Securing User Accounts</title>
-
-      <para>User accounts are usually the most difficult to secure.
-	Be vigilant in the monitoring of user accounts.  Use of
-	&man.ssh.1; and Kerberos for user accounts requires extra
-	administration and technical support, but provides a good
-	solution compared to an encrypted password file.</para>
-    </sect2>
-
-    <sect2>
-      <title>Securing the Password File</title>
+      <note>
+        <para>Only super users are able to change the shell for
+	  other users.  Attempting to perform this as a regular user
+	  will fail.</para>
+      </note>
 
-      <para>The only sure fire way is to star out as many passwords as
-	possible and use &man.ssh.1; or Kerberos for access to those
-	accounts.  Even though the encrypted password file
-	(<filename>/etc/spwd.db</filename>) can only be read by
-	<systemitem class="username">root</systemitem>, it may be possible for an intruder
-	to obtain read access to that file even if the attacker cannot
-	obtain root-write access.</para>
+      <para>The account structure will now look like this, with
+	the <quote>nologin</quote> shell as the last entry:</para>
 
-      <para>Security scripts should be used to check for and report
-	changes to the password file as described in the <link linkend="security-integrity">Checking file integrity</link>
-	section.</para>
-    </sect2>
-
-    <sect2>
-      <title>Securing the Kernel Core, Raw Devices, and
-	Filesystems</title>
+      <programlisting>toor:*:0:0::0:0:Bourne-again Superuser:/root:/usr/sbin/nologin</programlisting>
 
-      <para>Most modern kernels have a packet sniffing device driver
-	built in.  Under &os; it is called
-	<filename>bpf</filename>.  This device is needed for DHCP,
-	but can be removed in the custom kernel configuration file of
-	systems that do not provide or use DHCP.</para>
+      <para>The <filename>/usr/sbin/nologin</filename> shell will block
+	the &man.login.1; command from assigning a shell to this
+	user.</para>
+      </sect2>
 
-      <indexterm>
-	<primary>&man.sysctl.8;</primary>
-      </indexterm>
+    <sect2 xml:id="security-sudo">
+      <title>Permitted Account Escalation</title>
 
-      <para>Even if <filename>bpf</filename> is disabled,
-	<filename>/dev/mem</filename> and
-	<filename>/dev/kmem</filename> are still problematic.  An
-	intruder can still write to raw disk devices.  An enterprising
-	intruder can use &man.kldload.8; to install his own
-	<filename>bpf</filename>, or another sniffing device, on a
-	running kernel.  To avoid these problems, run the kernel at a
-	higher security level, at least security level 1.</para>
+      <para>In some cases, system administration access needs to
+	be shared with other users.  &os; has two methods to
+	handle this.  The first one, which is not recommended,
+	is a shared root password and adding users to the
+	<systemitem class="groupname">wheel</systemitem> group.
+	To achieve this, edit the <filename>/etc/group</filename>
+	and add the user to the end of the first group.  This
+	user must be separated by a comma character.</para>
+
+      <para>The correct way to permit this privilege escalation is
+	using the <package>security/sudo</package> port which will
+	provide additional auditing, more fine grained user
+	control, and even lock users into running only single,
+	privileged commands such as &man.service.8;</para>
+
+      <para>After installation, edit the
+	<filename>/usr/local/etc/sudoers</filename> file by using
+	the <command>visudo</command> interface.  In this example,
+	a new webadmin group will be added, the user
+	<systemitem class="username">trhodes</systemitem> to that
+	group, and then give the user
+	access to restart <package>apache24</package>, the following
+	procedure may be followed:</para>
+
+      <screen>&prompt.root; <userinput>pw groupadd webadmin -M trhodes -g 6000</userinput></screen>
+
+      <screen>&prompt.root; <userinput>visudo</userinput></screen>
+
+      <programlisting>%webadmin ALL=(ALL) /usr/sbin/service apache24 *</programlisting>
+
+      <para>The <package>security/sudo</package> provides an
+	invaluable resource when it comes to local user management.
+	It is also possible to not require passwords and just default
+	to the &man.ssh.1; key method.  To disable password login
+	via &man.sshd.8; and only use local passwords for
+	<command>sudo</command>, see <xref linkend="openssh"/>.</para>
+    </sect2>
+
+    <sect2 xml:id="security-passwords">
+      <title>Passwords</title>
+
+      <para>Passwords are a necessary evil of technology.  In the cases
+	they must be used, not only should the password be extremely
+	complex, but also use a powerful hash mechanism to protect it.
+	At the time of this writing, &os; supports
+	<acronym>DES</acronym>, <acronym>MD</acronym>5, Blowfish,
+	<acronym>SHA</acronym>256, and <acronym>SHA</acronym>512 in
+	the <function>crypt()</function> library.  The default is
+	<acronym>SHA</acronym>512 and should not be changed backwards;
+	however, some users like to use the Blowfish option.  Each
+	mechanism, aside from <acronym>DES</acronym>, has a unique
+	beginning to designate the hash mechanism assigned.  For the
+	<acronym>MD</acronym>5 mechanism, the symbol is a
+	<quote>$</quote> sign.  For the <acronym>SHA</acronym>256 or
+	<acronym>SHA</acronym>512, the symbol is <quote>$6$</quote>
+	and Blowfish uses <quote>$2a$</quote>.  Any weaker passwords
+	should be re-hashed by asking the user to run &man.passwd.1;
+	during their next login.</para>
 
-      <para>The security level of the kernel can be set in a variety
-	of ways.  The simplest way of raising the security level of a
-	running kernel is to set
-	<varname>kern.securelevel</varname>:</para>
+      <note>
+	<para>At the time of this writing, Blowfish is not part of
+	  <acronym>AES</acronym> nor is it considered compliant
+	  with any <acronym>FIPS</acronym> (Federal Information
+	  Processing Standards) standard and it's use may not be
+	  permitted in some environments.</para>
+      </note>
 
-      <screen>&prompt.root; <userinput>sysctl kern.securelevel=1</userinput></screen>
+      <para>For any system connected to the network, two factor
+	authentication should be used.  This is normally considered
+	something you have and something you know.  With
+	<application>OpenSSH</application> being part of the &os;
+	base system and the use of ssh-keys being available for some
+	time, all network logins should avoid the use of passwords in
+	exchange for this two factor authentication method.  For
+	more information see the <xref linkend="openssh"/> section of
+	the handbook.  Kerberose users may need to make additional
+	changes to implement <application>OpenSSH</application> in
+	their network.</para>
+    </sect2>
+
+    <sect2 xml:id="security-rkhunter">
+      <title>Backdoors and Rootkits</title>
+
+      <para>Backdoors and rootkits are only a threat after they have
+	been installed.  Once installed, this malicious software will
+	normally open up another avenue of entry for an attacker.
+	Realistically, once a system has been compromised, and an
+	investigation has been performed, it should be erased.  There
+	is tremendous risk that even the most prudent security or
+	systems engineer will miss something an attacker left
+	behind.</para>
+
+      <para>A backdoor or rootkit software does do one thing useful
+	for administrators - once detected, it is a sign that a
+	compromise happened at some point.  But normally these types
+	types of applications are hidden very well.  Tools do exist
+	to detect backdoors and rootkits, one of them is
+	<package>security/rkhunter</package>.</para>
+
+      <para>After installation the system may be checked using the
+	following command which will produce a lot of
+	information:</para>
+
+      <screen>&prompt.root; <userinput>rkhunter -c</userinput></screen>
+
+      <para>After the process complete, which will require some manual
+	pressing of the <keycap>ENTER</keycap> key, a status message
+	will be printed to the screen.  This message will include the
+	amount of files checked, suspect files, possible rootkits,
+	and more.  During the check, some generic security warnings may
+	be produced about hidden files, the
+	<application>OpenSSH</application> protocol selection, and
+	occasionally known vulnerable versions of installed software.
+	These can be handled now or later after a more detailed
+	analysis has been performed.</para>
+
+      <para>Every administrator should know what is running on the
+	systems they are responsible for.  Using tools like
+	<application>rkhunter</application>,
+	<application>lsof</application> and native commands such
+	as &man.netstat.1; and &man.ps.1; can show a great deal of
+	information on the system.  Take notes on what is normal,
+	ask questions when something seems out of place and be
+	paranoid.  And remember, preventing a compromise is ideal
+	but detecting a compromise is a must.</para>
+    </sect2>
+
+    <sect2 xml:id="security-ids">
+      <title>Binary Verification</title>
+
+      <para>Verification of system files and binaries is important
+	because it provides the system administration and security
+	team with information about system changes.  In any system,
+	no internal command or application should change without
+	the system admin team knowing.  A software application that
+	monitors the system for changes is called an Intrusion
+	Detection System or <acronym>IDS</acronym>.</para>
+
+      <para>&os; provides native support for a basic
+	<acronym>IDS</acronym> system.  In fact, as part of the nightly
+	&man.periodic.8; security emails will notify an administrator
+	of changes.  Since the information is stored locally, there is
+	a change a malicious user could modify and <quote>spoof</quote>
+	the information.  As such, it is recommended to create a
+	separate set of binary signatures and store them on a read
+	only, root owned directory or, preferably, off system such
+	as a <acronym>USB</acronym> disk or
+	<application>rsync</application> server.</para>
+
+      <para>To being, a seed needs to be generated.  This is a numeric
+	constant that will be used as to help generate the hash values
+	and to check the hash values.  Lacking this seed value will make
+	faking or checking the checksum values of files difficult it not
+	impossible.  In the following example, the key will be passed
+	with the <option>-s</option> flag.  First, generate a set of
+	hashes and checksums for <filename>/bin</filename> using the
+	following command:</para>
+
+      <screen>&prompt.root; <userinput>mtree -s 3483151339707503 -c -K cksum,sha256digest -p /bin &gt; bin_chksum_mtree</userinput></screen>
+
+      <para>This should have produced something similar to:</para>
+
+      <screen>&prompt.root; mtree: /bin checksum: 3427012225</screen>
+
+      <para>Viewing the <filename>bin_cksum_mtree</filename> file
+	should yield output similar to the following as well:</para>
+
+      <programlisting>#          user: root
+#       machine: dreadnaught
+#          tree: /bin
+#          date: Mon Feb  3 10:19:53 2014
+
+# .
+/set type=file uid=0 gid=0 mode=0555 nlink=1 flags=none
+.               type=dir mode=0755 nlink=2 size=1024 \
+                time=1380277977.000000000
+    \133        nlink=2 size=11704 time=1380277977.000000000 \
+                cksum=484492447 \
+                sha256digest=6207490fbdb5ed1904441fbfa941279055c3e24d3a4049aeb45094596400662a
+    cat         size=12096 time=1380277975.000000000 cksum=3909216944 \
+                sha256digest=65ea347b9418760b247ab10244f47a7ca2a569c9836d77f074e7a306900c1e69
+    chflags     size=8168 time=1380277975.000000000 cksum=3949425175 \
+                sha256digest=c99eb6fc1c92cac335c08be004a0a5b4c24a0c0ef3712017b12c89a978b2dac3
+    chio        size=18520 time=1380277975.000000000 cksum=2208263309 \
+                sha256digest=ddf7c8cb92a58750a675328345560d8cc7fe14fb3ccd3690c34954cbe69fc964
+    chmod       size=8640 time=1380277975.000000000 cksum=2214429708 \
+                sha256digest=a435972263bf814ad8df082c0752aa2a7bdd8b74ff01431ccbd52ed1e490bbe7</programlisting>
+
+      <para>Notice the machine's hostname, the current date and time,
+	and the user who executed &man.mtree.8; are all included in
+	this report.  There is also a checksum, size, time and
+	<acronym>SHA</acronym>256 digest for each binary that was
+	found.</para>
+
+      <para>To verify binary signatures, the following command will
+	read in the current list of signatures and provide an
+	output:</para>
+
+      <screen>&prompt.root; <userinput>mtree -s 3483151339707503 -p /bin &lt; bin_chksum_mtree &gt;&gt; bin_chksum_output</userinput></screen>
+
+      <para>This should produce the same checksum for
+	<filename>/bin</filename> that was produced when the command
+	was originally ran.  Since no changes occurred in the time these
+	commands were ran, the <filename>bin_chksum_output</filename>
+	output will be empty.  To simulate a change, change the date
+	on the <filename>/bin/cat</filename> file using
+	&man.touch.1; and run the verification command again:</para>
+
+      <screen>&prompt.root; <userinput>touch /bin/cat</userinput></screen>
+      <screen>&prompt.root; <userinput>mtree -s 3483151339707503 -p /bin &lt; bin_chksum_mtree &gt;&gt; bin_chksum_output</userinput></screen>
+      <screen>&prompt.root; <userinput>cat bin_chksum_output</userinput></screen>
+      <programlisting>cat changed
+	modification time expected Fri Sep 27 06:32:55 2013 found Mon Feb  3 10:28:43 2014</programlisting>
+
+      <para>More advanced <acronym>IDS</acronym> systems exist, such as
+	<package>security/aide</package> but in most cases,
+	&man.mtree.8; provides the functionality administrators need.
+	It is important to keep the seed value and the checksum output
+	hidden from malicious users.</para>
+    </sect2>
+
+    <sect2 xml:id="security-tuning">
+      <title>System Tuning for Security</title>
+
+      <para>Many of the systems features may be tuned through the use
+	of &man.sysctl.8;.  This is also true for a few security
+	features which could be used to prevent denial of service
+	(<acronym>DOS</acronym>) style attacks.  Some of the more
+	important will be covered here.  Any time a setting is changed
+	with &man.sysctl.8;, the chance to cause undesired harm is
+	increased affecting the availability of the system.  Considering
+	the <acronym>CIA</acronym> of the system should be done during
+	any system-wide configuration change.</para>
+
+      <para>The following is a list of &man.sysctl.8;'s and a short
+	description of what effects the changes will have on the
+	system.</para>
 
       <para>By default, the &os; kernel boots with a security level of
 	-1.  This is called <quote>insecure mode</quote> because
@@ -451,413 +472,58 @@
 	unless it is altered, either by the administrator or by
 	&man.init.8;, because of a setting in the startup scripts.
 	The security level may be raised during system startup by
-	setting
-	<varname>kern_securelevel_enable</varname> to
+	setting <varname>kern_securelevel_enable</varname> to
 	<literal>YES</literal> in <filename>/etc/rc.conf</filename>,
 	and the value of <varname>kern_securelevel</varname> to the
-	desired security level.</para>
-
-      <para>Once the security level is set to 1 or a higher value, the
-	append-only and immutable files are honored, they cannot be
-	turned off, and access to raw devices is denied.  Higher
-	levels restrict even more operations.  For a full description
-	of the effect of various security levels, refer to
-	&man.security.7; and &man.init.8;.</para>
-
-      <note>
-	<para>Bumping the security level to 1 or higher may cause a
-	  few problems to <application>&xorg;</application>, as access
-	  to <filename>/dev/io</filename> will be blocked, or to the
-	  installation of &os; built from source as
-	  <buildtarget>installworld</buildtarget> needs to temporarily
-	  reset the append-only and immutable flags of some files.
-	  In the case of <application>&xorg;</application>, it may be
-	  possible to work around this by starting &man.xdm.1; early
-	  in the boot process, when the security level is still low
-	  enough.  Workarounds may not be possible for all secure
-	  levels or for all the potential restrictions they enforce.
-	  A bit of forward planning is a good idea.  Understanding the
-	  restrictions imposed by each security level is important as
-	  they severely diminish the ease of system use.  It will also
-	  make choosing a default setting much simpler and prevent any
-	  surprises.</para>
-      </note>
-
-      <para>If the kernel's security level is raised to 1 or a higher
-	value, it may be useful to set the <literal>schg</literal>
-	flag on critical startup binaries, directories, script files,
-	and  everything that gets run up to the point where the
-	security level is set.  A less strict compromise is to run
-	the system at a higher security level but skip setting the
-	<literal>schg</literal> flag.  Another possibility is to
-	mount <filename>/</filename> and <filename>/usr</filename> read-only.  It should be
-	noted that being too draconian about what is permitted may
-	prevent detection of an intrusion.</para>
-    </sect2>
-
-    <sect2 xml:id="security-integrity">
-      <title>Checking File Integrity</title>
-
-      <para>One can only protect the core system configuration and
-	control files so much before the convenience factor rears its
-	ugly head.  For example, using &man.chflags.1; to set the
-	<literal>schg</literal> bit on most of the files in <filename>/</filename> and <filename>/usr</filename> is probably
-	counterproductive, because while it may protect the files, it
-	also closes an intrusion detection window.  Security measures
-	are useless or, worse, present a false sense of security, if
-	potential intrusions cannot be detected.  Half the job of
-	security is to slow down, not stop, an attacker, in order to
-	catch him in the act.</para>
-
-      <para>The best way to detect an intrusion is to look for
-	modified, missing, or unexpected files.  The best way to look
-	for modified files is from another, often centralized,
-	limited-access system.  Writing security scripts on the
-	extra-security limited-access system makes them mostly
-	invisible to potential attackers.  In order to take maximum
-	advantage, the limited-access box needs significant access to
-	the other machines, usually either through a read-only
-	<acronym>NFS</acronym> export or by setting up
-	&man.ssh.1; key-pairs.  Except for its network traffic,
-	<acronym>NFS</acronym> is the least visible method, allowing
-	the administrator to monitor the filesystems on each client
-	box virtually undetected.  If a limited-access server is
-	connected to the client boxes through a switch, the
-	<acronym>NFS</acronym> method is often the better choice.  If
-	a limited-access server is connected to the client boxes
-	through several layers of routing, the <acronym>NFS</acronym>
-	method may be too insecure and &man.ssh.1; may be the better
-	choice.</para>
-
-      <para>Once a limited-access box has been given at least read
-	access to the client systems it is supposed to monitor, create
-	the monitoring scripts.  Given an <acronym>NFS</acronym>
-	mount, write scripts out of simple system utilities such as
-	&man.find.1; and &man.md5.1;.  It is best to physically
-	&man.md5.1; the client system's files at least once a day, and
-	to test control files such as those found in <filename>/etc</filename> and <filename>/usr/local/etc</filename> even more often.
-	When mismatches are found, relative to the base md5
-	information the limited-access machine knows is valid, it
-	should alert the sysadmin.  A good security script will also
-	check for inappropriate SUID binaries and for new or deleted
-	files on system partitions such as <filename>/</filename> and <filename>/usr</filename>.</para>
-
-      <para>When using &man.ssh.1; rather than <acronym>NFS</acronym>,
-	writing the security script is more difficult.  For example,
-	&man.scp.1; is needed to send the scripts to the client box in
-	order to run them.  The &man.ssh.1; client on the client box
-	may already be compromised.  Using &man.ssh.1; may be
-	necessary when running over insecure links, but it is harder
-	to deal with.</para>
-
-      <para>A good security script will also check for changes to
-	hidden configuration files, such as
-	<filename>.rhosts</filename> and
-	<filename>.ssh/authorized_keys</filename>, as these files
-	might fall outside the purview of the
-	<literal>MD5</literal> check.</para>
-
-      <para>For a large amount of user disk space, it may take too
-	long to run through every file on those partitions.  In this
-	case, consider setting mount flags to disallow SUID binaries
-	by using <literal>nosuid</literal> with &man.mount.8;.  Scan
-	these partitions at least once a week, since the objective is
-	to detect a break-in attempt, whether or not the attempt
-	succeeds.</para>
-
-      <para>Process accounting (see &man.accton.8;) is a relatively
-	low-overhead feature of &os; which might help as a
-	post-break-in evaluation mechanism.  It is especially useful
-	in tracking down how an intruder broke into a system, assuming
-	the file is still intact after the break-in has
-	occurred.</para>
-
-      <para>Finally, security scripts should process the log files,
-	and the logs themselves should be generated in as secure a
-	manner as possible and sent to a remote syslog server.  An
-	intruder will try to cover his tracks, and log files are
-	critical to the sysadmin trying to track down the time and
-	method of the initial break-in.  One way to keep a permanent
-	record of the log files is to run the system console to a
-	serial port and collect the information to a secure machine
-	monitoring the consoles.</para>
-    </sect2>
-
-    <sect2>
-      <title>Paranoia</title>
-
-      <para>A little paranoia never hurts.  As a rule, a sysadmin can
-	add any number of security features which do not affect
-	convenience and can add security features that
-	<emphasis>do</emphasis> affect convenience with some added
-	thought.  More importantly, a security administrator should
-	mix it up a bit.  If recommendations, such as those mentioned
-	in this section, are applied verbatim, those methodologies are
-	given to the prospective attacker who also has access to this
-	document.</para>
-    </sect2>
-
-    <sect2>
-      <title>Denial of Service Attacks</title>
-
-      <indexterm>
-	<primary>Denial of Service (DoS)</primary>
-      </indexterm>
-
-      <para>A <acronym>DoS</acronym> attack is typically a packet
-	attack.  While there is not much one can do about spoofed
-	packet attacks that saturate a network, one can generally
-	limit the damage by ensuring that the attack cannot take down
-	servers by:</para>
-
-      <orderedlist>
-	<listitem>
-	  <para>Limiting server forks.</para>
-	</listitem>
-
-	<listitem>
-	  <para>Limiting springboard attacks such as ICMP response
-	    attacks and ping broadcasts.</para>
-	</listitem>
-
-	<listitem>
-	  <para>Overloading the kernel route cache.</para>
-	</listitem>
-      </orderedlist>
-
-      <para>A common <acronym>DoS</acronym> attack scenario is to
-	force a forking server to spawn so many child processes that
-	the host system eventually runs out of memory and file
-	descriptors, and then grinds to a halt.  There are several
-	options to &man.inetd.8; to limit this sort of attack.  It
-	should be noted that while it is possible to prevent a machine
-	from going down, it is not generally possible to prevent a
-	service from being disrupted by the attack.  Read
-	&man.inetd.8; carefully and pay specific attention to
-	<option>-c</option>, <option>-C</option>, and
-	<option>-R</option>.  Spoofed IP attacks will circumvent
-	<option>-C</option> to &man.inetd.8;, so typically a
-	combination of options must be used.  Some standalone servers
-	have self-fork-limitation parameters.</para>
-
-      <para><application>Sendmail</application> provides
-	<option>-OMaxDaemonChildren</option>, which tends to work
-	better than trying to use
-	<application>Sendmail</application>'s load limiting options
-	due to the load lag.  Specify a
-	<literal>MaxDaemonChildren</literal> when starting
-	<application>Sendmail</application> which is high enough to
-	handle the expected load, but not so high that the computer
-	cannot handle that number of
-	<application>Sendmail</application> instances.  It is prudent
-	to run <application>Sendmail</application> in queued mode
-	using <option>-ODeliveryMode=queued</option> and to run the
-	daemon (<command>sendmail -bd</command>) separate from the
-	queue-runs (<command>sendmail -q15m</command>).  For
-	real-time delivery, run the queue at a much lower interval,
-	such as <option>-q1m</option>, but be sure to specify a
-	reasonable <literal>MaxDaemonChildren</literal> to prevent
-	cascade failures.</para>
-
-      <para>&man.syslogd.8; can be attacked directly and it is
-	strongly recommended to use
-	<option>-s</option> whenever possible, and
-	<option>-a</option> otherwise.</para>
-
-      <para>Be careful with connect-back services such as
-	reverse-identd, which can be attacked directly.  The
-	reverse-ident feature of
-	<application>TCP Wrappers</application> is not recommended for
-	this reason.</para>
-
-      <para>It is recommended to protect internal services from
-	external access by firewalling them at the border routers.
-	This is to prevent saturation attacks from outside the LAN,
-	not so much to protect internal services from network-based
-	<systemitem class="username">root</systemitem> compromise.  Always configure an
-	exclusive firewall which denies everything by default except
-	for traffic which is explicitly allowed.  The range of port
-	numbers used for dynamic binding in &os; is controlled by
-	several <varname>net.inet.ip.portrange</varname>
-	&man.sysctl.8; variables.</para>
-
-      <para>Another common <acronym>DoS</acronym> attack, called a
-	springboard attack, causes the server to generate responses
-	which overloads the server, the local network, or some other
-	machine.  The most common attack of this nature is the
-	<emphasis>ICMP ping broadcast attack</emphasis>.  The attacker
-	spoofs ping packets sent to the LAN's broadcast address with
-	the source IP address set to the machine to attack.  If the
-	border routers are not configured to drop ping packets sent to
-	broadcast addresses, the LAN generates sufficient responses to
-	the spoofed source address to saturate the victim, especially
-	when the attack is against several dozen broadcast addresses
-	over several dozen different networks at once.  A second
-	common springboard attack constructs packets that generate
-	ICMP error responses which can saturate a server's incoming
-	network and cause the server to saturate its outgoing network
-	with ICMP responses.  This type of attack can crash the
-	server by running it out of memory, especially if the server
-	cannot drain the ICMP responses it generates fast enough.  Use
-	the &man.sysctl.8; variable
-	<literal>net.inet.icmp.icmplim</literal> to limit these
-	attacks.  The last major class of springboard attacks is
-	related to certain internal &man.inetd.8; services such as the
-	UDP echo service.  An attacker spoofs a UDP packet with a
-	source address of server A's echo port and a destination
-	address of server B's echo port, where server A and B on the
-	same LAN.  The two servers bounce this one packet back and
-	forth between each other.  The attacker can overload both
-	servers and the LAN by injecting a few packets in this manner.
-	Similar problems exist with the
-	<application>chargen</application> port.  These inetd-internal
-	test services should remain disabled.</para>
-
-      <para>Spoofed packet attacks may be used to overload the kernel
-	route cache.  Refer to the
-	<varname>net.inet.ip.rtexpire</varname>,
-	<varname>rtminexpire</varname>, and
-	<varname>rtmaxcache</varname> &man.sysctl.8; parameters.  A
-	spoofed packet attack that uses a random source IP will cause
-	the kernel to generate a temporary cached route in the route

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

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 00:48:13 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B1CE98AA;
 Tue,  4 Feb 2014 00:48:13 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9250E1A22;
 Tue,  4 Feb 2014 00:48:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s140mDGo073328;
 Tue, 4 Feb 2014 00:48:13 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s140mDSR073327;
 Tue, 4 Feb 2014 00:48:13 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402040048.s140mDSR073327@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 00:48:13 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43745 - head/en_US.ISO8859-1/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.17
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, 04 Feb 2014 00:48:13 -0000

Author: dru
Date: Tue Feb  4 00:48:13 2014
New Revision: 43745
URL: http://svnweb.freebsd.org/changeset/doc/43745

Log:
  Edits to first section of Updating section.
  Improve the introduction.
  Update the config file entries.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 00:31:27 2014	(r43744)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 00:48:13 2014	(r43745)
@@ -160,63 +160,68 @@
       <see>updating-upgrading</see>
     </indexterm>
 
-    <para>Applying security patches is an important part of
-      maintaining computer software, especially the operating system.
-      For the longest time on &os;, this process was not an easy one.
-      Patches had to be applied to the source code, the code rebuilt
-      into binaries, and then the binaries had to be
-      re-installed.</para>
-
-    <para>This is no longer the case as &os; now includes a utility
-      called <command>freebsd-update</command>.  This utility
-      provides two separate functions.  First, it allows for binary
-      security and errata updates to be applied to the &os; base
-      system without the build and install requirements.  Second, the
-      utility supports minor and major release upgrades.</para>
-
-    <note>
-      <para>Binary updates are available for all architectures and
-	releases currently supported by the security team.  Before
-	updating to a new release, its release announcement should be
-	reviewed as it contains important information pertinent to the
+    <para>Applying security patches in a timely manner and
+      upgrading to a newer release of
+      an operating system are important aspects of
+      ongoing system administration.
+      &os; includes a utility
+      called <command>freebsd-update</command> which can be used to
+	perform both these tasks.</para>
+
+    <para>This utility supports binary
+      security and errata updates to &os;,
+      without the need to manually compile and install the patch or a 
+      new kernel. Binary updates are available for all architectures and
+      releases currently supported by the security team.  The list of
+      supported releases and their estimated end-of-life dates are listed at <uri
+	  xlink:href="http://www.FreeBSD.org/security/">http://www.FreeBSD.org/security/</uri>.</para>   
+
+    <para>This utility also supports operating system upgrades to minor point
+	releases as well as upgrades to another release branch.  Before
+	upgrading to a new release, review its release announcement
+	as it contains important information pertinent to the
 	release.  Release announcements are available from <uri
 	  xlink:href="http://www.FreeBSD.org/releases/">http://www.FreeBSD.org/releases/</uri>.</para>
-    </note>
-
+    
+    <note>
     <para>If a <command>crontab</command> utilizing the features
       of &man.freebsd-update.8; exists, it must be
-      disabled before the following operation is started.</para>
+      disabled before upgrading the operating system.</para>
+    </note>
+    
+    <para>This section describes the configuration file used by
+      <command>freebsd-update</command>, demonstrates how to
+      apply a security patch and how to upgrade to a minor or major
+      operating system release, and discusses some of the considerations
+      when upgrading the operating system.</para>
 
     <sect2 xml:id="freebsdupdate-config-file">
       <title>The Configuration File</title>
 
-      <para>Some users may wish to tweak the default configuration
+      <para>The default configuration file for
+	<command>freebsd-update</command> works as-is.  Some users may wish to tweak the default configuration
 	in <filename>/etc/freebsd-update.conf</filename>, allowing
-	better control of the process.  The options are well
-	documented, but the following may require a bit more
+	better control of the process.  The comments in this file explain the available options,
+	but the following may require a bit more
 	explanation:</para>
 
       <programlisting># Components of the base system which should be kept updated.
-Components src world kernel</programlisting>
+Components world kernel</programlisting>
 
       <para>This parameter controls which parts of &os; will be kept
-	up-to-date.  The default is to update the source code, the
-	entire base system, and the kernel.  Components are the same
-	as those available during installation.  For instance, adding
-	<literal>world/games</literal> would allow game patches to be
-	applied.  Using <literal>src/bin</literal> would allow the
-	source code in <filename>src/bin</filename>
-	to be updated.</para>
-
-      <para>The best option is to leave this at the default as
-	changing it to include specific items requires the user to
-	list every item to be updated.  This could have disastrous
+	up-to-date.  The default is to update the
+	entire base system and the kernel.  Individual components can
+	instead be specified, such as
+	<literal>src/base</literal> or
+	<literal>src/sys</literal>.  However, the best option is to leave this at the default as
+	changing it to include specific items requires
+	every needed item to be listed.  Over time, this could have disastrous
 	consequences as source code and binaries may become out of
 	sync.</para>
 
       <programlisting># Paths which start with anything matching an entry in an IgnorePaths
 # statement will be ignored.
-IgnorePaths</programlisting>
+IgnorePaths /boot/kernel/linker.hints</programlisting>
 
       <para>To leave specified directories, such as
 	<filename>/bin</filename> or
@@ -233,7 +238,7 @@ UpdateIfUnmodified /etc/ /var/ /root/ /.
 
       <para>This option will only update unmodified configuration
 	files in the specified directories.  Any changes made by the
-	user will invalidate the automatic updating of these files.
+	user will prevent the automatic updating of these files.
 	There is another option,
 	<literal>KeepModifiedMetadata</literal>, which will instruct
 	<command>freebsd-update</command> to save the changes during
@@ -241,14 +246,14 @@ UpdateIfUnmodified /etc/ /var/ /root/ /.
 
       <programlisting># When upgrading to a new &os; release, files which match MergeChanges
 # will have any local changes merged into the version from the new release.
-MergeChanges /etc/ /var/named/etc/</programlisting>
+MergeChanges /etc/ /var/named/etc/ /boot/device.hints</programlisting>
 
       <para>List of directories with configuration files that
 	<command>freebsd-update</command> should attempt to merge.
 	The file merge process is a series of &man.diff.1; patches
 	similar to &man.mergemaster.8;, but with fewer options.
-	Merges are either accepted, open an editor, or
-	<command>freebsd-update</command> will abort.  When in doubt,
+	Merges are either accepted, open an editor, or cause
+	<command>freebsd-update</command> to abort.  When in doubt,
 	backup <filename>/etc</filename> and just
 	accept the merges.  See <xref linkend="mergemaster"/> for more
 	information about <command>mergemaster</command>.</para>
@@ -259,7 +264,7 @@ MergeChanges /etc/ /var/named/etc/</prog
 
       <para>This directory is where all patches and temporary files
 	are placed.  In cases where the user is doing a version
-	upgrade, this location should have a least a gigabyte of disk
+	upgrade, this location should have at least a gigabyte of disk
 	space available.</para>
 
       <programlisting># When upgrading between releases, should the list of Components be

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 12:31:53 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0E61A6D1;
 Tue,  4 Feb 2014 12:31:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id EC1091760;
 Tue,  4 Feb 2014 12:31:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14CVqO8050732;
 Tue, 4 Feb 2014 12:31:52 GMT (envelope-from brueffer@svn.freebsd.org)
Received: (from brueffer@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14CVqi5050731;
 Tue, 4 Feb 2014 12:31:52 GMT (envelope-from brueffer@svn.freebsd.org)
Message-Id: <201402041231.s14CVqi5050731@svn.freebsd.org>
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Tue, 4 Feb 2014 12:31:52 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43746 - 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.17
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, 04 Feb 2014 12:31:53 -0000

Author: brueffer
Date: Tue Feb  4 12:31:52 2014
New Revision: 43746
URL: http://svnweb.freebsd.org/changeset/doc/43746

Log:
  Add entities for qlxgbe(4) and qlxge(4).

Modified:
  head/share/xml/man-refs.ent

Modified: head/share/xml/man-refs.ent
==============================================================================
--- head/share/xml/man-refs.ent	Tue Feb  4 00:48:13 2014	(r43745)
+++ head/share/xml/man-refs.ent	Tue Feb  4 12:31:52 2014	(r43746)
@@ -3724,6 +3724,8 @@
 <!ENTITY man.pty.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pty</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.puc.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>puc</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.qlxgb.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>qlxgb</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
+<!ENTITY man.qlxgbe.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>qlxgbe</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
+<!ENTITY man.qlxge.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>qlxge</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.raid.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>raid</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.ral.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>ral</refentrytitle><manvolnum>4</manvolnum></citerefentry>">
 <!ENTITY man.random.4 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>random</refentrytitle><manvolnum>4</manvolnum></citerefentry>">

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 14:04:00 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 42A38FEF;
 Tue,  4 Feb 2014 14:04:00 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2D7861110;
 Tue,  4 Feb 2014 14:04:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14E40fW088053;
 Tue, 4 Feb 2014 14:04:00 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14E40cm088047;
 Tue, 4 Feb 2014 14:04:00 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402041404.s14E40cm088047@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 14:04:00 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43747 - head/en_US.ISO8859-1/books/handbook/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.17
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, 04 Feb 2014 14:04:00 -0000

Author: dru
Date: Tue Feb  4 14:03:59 2014
New Revision: 43747
URL: http://svnweb.freebsd.org/changeset/doc/43747

Log:
  Comment out traditional pkg_* section.
  Subsequent commits will chase down remaining pkg_* commands in other sections.
  
  Reviewed by: bapt
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue Feb  4 12:31:52 2014	(r43746)
+++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue Feb  4 14:03:59 2014	(r43747)
@@ -33,11 +33,6 @@
       </listitem>
 
       <listitem>
-	<para>How to manage binary packages using the traditional
-	  package system.</para>
-      </listitem>
-
-      <listitem>
 	<para>How to manage binary packages using
 	  <application>pkgng</application>.</para>
       </listitem>
@@ -101,14 +96,9 @@
       writing, over &os.numports; third-party applications have been
       ported to &os;.</para>
 
-    <para>&os; provides two technologies which automate these
-      steps.</para>
-
     <para>A &os; package contains pre-compiled copies of all the
       commands for an application, as well as any configuration files
       and documentation.  A package can be manipulated with the
-      traditional &os; package management commands, such as
-      &man.pkg.add.1;, or using the newer
       <application>pkgng</application> commands, such as
       <command>pkg install</command>.</para>
 
@@ -334,9 +324,8 @@ Info:   Lists information about open fil
     </itemizedlist>
   </sect1>
 
-
-  <sect1 xml:id="packages-using">
     <!--
+  <sect1 xml:id="packages-using">
     <sect1info>
       <authorgroup>
 	<author>
@@ -346,7 +335,6 @@ Info:   Lists information about open fil
 	</author>
       </authorgroup>
     </sect1info>
-    -->
 
     <title>Using Binary Packages</title>
 
@@ -561,6 +549,7 @@ docbook                     =
 	<literal>xchat</literal> will be deleted.</para>
     </sect2>
   </sect1>
+    -->
 
   <sect1 xml:id="pkgng-intro">
     <title>Using <application>pkgng</application> for Binary Package
@@ -582,7 +571,7 @@ docbook                     =
       <title>Getting Started with
 	<application>pkgng</application></title>
 
-      <para>&os;&nbsp;9.1 and later includes a bootstrap utility
+      <para>&os;&nbsp;8.4 and later includes a bootstrap utility
 	which can be used to download and install
 	<application>pkgng</application>, along with its manual
 	pages.</para>
@@ -944,7 +933,7 @@ Deinstalling ca_root_nss-3.15.1_1... don
 	  <application>Subversion</application> can be installed as
 	  a package:</para>
 
-	<screen>&prompt.root; <userinput>pkg_add -r subversion</userinput></screen>
+	<screen>&prompt.root; <userinput>pkg install subversion</userinput></screen>
 
 	<para>If <application>pkgng</application> is being used to
 	  manage packages, <application>Subversion</application> can
@@ -1249,10 +1238,8 @@ ftp://ftp.organization.org/pub/FreeBSD/p
       </indexterm>
 
       <para>Installed ports can be uninstalled using
-	&man.pkg.delete.1;.  Alternately, if the &os; system has been
-	configured to use <application>pkg</application>, a port can
-	be uninstalled using <command>pkg delete</command>.  Examples
-	for using these commands can be found in <xref linkend="packages-using"/> and <xref linkend="pkgng-intro"/></para>
+	<command>pkg delete</command>.  Examples
+	for using is command can be found in <xref linkend="pkgng-intro"/></para>
 
       <para>Alternately, <command>make deinstall</command> can be
 	run in the port's directory:</para>
@@ -1572,11 +1559,9 @@ The deinstallation will free 229 kB
       </listitem>
 
       <listitem>
-	<para>If the system is running the traditional package system,
-	  use &man.pkg.info.1; to determine which files, man pages,
-	  and binaries were installed with the application.  If the
-	  system is running <application>pkgng</application>, instead
-	  use <command>pkg info</command>.</para>
+	<para>Use
+	  use <command>pkg info</command> to determine which files, man pages,
+	  and binaries were installed with the application.</para>
       </listitem>
     </itemizedlist>
   </sect1>
@@ -1634,7 +1619,7 @@ The deinstallation will free 229 kB
 
       <listitem>
 	<para>Install the package instead of the port using the
-	  instructions in <xref linkend="packages-using"/> or <xref linkend="pkgng-intro"/>.</para>
+	  instructions in <xref linkend="pkgng-intro"/>.</para>
       </listitem>
     </orderedlist>
   </sect1>

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 14:09:03 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 57A95234;
 Tue,  4 Feb 2014 14:09:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3F78A116F;
 Tue,  4 Feb 2014 14:09:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14E93BU088844;
 Tue, 4 Feb 2014 14:09:03 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14E92Ki088839;
 Tue, 4 Feb 2014 14:09:02 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201402041409.s14E92Ki088839@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Tue, 4 Feb 2014 14:09:02 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43748 - in head/en_US.ISO8859-1:
 articles/committers-guide books/porters-handbook htdocs/portmgr
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.17
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, 04 Feb 2014 14:09:03 -0000

Author: mat (ports committer)
Date: Tue Feb  4 14:09:02 2014
New Revision: 43748
URL: http://svnweb.freebsd.org/changeset/doc/43748

Log:
  Remove LATEST_LINK mentions, nobody should use it, ever.
  
  Sponsored by:	Absolight

Modified:
  head/en_US.ISO8859-1/articles/committers-guide/article.xml
  head/en_US.ISO8859-1/books/porters-handbook/book.xml
  head/en_US.ISO8859-1/htdocs/portmgr/qa.xml

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Tue Feb  4 14:03:59 2014	(r43747)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Tue Feb  4 14:09:02 2014	(r43748)
@@ -4014,22 +4014,26 @@ MFC after:          1 month</programlist
 
 		  <step>
 		    <para>Upgrade the copied port to the new version.
-		      Remember to change the
-		      <varname>LATEST_LINK</varname> so there are no
+		      Remember to add or change the
+		      <varname>PKGNAMEPREFIX</varname> or
+		      <varname>PKGNAMESUFFIX</varname> so there are no
 		      duplicate ports with the same name.  In some
 		      rare cases it may be necessary to change the
-		      <varname>PORTNAME</varname> instead of
-		      <varname>LATEST_LINK</varname>, but this should
-		      only be done when it is really needed &mdash;
-		      e.g., using an existing port as the base for a
-		      very similar program with a different name, or
-		      upgrading a port to a new upstream version which
-		      actually changes the distribution name, like the
-		      transition from
+		      <varname>PORTNAME</varname> instead of adding
+		      <varname>PKGNAMEPREFIX</varname> or
+		      <varname>PKGNAMESUFFIX</varname>, but this
+		      should only be done when it is really needed
+		      &mdash; e.g., using an existing port as the base
+		      for a very similar program with a different
+		      name, or upgrading a port to a new upstream
+		      version which actually changes the distribution
+		      name, like the transition from
 		      <filename>textproc/libxml</filename> to
 		      <filename>textproc/libxml2</filename>.  In most
-		      cases, changing <varname>LATEST_LINK</varname>
-		      should suffice.</para>
+		      cases, adding or changing
+		      <varname>PKGNAMEPREFIX</varname> or
+		      <varname>PKGNAMESUFFIX</varname> should
+		      suffice.</para>
 		  </step>
 
 		  <step>

Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/book.xml	Tue Feb  4 14:03:59 2014	(r43747)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Tue Feb  4 14:09:02 2014	(r43748)
@@ -1238,41 +1238,6 @@ PORTEPOCH=	1</programlisting>
 	  them part of <varname>PORTNAME</varname>.</para>
       </sect2>
 
-      <sect2>
-	<title><varname>LATEST_LINK</varname></title>
-
-	<para><varname>LATEST_LINK</varname> is used during package
-	  building to determine a shortened name to create links that
-	  can be used by <command>pkg_add -r</command>.  This makes it
-	  possible to, for example, install the latest perl version by
-	  running <command>pkg_add -r perl</command> without knowing
-	  the exact version number.  This name needs to be unique and
-	  obvious to users.</para>
-
-	<para>In some cases, several versions of a program may be
-	  present in the ports collection at the same time.  Both the
-	  index build and the package build system need to be able to
-	  see them as different, independent ports, although they may
-	  all have the same <varname>PORTNAME</varname>,
-	  <varname>PKGNAMEPREFIX</varname>, and even
-	  <varname>PKGNAMESUFFIX</varname>.  In those cases, the
-	  optional <varname>LATEST_LINK</varname> variable should be
-	  set to a different value for all ports except the
-	  <quote>main</quote> one &mdash; see the
-	  <filename>lang/gcc46</filename> and
-	  <filename>lang/gcc</filename> ports, and the
-	  <filename>www/apache*</filename> family for examples of its
-	  use.  By setting <varname>NO_LATEST_LINK</varname>, no link
-	  will be generated, which may be an option for all but the
-	  <quote>main</quote> version.  Note that how to choose a
-	  <quote>main</quote> version &mdash;
-	  <quote>most popular</quote>, <quote>best supported</quote>,
-	  <quote>least patched</quote>, and so on &mdash; is outside
-	  the scope of this handbook's recommendations; we only tell
-	  you how to specify the other ports' versions after you have
-	  picked a <quote>main</quote> one.</para>
-      </sect2>
-
       <sect2 xml:id="porting-pkgname">
 	<title>Package Naming Conventions</title>
 
@@ -1341,9 +1306,8 @@ PORTEPOCH=	1</programlisting>
 	      <varname>PORTNAME</varname>, as the
 	      <filename>www/apache*</filename> ports do; in that case,
 	      different versions (and different index entries) are
-	      distinguished by the <varname>PKGNAMEPREFIX</varname>,
-	      <varname>PKGNAMESUFFIX</varname>, and
-	      <varname>LATEST_LINK</varname> values.</para>
+	      distinguished by the <varname>PKGNAMEPREFIX</varname>
+	      and <varname>PKGNAMESUFFIX</varname> values.</para>
 	  </listitem>
 
 	  <listitem>

Modified: head/en_US.ISO8859-1/htdocs/portmgr/qa.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/portmgr/qa.xml	Tue Feb  4 14:03:59 2014	(r43747)
+++ head/en_US.ISO8859-1/htdocs/portmgr/qa.xml	Tue Feb  4 14:09:02 2014	(r43748)
@@ -153,14 +153,6 @@ two main categories:
 	the port.  (This email is not automated but it should be sent
 	as a courtesy.)</p></li>
 
-      <li><p>a list of ports that do not set NO_LATEST_LINK.  (Ports
-	that have a stable version, and a development version, will
-	generally have the development version set to a later revision.
-	If it is desirable that users should install the stable version
-	from packages, rather than the development version, this flag
-	should be set; otherwise, users will get the latest version by
-	default.)</p></li>
-
     </ul>
 
   </li>

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 14:11:46 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 52E92510;
 Tue,  4 Feb 2014 14:11:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3932811E3;
 Tue,  4 Feb 2014 14:11:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14EBkgA092061;
 Tue, 4 Feb 2014 14:11:46 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14EBkIO092060;
 Tue, 4 Feb 2014 14:11:46 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201402041411.s14EBkIO092060@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Tue, 4 Feb 2014 14:11:46 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43749 - 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.17
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, 04 Feb 2014 14:11:46 -0000

Author: mat (ports committer)
Date: Tue Feb  4 14:11:45 2014
New Revision: 43749
URL: http://svnweb.freebsd.org/changeset/doc/43749

Log:
  Add the man pages that come with pkg so we can use them everywhere.
  
  Sponsored by:	Absolight

Modified:
  head/share/xml/man-refs.ent

Modified: head/share/xml/man-refs.ent
==============================================================================
--- head/share/xml/man-refs.ent	Tue Feb  4 14:09:02 2014	(r43748)
+++ head/share/xml/man-refs.ent	Tue Feb  4 14:11:45 2014	(r43749)
@@ -499,8 +499,43 @@
 <!ENTITY man.pgrep.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pgrep</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.pic.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pic</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.pim6stat.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pim6stat</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
+<!ENTITY man.pkg-add.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-add</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-annotate.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-annotate</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-audit.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-audit</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-autoremove.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-autoremove</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-backup.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-backup</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-check.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-check</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-clean.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-clean</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-config.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-config</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-convert.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-convert</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-create.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-create</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-delete.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-delete</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-fetch.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-fetch</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-info.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-info</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-install.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-install</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-lock.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-lock</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-query.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-query</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-register.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-register</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-remove.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-remove</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-repo.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-repo</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-repository.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-repository</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
+<!ENTITY man.pkg-rquery.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-rquery</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-search.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-search</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-set.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-set</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-shell.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-shell</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-shlib.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-shlib</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-static.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-static</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-stats.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-stats</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-unlock.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-unlock</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-update.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-update</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-updating.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-updating</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-upgrade.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-upgrade</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-version.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-version</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-which.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-which</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.pkg.add.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg_add</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.pkg.check.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg_check</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
+<!ENTITY man.pkg.conf.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.pkg.create.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg_create</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.pkg.delete.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg_delete</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.pkg.info.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg_info</refentrytitle><manvolnum>1</manvolnum></citerefentry>">

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 14:11:48 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E03A9513;
 Tue,  4 Feb 2014 14:11:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id ADC2311E5;
 Tue,  4 Feb 2014 14:11:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14EBmfN092101;
 Tue, 4 Feb 2014 14:11:48 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14EBmF5092099;
 Tue, 4 Feb 2014 14:11:48 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201402041411.s14EBmF5092099@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 4 Feb 2014 14:11:48 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43750 - 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.17
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, 04 Feb 2014 14:11:48 -0000

Author: jhb
Date: Tue Feb  4 14:11:48 2014
New Revision: 43750
URL: http://svnweb.freebsd.org/changeset/doc/43750

Log:
  Convert the list of general policies from a paragraph to a bullet list
  and sort the list by policy name.
  
  Reviewed by:	eadler

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

Modified: head/en_US.ISO8859-1/htdocs/internal/policies.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/internal/policies.xml	Tue Feb  4 14:11:45 2014	(r43749)
+++ head/en_US.ISO8859-1/htdocs/internal/policies.xml	Tue Feb  4 14:11:48 2014	(r43750)
@@ -34,25 +34,18 @@ below, for more info.</p>
 
 <h2><b>General Policies</b></h2>
 
-<p>Here you will find various things such as the
-<a href="new-account.html">New Account Creation Procedure</a>,
-the
-<a href="expire-bits.html">Commit Bit Expiration Policy</a>,
-the
-<a href="bylaws.html">Core Bylaws</a>,
-the
-<a href="resources.html">Commit Bit and Project Resources Policy</a>,
-<a href="core-vote.html">Core's Voting Procedures</a>,
-the
-<a href="fortunes.html">Fortune File Policy</a>,
-the
-<a href="i18n.html">Internationalization Policy</a>,
-the
-<a href="data.html">User Data Policy</a>,
-the
-<a href="hats.html">Hats Term Limits Policy</a>,
-and the
-<a href="../doc/en_US.ISO8859-1/articles/pr-guidelines/">Problem Report Handling Guidelines</a>.</p>
+<ul>
+  <li><a href="resources.html">Commit Bit and Project Resources Policy</a></li>
+  <li><a href="expire-bits.html">Commit Bit Expiration Policy</a></li>
+  <li><a href="bylaws.html">Core Bylaws</a></li>
+  <li><a href="core-vote.html">Core's Voting Procedures</a></li>
+  <li><a href="fortunes.html">Fortune File Policy</a></li>
+  <li><a href="hats.html">Hats Term Limits Policy</a></li>
+  <li><a href="i18n.html">Internationalization Policy</a></li>
+  <li><a href="new-account.html">New Account Creation Procedure</a></li>
+  <li><a href="../doc/en_US.ISO8859-1/articles/pr-guidelines/">Problem Report Handling Guidelines</a></li>
+  <li><a href="data.html">User Data Policy</a></li>
+</ul>
 
 <h2><b>The FreeBSD Documentation Project</b></h2>
 

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 14:21:24 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 95EFF778;
 Tue,  4 Feb 2014 14:21:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 801E412A8;
 Tue,  4 Feb 2014 14:21:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14ELONR096010;
 Tue, 4 Feb 2014 14:21:24 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14ELOEt096009;
 Tue, 4 Feb 2014 14:21:24 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402041421.s14ELOEt096009@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 14:21:24 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43751 - head/en_US.ISO8859-1/books/handbook/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.17
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, 04 Feb 2014 14:21:24 -0000

Author: dru
Date: Tue Feb  4 14:21:24 2014
New Revision: 43751
URL: http://svnweb.freebsd.org/changeset/doc/43751

Log:
  White space fix only. Translators can ignore.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue Feb  4 14:11:48 2014	(r43750)
+++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue Feb  4 14:21:24 2014	(r43751)
@@ -194,10 +194,12 @@
       &a.ports; and the &a.ports-bugs;.</para>
 
     <warning>
-      <para>Before installing any application, check <uri xlink:href="http://vuxml.freebsd.org/">http://vuxml.freebsd.org/</uri> for security issues
-	related to the application or install  <package>ports-mgmt/portaudit</package>. Once
-	installed, type <command>portaudit -F -a</command> to check
-	all installed applications for known vulnerabilities.</para>
+      <para>Before installing any application, check <uri
+	  xlink:href="http://vuxml.freebsd.org/">http://vuxml.freebsd.org/</uri>
+	for security issues related to the application or install
+	<package>ports-mgmt/portaudit</package>. Once installed, type
+	<command>portaudit -F -a</command> to check all installed
+	applications for known vulnerabilities.</para>
     </warning>
 
     <para>The remainder of this chapter explains how to use packages
@@ -215,7 +217,8 @@
     <itemizedlist>
       <listitem>
 	<para>The &os; web site maintains an up-to-date searchable
-	  list of all the available applications, at <link xlink:href="&url.base;/ports/index.html">http://www.FreeBSD.org/ports/</link>.
+	  list of all the available applications, at <link
+	    xlink:href="&url.base;/ports/index.html">http://www.FreeBSD.org/ports/</link>.
 	  The ports can be searched by application name or by
 	  software category.</para>
       </listitem>
@@ -223,7 +226,8 @@
       <listitem>
 	<indexterm><primary>FreshPorts</primary></indexterm>
 
-	<para>Dan Langille maintains <link xlink:href="http://www.FreshPorts.org/">FreshPorts.org</link>
+	<para>Dan Langille maintains <link
+	    xlink:href="http://www.FreshPorts.org/">FreshPorts.org</link>
 	  which provides a comprehensive search utility and also
 	  tracks changes to the applications in the Ports Collection.
 	  Registered users can create a customized watch list in order
@@ -235,8 +239,9 @@
 	<indexterm><primary>Freecode</primary></indexterm>
 
 	<para>If you do not know the name of an application, try
-	  using a site like <link xlink:href="http://www.freecode.com/">Freecode.com</link> to
-	  find an application, then check back at the &os; site to
+	  using a site like <link
+	    xlink:href="http://www.freecode.com/">Freecode.com</link>
+	  to find an application, then check back at the &os; site to
 	  see if the application has been ported yet.</para>
       </listitem>
 
@@ -258,18 +263,18 @@ lsof: /usr/ports/sysutils/lsof</screen>
 /usr/ports/sysutils/lsof</screen>
 
 	<para>Note that this will also return any matched files
-	  downloaded into the <filename>/usr/ports/distfiles</filename>
-	  directory.</para>
+	  downloaded into the
+	  <filename>/usr/ports/distfiles</filename> directory.</para>
       </listitem>
 
       <listitem>
 	<para>Another way to find software is by using the Ports
 	  Collection's built-in search mechanism.  To use the search
-	  feature, <application>cd</application> to <filename>/usr/ports</filename> then run
-	  <command>make search
-	    name=program-name</command>
-	  where <replaceable>program-name</replaceable> is the name
-	  of the software.  For example, to search for
+	  feature, <application>cd</application> to
+	  <filename>/usr/ports</filename> then run <command>make
+	    search name=program-name</command> where
+	  <replaceable>program-name</replaceable> is the name of the
+	  software.  For example, to search for
 	  <command>lsof</command>:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/ports</userinput>
@@ -561,9 +566,11 @@ docbook                     =
       faster and easier.</para>
 
     <para><application>pkgng</application> is not a replacement for
-      port management tools like <package>ports-mgmt/portmaster</package> or <package>ports-mgmt/portupgrade</package>.  These
-      tools can be used to install third-party software from both
-      binary packages and the Ports Collection, while
+      port management tools like
+      <package>ports-mgmt/portmaster</package> or
+      <package>ports-mgmt/portupgrade</package>.  These tools can be
+      used to install third-party software from both binary packages
+      and the Ports Collection, while
       <application>pkgng</application> installs only binary
       packages.</para>
 
@@ -844,12 +851,16 @@ Deinstalling ca_root_nss-3.15.1_1... don
 
       <screen>&prompt.root; <userinput>pkg set -o lang/php5:lang/php53</userinput></screen>
 
-      <para>As another example, to update <package>lang/ruby18</package> to <package>lang/ruby19</package>, run:</para>
+      <para>As another example, to update
+	<package>lang/ruby18</package> to
+	<package>lang/ruby19</package>, run:</para>
 
       <screen>&prompt.root; <userinput>pkg set -o lang/ruby18:lang/ruby19</userinput></screen>
 
       <para>As a final example, to change the origin of the
-	<filename>libglut</filename> shared libraries from <package>graphics/libglut</package> to <package>graphics/freeglut</package>, run:</para>
+	<filename>libglut</filename> shared libraries from
+	<package>graphics/libglut</package> to
+	<package>graphics/freeglut</package>, run:</para>
 
       <screen>&prompt.root; <userinput>pkg set -o graphics/libglut:graphics/freeglut</userinput></screen>
 
@@ -881,7 +892,8 @@ Deinstalling ca_root_nss-3.15.1_1... don
 
       <para><application>Portsnap</application> is a fast and
 	user-friendly tool for retrieving the Ports Collection and
-	is the recommended choice for most users.  See <xref linkend="updating-upgrading-portsnap"/> for a detailed
+	is the recommended choice for most users.  See <xref
+	  linkend="updating-upgrading-portsnap"/> for a detailed
 	description of <application>Portsnap</application>.</para>
 
       <step>
@@ -893,7 +905,8 @@ Deinstalling ca_root_nss-3.15.1_1... don
 
       <step>
 	<para>When running <application>Portsnap</application> for
-	  the first time, extract the snapshot into <filename>/usr/ports</filename>:</para>
+	  the first time, extract the snapshot into
+	  <filename>/usr/ports</filename>:</para>
 
 	<screen>&prompt.root; <userinput>portsnap extract</userinput></screen>
       </step>
@@ -901,8 +914,8 @@ Deinstalling ca_root_nss-3.15.1_1... don
       <step>
 	<para>After the first use of
 	  <application>Portsnap</application> has been completed as
-	  shown above, <filename>/usr/ports</filename> can be updated as
-	  needed by running:</para>
+	  shown above, <filename>/usr/ports</filename> can be updated
+	  as needed by running:</para>
 
 	<screen>&prompt.root; <userinput>portsnap fetch</userinput>
 &prompt.root; <userinput>portsnap update</userinput></screen>
@@ -915,7 +928,8 @@ Deinstalling ca_root_nss-3.15.1_1... don
       <para>If more control over the ports tree is needed or if
 	local changes need to be maintained,
 	<application>Subversion</application> can be used to
-	obtain the Ports Collection.  Refer to <link xlink:href="&url.articles.committers-guide;/subversion-primer.html">the
+	obtain the Ports Collection.  Refer to <link
+	  xlink:href="&url.articles.committers-guide;/subversion-primer.html">the
 	  Subversion Primer</link> for a detailed description of
 	<application>Subversion</application>.</para>
 
@@ -946,15 +960,17 @@ Deinstalling ca_root_nss-3.15.1_1... don
 	<para>Check out a copy of the ports tree.  For better
 	  performance, replace
 	  <replaceable>svn0.us-east.FreeBSD.org</replaceable> with a
-	  <link xlink:href="&url.books.handbook;/svn-mirrors.html">Subversion
+	  <link
+	    xlink:href="&url.books.handbook;/svn-mirrors.html">Subversion
 	    mirror</link> close to your geographic location:</para>
 
 	<screen>&prompt.root; <userinput>svn checkout https://svn0.us-east.FreeBSD.org/ports/head /usr/ports</userinput></screen>
       </step>
 
       <step>
-	<para>As needed, update <filename>/usr/ports</filename> after the initial
-	  <application>Subversion</application> checkout:</para>
+	<para>As needed, update <filename>/usr/ports</filename> after
+	  the initial <application>Subversion</application>
+	  checkout:</para>
 
 	<screen>&prompt.root; <userinput>svn update /usr/ports</userinput></screen>
       </step>
@@ -1002,8 +1018,9 @@ Deinstalling ca_root_nss-3.15.1_1... don
 
     <para>Some ports include <filename>pkg-message</filename> or
       other files to handle special situations.  For more details
-      on these files, and on ports in general, refer to the <link xlink:href="&url.books.porters-handbook;/index.html">&os; Porter's
-	Handbook</link>.</para>
+      on these files, and on ports in general, refer to the <link
+	xlink:href="&url.books.porters-handbook;/index.html">&os;
+	Porter's Handbook</link>.</para>
 
     <para>The port does not include the actual source code, also
       known as a <filename>distfile</filename>.  The extract portion
@@ -1028,14 +1045,15 @@ Deinstalling ca_root_nss-3.15.1_1... don
 	  Collection as described in the previous section.  Since
 	  the installation of any third-party software can introduce
 	  security vulnerabilities, it is recommended to first check
-	  <uri xlink:href="http://vuxml.freebsd.org/">http://vuxml.freebsd.org/</uri> for known
-	  security issues related to the port.  Alternately, if
-	  <package>ports-mgmt/portaudit</package>
-	  is installed, run <command>portaudit -F</command> before
-	  installing a new port.  This command can be configured to
-	  automatically perform a security audit and an update of
-	  the vulnerability database during the daily security system
-	  check.  For more information, refer to the manual page for
+	  <uri
+	    xlink:href="http://vuxml.freebsd.org/">http://vuxml.freebsd.org/</uri>
+	  for known security issues related to the port.  Alternately,
+	  if <package>ports-mgmt/portaudit</package> is installed, run
+	  <command>portaudit -F</command> before installing a new
+	  port.  This command can be configured to automatically
+	  perform a security audit and an update of the vulnerability
+	  database during the daily security system check.  For more
+	  information, refer to the manual page for
 	  <application>portaudit</application> and
 	  &man.periodic.8;.</para>
       </warning>
@@ -1044,17 +1062,19 @@ Deinstalling ca_root_nss-3.15.1_1... don
 	connection.  It also requires superuser privilege.</para>
 
       <para>Some third-party DVD products such as the &os; Toolkit
-	from <link xlink:href="http://www.freebsdmall.com/">freebsdmall.com</link>
+	from <link
+	  xlink:href="http://www.freebsdmall.com/">freebsdmall.com</link>
 	contain distfiles which can be used to install ports without
-	an Internet connection.  Mount the DVD on <filename>/cdrom</filename>.  If you use a different
-	mount point, set the <varname>CD_MOUNTPTS</varname> make
-	variable.  The needed distfiles will be automatically used
-	if they are present on the disk.  However, the licenses of
-	a few ports do not allow their inclusion on the DVD.  This
-	could be because a registration form needs to be filled out
-	before downloading or redistribution is not allowed.  In
-	order to install a port not included on the DVD, a connection
-	to the Internet will still be required.</para>
+	an Internet connection.  Mount the DVD on
+	<filename>/cdrom</filename>.  If you use a different mount
+	point, set the <varname>CD_MOUNTPTS</varname> make variable.
+	The needed distfiles will be automatically used if they are
+	present on the disk.  However, the licenses of a few ports do
+	not allow their inclusion on the DVD.  This could be because a
+	registration form needs to be filled out before downloading or
+	redistribution is not allowed.  In order to install a port not
+	included on the DVD, a connection to the Internet will still
+	be required.</para>
 
       <para>To compile and install the port, change to the directory
 	of the port to be installed, then type <command>make
@@ -1146,8 +1166,9 @@ Deinstalling ca_root_nss-3.15.1_1... don
 	  compile and install the port.</para>
 
 	<tip>
-	  <para>When using <buildtarget>config-recursive</buildtarget>,
-	    the list of ports to configure are gathered by the
+	  <para>When using
+	    <buildtarget>config-recursive</buildtarget>, the list of
+	    ports to configure are gathered by the
 	    <buildtarget>all-depends-list</buildtarget> target.  It is
 	    recommended to run <command>make
 	      config-recursive</command>
@@ -1160,11 +1181,9 @@ Deinstalling ca_root_nss-3.15.1_1... don
 	  menu in order to add, remove, or change these options after
 	  a port has been built.  One method is to
 	  <command>cd</command> into the directory containing the
-	  port and type <command>make
-	    config</command>.  Another
-	  option is to use <command>make
-	    showconfig</command>.  Another
-	  option is to execute <command>make
+	  port and type <command>make config</command>.  Another
+	  option is to use <command>make showconfig</command>.
+	  Another option is to execute <command>make
 	    rmconfig</command> which will
 	  remove all selected options and allow you to start over.
 	  All of these options, and others, are explained in great
@@ -1179,16 +1198,14 @@ Deinstalling ca_root_nss-3.15.1_1... don
 	  complete list of supported variables.</para>
 
 	<para>For users who cannot be connected to the Internet all
-	  the time, <command>make
-	    fetch</command> can be run
-	  within <filename>/usr/ports</filename>,
-	  to fetch all distfiles, or within a category, such as
-	  <filename>/usr/ports/net</filename>, or
-	  within the specific port skeleton.  Note that if a port
-	  has any dependencies, running this command in a category
-	  or ports skeleton will <emphasis>not</emphasis> fetch the
-	  distfiles of ports from another category.  Instead, use
-	  <command>make
+	  the time, <command>make fetch</command> can be run
+	  within <filename>/usr/ports</filename>, to fetch all
+	  distfiles, or within a category, such as
+	  <filename>/usr/ports/net</filename>, or within the specific
+	  port skeleton.  Note that if a port has any dependencies,
+	  running this command in a category or ports skeleton will
+	  <emphasis>not</emphasis> fetch the distfiles of ports from
+	  another category.  Instead, use <command>make
 	    fetch-recursive</command> to
 	  also fetch the distfiles for all the dependencies of a
 	  port.</para>
@@ -1209,14 +1226,15 @@ ftp://ftp.organization.org/pub/FreeBSD/p
 
 	<screen>&prompt.root; <userinput>make WRKDIRPREFIX=/usr/home/example/ports install</userinput></screen>
 
-	<para>will compile the port in <filename>/usr/home/example/ports</filename> and
-	  install everything under <filename>/usr/local</filename>.</para>
+	<para>will compile the port in
+	  <filename>/usr/home/example/ports</filename> and install
+	  everything under <filename>/usr/local</filename>.</para>
 
 	<screen>&prompt.root; <userinput>make PREFIX=/usr/home/example/local install</userinput></screen>
 
-	<para>will compile the port in <filename>/usr/ports</filename> and install it
-	  in <filename>/usr/home/example/local</filename>.
-	  And:</para>
+	<para>will compile the port in <filename>/usr/ports</filename>
+	  and install it in
+	  <filename>/usr/home/example/local</filename>.  And:</para>
 
 	<screen>&prompt.root; <userinput>make WRKDIRPREFIX=../ports PREFIX=../local install</userinput></screen>
 
@@ -1238,8 +1256,8 @@ ftp://ftp.organization.org/pub/FreeBSD/p
       </indexterm>
 
       <para>Installed ports can be uninstalled using
-	<command>pkg delete</command>.  Examples
-	for using is command can be found in <xref linkend="pkgng-intro"/></para>
+	<command>pkg delete</command>.  Examples for using is command
+	can be found in <xref linkend="pkgng-intro"/></para>
 
       <para>Alternately, <command>make deinstall</command> can be
 	run in the port's directory:</para>
@@ -1313,13 +1331,13 @@ The deinstallation will free 229 kB
 	  <primary>portmaster</primary>
 	</indexterm>
 
-	<para>The <package>ports-mgmt/portmaster</package>
-	  package or port is the recommended tool for upgrading
-	  installed ports as it is designed to use the tools installed
-	  with &os; without depending upon other ports.  It uses the
-	  information in <filename>/var/db/pkg/</filename> to determine
-	  which ports to upgrade.  To install this utility as a
-	  port:</para>
+	<para>The <package>ports-mgmt/portmaster</package> package or
+	  port is the recommended tool for upgrading installed ports
+	  as it is designed to use the tools installed with &os;
+	  without depending upon other ports.  It uses the
+	  information in <filename>/var/db/pkg/</filename> to
+	  determine which ports to upgrade.  To install this utility
+	  as a port:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/ports/ports-mgmt/portmaster</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -1416,8 +1434,8 @@ The deinstallation will free 229 kB
 	</indexterm>
 
 	<para>Another utility that can be used to upgrade ports is
-	  <application>Portupgrade</application>, which is
-	  available as the <package>ports-mgmt/portupgrade</package> package
+	  <application>Portupgrade</application>, which is available
+	  as the <package>ports-mgmt/portupgrade</package> package
 	  or port.  This utility installs a suite of applications
 	  which can be used to manage ports.  However, it is dependent
 	  upon Ruby.  To install the port:</para>
@@ -1439,10 +1457,9 @@ The deinstallation will free 229 kB
 
 	<para>To upgrade only a specified application instead of all
 	  available ports, use <command>portupgrade
-	    pkgname</command>.  It is
-	  very important to include <option>-R</option> to first
-	  upgrade all the ports required by the given
-	  application:</para>
+	    pkgname</command>.  It is very important to include
+	  <option>-R</option> to first upgrade all the ports required
+	  by the given application:</para>
 
 	<screen>&prompt.root; <userinput>portupgrade -R firefox</userinput></screen>
 
@@ -1479,22 +1496,21 @@ The deinstallation will free 229 kB
 
       <para>Using the Ports Collection will use up disk space over
 	time.  After building and installing a port, running
-	<command>make clean</command>
-	within the ports skeleton will clean up the temporary
-	<filename>work</filename> directory.  If
-	<application>Portmaster</application> is used to install a
+	<command>make clean</command> within the ports skeleton will
+	clean up the temporary <filename>work</filename> directory.
+	If <application>Portmaster</application> is used to install a
 	port, it will automatically remove this directory unless
 	<option>-K</option> is specified.  If
 	<application>Portupgrade</application> is installed, this
-	command will remove all <filename>work</filename> directories found within
-	the local copy of the Ports Collection:</para>
+	command will remove all <filename>work</filename> directories
+	found within the local copy of the Ports Collection:</para>
 
       <screen>&prompt.root; <userinput>portsclean -C</userinput></screen>
 
       <para>In addition, a lot of out-dated source distribution files
-	will collect in <filename>/usr/ports/distfiles</filename> over time.
-	If <application>Portupgrade</application> is installed, this
-	command will delete all the distfiles that are no longer
+	will collect in <filename>/usr/ports/distfiles</filename> over
+	time.  If <application>Portupgrade</application> is installed,
+	this command will delete all the distfiles that are no longer
 	referenced by any ports:</para>
 
       <screen>&prompt.root; <userinput>portsclean -D</userinput></screen>
@@ -1513,9 +1529,10 @@ The deinstallation will free 229 kB
       <para>By default, this command is interactive and will prompt
 	the user to confirm if a distfile should be deleted.</para>
 
-      <para>In addition to these commands, the <package>ports-mgmt/pkg_cutleaves</package> package
-	or port automates the task of removing installed ports that
-	are no longer needed.</para>
+      <para>In addition to these commands, the
+	<package>ports-mgmt/pkg_cutleaves</package> package or port
+	automates the task of removing installed ports that are no
+	longer needed.</para>
     </sect2>
   </sect1>
 
@@ -1531,9 +1548,9 @@ The deinstallation will free 229 kB
     <itemizedlist>
       <listitem>
 	<para>Most applications install at least one default
-	  configuration file in <filename>/usr/local/etc</filename>.  The
-	  configuration files should be reviewed and possibly edited
-	  to meet the system's needs.</para>
+	  configuration file in <filename>/usr/local/etc</filename>.
+	  The configuration files should be reviewed and possibly
+	  edited to meet the system's needs.</para>
       </listitem>
 
       <listitem>
@@ -1545,23 +1562,24 @@ The deinstallation will free 229 kB
 
       <listitem>
 	<para>Some applications run services which must be added
-	  to <filename>/etc/rc.conf</filename>
-	  before starting the application.  These applications usually
-	  install a startup script in
-	  <filename>/usr/local/etc/rc.d</filename>.  See <link linkend="configtuning-starting-services">Starting
+	  to <filename>/etc/rc.conf</filename> before starting the
+	  application.  These applications usually install a startup
+	  script in <filename>/usr/local/etc/rc.d</filename>.  See
+	  <link linkend="configtuning-starting-services">Starting
 	    Services</link> for more information.</para>
       </listitem>
 
       <listitem>
 	<para>Users of &man.csh.1; should run
-	  <command>rehash</command> to rebuild the known binary
-	  list in the shells <envar>PATH</envar>.</para>
+	  <command>rehash</command> to rebuild the known binary list
+	  in the shells <envar>PATH</envar>.</para>
       </listitem>
 
       <listitem>
 	<para>Use
-	  use <command>pkg info</command> to determine which files, man pages,
-	  and binaries were installed with the application.</para>
+	  use <command>pkg info</command> to determine which files,
+	  man pages, and binaries were installed with the
+	  application.</para>
       </listitem>
     </itemizedlist>
   </sect1>
@@ -1592,12 +1610,15 @@ The deinstallation will free 229 kB
 
 	<note>
 	  <para>Some ports are not maintained by an individual but
-	    instead by a <link xlink:href="&url.articles.mailing-list-faq;/article.html">mailing
-	      list</link>.  Many, but not all, of these addresses
-	    look like <email role="nolink">freebsd-listname@FreeBSD.org</email>.
+	    instead by a <link
+	      xlink:href="&url.articles.mailing-list-faq;/article.html">mailing
+	      list</link>.  Many, but not all, of these addresses look
+	    like <email
+	      role="nolink">freebsd-listname@FreeBSD.org</email>.
 	    Take this into account when sending an email.</para>
 
-	  <para>In particular, ports shown as maintained by <email role="nolink">ports@FreeBSD.org</email> are not
+	  <para>In particular, ports shown as maintained by <email
+	      role="nolink">ports@FreeBSD.org</email> are not
 	    maintained by a specific individual.  Instead, any fixes
 	    and support come from the general community who subscribe
 	    to that mailing list.  More volunteers are always
@@ -1606,15 +1627,17 @@ The deinstallation will free 229 kB
 
 	<para>If there is no response to the email, use
 	  &man.send-pr.1; to submit a bug report using the
-	  instructions in <link xlink:href="&url.articles.problem-reports;/article.html">Writing
+	  instructions in <link
+	    xlink:href="&url.articles.problem-reports;/article.html">Writing
 	    &os; Problem Reports</link>.</para>
       </listitem>
 
       <listitem>
-	<para>Fix it!  The <link xlink:href="&url.books.porters-handbook;/index.html">Porter's
+	<para>Fix it!  The <link
+	    xlink:href="&url.books.porters-handbook;/index.html">Porter's
 	    Handbook</link> includes detailed information on the
-	  ports infrastructure so that you can fix the
-	  occasional broken port or even submit your own!</para>
+	  ports infrastructure so that you can fix the occasional
+	  broken port or even submit your own!</para>
       </listitem>
 
       <listitem>

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 14:24:18 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1C861B69;
 Tue,  4 Feb 2014 14:24:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 07A9E12DA;
 Tue,  4 Feb 2014 14:24:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14EOHhP096667;
 Tue, 4 Feb 2014 14:24:17 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14EOH7P096666;
 Tue, 4 Feb 2014 14:24:17 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402041424.s14EOH7P096666@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 14:24:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43752 - head/en_US.ISO8859-1/articles/linux-users
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.17
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, 04 Feb 2014 14:24:18 -0000

Author: dru
Date: Tue Feb  4 14:24:17 2014
New Revision: 43752
URL: http://svnweb.freebsd.org/changeset/doc/43752

Log:
  Last commit forgot to include this file.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/articles/linux-users/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/linux-users/article.xml	Tue Feb  4 14:21:24 2014	(r43751)
+++ head/en_US.ISO8859-1/articles/linux-users/article.xml	Tue Feb  4 14:24:17 2014	(r43752)
@@ -122,7 +122,7 @@ in your /etc/rc.conf. Extra options can 
       </note>
 
       <para>For more information on packages please refer to section 4.4 of
-	the &os; Handbook: <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/packages-using.html">Using the Packages System</link>.</para>
+	the &os; Handbook: <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/pkgng-intro.html">Using the Packages System</link>.</para>
     </sect2>
 
     <sect2 xml:id="ports">

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 14:27:52 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6C7FEC0C;
 Tue,  4 Feb 2014 14:27:52 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 380361305;
 Tue,  4 Feb 2014 14:27:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14ERq1Z097059;
 Tue, 4 Feb 2014 14:27:52 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14ERqu0097058;
 Tue, 4 Feb 2014 14:27:52 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201402041427.s14ERqu0097058@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Tue, 4 Feb 2014 14:27:52 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43753 - 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.17
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, 04 Feb 2014 14:27:52 -0000

Author: mat (ports committer)
Date: Tue Feb  4 14:27:51 2014
New Revision: 43753
URL: http://svnweb.freebsd.org/changeset/doc/43753

Log:
  Actually add the pkg man pages at the right place.
  
  Noticed by:	gjb
  Sponsored by:	Absolight

Modified:
  head/share/xml/man-refs.ent

Modified: head/share/xml/man-refs.ent
==============================================================================
--- head/share/xml/man-refs.ent	Tue Feb  4 14:24:17 2014	(r43752)
+++ head/share/xml/man-refs.ent	Tue Feb  4 14:27:51 2014	(r43753)
@@ -499,43 +499,8 @@
 <!ENTITY man.pgrep.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pgrep</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.pic.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pic</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.pim6stat.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pim6stat</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
-<!ENTITY man.pkg-add.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-add</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-annotate.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-annotate</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-audit.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-audit</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-autoremove.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-autoremove</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-backup.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-backup</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-check.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-check</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-clean.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-clean</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-config.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-config</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-convert.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-convert</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-create.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-create</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-delete.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-delete</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-fetch.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-fetch</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-info.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-info</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-install.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-install</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-lock.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-lock</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-query.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-query</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-register.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-register</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-remove.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-remove</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-repo.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-repo</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-repository.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-repository</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
-<!ENTITY man.pkg-rquery.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-rquery</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-search.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-search</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-set.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-set</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-shell.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-shell</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-shlib.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-shlib</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-static.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-static</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-stats.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-stats</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-unlock.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-unlock</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-update.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-update</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-updating.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-updating</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-upgrade.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-upgrade</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-version.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-version</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg-which.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-which</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
-<!ENTITY man.pkg.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.pkg.add.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg_add</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.pkg.check.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg_check</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
-<!ENTITY man.pkg.conf.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.pkg.create.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg_create</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.pkg.delete.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg_delete</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
 <!ENTITY man.pkg.info.1 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg_info</refentrytitle><manvolnum>1</manvolnum></citerefentry>">
@@ -4124,6 +4089,8 @@
 <!ENTITY man.phones.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>phones</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.pim6dd.conf.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pim6dd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.pim6sd.conf.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pim6sd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
+<!ENTITY man.pkg-repository.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-repository</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
+<!ENTITY man.pkg.conf.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.portsnap.conf.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>portsnap.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.printcap.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>printcap</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
 <!ENTITY man.procfs.5 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>procfs</refentrytitle><manvolnum>5</manvolnum></citerefentry>">
@@ -4649,6 +4616,39 @@
 <!ENTITY man.pim6sd.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pim6sd</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.ping.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>ping</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.ping6.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>ping6</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-add.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-add</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-annotate.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-annotate</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-audit.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-audit</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-autoremove.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-autoremove</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-backup.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-backup</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-check.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-check</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-clean.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-clean</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-config.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-config</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-convert.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-convert</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-create.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-create</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-delete.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-delete</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-fetch.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-fetch</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-info.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-info</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-install.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-install</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-lock.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-lock</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-query.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-query</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-register.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-register</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-remove.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-remove</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-repo.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-repo</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-rquery.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-rquery</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-search.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-search</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-set.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-set</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-shell.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-shell</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-shlib.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-shlib</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-static.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-static</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-stats.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-stats</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-unlock.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-unlock</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-update.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-update</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-updating.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-updating</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-upgrade.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-upgrade</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-version.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-version</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
+<!ENTITY man.pkg-which.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pkg-which</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.pmcannotate.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pmcannotate</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.pmccontrol.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pmccontrol</refentrytitle><manvolnum>8</manvolnum></citerefentry>">
 <!ENTITY man.pmcstat.8 "<citerefentry xmlns='http://docbook.org/ns/docbook'><refentrytitle>pmcstat</refentrytitle><manvolnum>8</manvolnum></citerefentry>">

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 14:41:23 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5C86D43D;
 Tue,  4 Feb 2014 14:41:23 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4718D14EB;
 Tue,  4 Feb 2014 14:41:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14EfNNB004011;
 Tue, 4 Feb 2014 14:41:23 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14EfNFT004010;
 Tue, 4 Feb 2014 14:41:23 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402041441.s14EfNFT004010@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 14:41:23 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43754 - head/en_US.ISO8859-1/books/handbook/desktop
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.17
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, 04 Feb 2014 14:41:23 -0000

Author: dru
Date: Tue Feb  4 14:41:22 2014
New Revision: 43754
URL: http://svnweb.freebsd.org/changeset/doc/43754

Log:
  Replace pkg_ in this chapter.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml	Tue Feb  4 14:27:51 2014	(r43753)
+++ head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml	Tue Feb  4 14:41:22 2014	(r43754)
@@ -287,12 +287,12 @@
       <para>To install the package of the latest release version of
 	<application>Firefox</application>, type:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r firefox</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install firefox</userinput></screen>
 
       <para>To instead install <application>Firefox</application>
 	Extended Support Release (ESR) version, use:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r firefox-esr</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install firefox-esr</userinput></screen>
 
       <para>Localized versions are available in <package>www/firefox-i18n</package> and <package>www/firefox-esr-i18n</package>.</para>
 
@@ -405,7 +405,7 @@
 
       <para>To install the package:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r swfdec-plugin</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install swfdec-plugin</userinput></screen>
 
       <para>If the package is not available, compile and install it
 	from the Ports Collection:</para>
@@ -436,7 +436,7 @@
 	<literal>opera</literal> with <literal>linux-opera</literal>
 	to instead install the &linux; version.</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r opera</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install opera</userinput></screen>
 
       <para>Alternately, install either version through the Ports
 	Collection.  This example compiles the native version:</para>
@@ -524,7 +524,7 @@
       <para><application>Chromium</application> can be installed as a
 	package by typing:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r chromium</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install chromium</userinput></screen>
 
       <para>Alternatively, <application>Chromium</application> can be
 	compiled from source using the Ports Collection:</para>
@@ -671,7 +671,7 @@
       <para>In &os;, <package>editors/calligra</package> can be installed
 	as a package or a port.  To install the package:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r calligra</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install calligra</userinput></screen>
 
       <para>If the package is not available, use the Ports Collection
 	instead:</para>
@@ -699,7 +699,7 @@
       <para>To install the <application>AbiWord</application>
 	package:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r abiword</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install abiword</userinput></screen>
 
       <para>If the package is not available, it can be compiled from
 	the Ports Collection:</para>
@@ -726,7 +726,7 @@
 
       <para>To install the package:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r gimp</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install gimp</userinput></screen>
 
       <para>Alternately, use the Ports Collection:</para>
 
@@ -780,7 +780,7 @@
       <para>To install the <application>Apache
 	  OpenOffice</application> package:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r apache-openoffice</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install apache-openoffice</userinput></screen>
 
       <para>Once the package is installed, type the following command
 	to launch <application>Apache OpenOffice</application>:</para>
@@ -855,7 +855,7 @@
       <para>To install the English version of the
 	<application>LibreOffice</application> package:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r libreoffice</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install libreoffice</userinput></screen>
 
       <para>The editors category (<link xlink:href="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</link>)
 	of the Ports Collection contains several localizations for
@@ -1002,7 +1002,7 @@
       <para>To install <application>gv</application> as a
 	package:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r gv</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install gv</userinput></screen>
 
       <para>If a package is unavailable, use the Ports
 	Collection:</para>
@@ -1031,7 +1031,7 @@
       <para>To install the <application>Xpdf</application>
 	package:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r xpdf</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install xpdf</userinput></screen>
 
       <para>If the package is not available, use the Ports
 	Collection:</para>
@@ -1062,7 +1062,7 @@
       <para>To install the <application>GQview</application>
 	package:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r gqview</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install gqview</userinput></screen>
 
       <para>If the package is not available, use the Ports
 	Collection:</para>
@@ -1145,7 +1145,7 @@
       <para>To install the <application>GnuCash</application>
 	package:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r gnucash</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install gnucash</userinput></screen>
 
       <para>If the package is not available, use the Ports
 	Collection:</para>
@@ -1179,7 +1179,7 @@
       <para>To install <application>Gnumeric</application> as a
 	package:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r gnumeric</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install gnumeric</userinput></screen>
 
       <para>If the package is not available, use the Ports
 	Collection:</para>
@@ -1212,7 +1212,7 @@
       <para>To install <application>KMyMoney</application> as a
 	package:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r kmymoney-kde4</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install kmymoney-kde4</userinput></screen>
 
       <para>If the package is not available, use the Ports
 	Collection:</para>

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 14:47:02 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E0E7C624;
 Tue,  4 Feb 2014 14:47:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CD4D1153C;
 Tue,  4 Feb 2014 14:47:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14El24k005084;
 Tue, 4 Feb 2014 14:47:02 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14El2tu005083;
 Tue, 4 Feb 2014 14:47:02 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201402041447.s14El2tu005083@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 4 Feb 2014 14:47:02 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43755 - head/share/misc
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.17
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, 04 Feb 2014 14:47:03 -0000

Author: gabor
Date: Tue Feb  4 14:47:02 2014
New Revision: 43755
URL: http://svnweb.freebsd.org/changeset/doc/43755

Log:
  - Revert the change of the size of admonition boxes since it did not render
    fine when embedded to procedures (should that be allowed at all?)
  
  Reported by:	wblock

Modified:
  head/share/misc/docbook.css

Modified: head/share/misc/docbook.css
==============================================================================
--- head/share/misc/docbook.css	Tue Feb  4 14:41:22 2014	(r43754)
+++ head/share/misc/docbook.css	Tue Feb  4 14:47:02 2014	(r43755)
@@ -289,41 +289,41 @@ pre.programlisting {
 	color: #222;
 	background: #eee;
 	border: 1px solid #ccc;
-	width: 63em;
+	width: 90%;
 }
 
 .tip {
 	color: #004F00;
 	background: #d8ecd6;
 	border: 1px solid green;
-	width: 63em;
+	width: 90%;
 }
 
 .important {
 	font-style:italic;
 	border: 1px solid #a00;
-	border-left: 1em solid #c00;
-	width: 62em;
+	border-left: 12px solid #c00;
+	width: 90%;
 }
 
 .warning {
 	color: #9F1313;
 	background: #f8e8e8;
 	border: 1px solid #e59595;
-	width: 63em;
+	width: 90%;
 }
 
 .caution {
 	color: #3E3535;
 	background: #FFC;
 	border: 1px solid #e59595;
-	width: 63em;
+	width: 90%;
 }
 
 .example {
 	background: #fefde6;
 	border: 1px solid #f1bb16;
-	width: 63em;
+	width: 90%;
 }
 
 .admontitle {

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 14:49:42 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 892866C5;
 Tue,  4 Feb 2014 14:49:42 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 70F491571;
 Tue,  4 Feb 2014 14:49:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14Eng9Q005391;
 Tue, 4 Feb 2014 14:49:42 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14EngMi005390;
 Tue, 4 Feb 2014 14:49:42 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402041449.s14EngMi005390@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 14:49:42 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43756 - head/en_US.ISO8859-1/books/handbook/desktop
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.17
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, 04 Feb 2014 14:49:42 -0000

Author: dru
Date: Tue Feb  4 14:49:41 2014
New Revision: 43756
URL: http://svnweb.freebsd.org/changeset/doc/43756

Log:
  White space fix only. Translators can ignore.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml	Tue Feb  4 14:47:02 2014	(r43755)
+++ head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml	Tue Feb  4 14:49:41 2014	(r43756)
@@ -32,7 +32,8 @@
     <note>
       <para>Users who prefer to install a pre-built desktop version
 	of FreeBSD rather than configuring one from scratch should
-	refer to the <link xlink:href="http://www.pcbsd.org/">pcbsd.org
+	refer to the <link
+	  xlink:href="http://www.pcbsd.org/">pcbsd.org
 	website.</link></para>
     </note>
 
@@ -185,7 +186,8 @@
       </listitem>
 
       <listitem>
-	<para>Install X and a window manager as described in <xref linkend="x11"/>.</para>
+	<para>Install X and a window manager as described in <xref
+	  linkend="x11"/>.</para>
       </listitem>
 
       <listitem>
@@ -207,7 +209,8 @@
     </indexterm>
 
     <para>&os; does not come with a pre-installed web browser.
-      Instead, the <link xlink:href="http://www.FreeBSD.org/ports/www.html">www</link>
+      Instead, the <link
+	xlink:href="http://www.FreeBSD.org/ports/www.html">www</link>
       category of the Ports Collection contains many browsers which
       can be installed as a package or compiled from the Ports
       Collection.</para>
@@ -218,7 +221,9 @@
       for more information on how to set up these complete
       desktops.</para>
 
-    <para>Some light-weight browsers include <package>www/dillo2</package>, <package>www/links</package>, and <package>www/w3m</package>.</para>
+    <para>Some light-weight browsers include
+      <package>www/dillo2</package>, <package>www/links</package>, and
+      <package>www/w3m</package>.</para>
 
     <para>This section demonstrates how to install the following
       popular web browsers and indicates if the application is
@@ -294,11 +299,14 @@
 
       <screen>&prompt.root; <userinput>pkg install firefox-esr</userinput></screen>
 
-      <para>Localized versions are available in <package>www/firefox-i18n</package> and <package>www/firefox-esr-i18n</package>.</para>
+      <para>Localized versions are available in
+	<package>www/firefox-i18n</package> and
+	<package>www/firefox-esr-i18n</package>.</para>
 
       <para>The Ports Collection can instead be used to compile the
 	desired version of <application>Firefox</application> from
-	source code.  This example builds <package>www/firefox</package>, where
+	source code.  This example builds
+	<package>www/firefox</package>, where
 	<literal>firefox</literal> can be replaced with the ESR or
 	localized version to install.</para>
 
@@ -310,10 +318,10 @@
 
       <para>The installation of
 	<application>Firefox</application> does not include &java;
-	support.  However, <package>java/icedtea-web</package> provides a free
-	software web browser plugin for running Java applets.  It can
-	be installed as a package.  To alternately compile the
-	port:</para>
+	support.  However, <package>java/icedtea-web</package>
+	provides a free software web browser plugin for running Java
+	applets.  It can be installed as a package.  To alternately
+	compile the port:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/java/icedtea-web</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -354,15 +362,17 @@
 
       <procedure>
 	<step>
-	  <para>Install the <package>www/nspluginwrapper</package> port.
-	    Due to licensing restrictions, a package is not available.
-	    This port requires <package>emulators/linux_base-f10</package> which
-	    is a large port.</para>
+	  <para>Install the <package>www/nspluginwrapper</package>
+	    port.  Due to licensing restrictions, a package is not
+	    available.  This port requires
+	    <package>emulators/linux_base-f10</package> which is a
+	    large port.</para>
 	</step>
 
 	<step>
-	  <para>Install the <package>www/linux-f10-flashplugin11</package>
-	    port.  Due to licensing restrictions, a package is not
+	  <para>Install the
+	    <package>www/linux-f10-flashplugin11</package> port.  Due
+	    to licensing restrictions, a package is not
 	    available.</para>
 	</step>
 
@@ -370,7 +380,8 @@
 	  <screen>&prompt.root; <userinput>ln -s /usr/local/lib/npapi/linux-f10-flashplugin/libflashplayer.so \
   /usr/local/lib/browser_plugins/</userinput></screen>
 
-	  <para>Create the <filename>/usr/local/lib/browser_plugins</filename>
+	  <para>Create the
+	    <filename>/usr/local/lib/browser_plugins</filename>
 	    directory if it is not already present.</para>
 	</step>
 
@@ -451,9 +462,9 @@
       <para>To install &adobe; &flash; plugin support, first compile
 	the <package>www/linux-f10-flashplugin11</package> port,
 	as a package is not available due to licensing restrictions.
-	Then install either the <package>www/opera-linuxplugins</package> port
-	or package.  This example compiles both applications from
-	ports:</para>
+	Then install either the
+	<package>www/opera-linuxplugins</package> port or package.
+	This example compiles both applications from ports:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/www/linux-f10-flashplugin11</userinput>
 &prompt.root; <userinput>make install clean</userinput>
@@ -467,7 +478,8 @@
 	all the currently available plugins.</para>
 
       <para>To add the <application>&java;</application> plugin,
-	follow the instructions in <xref linkend="moz-java-plugin"/>.</para>
+	follow the instructions in <xref
+	  linkend="moz-java-plugin"/>.</para>
     </sect2>
 
     <sect2>
@@ -479,8 +491,8 @@
 
       <para><application>Konqueror</application> is more than a web
 	browser as it is also a file manager and a multimedia
-	viewer.  It is included in the <package>x11/kde4-baseapps</package> package or
-	port.</para>
+	viewer.  It is included in the
+	<package>x11/kde4-baseapps</package> package or port.</para>
 
       <para><application>Konqueror</application> supports WebKit as
 	well as its own KHTML.  WebKit is a rendering engine used by
@@ -503,7 +515,8 @@
       <para><application>Konqueror</application> also supports
 	<application>&flash;</application>.  A <quote>How To</quote>
 	guide for getting <application>&flash;</application> support
-	on <application>Konqueror</application> is available at <uri xlink:href="http://freebsd.kde.org/howtos/konqueror-flash.php">http://freebsd.kde.org/howtos/konqueror-flash.php</uri>.</para>
+	on <application>Konqueror</application> is available at <uri
+	  xlink:href="http://freebsd.kde.org/howtos/konqueror-flash.php">http://freebsd.kde.org/howtos/konqueror-flash.php</uri>.</para>
     </sect2>
 
     <sect2>
@@ -668,8 +681,9 @@
 	and <application>Karbon</application> is used to draw
 	graphical documents.</para>
 
-      <para>In &os;, <package>editors/calligra</package> can be installed
-	as a package or a port.  To install the package:</para>
+      <para>In &os;, <package>editors/calligra</package> can be
+	installed as a package or a port.  To install the
+	package:</para>
 
       <screen>&prompt.root; <userinput>pkg install calligra</userinput></screen>
 
@@ -733,7 +747,8 @@
       <screen>&prompt.root; <userinput>cd /usr/ports/graphics/gimp</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-      <para>The graphics category (<link xlink:href="http://www.FreeBSD.org/ports/graphics.html">freebsd.org/ports/graphics.html</link>)
+      <para>The graphics category (<link
+	  xlink:href="http://www.FreeBSD.org/ports/graphics.html">freebsd.org/ports/graphics.html</link>)
 	of the Ports Collection contains several
 	<application>GIMP</application>-related plugins, help files,
 	and user manuals.</para>
@@ -774,8 +789,10 @@
 	  OpenOffice</application> is stable and runs natively on
 	&windows;, &solaris;, &linux;, &os;, and &macos;&nbsp;X.
 	More information about <application>Apache
-	  OpenOffice</application> can be found at <link xlink:href="http://openoffice.org/">openoffice.org</link>.  For
-	&os; specific information refer to <link xlink:href="http://porting.openoffice.org/freebsd/">porting.openoffice.org/freebsd/</link>.</para>
+	  OpenOffice</application> can be found at <link
+	  xlink:href="http://openoffice.org/">openoffice.org</link>.
+	For &os; specific information refer to <link
+	  xlink:href="http://porting.openoffice.org/freebsd/">porting.openoffice.org/freebsd/</link>.</para>
 
       <para>To install the <application>Apache
 	  OpenOffice</application> package:</para>
@@ -791,8 +808,9 @@
 	number of the installed version of <application>Apache
 	  OpenOffice</application>.  The first time
 	<application>Apache OpenOffice</application> launches, some
-	questions will be asked and a <filename>.openoffice.org</filename> folder will
-	be created in the user's home directory.</para>
+	questions will be asked and a
+	<filename>.openoffice.org</filename> folder will be created in
+	the user's home directory.</para>
 
       <para>If the desired <application>Apache
 	  OpenOffice</application> package is not available, compiling
@@ -829,7 +847,8 @@
       </indexterm>
 
       <para><application>LibreOffice</application> is a free software
-	office suite developed by <link xlink:href="http://www.documentfoundation.org/">documentfoundation.org</link>.
+	office suite developed by <link
+	  xlink:href="http://www.documentfoundation.org/">documentfoundation.org</link>.
 	It is compatible with other major office suites and available
 	on a variety of platforms.  It is a rebranded fork of
 	<application>OpenOffice.org</application> and includes
@@ -848,16 +867,17 @@
 	interfaced with external databases.
 	<application>LibreOffice</application> is stable and runs
 	natively on &windows;, &linux;, &os;, and &macos;&nbsp;X.
-	More information about
-	<application>LibreOffice </application> can be found at
-	<link xlink:href="http://www.libreoffice.org/">libreoffice.org</link>.</para>
+	More information about <application>LibreOffice</application>
+	can be found at <link
+	  xlink:href="http://www.libreoffice.org/">libreoffice.org</link>.</para>
 
       <para>To install the English version of the
 	<application>LibreOffice</application> package:</para>
 
       <screen>&prompt.root; <userinput>pkg install libreoffice</userinput></screen>
 
-      <para>The editors category (<link xlink:href="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</link>)
+      <para>The editors category (<link
+	  xlink:href="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</link>)
 	of the Ports Collection contains several localizations for
 	<application>LibreOffice</application>.  When installing a
 	localized package, replace <literal>libreoffice</literal>
@@ -869,8 +889,8 @@
       <screen>&prompt.user; <userinput>libreoffice</userinput></screen>
 
       <para>During the first launch, some questions will be asked
-	and a <filename>.libreoffice</filename>
-	folder will be created in the user's home directory.</para>
+	and a <filename>.libreoffice</filename> folder will be created
+	in the user's home directory.</para>
 
       <para>If the desired <application>LibreOffice</application>
 	package is not available, compiling the port is still an
@@ -885,7 +905,8 @@
 	<para>To build a localized version,
 	  <application>cd</application> into the port directory of
 	  the desired language.  Supported languages can be found
-	  in the editors category (<link xlink:href="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</link>)
+	  in the editors category (<link
+	    xlink:href="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</link>)
 	  of the Ports Collection.</para>
       </note>
     </sect2>
@@ -961,7 +982,8 @@
 	is also available for &os;.  Due to licensing restrictions,
 	a package is not available, meaning that this application
 	must be compiled from ports.  Several localizations are
-	available from the print category (<link xlink:href="http://www.FreeBSD.org/ports/print.html">freebsd.org/ports/print.html</link>)
+	available from the print category (<link
+	  xlink:href="http://www.FreeBSD.org/ports/print.html">freebsd.org/ports/print.html</link>)
 	of the Ports Collection.</para>
 
       <para>This command installs the English version of

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 14:52:11 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0336A790;
 Tue,  4 Feb 2014 14:52:11 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DF1FB15F1;
 Tue,  4 Feb 2014 14:52:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14EqA1i008339;
 Tue, 4 Feb 2014 14:52:10 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14EqAXx008338;
 Tue, 4 Feb 2014 14:52:10 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402041452.s14EqAXx008338@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 14:52:10 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43757 - head/en_US.ISO8859-1/books/handbook/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.17
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, 04 Feb 2014 14:52:11 -0000

Author: dru
Date: Tue Feb  4 14:52:10 2014
New Revision: 43757
URL: http://svnweb.freebsd.org/changeset/doc/43757

Log:
  Fix typo.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue Feb  4 14:49:41 2014	(r43756)
+++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue Feb  4 14:52:10 2014	(r43757)
@@ -1256,7 +1256,7 @@ ftp://ftp.organization.org/pub/FreeBSD/p
       </indexterm>
 
       <para>Installed ports can be uninstalled using
-	<command>pkg delete</command>.  Examples for using is command
+	<command>pkg delete</command>.  Examples for using this command
 	can be found in <xref linkend="pkgng-intro"/></para>
 
       <para>Alternately, <command>make deinstall</command> can be

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 14:56:37 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 71E22B8E;
 Tue,  4 Feb 2014 14:56:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5CE9E1628;
 Tue,  4 Feb 2014 14:56:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14EubV5009142;
 Tue, 4 Feb 2014 14:56:37 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14EubkY009141;
 Tue, 4 Feb 2014 14:56:37 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402041456.s14EubkY009141@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 14:56:37 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43758 - head/en_US.ISO8859-1/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.17
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, 04 Feb 2014 14:56:37 -0000

Author: dru
Date: Tue Feb  4 14:56:36 2014
New Revision: 43758
URL: http://svnweb.freebsd.org/changeset/doc/43758

Log:
  Chase pkg_ in this chapter.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 14:52:10 2014	(r43757)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 14:56:36 2014	(r43758)
@@ -1210,7 +1210,7 @@ Fetching 133 new ports or files... done.
 	  latest pre-built package of the Hungarian
 	  documentation:</para>
 
-	<screen>&prompt.root; <userinput>pkg_add -r hu-freebsd-doc</userinput></screen>
+	<screen>&prompt.root; <userinput>pkg install hu-freebsd-doc</userinput></screen>
 
 	<note>
 	  <para>Packages use a format that differs from the
@@ -2774,9 +2774,9 @@ Script done, &hellip;</screen>
       <para>To solve these problems, determine which port installed
 	the library:</para>
 
-      <screen>&prompt.root; <userinput>pkg_info -W  /usr/local/lib/libtiff.so</userinput>
+      <screen>&prompt.root; <userinput>pkg which /usr/local/lib/libtiff.so</userinput>
   /usr/local/lib/libtiff.so was installed by package tiff-3.9.4
-  &prompt.root; <userinput>pkg_info -W /usr/local/lib/libXext.so</userinput>
+  &prompt.root; <userinput>pkg which /usr/local/lib/libXext.so</userinput>
   /usr/local/lib/libXext.so was installed by package libXext-1.1.1,1</screen>
 
       <para>Then deinstall, rebuild and reinstall the port.

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 15:05:55 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 362F4E4D;
 Tue,  4 Feb 2014 15:05:55 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1F09616FC;
 Tue,  4 Feb 2014 15:05:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14F5sGs013092;
 Tue, 4 Feb 2014 15:05:54 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14F5sxb013091;
 Tue, 4 Feb 2014 15:05:54 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402041505.s14F5sxb013091@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 15:05:54 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43759 - head/en_US.ISO8859-1/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.17
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, 04 Feb 2014 15:05:55 -0000

Author: dru
Date: Tue Feb  4 15:05:54 2014
New Revision: 43759
URL: http://svnweb.freebsd.org/changeset/doc/43759

Log:
  White space fix only. Translators can ignore.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 14:56:36 2014	(r43758)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 15:05:54 2014	(r43759)
@@ -160,74 +160,71 @@
       <see>updating-upgrading</see>
     </indexterm>
 
-    <para>Applying security patches in a timely manner and
-      upgrading to a newer release of
-      an operating system are important aspects of
-      ongoing system administration.
-      &os; includes a utility
+    <para>Applying security patches in a timely manner and upgrading
+      to a newer release of an operating system are important aspects
+      of ongoing system administration.  &os; includes a utility
       called <command>freebsd-update</command> which can be used to
-	perform both these tasks.</para>
+      perform both these tasks.</para>
+
+    <para>This utility supports binary security and errata updates to
+      &os;, without the need to manually compile and install the patch
+      or a  new kernel.  Binary updates are available for all
+      architectures and releases currently supported by the security
+      team.  The list of supported releases and their estimated
+      end-of-life dates are listed at <uri
+	xlink:href="http://www.FreeBSD.org/security/">http://www.FreeBSD.org/security/</uri>.</para>
+
+    <para>This utility also supports operating system upgrades to
+      minor point releases as well as upgrades to another release
+      branch.  Before upgrading to a new release, review its release
+      announcement as it contains important information pertinent to
+      the release.  Release announcements are available from <uri
+	xlink:href="http://www.FreeBSD.org/releases/">http://www.FreeBSD.org/releases/</uri>.</para>
+
+      <note>
+	<para>If a <command>crontab</command> utilizing the features
+	  of &man.freebsd-update.8; exists, it must be disabled before
+	  upgrading the operating system.</para>
+      </note>
 
-    <para>This utility supports binary
-      security and errata updates to &os;,
-      without the need to manually compile and install the patch or a 
-      new kernel. Binary updates are available for all architectures and
-      releases currently supported by the security team.  The list of
-      supported releases and their estimated end-of-life dates are listed at <uri
-	  xlink:href="http://www.FreeBSD.org/security/">http://www.FreeBSD.org/security/</uri>.</para>   
-
-    <para>This utility also supports operating system upgrades to minor point
-	releases as well as upgrades to another release branch.  Before
-	upgrading to a new release, review its release announcement
-	as it contains important information pertinent to the
-	release.  Release announcements are available from <uri
-	  xlink:href="http://www.FreeBSD.org/releases/">http://www.FreeBSD.org/releases/</uri>.</para>
-    
-    <note>
-    <para>If a <command>crontab</command> utilizing the features
-      of &man.freebsd-update.8; exists, it must be
-      disabled before upgrading the operating system.</para>
-    </note>
-    
     <para>This section describes the configuration file used by
-      <command>freebsd-update</command>, demonstrates how to
-      apply a security patch and how to upgrade to a minor or major
-      operating system release, and discusses some of the considerations
-      when upgrading the operating system.</para>
+      <command>freebsd-update</command>, demonstrates how to apply a
+      security patch and how to upgrade to a minor or major operating
+      system release, and discusses some of the considerations when
+      upgrading the operating system.</para>
 
     <sect2 xml:id="freebsdupdate-config-file">
       <title>The Configuration File</title>
 
       <para>The default configuration file for
-	<command>freebsd-update</command> works as-is.  Some users may wish to tweak the default configuration
-	in <filename>/etc/freebsd-update.conf</filename>, allowing
-	better control of the process.  The comments in this file explain the available options,
-	but the following may require a bit more
-	explanation:</para>
+	<command>freebsd-update</command> works as-is.  Some users may
+	wish to tweak the default configuration in
+	<filename>/etc/freebsd-update.conf</filename>, allowing
+	better control of the process.  The comments in this file
+	explain the available options, but the following may require a
+	bit more explanation:</para>
 
       <programlisting># Components of the base system which should be kept updated.
 Components world kernel</programlisting>
 
       <para>This parameter controls which parts of &os; will be kept
-	up-to-date.  The default is to update the
-	entire base system and the kernel.  Individual components can
-	instead be specified, such as
-	<literal>src/base</literal> or
-	<literal>src/sys</literal>.  However, the best option is to leave this at the default as
-	changing it to include specific items requires
-	every needed item to be listed.  Over time, this could have disastrous
-	consequences as source code and binaries may become out of
-	sync.</para>
+	up-to-date.  The default is to update the entire base system
+	and the kernel.  Individual components can instead be
+	specified, such as <literal>src/base</literal> or
+	<literal>src/sys</literal>.  However, the best option is to
+	leave this at the default as changing it to include specific
+	items requires every needed item to be listed.  Over time,
+	this could have disastrous consequences as source code and
+	binaries may become out of sync.</para>
 
       <programlisting># Paths which start with anything matching an entry in an IgnorePaths
 # statement will be ignored.
 IgnorePaths /boot/kernel/linker.hints</programlisting>
 
       <para>To leave specified directories, such as
-	<filename>/bin</filename> or
-	<filename>/sbin</filename>, untouched during
-	the update process, add their paths to this statement.  This
-	option may be used to prevent
+	<filename>/bin</filename> or <filename>/sbin</filename>,
+	untouched during the update process, add their paths to this
+	statement.  This option may be used to prevent
 	<command>freebsd-update</command> from overwriting local
 	modifications.</para>
 

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 15:12:58 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 72CCA1DD;
 Tue,  4 Feb 2014 15:12:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 53611179E;
 Tue,  4 Feb 2014 15:12:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14FCw4F016805;
 Tue, 4 Feb 2014 15:12:58 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14FCwkF016804;
 Tue, 4 Feb 2014 15:12:58 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402041512.s14FCwkF016804@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 15:12:58 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43760 - head/en_US.ISO8859-1/books/handbook/x11
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.17
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, 04 Feb 2014 15:12:58 -0000

Author: dru
Date: Tue Feb  4 15:12:57 2014
New Revision: 43760
URL: http://svnweb.freebsd.org/changeset/doc/43760

Log:
  Chase pkg_ in this chapter.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Tue Feb  4 15:05:54 2014	(r43759)
+++ head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Tue Feb  4 15:12:57 2014	(r43760)
@@ -259,13 +259,7 @@
     </note>
 
     <para>Alternatively, <application>&xorg;</application> can be
-      installed directly from packages.  To install the package using
-      <application>pkg_add</application>, type:</para>
-
-    <screen>&prompt.root; <userinput>pkg_add -r xorg</userinput></screen>
-
-    <para>To instead install the package using
-      <application>pkg</application>, type:</para>
+      installed directly from packages with this command:</para>
 
     <screen>&prompt.root; <userinput>pkg install xorg</userinput></screen>
   </sect1>
@@ -1119,13 +1113,7 @@ DisplayManager.requestPort:     0</scree
 	<para>The software can be easily installed from a package
 	  or the Ports Collection:</para>
 
-	<para>To install the <application>GNOME</application> package
-	  from the network, simply type:</para>
-
-	<screen>&prompt.root; <userinput>pkg_add -r gnome2</userinput></screen>
-
-	<para>For <application>pkgng</application> users, the
-	  equivalent command is:</para>
+	<para>To install the <application>GNOME</application> package, type:</para>
 
 	<screen>&prompt.root; <userinput>pkg install gnome2</userinput></screen>
 
@@ -1284,16 +1272,7 @@ DisplayManager.requestPort:     0</scree
 	  other desktop environment, the software can be easily
 	  installed from a package or the Ports Collection:</para>
 
-	<para>To install the <application>KDE 4</application> package
-	  from the network, type:</para>
-
-	<screen>&prompt.root; <userinput>pkg_add -r kde4</userinput></screen>
-
-	<para>&man.pkg.add.1; will automatically fetch the latest
-	  version of the application.</para>
-
-	<para>For <application>pkgng</application> users, the
-	  equivalent command is:</para>
+	<para>To install the <application>KDE4</application> package, type:</para>
 
 	<screen>&prompt.root; <userinput>pkg install kde4</userinput></screen>
 
@@ -1429,13 +1408,7 @@ DisplayManager.requestPort:     0</scree
       <sect3 xml:id="x11-wm-xfce-install">
 	<title>Installing Xfce</title>
 
-	<para>To install the <application>Xfce</application> from the
-	  network, simply type:</para>
-
-	<screen>&prompt.root; <userinput>pkg_add -r xfce4</userinput></screen>
-
-	<para>For <application>pkgng</application> users, the
-	  equivalent command is:</para>
+	<para>To install <application>Xfce</application>, type:</para>
 
 	<screen>&prompt.root; <userinput>pkg install xfce</userinput></screen>
 

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 15:22:09 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E9865336;
 Tue,  4 Feb 2014 15:22:08 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D02A1185D;
 Tue,  4 Feb 2014 15:22:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14FM6Qi020589;
 Tue, 4 Feb 2014 15:22:06 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14FM6KZ020588;
 Tue, 4 Feb 2014 15:22:06 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402041522.s14FM6KZ020588@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 15:22:06 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43761 - head/en_US.ISO8859-1/books/handbook/x11
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.17
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, 04 Feb 2014 15:22:09 -0000

Author: dru
Date: Tue Feb  4 15:22:06 2014
New Revision: 43761
URL: http://svnweb.freebsd.org/changeset/doc/43761

Log:
  White space fix only. Translators can ignore.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/x11/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Tue Feb  4 15:12:57 2014	(r43760)
+++ head/en_US.ISO8859-1/books/handbook/x11/chapter.xml	Tue Feb  4 15:22:06 2014	(r43761)
@@ -38,13 +38,14 @@
       <para>Users who prefer an installation method that automatically
 	configures the <application>&xorg;</application> and offers
 	a choice of window managers during installation should
-	refer to the <link xlink:href="http://www.pcbsd.org/">pcbsd.org</link>
+	refer to the <link
+	  xlink:href="http://www.pcbsd.org/">pcbsd.org</link>
 	website.</para>
     </note>
 
     <para>For more information on the video hardware that
-      <application>&xorg;</application> supports, refer to the
-      <link xlink:href="http://www.x.org/">x.org</link> website.</para>
+      <application>&xorg;</application> supports, refer to the <link
+	xlink:href="http://www.x.org/">x.org</link> website.</para>
 
     <para>After reading this chapter, you will know:</para>
 
@@ -147,7 +148,8 @@
 	    the title bars on each window should look like, whether
 	    or not they have close buttons on them, and so on.
 	    Instead, X delegates this responsibility to a separate
-	    window manager application.  There are <link xlink:href="http://xwinman.org/">dozens of window
+	    window manager application.  There are <link
+	      xlink:href="http://xwinman.org/">dozens of window
 	      managers</link> available.  Each window manager
 	    provides a different look and feel: some support virtual
 	    desktops, some allow customized keystrokes to manage the
@@ -235,16 +237,16 @@
   <sect1 xml:id="x-install">
     <title>Installing <application>&xorg;</application></title>
 
-    <para><application>&xorg;</application> is the
-      implementation of the open source X Window System
-      released by the X.Org Foundation.  In &os;, it
-      can be installed as a package or port.  The meta-port for the
-      complete distribution which includes X servers, clients,
-      libraries, and fonts is located in <package>x11/xorg</package>.  A minimal distribution
-      is located in <package>x11/xorg-minimal</package>, with separate
-      ports available for docs, libraries, and apps.
-      The examples in this section install the complete
-      <application>&xorg;</application> distribution.</para>
+    <para><application>&xorg;</application> is the implementation of
+      the open source X Window System released by the X.Org
+      Foundation.  In &os;, it can be installed as a package or port.
+      The meta-port for the complete distribution which includes X
+      servers, clients, libraries, and fonts is located in
+      <package>x11/xorg</package>.  A minimal distribution is located
+      in <package>x11/xorg-minimal</package>, with separate ports
+      available for docs, libraries, and apps.  The examples in this
+      section install the complete <application>&xorg;</application>
+      distribution.</para>
 
     <para>To build and install <application>&xorg;</application>
       from the Ports Collection:</para>
@@ -350,7 +352,7 @@
 	<listitem>
 	  <para>Intel: as of FreeBSD 9.1, 3D acceleration on most
 	    Intel graphics, including IronLake, SandyBridge, and
-	    IvyBridge, is supported. Due to the current KMS
+	    IvyBridge, is supported.  Due to the current KMS
 	    implementation, it is not possible to switch between the
 	    graphical console and a virtual console using
 	    Crtl+Alt+F#.</para>
@@ -381,9 +383,9 @@
       <para><application>&xorg;</application> uses
 	<acronym>HAL</acronym> to autodetect keyboards and mice.  The
 	<package>sysutils/hal</package> and
-	<package>devel/dbus</package> ports are
-	automatically installed as dependencies of <package>x11/xorg</package>, but must be enabled by
-	adding the following entries to
+	<package>devel/dbus</package> ports are automatically
+	installed as dependencies of <package>x11/xorg</package>, but
+	must be enabled by adding the following entries to
 	<filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>hald_enable="YES"
@@ -463,7 +465,8 @@ dbus_enable="YES"</programlisting>
 	<programlisting>Option	"DontZap"	"off"</programlisting>
       </note>
 
-      <para>If the test is unsuccessful, skip ahead to <xref linkend="x11-understanding"/>. Once the test is successful,
+      <para>If the test is unsuccessful, skip ahead to <xref
+	  linkend="x11-understanding"/>. Once the test is successful,
 	copy the configuration file to
 	<filename>/etc/X11/xorg.conf</filename>:</para>
 
@@ -506,16 +509,20 @@ dbus_enable="YES"</programlisting>
 	are several free, high quality Type1 (&postscript;) fonts
 	available which can be readily used with
 	<application>&xorg;</application>.  For instance, the URW
-	font collection (<package>x11-fonts/urwfonts</package>) includes high
-	quality versions of standard type1 fonts (<trademark class="registered">Times Roman</trademark>, <trademark class="registered">Helvetica</trademark>, <trademark class="registered">Palatino</trademark> and others).  The
-	Freefonts collection (<package>x11-fonts/freefonts</package>) includes
-	many more fonts, but most of them are intended for use in
-	graphics software such as the <application>Gimp</application>,
-	and are not complete enough to serve as screen fonts.  In
-	addition, <application>&xorg;</application> can be configured
-	to use &truetype; fonts with a minimum of effort.  For more
-	details on this, see the &man.X.7; manual page or the
-	<link linkend="truetype">section on &truetype;
+	font collection (<package>x11-fonts/urwfonts</package>)
+	includes high quality versions of standard type1 fonts
+	(<trademark class="registered">Times Roman</trademark>,
+	<trademark class="registered">Helvetica</trademark>,
+	<trademark class="registered">Palatino</trademark> and
+	others).  The Freefonts collection
+	(<package>x11-fonts/freefonts</package>) includes many more
+	fonts, but most of them are intended for use in graphics
+	software such as the <application>Gimp</application>, and are
+	not complete enough to serve as screen fonts.  In addition,
+	<application>&xorg;</application> can be configured to use
+	&truetype; fonts with a minimum of effort.  For more details
+	on this, see the &man.X.7; manual page or the <link
+	  linkend="truetype">section on &truetype;
 	  fonts</link>.</para>
 
       <para>To install the above Type1 font collections from the
@@ -583,13 +590,15 @@ dbus_enable="YES"</programlisting>
 	<filename>fonts.dir</filename> file, so that the X font
 	renderer knows that these new files have been installed.
 	<command>ttmkfdir</command> is available from the FreeBSD
-	Ports Collection as <package>x11-fonts/ttmkfdir</package>.</para>
+	Ports Collection as
+	<package>x11-fonts/ttmkfdir</package>.</para>
 
       <screen>&prompt.root; <userinput>cd /usr/local/lib/X11/fonts/TrueType</userinput>
 &prompt.root; <userinput>ttmkfdir -o fonts.dir</userinput></screen>
 
       <para>Now add the &truetype; directory to the font path.  This
-	is just the same as described above for <link linkend="type1">Type1</link> fonts, that is, use</para>
+	is just the same as described above for <link
+	  linkend="type1">Type1</link> fonts, that is, use</para>
 
       <screen>&prompt.user; <userinput>xset fp+ /usr/local/lib/X11/fonts/TrueType</userinput>
 &prompt.user; <userinput>xset fp rehash</userinput></screen>
@@ -843,19 +852,20 @@ dbus_enable="YES"</programlisting>
       <title>Using XDM</title>
 
       <para>To start using <application>XDM</application>, install
-	the <package>x11/xdm</package> port (it is
-	not installed by default in recent versions of
+	the <package>x11/xdm</package> port (it is not installed by
+	default in recent versions of
 	<application>&xorg;</application>).  The
 	<application>XDM</application> daemon program may then be
 	found in <filename>/usr/local/bin/xdm</filename>.  This
-	program can be run at any time as <systemitem class="username">root</systemitem>
-	and it will start managing the X display on the local machine.
-	If <application>XDM</application> is to be run every time the
+	program can be run at any time as <systemitem
+	  class="username">root</systemitem> and it will start
+	managing the X display on the local machine.  If
+	<application>XDM</application> is to be run every time the
 	machine boots up, a convenient way to do this is by adding an
 	entry to <filename>/etc/ttys</filename>.  For more information
-	about the format and usage of this file, see
-	<xref linkend="term-etcttys"/>.  There is a line in the
-	default <filename>/etc/ttys</filename> file for running the
+	about the format and usage of this file, see <xref
+	  linkend="term-etcttys"/>.  There is a line in the default
+	<filename>/etc/ttys</filename> file for running the
 	<application>XDM</application> daemon on a virtual
 	terminal:</para>
 
@@ -1100,8 +1110,8 @@ DisplayManager.requestPort:     0</scree
 	  home using the powerful graphics-driven environment that
 	  <application>GNOME</application> provides.  More information
 	  regarding <application>GNOME</application> on FreeBSD can be
-	  found on the
-	  <link xlink:href="http://www.FreeBSD.org/gnome">FreeBSD GNOME
+	  found on the <link
+	    xlink:href="http://www.FreeBSD.org/gnome">FreeBSD GNOME
 	    Project</link>'s web site.  The web site also contains
 	  fairly comprehensive FAQs about installing, configuring, and
 	  managing <application>GNOME</application>.</para>
@@ -1113,7 +1123,8 @@ DisplayManager.requestPort:     0</scree
 	<para>The software can be easily installed from a package
 	  or the Ports Collection:</para>
 
-	<para>To install the <application>GNOME</application> package, type:</para>
+	<para>To install the <application>GNOME</application> package,
+	  type:</para>
 
 	<screen>&prompt.root; <userinput>pkg install gnome2</userinput></screen>
 
@@ -1258,8 +1269,8 @@ DisplayManager.requestPort:     0</scree
 	  is a solid competitor to other existing web browsers on
 	  &unix; systems.  More information on
 	  <application>KDE</application> can be found on the
-	  <link xlink:href="http://www.kde.org/">KDE website</link>.  For
-	  FreeBSD specific information and resources on
+	  <link xlink:href="http://www.kde.org/">KDE website</link>.
+	  For FreeBSD specific information and resources on
 	  <application>KDE</application>, consult the
 	  <link xlink:href="http://freebsd.kde.org/">KDE/FreeBSD
 	    initiative</link>'s website.</para>
@@ -1272,7 +1283,8 @@ DisplayManager.requestPort:     0</scree
 	  other desktop environment, the software can be easily
 	  installed from a package or the Ports Collection:</para>
 
-	<para>To install the <application>KDE4</application> package, type:</para>
+	<para>To install the <application>KDE4</application> package,
+	  type:</para>
 
 	<screen>&prompt.root; <userinput>pkg install kde4</userinput></screen>
 
@@ -1402,7 +1414,8 @@ DisplayManager.requestPort:     0</scree
 	</itemizedlist>
 
 	<para>More information on <application>Xfce</application>
-	  can be found on the <link xlink:href="http://www.xfce.org/">Xfce website</link>.</para>
+	  can be found on the <link
+	    xlink:href="http://www.xfce.org/">Xfce website</link>.</para>
       </sect3>
 
       <sect3 xml:id="x11-wm-xfce-install">

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 15:27:05 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 70B60565;
 Tue,  4 Feb 2014 15:27:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 56EAC189F;
 Tue,  4 Feb 2014 15:27:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14FR5dT021121;
 Tue, 4 Feb 2014 15:27:05 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14FR5Xo021120;
 Tue, 4 Feb 2014 15:27:05 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402041527.s14FR5Xo021120@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 15:27:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43762 - head/en_US.ISO8859-1/articles/linux-users
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.17
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, 04 Feb 2014 15:27:05 -0000

Author: dru
Date: Tue Feb  4 15:27:04 2014
New Revision: 43762
URL: http://svnweb.freebsd.org/changeset/doc/43762

Log:
  Fix reference.
  This whole article needs a go-through, more commits to follow.
  
  Submitted by: wblock
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/articles/linux-users/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/linux-users/article.xml	Tue Feb  4 15:22:06 2014	(r43761)
+++ head/en_US.ISO8859-1/articles/linux-users/article.xml	Tue Feb  4 15:27:04 2014	(r43762)
@@ -121,8 +121,8 @@ in your /etc/rc.conf. Extra options can 
 	  6.X series.</para>
       </note>
 
-      <para>For more information on packages please refer to section 4.4 of
-	the &os; Handbook: <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/pkgng-intro.html">Using the Packages System</link>.</para>
+      <para>For more information on packages please refer to section 5.4 of
+	the &os; Handbook: <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/pkgng-intro.html">Using pkgng for Binary Package Management</link>.</para>
     </sect2>
 
     <sect2 xml:id="ports">

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 15:29:46 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CA5285F7;
 Tue,  4 Feb 2014 15:29:46 +0000 (UTC)
Received: from wonkity.com (wonkity.com [67.158.26.137])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7796218B8;
 Tue,  4 Feb 2014 15:29:46 +0000 (UTC)
Received: from wonkity.com (localhost [127.0.0.1])
 by wonkity.com (8.14.7/8.14.7) with ESMTP id s14FTjgW037560;
 Tue, 4 Feb 2014 08:29:45 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Received: from localhost (wblock@localhost)
 by wonkity.com (8.14.7/8.14.7/Submit) with ESMTP id s14FTj0J037557;
 Tue, 4 Feb 2014 08:29:45 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Date: Tue, 4 Feb 2014 08:29:45 -0700 (MST)
From: Warren Block <wblock@wonkity.com>
To: Gabor Kovesdan <gabor@FreeBSD.org>
Subject: Re: svn commit: r43755 - head/share/misc
In-Reply-To: <201402041447.s14El2tu005083@svn.freebsd.org>
Message-ID: <alpine.BSF.2.00.1402040820430.37213@wonkity.com>
References: <201402041447.s14El2tu005083@svn.freebsd.org>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3
 (wonkity.com [127.0.0.1]); Tue, 04 Feb 2014 08:29:45 -0700 (MST)
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.17
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, 04 Feb 2014 15:29:46 -0000

On Tue, 4 Feb 2014, Gabor Kovesdan wrote:

> Author: gabor
> Date: Tue Feb  4 14:47:02 2014
> New Revision: 43755
> URL: http://svnweb.freebsd.org/changeset/doc/43755
>
> Log:
>  - Revert the change of the size of admonition boxes since it did not render
>    fine when embedded to procedures

Thank you!

> (should that be allowed at all?)

Yes.  Steps of the procedure may need individual admonitions like 
"warning: this step will erase the disk" or "tip: sometimes a bigger 
hammer really does help."

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 16:18:14 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 01E9B339;
 Tue,  4 Feb 2014 16:18:14 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C51B21D3A;
 Tue,  4 Feb 2014 16:18:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14GIDT2041720;
 Tue, 4 Feb 2014 16:18:13 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14GIDRv041719;
 Tue, 4 Feb 2014 16:18:13 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402041618.s14GIDRv041719@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 16:18:13 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43763 - head/en_US.ISO8859-1/articles/linux-users
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.17
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, 04 Feb 2014 16:18:14 -0000

Author: dru
Date: Tue Feb  4 16:18:13 2014
New Revision: 43763
URL: http://svnweb.freebsd.org/changeset/doc/43763

Log:
  First pass through first half of this article. More commits to follow.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/articles/linux-users/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/linux-users/article.xml	Tue Feb  4 15:27:04 2014	(r43762)
+++ head/en_US.ISO8859-1/articles/linux-users/article.xml	Tue Feb  4 16:18:13 2014	(r43763)
@@ -29,59 +29,82 @@
 
     <abstract>
       <para>This document is intended to quickly familiarize intermediate to
-	advanced &linux; users with the basics of FreeBSD.</para>
+	advanced &linux; users with the basics of &os;.</para>
     </abstract>
   </info>
 
   <sect1 xml:id="intro">
     <title>Introduction</title>
 
-    <para>This document will highlight the differences between &os; and
+    <para>This document highlights the technical differences between &os; and
       &linux; so that intermediate to advanced &linux; users can quickly
-      familiarize themselves with the basics of &os;.  This is just a
-      technical quickstart, it does not attempt to design
-      <quote>philosophical</quote> differences between the two
-      operating systems.</para>
-
-    <para>This document assumes that you have already installed &os;.
-      If you have not installed &os; or need help with the installation
-      process please refer to the
-      <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/install.html">
-      Installing FreeBSD</link> chapter of the &os;&nbsp;Handbook.</para>
+      familiarize themselves with the basics of &os;.</para>
+
+    <para>This document assumes that &os; is already installed.
+      Refer to the
+      <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/bsdinstall.html">
+      Installing &os;</link> chapter of the &os;&nbsp;Handbook for help with the installation
+      process.</para>
   </sect1>
 
   <sect1 xml:id="shells">
     <title>Shells: No Bash?</title>
 
-    <para>Those coming from &linux; are often surprised to find that
+    <para>&linux; users are often surprised to find that
       <application>Bash</application> is not the default shell in &os;.
       In fact, <application>Bash</application> is not even in the default
       installation.  Instead, &os; uses &man.tcsh.1; as the default shell.
-      Although, <application>Bash</application> and your other favorite
-      shells are available in &os;'s <link xlink:href="article.html#SOFTWARE">Packages and Ports&nbsp;Collection</link>.</para>
+      However, <application>Bash</application> and other
+      shells are available in &os;'s <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports.html">Packages and Ports&nbsp;Collection</link>.</para>
 
-    <para>If you do install other shells you can use &man.chsh.1; to set
-      a user's default shell.  It is, however, recommended that the
-      <systemitem class="username">root</systemitem>'s default shell remain unchanged.  The
-      reason for this is that shells not included in the base distribution
-      are normally installed in <filename>/usr/local/bin</filename> or
-      <filename>/usr/bin</filename>.  In the event of a problem the file
-      systems where <filename>/usr/local/bin</filename> and
-      <filename>/usr/bin</filename> are located may not be mounted.  In this
-      case <systemitem class="username">root</systemitem> would not have access to its default
-      shell, preventing <systemitem class="username">root</systemitem> from logging in.  For this
-      reason a second <systemitem class="username">root</systemitem> account, the
-      <systemitem class="username">toor</systemitem> account, was created for use with non-default
-      shells.  See the security FAQ for information regarding the <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/faq/security.html#TOOR-ACCOUNT">toor account</link>.</para>
+    <para>After installing another shell, use &man.chsh.1; to change
+      a user's default shell.  It is recommended that the
+      <systemitem class="username">root</systemitem> user's default shell remain unchanged since
+      shells which are not included in the base distribution
+      are installed to <filename>/usr/local/bin</filename>.
+      In the event of a problem, the file
+      system where <filename>/usr/local/bin</filename> is
+      located may not be mounted.  In this
+      case, <systemitem class="username">root</systemitem> would not have access to its default
+      shell, preventing <systemitem class="username">root</systemitem> from logging in.</para>
   </sect1>
 
   <sect1 xml:id="software">
-    <title>Packages and Ports: Adding software in &os;</title>
+    <title>Packages and Ports: Adding Software in &os;</title>
+
+    <para>&os; provides
+      two methods for installing applications: binary packages and compiled ports.  
+      Each method has its own benefits:</para>
+
+      <itemizedlist>
+	<title>Binary Packages</title>
+
+	<listitem><simpara>Faster installation as compared to compiling large applications.</simpara></listitem>
+
+	<listitem><simpara>Does not require an understanding of how to compile
+	  software.</simpara></listitem>
+
+	<listitem><simpara>No need to install a compiler.</simpara></listitem>
+      </itemizedlist>
+
+      <itemizedlist>
+	<title>Ports</title>
+
+	<listitem><simpara>Ability to customize installation options.</simpara></listitem>
 
-    <para>In addition to the traditional &unix; method of installing software
-      (download source, extract, edit source code, and compile), &os; offers
-      two other methods for installing applications: packages and ports.  A
-      complete list of of all available ports and packages can be found <link xlink:href="http://www.freebsd.org/ports/master-index.html">here</link>.</para>
+	<listitem><simpara>Custom patches can be applied.</simpara></listitem>
+      </itemizedlist>
+
+      <para>If an application installation does not require any customization, installing the package
+	is sufficient.  Compile the port instead whenever an application requires
+	customization of the default options.  If needed,
+	a custom
+	package can be compiled from ports using <command>make</command>
+	<buildtarget>package</buildtarget>.</para>
+	
+	<para>A complete list of of all available ports and packages
+	  can be found <link
+	    xlink:href="http://www.freebsd.org/ports/master-index.html">here</link>.</para>	
 
     <sect2 xml:id="packages">
       <title>Packages</title>
@@ -89,124 +112,50 @@
       <para>Packages are pre-compiled applications, the &os; equivalents
 	of <filename>.deb</filename> files on Debian/Ubuntu based systems
 	and <filename>.rpm</filename> files on Red&nbsp;Hat/Fedora based
-	systems.  Packages are installed using &man.pkg.add.1;.  For example,
+	systems.  Packages are installed using <application>pkg</application>.  For example,
 	the following command installs
-	<application>Apache 2.2</application>:</para>
+	<application>Apache 2.4</application>:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add /tmp/apache-2.2.6_2.tbz</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install apache24</userinput></screen>
 
-      <para>Using the <option>-r</option> switch will tell &man.pkg.add.1;
-	to automatically fetch a package and install it, as well as any
-	dependencies:</para>
-
-      <screen>&prompt.root; <userinput>pkg_add -r apache22</userinput>
-Fetching ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6.2-release/Latest/apache22.tbz... Done.
-Fetching ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6.2-release/All/expat-2.0.0_1.tbz... Done.
-Fetching ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6.2-release/All/perl-5.8.8_1.tbz... Done.
-[snip]
-
-To run apache www server from startup, add apache22_enable="YES"
-in your /etc/rc.conf. Extra options can be found in startup script.</screen>
-
-      <note>
-	<para>If you are running a release version of &os; (6.2, 6.3, 7.0,
-	  etc., generally installed from CD-ROM) <command>pkg_add -r</command>
-	  will download packages built for that specific release.  These
-	  packages <emphasis>may not</emphasis> be the most up-to-date
-	  version of the application.  You can use the
-	  <envar>PACKAGESITE</envar> variable to override this default
-	  behavior.  For example, set <envar>PACKAGESITE</envar> to
-          <uri xlink:href="ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/Latest/">ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/Latest/</uri>
-          to download the most recent packages built for the
-	  6.X series.</para>
-      </note>
-
-      <para>For more information on packages please refer to section 5.4 of
+      <para>For more information on packages refer to section 5.4 of
 	the &os; Handbook: <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/pkgng-intro.html">Using pkgng for Binary Package Management</link>.</para>
     </sect2>
 
     <sect2 xml:id="ports">
       <title>Ports</title>
 
-      <para>&os;'s second method for installing applications is the
-	Ports&nbsp;Collection.  The Ports&nbsp;Collection is a framework of
+      <para>The &os; Ports Collection is a framework of
 	<filename>Makefiles</filename> and patches specifically customized
-	for installing various software applications from source on &os;.
-	When installing a port the system will fetch the source code, apply
+	for installing applications from source on &os;.
+	When installing a port, the system will fetch the source code, apply
 	any required patches, compile the code, and install the application
-	(and do the same for any dependencies).</para>
+	and any required dependencies.</para>
 
-      <para>The Ports&nbsp;Collection, sometimes referred to as the ports tree,
-	can be found in <filename>/usr/ports</filename>.  That is assuming
-	the Ports&nbsp;Collection was installed during the &os; installation
-	process.  If the Ports&nbsp;Collection has not been installed it can be
-	added from the installation discs using &man.sysinstall.8;, or pulled
-	from the &os; servers using &man.csup.1; or &man.portsnap.8;.
-	Detailed instructions for installing the Ports&nbsp;Collection can be
-	found in <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">section 4.5.1</link>
-	of the handbook.</para>
+      <para>The Ports Collection, sometimes referred to as the ports tree,
+	can be installed to <filename>/usr/ports</filename> using &man.portsnap.8;.
+	Detailed instructions for installing the Ports Collection can be
+	found in <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">section 5.5</link>
+	of the &os; Handbook.</para>
 
-      <para>Installing a port is as simple (generally) as changing in to the
+      <para>To compile a port, change to the
 	port's directory and starting the build process.  The following example
-	installs <application>Apache 2.2</application> from the
-	Ports&nbsp;Collection:</para>
+	installs <application>Apache 2.4</application> from the
+	Ports Collection:</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/www/apache22</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/ports/www/apache24</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-      <para>A major benefit of using ports to install software is the
-	ability to customize the installation options.  For example, when
-	installing <application>Apache 2.2</application> from ports you can
-	enable <application>mod_ldap</application> by setting the
-	<varname>WITH_LDAP</varname> &man.make.1; variable:</para>
+      <para>A benefit of using ports to install software is the
+	ability to customize the installation options.  This example
+	enables <application>mod_ldap</application> by setting
+	<varname>WITH_LDAP</varname>:</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/www/apache22</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/ports/www/apache24</userinput>
 &prompt.root; <userinput>make WITH_LDAP="YES" install clean</userinput></screen>
 
-      <para>Please see section 4.5 of the &os; Handbook, <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">Using
-	 the Ports&nbsp;Collection</link>, for more information about the
-	Ports&nbsp;Collection.</para>
-    </sect2>
-
-    <sect2 xml:id="which">
-      <title>Ports or packages, which one should I use?</title>
-
-      <para>Packages are just pre-compiled ports, so it is really a matter
-	of installing from source (ports) versus installing from binary
-	packages.  Each method has its own benefits:</para>
-
-      <itemizedlist>
-	<title>Packages (binary)</title>
-
-	<listitem><simpara>Faster installation (compiling large applications
-	  can take quite a while).</simpara></listitem>
-
-	<listitem><simpara>You do not need to understand how to compile
-	  software.</simpara></listitem>
-
-	<listitem><simpara>No need to install compilers on your
-	  system.</simpara></listitem>
-      </itemizedlist>
-
-      <itemizedlist>
-	<title>Ports (source)</title>
-
-	<listitem><simpara>Ability to customize installation options.
-	  (Packages are normally built with standard options.  With ports
-	  you can customize various options, such as building additional
-	  modules or changing the default path.)</simpara></listitem>
-
-	<listitem><simpara>You can apply your own patches if you are so
-	  inclined.</simpara></listitem>
-      </itemizedlist>
-
-      <para>If you do not have any special requirements, packages will
-	probably suit your situation just fine.  If you may ever need to
-	customize, ports are the way to go.  (And remember, if you
-	need to customize but prefer packages, you can build a custom
-	package from ports using <command>make</command>
-	<buildtarget>package</buildtarget> and then copy the package to
-	other servers.)</para>
+      <para>Refer to <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">Using
+	 the Ports Collection</link> for more information.</para>
     </sect2>
   </sect1>
 

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 16:45:40 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 35F6D11B;
 Tue,  4 Feb 2014 16:45:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 131D11127;
 Tue,  4 Feb 2014 16:45:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14GjdiJ053376;
 Tue, 4 Feb 2014 16:45:39 GMT (envelope-from trhodes@svn.freebsd.org)
Received: (from trhodes@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14GjdYM053375;
 Tue, 4 Feb 2014 16:45:39 GMT (envelope-from trhodes@svn.freebsd.org)
Message-Id: <201402041645.s14GjdYM053375@svn.freebsd.org>
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Tue, 4 Feb 2014 16:45:39 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43764 - head/en_US.ISO8859-1/books/handbook/security
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.17
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, 04 Feb 2014 16:45:40 -0000

Author: trhodes
Date: Tue Feb  4 16:45:39 2014
New Revision: 43764
URL: http://svnweb.freebsd.org/changeset/doc/43764

Log:
  Add a section on password policy and password policy
  enforcement (with pam, pw, login.conf).

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

Modified: head/en_US.ISO8859-1/books/handbook/security/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/security/chapter.xml	Tue Feb  4 16:18:13 2014	(r43763)
+++ head/en_US.ISO8859-1/books/handbook/security/chapter.xml	Tue Feb  4 16:45:39 2014	(r43764)
@@ -305,6 +305,90 @@
 	the handbook.  Kerberose users may need to make additional
 	changes to implement <application>OpenSSH</application> in
 	their network.</para>
+
+      <sect3 xml:id="security-pwpolicy">
+        <title>Password Policy and Enforcement</title>
+
+	<para>Enforcing a strong password policy for local accounts
+	  is a fundamental aspect of local system security and policy.
+	  During password enforcement, things like password length,
+	  password strength, and the likelihood the password could be
+	  guessed or cracked can be implemented through the system
+	  &man.pam.8; modules.</para>
+
+	<para>The <acronym>PAM</acronym> system, or Pluggable
+	  Authentication Modules, will enforce the password policy by
+	  setting a minimum and maximum password length.  They will
+	  also enforce mixed characters.  In particular the
+	  &man.pam.passwdqc.8; will be discussed.</para>
+
+	<para>To proceed, open the
+	  <filename>/etc/pam.d/passwd</filename> file and add the
+	  following line to the file.</para>
+
+	<programlisting>password        requisite       pam_passwdqc.so         min=disabled,disabled,disabled,12,10 similar=deny retry=3 enforce=users</programlisting>
+
+	<para>There is already a commented out line for this module and
+	  it may be altered to the version above.  This statement
+	  basically sets several requirements.  First, a minimal
+	  password length is disabled, allowing for a password of any
+	  length.  Using only two character classes are disabled,
+	  which means that all classes, including special, will be
+	  considered valid.  The next entry requires that passwords
+	  be twelve characters in length with characters from three
+	  classes or ten byte (or more) passwords with characters from
+	  four character classes.  This also denies passwords that
+	  are similar to the previously used password.  A user is
+	  provided three opportunities to enter a new password and
+	  finally only enforce this requirement on users.  That is,
+	  exempt super users.  This statement is probably confusing
+	  so reading the manual page is highly recommended, in
+	  particular to understand what character classes are.</para>
+
+	<para>After this change is made and the file saved, any user
+          changing their password will see a message similar to the
+	  following.  This message might also clear up some confusion
+	  about the configuration.</para>
+
+	<screen>&prompt.user; <userinput>passwd</userinput></screen>
+
+	<programlisting>Changing local password for trhodes
+Old Password:
+
+You can now choose the new password.
+A valid password should be a mix of upper and lower case letters,
+digits and other characters.  You can use a 12 character long
+password with characters from at least 3 of these 4 classes, or
+a 10 character long password containing characters from all the
+classes.  Characters that form a common pattern are discarded by
+the check.
+Alternatively, if noone else can see your terminal now, you can
+pick this as your password: "trait-useful&amp;knob".
+Enter new password:</programlisting>
+
+	<para>If a weak password is entered, it will be rejected with
+	  a warning and the user will have an opportunity to try
+	  again</para>
+
+	<para>In most password policies, a password aging requirement
+	  is normally set.  This means that a every password must expire
+	  after so many days after it has been set.  To set a password
+	  age time in &os;, set the <option>passwordtime</option> in
+	  <filename>/etc/login.conf</filename>.  Most users when added
+	  to the system just fall into the <option>default</option>
+	  default group which is where this variable could be added and
+	  the database rebuilt using:</para>
+
+	<screen>&prompt.root; <userinput>cap_mkdb /etc/login.conf</userinput></screen>
+
+	<para>To set the expiration on individual users, provide a day
+	  count to &man.pw.8; and a username like:</para>
+
+	<screen>&prompt.root; <userinput>pw usermod -p 30-apr-2014 -n trhodes</userinput></screen>
+
+	<para>As seen here, an expiration date is set in the form of day,
+	  month, year.  For more information, see &man.pw.8;</para>
+      </sect3>
     </sect2>
 
     <sect2 xml:id="security-rkhunter">

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 17:15:34 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0EC27BE3;
 Tue,  4 Feb 2014 17:15:34 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id ECD1213AC;
 Tue,  4 Feb 2014 17:15:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14HFXgv065715;
 Tue, 4 Feb 2014 17:15:33 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14HFXGD065714;
 Tue, 4 Feb 2014 17:15:33 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402041715.s14HFXGD065714@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 17:15:33 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43765 - head/en_US.ISO8859-1/articles/linux-users
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.17
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, 04 Feb 2014 17:15:34 -0000

Author: dru
Date: Tue Feb  4 17:15:33 2014
New Revision: 43765
URL: http://svnweb.freebsd.org/changeset/doc/43765

Log:
  First pass through next 1/3 of this article.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/articles/linux-users/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/linux-users/article.xml	Tue Feb  4 16:45:39 2014	(r43764)
+++ head/en_US.ISO8859-1/articles/linux-users/article.xml	Tue Feb  4 17:15:33 2014	(r43765)
@@ -48,7 +48,7 @@
   </sect1>
 
   <sect1 xml:id="shells">
-    <title>Shells: No Bash?</title>
+    <title>Default Shell</title>
 
     <para>&linux; users are often surprised to find that
       <application>Bash</application> is not the default shell in &os;.
@@ -160,13 +160,13 @@
   </sect1>
 
   <sect1 xml:id="startup">
-    <title>System Startup: Where are the run-levels?</title>
+    <title>System Startup</title>
 
-    <para>&linux; uses the SysV init system, whereas &os; uses the
-      traditional BSD-style &man.init.8;.  Under the BSD-style &man.init.8;
-      there are no run-levels and no <filename>/etc/inittab</filename>,
-      instead startup is controlled by the &man.rc.8; utility.  The
-      <filename>/etc/rc</filename> script reads
+    <para>Many &linux; distributions use the SysV init system, whereas &os; uses the
+      traditional BSD-style &man.init.8;.  Under the BSD-style &man.init.8;,
+      there are no run-levels and <filename>/etc/inittab</filename> does not exist.
+      Instead, startup is controlled by &man.rc.8; scripts.  At system boot,
+      <filename>/etc/rc</filename> reads
       <filename>/etc/defaults/rc.conf</filename> and
       <filename>/etc/rc.conf</filename> to determine which services are to be
       started.  The specified services are then started by running the
@@ -176,73 +176,63 @@
       the scripts located in <filename>/etc/init.d/</filename> on &linux;
       systems.</para>
 
-    <sidebar>
-      <para><emphasis>Why are there two locations for service initialization
-	scripts?</emphasis>  The scripts found in
+      <para>The scripts found in
 	<filename>/etc/rc.d/</filename> are for applications that are part of
-	the <quote>base</quote> system.  (&man.cron.8;, &man.sshd.8;,
-	&man.syslog.3;, and others.)  The scripts in
+	the <quote>base</quote> system, such as &man.cron.8;, &man.sshd.8;, and
+	&man.syslog.3;.  The scripts in
 	<filename>/usr/local/etc/rc.d/</filename> are for user-installed
-	applications such as <application>Apache</application>,
-	<application>Squid</application>, etc.</para>
+	applications such as <application>Apache</application> and
+	<application>Squid</application>.</para>
 
-      <para><emphasis>What is the difference between the <quote>base</quote>
-	system and user-installed applications?</emphasis>  FreeBSD is
-	developed as a complete operating system.  In other words, the
-	kernel, system libraries, and userland utilities (such as &man.ls.1;,
-	&man.cat.1;, &man.cp.1;, etc.) are developed and released together as
-	one.  This is what is referred to as the <quote>base</quote> system.
-	The user-installed applications are applications that are not part of
-	the <quote>base</quote> system, such as
-	<application>Apache</application>, <application>X11</application>,
-	<application>Mozilla&nbsp;Firefox</application>, etc.  These
-	user-installed applications are generally installed using &os;'s <link xlink:href="article.html#SOFTWARE">Packages and Ports&nbsp;Collection</link>.
+      <para>Since &os; is
+	developed as a complete operating system,
+	user-installed applications are not considered to be part of
+	the <quote>base</quote> system.
+	User-installed applications are generally installed using <link
+	  xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">Packages or Ports</link>.
 	In order to keep them separate from the <quote>base</quote> system,
-	user-installed applications are normally installed under
-	<filename>/usr/local/</filename>.  Therefore the user-installed
+	user-installed applications are installed under
+	<filename>/usr/local/</filename>.  Therefore, user-installed
 	binaries reside in <filename>/usr/local/bin/</filename>,
 	configuration files are in <filename>/usr/local/etc/</filename>,
 	and so on.</para>
-    </sidebar>
 
-    <para>Services are enabled by specifying
-      <literal>ServiceName_enable="YES"</literal> in
-      <filename>/etc/rc.conf</filename> (&man.rc.conf.5;).  Take a look at
-      <filename>/etc/defaults/rc.conf</filename> for the system defaults,
+    <para>Services are enabled by adding an entry for the service in
+      <filename>/etc/rc.conf</filename> .  The system defaults are found in
+      <filename>/etc/defaults/rc.conf</filename> and
       these default settings are overridden by settings in
-      <filename>/etc/rc.conf</filename>.  Also, when installing additional
-      applications be sure to review the documentation to determine how to
+      <filename>/etc/rc.conf</filename>.  Refer to &man.rc.conf.5; for
+      more information about the available entries.  When installing additional
+      applications, review the application's install message to determine how to
       enable any associated services.</para>
 
-    <para>The following snippet from <filename>/etc/rc.conf</filename> enables
-      &man.sshd.8; and <application>Apache 2.2</application>.  It also
-      specifies that <application>Apache</application> should be started
-      with SSL.</para>
+    <para>The following entries in <filename>/etc/rc.conf</filename> enable
+      &man.sshd.8;, enable <application>Apache 2.4</application>, and
+      specify that <application>Apache</application> should be started
+      with <acronym>SSL</acronym>.</para>
 
     <programlisting># enable SSHD
 sshd_enable="YES"
 # enable Apache with SSL
-apache22_enable="YES"
-apache22_flags="-DSSL"</programlisting>
+apache24_enable="YES"
+apache24_flags="-DSSL"</programlisting>
 
     <para>Once a service has been enabled in <filename>/etc/rc.conf</filename>,
-      the service can be started from the command line (without rebooting the
-      system):</para>
+      it can be started without rebooting the
+      system:</para>
 
-    <screen>&prompt.root; <userinput>/etc/rc.d/sshd start</userinput></screen>
+    <screen>&prompt.root; <userinput>service sshd start</userinput>
+ &prompt.root; <userinput>service apache24 start</userinput></screen>
 
-    <para>If a service has not been enabled it can be started from the
-      command line using <option>forcestart</option>:</para>
+    <para>If a service has not been enabled, it can be started from the
+      command line using <option>onestart</option>:</para>
 
-    <screen>&prompt.root; <userinput>/etc/rc.d/sshd forcestart</userinput></screen>
+    <screen>&prompt.root; <userinput>service sshd onestart</userinput></screen>
   </sect1>
 
   <sect1 xml:id="network">
     <title>Network configuration</title>
 
-    <sect2 xml:id="interfaces">
-      <title>Network Interfaces</title>
-
       <para>Instead of a generic <emphasis>ethX</emphasis> identifier that
 	&linux; uses to identify a network interface, &os; uses the driver
 	name followed by a number as the identifier.  The following output
@@ -262,75 +252,67 @@ em1: flags=8843&lt;UP,BROADCAST,RUNNING,
         ether 00:50:56:a7:03:2b
         media: Ethernet autoselect (1000baseTX &lt;full-duplex&gt;)
         status: active</screen>
-    </sect2>
 
-    <sect2 xml:id="ipaddress">
-      <title>IP Configuration</title>
-
-      <para>An IP address can be assigned to an interface using
-	&man.ifconfig.8;.  However, to remain persistent across reboots the
-	IP configuration must be included in
+      <para>An <acronym>IP</acronym> address can be assigned to an interface using
+	&man.ifconfig.8;.  To remain persistent across reboots, the
+	<acronym>IP</acronym> configuration must be included in
 	<filename>/etc/rc.conf</filename>.  The following example
-	specifies the hostname, IP address, and default gateway:</para>
+	specifies the hostname, <acronym>IP</acronym> address, and default gateway:</para>
 
       <programlisting>hostname="server1.example.com"
-ifconfig_em0="inet 10.10.10.100  netmask 255.255.255.0"
+ifconfig_em0="inet 10.10.10.100 netmask 255.255.255.0"
 defaultrouter="10.10.10.1"</programlisting>
 
-      <para>Use the following to configure an interface for DHCP:</para>
+      <para>Use the following to instead configure an interface for <acronym>DHCP</acronym>:</para>
 
       <programlisting>hostname="server1.example.com"
 ifconfig_em0="DHCP"</programlisting>
-
-    </sect2>
   </sect1>
 
   <sect1 xml:id="firewall">
     <title>Firewall</title>
 
-    <para>Like <application>IPTABLES</application> in &linux;, &os; also offers
-      a kernel level firewall; actually &os; offers three firewalls:</para>
+    <para>&os; does not use  &linux; <application>IPTABLES</application> for its firewall.  Instead, &os; offers
+      a choice of three kernel level firewalls:</para>
 
     <itemizedlist>
-      <listitem><simpara><link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/firewalls-ipfw.html">IPFIREWALL</link></simpara></listitem>
-      <listitem><simpara><link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/firewalls-ipf.html">IPFILTER</link></simpara></listitem>
       <listitem><simpara><link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/firewalls-pf.html">PF</link></simpara></listitem>
+      <listitem><simpara><link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/firewalls-ipf.html">IPFILTER</link></simpara></listitem>
+      <listitem><simpara><link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/firewalls-ipfw.html">IPFW</link></simpara></listitem>
     </itemizedlist>
 
-    <para><application>IPFIREWALL</application> or
-      <application>IPFW</application> (the command to manage an
-      <application>IPFW</application> ruleset is &man.ipfw.8;) is the
-      firewall developed and maintained by the &os; developers.
-      <application>IPFW</application> can be paired with &man.dummynet.4; to
-      provide traffic shaping capabilities and simulate different types of
-      network connections.</para>
+    <para><application>PF</application> is
+      developed by the OpenBSD project and ported to &os;.  <application>PF</application> was
+      created as a replacement for <application>IPFILTER</application> and
+      its syntax is similar to that of
+      <application>IPFILTER</application>.  <application>PF</application> can
+      be paired with &man.altq.4; to provide <acronym>QoS</acronym> features.</para>
 
-    <para>Sample <application>IPFW</application> rule to allow
-      <application>SSH</application> in:</para>
+     <para>This sample <application>PF</application> entry allows inbound
+       <application>SSH</application>:</para>
 
-    <programlisting>ipfw add allow tcp from any to me 22 in via $ext_if</programlisting>
+     <programlisting>pass in on $ext_if inet proto tcp from any to ($ext_if) port 22</programlisting>
 
-    <para><application>IPFILTER</application> is the firewall application
-      developed by Darren&nbsp;Reed.  It is not specific to &os;, and has been
+     <para><application>IPFILTER</application> is the firewall application
+      developed by Darren Reed.  It is not specific to &os; and has been
       ported to several operating systems including NetBSD, OpenBSD, SunOS,
       HP/UX, and Solaris.</para>
 
-    <para>Sample <application>IPFILTER</application> command to allow
-      <application>SSH</application> in:</para>
+    <para>The <application>IPFILTER</application> syntax to allow inbound
+      <application>SSH</application> is:</para>
 
     <programlisting>pass in on $ext_if proto tcp from any to any port = 22</programlisting>
+ 
+    <para><application>IPFW</application> is the
+      firewall developed and maintained by &os;.
+      It can be paired with &man.dummynet.4; to
+      provide traffic shaping capabilities and simulate different types of
+      network connections.</para>
 
-    <para>The last firewall application, <application>PF</application>, is
-      developed by the OpenBSD project.  <application>PF</application> was
-      created as a replacement for <application>IPFILTER</application>.  As
-      such, the <application>PF</application> syntax is very similar to that of
-      <application>IPFILTER</application>.  <application>PF</application> can
-      be paired with &man.altq.4; to provide QoS features.</para>
-
-     <para>Sample <application>PF</application> command to allow
-       <application>SSH</application> in:</para>
+    <para>The <application>IPFW</application> syntax to allow inbound
+      <application>SSH</application> would be:</para>
 
-     <programlisting>pass in on $ext_if inet proto tcp from any to ($ext_if) port 22</programlisting>
+    <programlisting>ipfw add allow tcp from any to me 22 in via $ext_if</programlisting>
   </sect1>
 
   <sect1 xml:id="updates">

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 18:20:56 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D5A24FE2;
 Tue,  4 Feb 2014 18:20:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A611919AF;
 Tue,  4 Feb 2014 18:20:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14IKuge090633;
 Tue, 4 Feb 2014 18:20:56 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14IKu5D090632;
 Tue, 4 Feb 2014 18:20:56 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402041820.s14IKu5D090632@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 18:20:56 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43766 - head/en_US.ISO8859-1/articles/linux-users
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.17
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, 04 Feb 2014 18:20:56 -0000

Author: dru
Date: Tue Feb  4 18:20:56 2014
New Revision: 43766
URL: http://svnweb.freebsd.org/changeset/doc/43766

Log:
  Last pass through this article.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/articles/linux-users/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/linux-users/article.xml	Tue Feb  4 17:15:33 2014	(r43765)
+++ head/en_US.ISO8859-1/articles/linux-users/article.xml	Tue Feb  4 18:20:56 2014	(r43766)
@@ -36,7 +36,7 @@
   <sect1 xml:id="intro">
     <title>Introduction</title>
 
-    <para>This document highlights the technical differences between &os; and
+    <para>This document highlights some of the technical differences between &os; and
       &linux; so that intermediate to advanced &linux; users can quickly
       familiarize themselves with the basics of &os;.</para>
 
@@ -55,7 +55,7 @@
       In fact, <application>Bash</application> is not even in the default
       installation.  Instead, &os; uses &man.tcsh.1; as the default shell.
       However, <application>Bash</application> and other
-      shells are available in &os;'s <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports.html">Packages and Ports&nbsp;Collection</link>.</para>
+      shells are available for installation using the &os; <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports.html">Packages and Ports Collection</link>.</para>
 
     <para>After installing another shell, use &man.chsh.1; to change
       a user's default shell.  It is recommended that the
@@ -66,7 +66,7 @@
       system where <filename>/usr/local/bin</filename> is
       located may not be mounted.  In this
       case, <systemitem class="username">root</systemitem> would not have access to its default
-      shell, preventing <systemitem class="username">root</systemitem> from logging in.</para>
+      shell, preventing <systemitem class="username">root</systemitem> from logging in and fixing the problem.</para>
   </sect1>
 
   <sect1 xml:id="software">
@@ -139,7 +139,7 @@
 	of the &os; Handbook.</para>
 
       <para>To compile a port, change to the
-	port's directory and starting the build process.  The following example
+	port's directory and start the build process.  The following example
 	installs <application>Apache 2.4</application> from the
 	Ports Collection:</para>
 
@@ -148,8 +148,8 @@
 
       <para>A benefit of using ports to install software is the
 	ability to customize the installation options.  This example
-	enables <application>mod_ldap</application> by setting
-	<varname>WITH_LDAP</varname>:</para>
+	specifies that the <application>mod_ldap</application> module
+	should also be installed:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/www/apache24</userinput>
 &prompt.root; <userinput>make WITH_LDAP="YES" install clean</userinput></screen>
@@ -167,8 +167,9 @@
       there are no run-levels and <filename>/etc/inittab</filename> does not exist.
       Instead, startup is controlled by &man.rc.8; scripts.  At system boot,
       <filename>/etc/rc</filename> reads
-      <filename>/etc/defaults/rc.conf</filename> and
-      <filename>/etc/rc.conf</filename> to determine which services are to be
+      <filename>/etc/rc.conf</filename> and
+      <filename>/etc/defaults/rc.conf</filename>
+      to determine which services are to be
       started.  The specified services are then started by running the
       corresponding service initialization scripts located in
       <filename>/etc/rc.d/</filename> and
@@ -190,7 +191,7 @@
 	the <quote>base</quote> system.
 	User-installed applications are generally installed using <link
 	  xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">Packages or Ports</link>.
-	In order to keep them separate from the <quote>base</quote> system,
+	In order to keep them separate from the base system,
 	user-installed applications are installed under
 	<filename>/usr/local/</filename>.  Therefore, user-installed
 	binaries reside in <filename>/usr/local/bin/</filename>,
@@ -222,7 +223,7 @@ apache24_flags="-DSSL"</programlisting>
       system:</para>
 
     <screen>&prompt.root; <userinput>service sshd start</userinput>
- &prompt.root; <userinput>service apache24 start</userinput></screen>
+&prompt.root; <userinput>service apache24 start</userinput></screen>
 
     <para>If a service has not been enabled, it can be started from the
       command line using <option>onestart</option>:</para>
@@ -235,7 +236,7 @@ apache24_flags="-DSSL"</programlisting>
 
       <para>Instead of a generic <emphasis>ethX</emphasis> identifier that
 	&linux; uses to identify a network interface, &os; uses the driver
-	name followed by a number as the identifier.  The following output
+	name followed by a number.  The following output
 	from &man.ifconfig.8; shows two &intel;&nbsp;Pro&nbsp;1000 network
 	interfaces (<filename>em0</filename> and <filename>em1</filename>):</para>
 
@@ -256,14 +257,14 @@ em1: flags=8843&lt;UP,BROADCAST,RUNNING,
       <para>An <acronym>IP</acronym> address can be assigned to an interface using
 	&man.ifconfig.8;.  To remain persistent across reboots, the
 	<acronym>IP</acronym> configuration must be included in
-	<filename>/etc/rc.conf</filename>.  The following example
-	specifies the hostname, <acronym>IP</acronym> address, and default gateway:</para>
+	<filename>/etc/rc.conf</filename>.  The following <filename>/etc/rc.conf</filename> entries
+	specify the hostname, <acronym>IP</acronym> address, and default gateway:</para>
 
       <programlisting>hostname="server1.example.com"
 ifconfig_em0="inet 10.10.10.100 netmask 255.255.255.0"
 defaultrouter="10.10.10.1"</programlisting>
 
-      <para>Use the following to instead configure an interface for <acronym>DHCP</acronym>:</para>
+      <para>Use the following entries to instead configure an interface for <acronym>DHCP</acronym>:</para>
 
       <programlisting>hostname="server1.example.com"
 ifconfig_em0="DHCP"</programlisting>
@@ -318,93 +319,65 @@ ifconfig_em0="DHCP"</programlisting>
   <sect1 xml:id="updates">
     <title>Updating &os;</title>
 
-    <para>There are three methods for updating a &os; system: from source,
-      binary updates, and the installation discs.</para>
+    <para>There are two methods for updating a &os; system: from source or
+      binary updates.</para>
 
     <para>Updating from source is the most involved update method, but offers
       the greatest amount of flexibility.  The process involves synchronizing a
-      local copy of the FreeBSD source code with the &os;
+      local copy of the &os; source code with the &os;
       <application>Subversion</application> servers.
-      Once the local source code is up to date you can build new versions of
-      the kernel and userland.  For more information on source updates see
-      <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/updating-upgrading.html">the chapter on updating</link>
-      in the &os;&nbsp;Handbook.</para>
+      Once the local source code is up-to-date, a new version of
+      the kernel and userland can be compiled.</para>
 
     <para>Binary updates are similar to using <command>yum</command> or
-     <command>apt-get</command> to update a &linux; system.  The command
-     &man.freebsd-update.8; will fetch new updates and install them.  The
+     <command>apt-get</command> to update a &linux; system.  In &os;,
+     &man.freebsd-update.8; can be used fetch new binary updates and install them.  These
      updates can be scheduled using &man.cron.8;.</para>
 
     <note>
-      <para>If you do use &man.cron.8; to schedule the updates, please be sure
-	to use <command>freebsd-update cron</command> in your &man.crontab.1;
+      <para>When using &man.cron.8; to schedule updates,
+	use <command>freebsd-update cron</command> in the &man.crontab.1;
 	to reduce the possibility of a large number of machines all pulling
-	updates at the same time.</para>
+	updates at the same time:</para>
 
       <programlisting>0 3 * * * root /usr/sbin/freebsd-update cron</programlisting>
     </note>
 
-    <para>The last update method, updating from the installation discs, is a
-      straight-forward process.  Boot from the installation discs and select
-      the option to upgrade.</para>
+    <para>For more information on source and binary updates, refer to
+      <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/updating-upgrading.html">the chapter on updating</link>
+      in the &os; Handbook.</para>
   </sect1>
 
   <sect1 xml:id="procfs">
     <title>procfs: Gone But Not Forgotten</title>
 
-    <para>In &linux;, you may have looked at
+    <para>In some &linux; distributions, one could look at
       <filename>/proc/sys/net/ipv4/ip_forward</filename> to determine if
-      IP forwarding was enabled.  Under &os; you should use &man.sysctl.8; to
-      view this and other system settings, as &man.procfs.5; has been
-      deprecated in current versions of &os;.  (Although
-      <command>sysctl</command> is available in &linux; as well.)</para>
+      <acronym>IP</acronym> forwarding is enabled.  In &os; &man.sysctl.8; is instead used to
+      view this and other system settings.</para>
 
-    <para>In the IP forwarding example, you would use the following to
-      determine if IP forwarding is enabled on your FreeBSD system:</para>
+    <para>For example, use the following to
+      determine if <acronym>IP</acronym> forwarding is enabled on a &os; system:</para>
 
     <screen>&prompt.user; <userinput>sysctl net.inet.ip.forwarding</userinput>
 net.inet.ip.forwarding: 0</screen>
 
-    <para>The <option>-a</option> flag is used to list all the system
+    <para>Use <option>-a</option> to list all the system
       settings:</para>
 
-    <screen>&prompt.user; <userinput>sysctl -a</userinput>
-kern.ostype: FreeBSD
-kern.osrelease: 6.2-RELEASE-p9
-kern.osrevision: 199506
-kern.version: FreeBSD 6.2-RELEASE-p9 #0: Thu Nov 29 04:07:33 UTC 2007
-    root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC
-
-kern.maxvnodes: 17517
-kern.maxproc: 1988
-kern.maxfiles: 3976
-kern.argmax: 262144
-kern.securelevel: -1
-kern.hostname: server1
-kern.hostid: 0
-kern.clockrate: { hz = 1000, tick = 1000, profhz = 666, stathz = 133 }
-kern.posix1version: 200112
-...</screen>
+    <screen>&prompt.user; <userinput>sysctl -a | more</userinput></screen>
 
-    <note>
-      <para>Some of these <command>sysctl</command> values are
-	read-only.</para></note>
-
-    <para>There are occasions where procfs is required, such as running
-      older software, using &man.truss.1; to trace system calls, and
-      <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/linuxemu.html">&linux; Binary Compatibility</link>.
-      (Although, &linux; Binary Compatibility uses its own procfs, &man.linprocfs.5;.)
-      If you need to mount procfs you can add the following to
+    <para>If an application requires procfs,
+      add the following entry to
       <filename>/etc/fstab</filename>:</para>
 
     <screen>proc                /proc           procfs  rw,noauto       0       0</screen>
 
-    <note>
-      <para><option>noauto</option> will prevent
+      <para>Including <option>noauto</option> will prevent
 	<filename>/proc</filename> from being automatically mounted at
-	boot.</para></note>
+	boot.</para>
 
-    <para>And then mount procfs with:</para>
+    <para>To mount the file system without rebooting:</para>
 
     <screen>&prompt.root; <userinput>mount /proc</userinput></screen>
   </sect1>
@@ -412,8 +385,7 @@ kern.posix1version: 200112
   <sect1 xml:id="commands">
     <title>Common Commands</title>
 
-    <sect2 xml:id="packageCommands">
-      <title>Package Management</title>
+    <para>Some common command equivalents are as follows:</para>
 
       <para>
 	<informaltable frame="none" pgwide="1">
@@ -429,46 +401,26 @@ kern.posix1version: 200112
 	    <tbody>
 	      <row>
 		<entry><command>yum install package</command> / <command>apt-get install package</command></entry>
-		<entry><command>pkg_add -r package</command></entry>
-		<entry>Install <replaceable>package</replaceable> from remote repository</entry>
+		<entry><command>pkg install package</command></entry>
+		<entry>Install package from remote repository</entry>
 	      </row>
 
 	      <row>
 		<entry><command>rpm -ivh package</command> / <command>dpkg -i package</command></entry>
-		<entry><command>pkg_add -v package</command></entry>
-		<entry>Install package</entry>
+		<entry><command>pkg add package</command></entry>
+		<entry>Install local package</entry>
 	      </row>
 
 	      <row>
 		<entry><command>rpm -qa</command> / <command>dpkg -l</command></entry>
-		<entry><command>pkg_info</command></entry>
+		<entry><command>pkg info</command></entry>
 		<entry>List installed packages</entry>
 	      </row>
-	    </tbody>
-	  </tgroup>
-	</informaltable>
-      </para>
-    </sect2>
-
-    <sect2 xml:id="systemCommands">
-      <title>System Management</title>
-
-      <para>
-	<informaltable frame="none" pgwide="1">
-	  <tgroup cols="3">
-	    <thead>
-	      <row>
-		<entry>&linux; command</entry>
-		<entry>&os; equivalent</entry>
-		<entry>Purpose</entry>
-	      </row>
-	    </thead>
 
-	    <tbody>
 	      <row>
 		<entry><command>lspci</command></entry>
 		<entry><command>pciconf</command></entry>
-		<entry>List PCI devices</entry>
+		<entry>List <acronym>PCI</acronym> devices</entry>
 	      </row>
 
 	      <row>
@@ -492,15 +444,14 @@ kern.posix1version: 200112
 	  </tgroup>
 	</informaltable>
       </para>
-    </sect2>
   </sect1>
 
   <sect1 xml:id="conclusion">
     <title>Conclusion</title>
 
-    <para>Hopefully this document has provided you with enough to get
-      started with &os;.   Be sure to take a look at the <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/index.html">&os;&nbsp;Handbook</link>
-      for more in depth coverage of the topics touched on as well as
-      the many topics not covered in this document.</para>
+    <para>This document has provided an overview of
+      &os;.   Refer to the <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/index.html">&os;&nbsp;Handbook</link>
+      for more in-depth coverage of these topics as well as
+      the many topics not covered by this document.</para>
   </sect1>
 </article>

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 18:53:38 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 64DECEA3;
 Tue,  4 Feb 2014 18:53:38 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4E7B11CD8;
 Tue,  4 Feb 2014 18:53:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14IrcqX004774;
 Tue, 4 Feb 2014 18:53:38 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14IrceL004772;
 Tue, 4 Feb 2014 18:53:38 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402041853.s14IrceL004772@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 18:53:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43767 - head/en_US.ISO8859-1/articles/linux-users
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.17
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, 04 Feb 2014 18:53:38 -0000

Author: dru
Date: Tue Feb  4 18:53:37 2014
New Revision: 43767
URL: http://svnweb.freebsd.org/changeset/doc/43767

Log:
  White space fix only. Translators can ignore.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/articles/linux-users/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/linux-users/article.xml	Tue Feb  4 18:20:56 2014	(r43766)
+++ head/en_US.ISO8859-1/articles/linux-users/article.xml	Tue Feb  4 18:53:37 2014	(r43767)
@@ -2,8 +2,8 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
 	"http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd">
 <article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
-  <info><title>FreeBSD Quickstart Guide for &linux; Users</title>
-    
+  <info>
+    <title>FreeBSD Quickstart Guide for &linux; Users</title>
 
     <authorgroup>
       <author><personname><firstname>John</firstname><surname>Ferrell</surname></personname></author>
@@ -28,120 +28,141 @@
     </legalnotice>
 
     <abstract>
-      <para>This document is intended to quickly familiarize intermediate to
-	advanced &linux; users with the basics of &os;.</para>
+      <para>This document is intended to quickly familiarize
+	intermediate to advanced &linux; users with the basics of
+	&os;.</para>
     </abstract>
   </info>
 
   <sect1 xml:id="intro">
     <title>Introduction</title>
 
-    <para>This document highlights some of the technical differences between &os; and
-      &linux; so that intermediate to advanced &linux; users can quickly
-      familiarize themselves with the basics of &os;.</para>
-
-    <para>This document assumes that &os; is already installed.
-      Refer to the
-      <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/bsdinstall.html">
-      Installing &os;</link> chapter of the &os;&nbsp;Handbook for help with the installation
-      process.</para>
+    <para>This document highlights some of the technical differences
+      between &os; and &linux; so that intermediate to advanced
+      &linux; users can quickly familiarize themselves with the basics
+      of &os;.</para>
+
+    <para>This document assumes that &os; is already installed.  Refer
+      to the <link
+	xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/bsdinstall.html">
+      Installing &os;</link> chapter of the &os;&nbsp;Handbook for
+      help with the installation process.</para>
   </sect1>
 
   <sect1 xml:id="shells">
     <title>Default Shell</title>
 
     <para>&linux; users are often surprised to find that
-      <application>Bash</application> is not the default shell in &os;.
-      In fact, <application>Bash</application> is not even in the default
-      installation.  Instead, &os; uses &man.tcsh.1; as the default shell.
-      However, <application>Bash</application> and other
-      shells are available for installation using the &os; <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports.html">Packages and Ports Collection</link>.</para>
+      <application>Bash</application> is not the default shell in
+      &os;.  In fact, <application>Bash</application> is not even in
+      the default installation.  Instead, &os; uses &man.tcsh.1; as
+      the default shell.  However, <application>Bash</application> and
+      other shells are available for installation using the &os; <link
+	xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports.html">Packages
+	and Ports Collection</link>.</para>
 
     <para>After installing another shell, use &man.chsh.1; to change
       a user's default shell.  It is recommended that the
-      <systemitem class="username">root</systemitem> user's default shell remain unchanged since
-      shells which are not included in the base distribution
-      are installed to <filename>/usr/local/bin</filename>.
-      In the event of a problem, the file
-      system where <filename>/usr/local/bin</filename> is
-      located may not be mounted.  In this
-      case, <systemitem class="username">root</systemitem> would not have access to its default
-      shell, preventing <systemitem class="username">root</systemitem> from logging in and fixing the problem.</para>
+      <systemitem class="username">root</systemitem> user's default
+      shell remain unchanged since shells which are not included in
+      the base distribution are installed to
+      <filename>/usr/local/bin</filename>.  In the event of a problem,
+      the file system where <filename>/usr/local/bin</filename> is
+      located may not be mounted.  In this case, <systemitem
+	class="username">root</systemitem> would not have access to
+      its default  shell, preventing <systemitem
+	class="username">root</systemitem> from logging in and fixing
+      the problem.</para>
   </sect1>
 
   <sect1 xml:id="software">
     <title>Packages and Ports: Adding Software in &os;</title>
 
-    <para>&os; provides
-      two methods for installing applications: binary packages and compiled ports.  
-      Each method has its own benefits:</para>
-
-      <itemizedlist>
-	<title>Binary Packages</title>
-
-	<listitem><simpara>Faster installation as compared to compiling large applications.</simpara></listitem>
-
-	<listitem><simpara>Does not require an understanding of how to compile
-	  software.</simpara></listitem>
-
-	<listitem><simpara>No need to install a compiler.</simpara></listitem>
-      </itemizedlist>
-
-      <itemizedlist>
-	<title>Ports</title>
-
-	<listitem><simpara>Ability to customize installation options.</simpara></listitem>
-
-	<listitem><simpara>Custom patches can be applied.</simpara></listitem>
-      </itemizedlist>
-
-      <para>If an application installation does not require any customization, installing the package
-	is sufficient.  Compile the port instead whenever an application requires
-	customization of the default options.  If needed,
-	a custom
-	package can be compiled from ports using <command>make</command>
-	<buildtarget>package</buildtarget>.</para>
-	
-	<para>A complete list of of all available ports and packages
-	  can be found <link
-	    xlink:href="http://www.freebsd.org/ports/master-index.html">here</link>.</para>	
+    <para>&os; provides two methods for installing applications:
+      binary packages and compiled ports.  Each method has its own
+      benefits:</para>
+
+    <itemizedlist>
+      <title>Binary Packages</title>
+
+      <listitem>
+	<simpara>Faster installation as compared to
+	compiling large applications.</simpara>
+      </listitem>
+
+      <listitem>
+	<simpara>Does not require an understanding of how to
+	compile software.</simpara>
+      </listitem>
+
+      <listitem>
+	<simpara>No need to install a compiler.</simpara>
+      </listitem>
+    </itemizedlist>
+
+    <itemizedlist>
+      <title>Ports</title>
+
+      <listitem>
+	<simpara>Ability to customize installation options.</simpara>
+      </listitem>
+
+      <listitem>
+	<simpara>Custom patches can be applied.</simpara>
+      </listitem>
+    </itemizedlist>
+
+    <para>If an application installation does not require any
+      customization, installing the package is sufficient.  Compile
+      the port instead whenever an application requires customization
+      of the default options.  If needed, a custom package can be
+      compiled from ports using <command>make</command>
+      <buildtarget>package</buildtarget>.</para>
+
+    <para>A complete list of of all available ports and packages can
+      be found <link
+	xlink:href="http://www.freebsd.org/ports/master-index.html">here</link>.</para>
 
     <sect2 xml:id="packages">
       <title>Packages</title>
 
-      <para>Packages are pre-compiled applications, the &os; equivalents
-	of <filename>.deb</filename> files on Debian/Ubuntu based systems
-	and <filename>.rpm</filename> files on Red&nbsp;Hat/Fedora based
-	systems.  Packages are installed using <application>pkg</application>.  For example,
+      <para>Packages are pre-compiled applications, the &os;
+	equivalents of <filename>.deb</filename> files on
+	Debian/Ubuntu based systems and <filename>.rpm</filename>
+	files on Red&nbsp;Hat/Fedora based systems.  Packages are
+	installed using <application>pkg</application>.  For example,
 	the following command installs
 	<application>Apache 2.4</application>:</para>
 
       <screen>&prompt.root; <userinput>pkg install apache24</userinput></screen>
 
       <para>For more information on packages refer to section 5.4 of
-	the &os; Handbook: <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/pkgng-intro.html">Using pkgng for Binary Package Management</link>.</para>
+	the &os; Handbook: <link
+	  xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/pkgng-intro.html">Using
+	  pkgng for Binary Package Management</link>.</para>
     </sect2>
 
     <sect2 xml:id="ports">
       <title>Ports</title>
 
       <para>The &os; Ports Collection is a framework of
-	<filename>Makefiles</filename> and patches specifically customized
-	for installing applications from source on &os;.
-	When installing a port, the system will fetch the source code, apply
-	any required patches, compile the code, and install the application
-	and any required dependencies.</para>
-
-      <para>The Ports Collection, sometimes referred to as the ports tree,
-	can be installed to <filename>/usr/ports</filename> using &man.portsnap.8;.
-	Detailed instructions for installing the Ports Collection can be
-	found in <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">section 5.5</link>
-	of the &os; Handbook.</para>
-
-      <para>To compile a port, change to the
-	port's directory and start the build process.  The following example
-	installs <application>Apache 2.4</application> from the
-	Ports Collection:</para>
+	<filename>Makefiles</filename> and patches specifically
+	customized for installing applications from source on &os;.
+	When installing a port, the system will fetch the source code,
+	apply any required patches, compile the code, and install the
+	application and any required dependencies.</para>
+
+      <para>The Ports Collection, sometimes referred to as the ports
+	tree, can be installed to <filename>/usr/ports</filename>
+	using &man.portsnap.8;.  Detailed instructions for installing
+	the Ports Collection can be found in <link
+	  xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">section
+	  5.5</link> of the &os; Handbook.</para>
+
+      <para>To compile a port, change to the port's directory and
+	start the build process.  The following example installs
+	<application>Apache 2.4</application> from the Ports
+	Collection:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/www/apache24</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
@@ -154,63 +175,66 @@
       <screen>&prompt.root; <userinput>cd /usr/ports/www/apache24</userinput>
 &prompt.root; <userinput>make WITH_LDAP="YES" install clean</userinput></screen>
 
-      <para>Refer to <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">Using
-	 the Ports Collection</link> for more information.</para>
+      <para>Refer to <link
+	  xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">Using
+	  the Ports Collection</link> for more information.</para>
     </sect2>
   </sect1>
 
   <sect1 xml:id="startup">
     <title>System Startup</title>
 
-    <para>Many &linux; distributions use the SysV init system, whereas &os; uses the
-      traditional BSD-style &man.init.8;.  Under the BSD-style &man.init.8;,
-      there are no run-levels and <filename>/etc/inittab</filename> does not exist.
-      Instead, startup is controlled by &man.rc.8; scripts.  At system boot,
+    <para>Many &linux; distributions use the SysV init system, whereas
+      &os; uses the traditional BSD-style &man.init.8;.  Under the
+      BSD-style &man.init.8;, there are no run-levels and
+      <filename>/etc/inittab</filename> does not exist.  Instead,
+      startup is controlled by &man.rc.8; scripts.  At system boot,
       <filename>/etc/rc</filename> reads
       <filename>/etc/rc.conf</filename> and
       <filename>/etc/defaults/rc.conf</filename>
-      to determine which services are to be
-      started.  The specified services are then started by running the
-      corresponding service initialization scripts located in
+      to determine which services are to be started.  The specified
+      services are then started by running the corresponding service
+      initialization scripts located in
       <filename>/etc/rc.d/</filename> and
-      <filename>/usr/local/etc/rc.d/</filename>.  These scripts are similar to
-      the scripts located in <filename>/etc/init.d/</filename> on &linux;
-      systems.</para>
-
-      <para>The scripts found in
-	<filename>/etc/rc.d/</filename> are for applications that are part of
-	the <quote>base</quote> system, such as &man.cron.8;, &man.sshd.8;, and
-	&man.syslog.3;.  The scripts in
-	<filename>/usr/local/etc/rc.d/</filename> are for user-installed
-	applications such as <application>Apache</application> and
-	<application>Squid</application>.</para>
-
-      <para>Since &os; is
-	developed as a complete operating system,
-	user-installed applications are not considered to be part of
-	the <quote>base</quote> system.
-	User-installed applications are generally installed using <link
-	  xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">Packages or Ports</link>.
-	In order to keep them separate from the base system,
-	user-installed applications are installed under
-	<filename>/usr/local/</filename>.  Therefore, user-installed
-	binaries reside in <filename>/usr/local/bin/</filename>,
-	configuration files are in <filename>/usr/local/etc/</filename>,
-	and so on.</para>
+      <filename>/usr/local/etc/rc.d/</filename>.  These scripts are
+      similar to the scripts located in
+      <filename>/etc/init.d/</filename> on &linux; systems.</para>
+
+    <para>The scripts found in <filename>/etc/rc.d/</filename> are for
+      applications that are part of the <quote>base</quote> system,
+      such as &man.cron.8;, &man.sshd.8;, and &man.syslog.3;.  The
+      scripts in <filename>/usr/local/etc/rc.d/</filename> are for
+      user-installed applications such as
+      <application>Apache</application> and
+      <application>Squid</application>.</para>
+
+    <para>Since &os; is developed as a complete operating system,
+      user-installed applications are not considered to be part of
+      the <quote>base</quote> system.  User-installed applications
+      are generally installed using <link
+	xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">Packages
+	or Ports</link>.  In order to keep them separate from the base
+      system, user-installed applications are installed under
+      <filename>/usr/local/</filename>.  Therefore, user-installed
+      binaries reside in <filename>/usr/local/bin/</filename>,
+      configuration files are in <filename>/usr/local/etc/</filename>,
+      and so on.</para>
 
     <para>Services are enabled by adding an entry for the service in
-      <filename>/etc/rc.conf</filename> .  The system defaults are found in
-      <filename>/etc/defaults/rc.conf</filename> and
-      these default settings are overridden by settings in
+      <filename>/etc/rc.conf</filename> .  The system defaults are
+      found in <filename>/etc/defaults/rc.conf</filename> and these
+      default settings are overridden by settings in
       <filename>/etc/rc.conf</filename>.  Refer to &man.rc.conf.5; for
-      more information about the available entries.  When installing additional
-      applications, review the application's install message to determine how to
-      enable any associated services.</para>
-
-    <para>The following entries in <filename>/etc/rc.conf</filename> enable
-      &man.sshd.8;, enable <application>Apache 2.4</application>, and
-      specify that <application>Apache</application> should be started
-      with <acronym>SSL</acronym>.</para>
+      more information about the available entries.  When installing
+      additional applications, review the application's install
+      message to determine how to enable any associated
+      services.</para>
+
+    <para>The following entries in <filename>/etc/rc.conf</filename>
+      enable &man.sshd.8;, enable <application>Apache
+	2.4</application>, and specify that
+      <application>Apache</application> should be started with
+      <acronym>SSL</acronym>.</para>
 
     <programlisting># enable SSHD
 sshd_enable="YES"
@@ -218,15 +242,15 @@ sshd_enable="YES"
 apache24_enable="YES"
 apache24_flags="-DSSL"</programlisting>
 
-    <para>Once a service has been enabled in <filename>/etc/rc.conf</filename>,
-      it can be started without rebooting the
-      system:</para>
+    <para>Once a service has been enabled in
+      <filename>/etc/rc.conf</filename>, it can be started without
+      rebooting the system:</para>
 
     <screen>&prompt.root; <userinput>service sshd start</userinput>
 &prompt.root; <userinput>service apache24 start</userinput></screen>
 
-    <para>If a service has not been enabled, it can be started from the
-      command line using <option>onestart</option>:</para>
+    <para>If a service has not been enabled, it can be started from
+      the command line using <option>onestart</option>:</para>
 
     <screen>&prompt.root; <userinput>service sshd onestart</userinput></screen>
   </sect1>
@@ -234,13 +258,14 @@ apache24_flags="-DSSL"</programlisting>
   <sect1 xml:id="network">
     <title>Network configuration</title>
 
-      <para>Instead of a generic <emphasis>ethX</emphasis> identifier that
-	&linux; uses to identify a network interface, &os; uses the driver
-	name followed by a number.  The following output
-	from &man.ifconfig.8; shows two &intel;&nbsp;Pro&nbsp;1000 network
-	interfaces (<filename>em0</filename> and <filename>em1</filename>):</para>
+    <para>Instead of a generic <emphasis>ethX</emphasis> identifier
+      that &linux; uses to identify a network interface, &os; uses the
+      driver name followed by a number.  The following output from
+      &man.ifconfig.8; shows two &intel;&nbsp;Pro&nbsp;1000 network
+      interfaces (<filename>em0</filename> and
+      <filename>em1</filename>):</para>
 
-      <screen>&prompt.user; <userinput>ifconfig</userinput>
+    <screen>&prompt.user; <userinput>ifconfig</userinput>
 em0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
         options=b&lt;RXCSUM,TXCSUM,VLAN_MTU&gt;
         inet 10.10.10.100 netmask 0xffffff00 broadcast 10.10.10.255
@@ -254,61 +279,73 @@ em1: flags=8843&lt;UP,BROADCAST,RUNNING,
         media: Ethernet autoselect (1000baseTX &lt;full-duplex&gt;)
         status: active</screen>
 
-      <para>An <acronym>IP</acronym> address can be assigned to an interface using
-	&man.ifconfig.8;.  To remain persistent across reboots, the
-	<acronym>IP</acronym> configuration must be included in
-	<filename>/etc/rc.conf</filename>.  The following <filename>/etc/rc.conf</filename> entries
-	specify the hostname, <acronym>IP</acronym> address, and default gateway:</para>
+    <para>An <acronym>IP</acronym> address can be assigned to an
+      interface using &man.ifconfig.8;.  To remain persistent across
+      reboots, the <acronym>IP</acronym> configuration must be
+      included in <filename>/etc/rc.conf</filename>.  The following
+      <filename>/etc/rc.conf</filename> entries specify the hostname,
+      <acronym>IP</acronym> address, and default gateway:</para>
 
-      <programlisting>hostname="server1.example.com"
+    <programlisting>hostname="server1.example.com"
 ifconfig_em0="inet 10.10.10.100 netmask 255.255.255.0"
 defaultrouter="10.10.10.1"</programlisting>
 
-      <para>Use the following entries to instead configure an interface for <acronym>DHCP</acronym>:</para>
+    <para>Use the following entries to instead configure an interface
+      for <acronym>DHCP</acronym>:</para>
 
-      <programlisting>hostname="server1.example.com"
+    <programlisting>hostname="server1.example.com"
 ifconfig_em0="DHCP"</programlisting>
   </sect1>
 
   <sect1 xml:id="firewall">
     <title>Firewall</title>
 
-    <para>&os; does not use  &linux; <application>IPTABLES</application> for its firewall.  Instead, &os; offers
-      a choice of three kernel level firewalls:</para>
+    <para>&os; does not use  &linux;
+      <application>IPTABLES</application> for its firewall.  Instead,
+      &os; offers a choice of three kernel level firewalls:</para>
 
     <itemizedlist>
-      <listitem><simpara><link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/firewalls-pf.html">PF</link></simpara></listitem>
-      <listitem><simpara><link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/firewalls-ipf.html">IPFILTER</link></simpara></listitem>
-      <listitem><simpara><link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/firewalls-ipfw.html">IPFW</link></simpara></listitem>
+      <listitem>
+	<simpara><link
+	xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/firewalls-pf.html">PF</link></simpara>
+      </listitem>
+      <listitem>
+	<simpara><link
+	xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/firewalls-ipf.html">IPFILTER</link></simpara>
+      </listitem>
+      <listitem>
+	<simpara><link
+	xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/firewalls-ipfw.html">IPFW</link></simpara>
+      </listitem>
     </itemizedlist>
 
-    <para><application>PF</application> is
-      developed by the OpenBSD project and ported to &os;.  <application>PF</application> was
-      created as a replacement for <application>IPFILTER</application> and
-      its syntax is similar to that of
-      <application>IPFILTER</application>.  <application>PF</application> can
-      be paired with &man.altq.4; to provide <acronym>QoS</acronym> features.</para>
-
-     <para>This sample <application>PF</application> entry allows inbound
-       <application>SSH</application>:</para>
-
-     <programlisting>pass in on $ext_if inet proto tcp from any to ($ext_if) port 22</programlisting>
-
-     <para><application>IPFILTER</application> is the firewall application
-      developed by Darren Reed.  It is not specific to &os; and has been
-      ported to several operating systems including NetBSD, OpenBSD, SunOS,
-      HP/UX, and Solaris.</para>
+    <para><application>PF</application> is developed by the OpenBSD
+      project and ported to &os;.  <application>PF</application> was
+      created as a replacement for <application>IPFILTER</application>
+      and its syntax is similar to that of
+      <application>IPFILTER</application>.
+      <application>PF</application> can be paired with &man.altq.4; to
+      provide <acronym>QoS</acronym> features.</para>
+
+    <para>This sample <application>PF</application> entry allows
+      inbound <application>SSH</application>:</para>
+
+    <programlisting>pass in on $ext_if inet proto tcp from any to ($ext_if) port 22</programlisting>
+
+    <para><application>IPFILTER</application> is the firewall
+      application developed by Darren Reed.  It is not specific to
+      &os; and has been ported to several operating systems including
+      NetBSD, OpenBSD, SunOS, HP/UX, and Solaris.</para>
 
-    <para>The <application>IPFILTER</application> syntax to allow inbound
-      <application>SSH</application> is:</para>
+    <para>The <application>IPFILTER</application> syntax to allow
+      inbound <application>SSH</application> is:</para>
 
     <programlisting>pass in on $ext_if proto tcp from any to any port = 22</programlisting>
- 
-    <para><application>IPFW</application> is the
-      firewall developed and maintained by &os;.
-      It can be paired with &man.dummynet.4; to
-      provide traffic shaping capabilities and simulate different types of
-      network connections.</para>
+
+    <para><application>IPFW</application> is the firewall developed
+      and maintained by &os;.  It can be paired with &man.dummynet.4;
+      to provide traffic shaping capabilities and simulate different
+      types of network connections.</para>
 
     <para>The <application>IPFW</application> syntax to allow inbound
       <application>SSH</application> would be:</para>
@@ -319,45 +356,49 @@ ifconfig_em0="DHCP"</programlisting>
   <sect1 xml:id="updates">
     <title>Updating &os;</title>
 
-    <para>There are two methods for updating a &os; system: from source or
-      binary updates.</para>
+    <para>There are two methods for updating a &os; system: from
+      source or binary updates.</para>
 
-    <para>Updating from source is the most involved update method, but offers
-      the greatest amount of flexibility.  The process involves synchronizing a
-      local copy of the &os; source code with the &os;
-      <application>Subversion</application> servers.
-      Once the local source code is up-to-date, a new version of
-      the kernel and userland can be compiled.</para>
-
-    <para>Binary updates are similar to using <command>yum</command> or
-     <command>apt-get</command> to update a &linux; system.  In &os;,
-     &man.freebsd-update.8; can be used fetch new binary updates and install them.  These
-     updates can be scheduled using &man.cron.8;.</para>
+    <para>Updating from source is the most involved update method, but
+      offers the greatest amount of flexibility.  The process involves
+      synchronizing a local copy of the &os; source code with the &os;
+      <application>Subversion</application> servers.  Once the local
+      source code is up-to-date, a new version of the kernel and
+      userland can be compiled.</para>
+
+    <para>Binary updates are similar to using <command>yum</command>
+      or <command>apt-get</command> to update a &linux; system.  In
+      &os;, &man.freebsd-update.8; can be used fetch new binary
+      updates and install them.  These updates can be scheduled using
+      &man.cron.8;.</para>
 
     <note>
-      <para>When using &man.cron.8; to schedule updates,
-	use <command>freebsd-update cron</command> in the &man.crontab.1;
-	to reduce the possibility of a large number of machines all pulling
-	updates at the same time:</para>
+      <para>When using &man.cron.8; to schedule updates, use
+	<command>freebsd-update cron</command> in the &man.crontab.1;
+	to reduce the possibility of a large number of machines all
+	pulling updates at the same time:</para>
 
       <programlisting>0 3 * * * root /usr/sbin/freebsd-update cron</programlisting>
     </note>
 
     <para>For more information on source and binary updates, refer to
-      <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/updating-upgrading.html">the chapter on updating</link>
-      in the &os; Handbook.</para>
+      <link
+	xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/updating-upgrading.html">the
+	chapter on updating</link> in the &os; Handbook.</para>
   </sect1>
 
   <sect1 xml:id="procfs">
     <title>procfs: Gone But Not Forgotten</title>
 
     <para>In some &linux; distributions, one could look at
-      <filename>/proc/sys/net/ipv4/ip_forward</filename> to determine if
-      <acronym>IP</acronym> forwarding is enabled.  In &os; &man.sysctl.8; is instead used to
-      view this and other system settings.</para>
+      <filename>/proc/sys/net/ipv4/ip_forward</filename> to determine
+      if <acronym>IP</acronym> forwarding is enabled.  In &os;
+      &man.sysctl.8; is instead used to view this and other system
+      settings.</para>
 
-    <para>For example, use the following to
-      determine if <acronym>IP</acronym> forwarding is enabled on a &os; system:</para>
+    <para>For example, use the following to determine if
+      <acronym>IP</acronym> forwarding is enabled on a &os;
+      system:</para>
 
     <screen>&prompt.user; <userinput>sysctl net.inet.ip.forwarding</userinput>
 net.inet.ip.forwarding: 0</screen>
@@ -367,15 +408,14 @@ net.inet.ip.forwarding: 0</screen>
 
     <screen>&prompt.user; <userinput>sysctl -a | more</userinput></screen>
 
-    <para>If an application requires procfs,
-      add the following entry to
-      <filename>/etc/fstab</filename>:</para>
+    <para>If an application requires procfs, add the following entry
+      to <filename>/etc/fstab</filename>:</para>
 
     <screen>proc                /proc           procfs  rw,noauto       0       0</screen>
 
-      <para>Including <option>noauto</option> will prevent
-	<filename>/proc</filename> from being automatically mounted at
-	boot.</para>
+    <para>Including <option>noauto</option> will prevent
+      <filename>/proc</filename> from being automatically mounted at
+      boot.</para>
 
     <para>To mount the file system without rebooting:</para>
 
@@ -387,71 +427,75 @@ net.inet.ip.forwarding: 0</screen>
 
     <para>Some common command equivalents are as follows:</para>
 
-      <para>
-	<informaltable frame="none" pgwide="1">
-	  <tgroup cols="3">
-	    <thead>
-	      <row>
-		<entry>&linux; command (Red&nbsp;Hat/Debian)</entry>
-		<entry>&os; equivalent</entry>
-		<entry>Purpose</entry>
-	      </row>
-	    </thead>
-
-	    <tbody>
-	      <row>
-		<entry><command>yum install package</command> / <command>apt-get install package</command></entry>
-		<entry><command>pkg install package</command></entry>
-		<entry>Install package from remote repository</entry>
-	      </row>
-
-	      <row>
-		<entry><command>rpm -ivh package</command> / <command>dpkg -i package</command></entry>
-		<entry><command>pkg add package</command></entry>
-		<entry>Install local package</entry>
-	      </row>
-
-	      <row>
-		<entry><command>rpm -qa</command> / <command>dpkg -l</command></entry>
-		<entry><command>pkg info</command></entry>
-		<entry>List installed packages</entry>
-	      </row>
-
-	      <row>
-		<entry><command>lspci</command></entry>
-		<entry><command>pciconf</command></entry>
-		<entry>List <acronym>PCI</acronym> devices</entry>
-	      </row>
-
-	      <row>
-		<entry><command>lsmod</command></entry>
-		<entry><command>kldstat</command></entry>
-		<entry>List loaded kernel modules</entry>
-	      </row>
-
-	      <row>
-		<entry><command>modprobe</command></entry>
-		<entry><command>kldload</command> / <command>kldunload</command></entry>
-		<entry>Load/Unload kernel modules</entry>
-	      </row>
-
-	      <row>
-		<entry><command>strace</command></entry>
-		<entry><command>truss</command></entry>
-		<entry>Trace system calls</entry>
-	      </row>
-	    </tbody>
-	  </tgroup>
-	</informaltable>
-      </para>
+    <para>
+      <informaltable frame="none" pgwide="1">
+	<tgroup cols="3">
+	  <thead>
+	    <row>
+	      <entry>&linux; command (Red&nbsp;Hat/Debian)</entry>
+	      <entry>&os; equivalent</entry>
+	      <entry>Purpose</entry>
+	    </row>
+	  </thead>
+
+	  <tbody>
+	    <row>
+	      <entry><command>yum install package</command> /
+		<command>apt-get install package</command></entry>
+	      <entry><command>pkg install package</command></entry>
+	      <entry>Install package from remote repository</entry>
+	    </row>
+
+	    <row>
+	      <entry><command>rpm -ivh package</command>
+		/ <command>dpkg -i package</command></entry>
+	      <entry><command>pkg add package</command></entry>
+	      <entry>Install local package</entry>
+	    </row>
+
+	    <row>
+	      <entry><command>rpm -qa</command>
+		/ <command>dpkg -l</command></entry>
+	      <entry><command>pkg info</command></entry>
+	      <entry>List installed packages</entry>
+	    </row>
+
+	    <row>
+	      <entry><command>lspci</command></entry>
+	      <entry><command>pciconf</command></entry>
+	      <entry>List <acronym>PCI</acronym> devices</entry>
+	    </row>
+
+	    <row>
+	      <entry><command>lsmod</command></entry>
+	      <entry><command>kldstat</command></entry>
+	      <entry>List loaded kernel modules</entry>
+	    </row>
+
+	    <row>
+	      <entry><command>modprobe</command></entry>
+	      <entry><command>kldload</command>
+		/ <command>kldunload</command></entry>
+	      <entry>Load/Unload kernel modules</entry>
+	    </row>
+
+	    <row>
+	      <entry><command>strace</command></entry>
+	      <entry><command>truss</command></entry>
+	      <entry>Trace system calls</entry>
+	    </row>
+	  </tbody>
+	</tgroup>
+      </informaltable></para>
   </sect1>
 
   <sect1 xml:id="conclusion">
     <title>Conclusion</title>
 
-    <para>This document has provided an overview of
-      &os;.   Refer to the <link xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/index.html">&os;&nbsp;Handbook</link>
-      for more in-depth coverage of these topics as well as
-      the many topics not covered by this document.</para>
+    <para>This document has provided an overview of &os;.   Refer to
+      the <link
+	xlink:href="&url.base;/doc/en_US.ISO8859-1/books/handbook/index.html">&os;&nbsp;Handbook</link>
+      for more in-depth coverage of these topics as well as the many
+      topics not covered by this document.</para>
   </sect1>
 </article>

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 18:55:30 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 687A3D8;
 Tue,  4 Feb 2014 18:55:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 541D21CF1;
 Tue,  4 Feb 2014 18:55:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14ItU9O005116;
 Tue, 4 Feb 2014 18:55:30 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14ItUrw005115;
 Tue, 4 Feb 2014 18:55:30 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402041855.s14ItUrw005115@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 18:55:30 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43768 - head/en_US.ISO8859-1/articles/linux-users
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.17
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, 04 Feb 2014 18:55:30 -0000

Author: dru
Date: Tue Feb  4 18:55:29 2014
New Revision: 43768
URL: http://svnweb.freebsd.org/changeset/doc/43768

Log:
  Fix 2 grammos and a title capitalization.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/articles/linux-users/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/linux-users/article.xml	Tue Feb  4 18:53:37 2014	(r43767)
+++ head/en_US.ISO8859-1/articles/linux-users/article.xml	Tue Feb  4 18:55:29 2014	(r43768)
@@ -119,7 +119,7 @@
       compiled from ports using <command>make</command>
       <buildtarget>package</buildtarget>.</para>
 
-    <para>A complete list of of all available ports and packages can
+    <para>A complete list of all available ports and packages can
       be found <link
 	xlink:href="http://www.freebsd.org/ports/master-index.html">here</link>.</para>
 
@@ -256,7 +256,7 @@ apache24_flags="-DSSL"</programlisting>
   </sect1>
 
   <sect1 xml:id="network">
-    <title>Network configuration</title>
+    <title>Network Configuration</title>
 
     <para>Instead of a generic <emphasis>ethX</emphasis> identifier
       that &linux; uses to identify a network interface, &os; uses the
@@ -392,7 +392,7 @@ ifconfig_em0="DHCP"</programlisting>
 
     <para>In some &linux; distributions, one could look at
       <filename>/proc/sys/net/ipv4/ip_forward</filename> to determine
-      if <acronym>IP</acronym> forwarding is enabled.  In &os;
+      if <acronym>IP</acronym> forwarding is enabled.  In &os;,
       &man.sysctl.8; is instead used to view this and other system
       settings.</para>
 

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 19:32:45 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E94734ED;
 Tue,  4 Feb 2014 19:32:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D261511B9;
 Tue,  4 Feb 2014 19:32:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14JWjXS021436;
 Tue, 4 Feb 2014 19:32:45 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14JWjPG021435;
 Tue, 4 Feb 2014 19:32:45 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402041932.s14JWjPG021435@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 19:32:45 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43769 - head/en_US.ISO8859-1/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.17
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, 04 Feb 2014 19:32:46 -0000

Author: dru
Date: Tue Feb  4 19:32:45 2014
New Revision: 43769
URL: http://svnweb.freebsd.org/changeset/doc/43769

Log:
  Fix grammo.
  
  Submitted by: wblock
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 18:55:29 2014	(r43768)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 19:32:45 2014	(r43769)
@@ -2776,7 +2776,7 @@ Script done, &hellip;</screen>
   &prompt.root; <userinput>pkg which /usr/local/lib/libXext.so</userinput>
   /usr/local/lib/libXext.so was installed by package libXext-1.1.1,1</screen>
 
-      <para>Then deinstall, rebuild and reinstall the port.
+      <para>Then deinstall, rebuild, and reinstall the port.
 	<package>ports-mgmt/portmaster</package> can
 	be used to automate this process.  After all ports are rebuilt
 	and no longer use the old libraries, delete the old libraries

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 20:19:23 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 22C839D5;
 Tue,  4 Feb 2014 20:19:23 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E7AEE1655;
 Tue,  4 Feb 2014 20:19:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14KJMQj038544;
 Tue, 4 Feb 2014 20:19:22 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14KJMeL038541;
 Tue, 4 Feb 2014 20:19:22 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402042019.s14KJMeL038541@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 20:19:22 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43770 - in head/en_US.ISO8859-1: books/handbook/jails
 books/handbook/ports htdocs/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.17
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, 04 Feb 2014 20:19:23 -0000

Author: dru
Date: Tue Feb  4 20:19:22 2014
New Revision: 43770
URL: http://svnweb.freebsd.org/changeset/doc/43770

Log:
  Remove references to updating-upgrading-portsnap in prep for moving the remaining meat of this section into ports-using.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/jails/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/jails/chapter.xml	Tue Feb  4 19:32:45 2014	(r43769)
+++ head/en_US.ISO8859-1/books/handbook/jails/chapter.xml	Tue Feb  4 20:19:22 2014	(r43770)
@@ -690,7 +690,7 @@ jail_<replaceable>www</replaceable>_devf
 	  <package>sysutils/cpdup</package> package
 	  will be required.  We will use the &man.portsnap.8; utility
 	  to download the &os; Ports Collection.  The Handbook
-	  <link xlink:href="&url.books.handbook;/updating-upgrading-portsnap.html">Portsnap
+	  <link xlink:href="&url.books.handbook;/ports-using.html">Portsnap
 	    Chapter</link> is always good reading for
 	  newcomers.</para>
 

Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue Feb  4 19:32:45 2014	(r43769)
+++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue Feb  4 20:19:22 2014	(r43770)
@@ -892,9 +892,7 @@ Deinstalling ca_root_nss-3.15.1_1... don
 
       <para><application>Portsnap</application> is a fast and
 	user-friendly tool for retrieving the Ports Collection and
-	is the recommended choice for most users.  See <xref
-	  linkend="updating-upgrading-portsnap"/> for a detailed
-	description of <application>Portsnap</application>.</para>
+	is the recommended choice for most users.</para>
 
       <step>
 	<para>Download a compressed snapshot of the Ports Collection

Modified: head/en_US.ISO8859-1/htdocs/ports/installing.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/ports/installing.xml	Tue Feb  4 19:32:45 2014	(r43769)
+++ head/en_US.ISO8859-1/htdocs/ports/installing.xml	Tue Feb  4 20:19:22 2014	(r43770)
@@ -29,7 +29,7 @@
 
 <p>If the Ports Collection is not initially installed, it can be added
   with <a
-    href="&base;/doc/en_US.ISO8859-1/books/handbook/updating-upgrading-portsnap.html"><tt>portsnap</tt></a>
+    href="&base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html"><tt>portsnap</tt></a>
   or <a
     href="&base;/doc/en_US.ISO8859-1/books/handbook/svn.html">Subversion</a>.</p>
 

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 20:27:57 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4E800D5A;
 Tue,  4 Feb 2014 20:27:57 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3A5C51714;
 Tue,  4 Feb 2014 20:27:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14KRvqb042308;
 Tue, 4 Feb 2014 20:27:57 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14KRvrL042307;
 Tue, 4 Feb 2014 20:27:57 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402042027.s14KRvrL042307@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 20:27:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43771 - head/en_US.ISO8859-1/books/handbook/mirrors
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.17
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, 04 Feb 2014 20:27:57 -0000

Author: dru
Date: Tue Feb  4 20:27:56 2014
New Revision: 43771
URL: http://svnweb.freebsd.org/changeset/doc/43771

Log:
  Chase remaining reference.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml	Tue Feb  4 20:19:22 2014	(r43770)
+++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml	Tue Feb  4 20:27:56 2014	(r43771)
@@ -499,7 +499,7 @@
       <note>
 	<para>Subversion is generally a developer tool.  Most users
 	  should use <link linkend="updating-upgrading-freebsdupdate">FreeBSD
-	    Update</link> to update the &os; base system, and <link linkend="updating-upgrading-portsnap">Portsnap</link> to
+	    Update</link> to update the &os; base system, and <link linkend="ports-using">Portsnap</link> to
 	  update the &os; Ports Collection.</para>
       </note>
 

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 20:29:05 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ADF9CDD7;
 Tue,  4 Feb 2014 20:29:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 984681727;
 Tue,  4 Feb 2014 20:29:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14KT5Hn042467;
 Tue, 4 Feb 2014 20:29:05 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14KT5mF042466;
 Tue, 4 Feb 2014 20:29:05 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201402042029.s14KT5mF042466@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Tue, 4 Feb 2014 20:29:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43772 - 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.17
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, 04 Feb 2014 20:29:05 -0000

Author: mat (ports committer)
Date: Tue Feb  4 20:29:05 2014
New Revision: 43772
URL: http://svnweb.freebsd.org/changeset/doc/43772

Log:
  Spelling out explicitly when you have to bump PORTREVISION.
  
  Reviewed by:	bdrewery
  With hat:	portmgr
  Sponsored by:	Absolight

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	Tue Feb  4 20:27:56 2014	(r43771)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Tue Feb  4 20:29:05 2014	(r43772)
@@ -979,9 +979,10 @@ DOS2UNIX_GLOB=	*.c *.cpp *.h</programlis
 	    that a new package is available.</para>
 
 	  <para><varname>PORTREVISION</varname> should be increased
-	    each time a change is made to the port which significantly
-	    affects the content or structure of the derived
-	    package.</para>
+	    each time a change is made to the port that changes the
+	    generated package in any way.  That includes changes that
+	    only affect a package built with non-default <link
+	      linkend="makefile-options">options</link>.</para>
 
 	  <para>Examples of when <varname>PORTREVISION</varname>
 	    should be bumped:</para>

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 20:36:22 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D7E24320;
 Tue,  4 Feb 2014 20:36:22 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B68301803;
 Tue,  4 Feb 2014 20:36:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14KaMJm046093;
 Tue, 4 Feb 2014 20:36:22 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14KaM1k046092;
 Tue, 4 Feb 2014 20:36:22 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402042036.s14KaM1k046092@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 20:36:22 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43773 - head/en_US.ISO8859-1/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.17
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, 04 Feb 2014 20:36:22 -0000

Author: dru
Date: Tue Feb  4 20:36:22 2014
New Revision: 43773
URL: http://svnweb.freebsd.org/changeset/doc/43773

Log:
  Remove 23.3. Portsnap: a Ports Collection Update Tool as most of this content is already in
  Procedure 5.1 of 5.5. Using the Ports Collection.
  The next commit will ensure that Procedure 5.1 is not missing any pertinent details that were covered by this section.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 20:29:05 2014	(r43772)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 20:36:22 2014	(r43773)
@@ -72,11 +72,6 @@
 
     <itemizedlist>
       <listitem>
-	<para>Which utilities are available to update the system and
-	  the Ports Collection.</para>
-      </listitem>
-
-      <listitem>
 	<para>How to keep a &os; system up-to-date with
 	  <application>freebsd-update</application>,
 	  <application>Subversion</application>, or
@@ -710,104 +705,6 @@ before running "/usr/sbin/freebsd-update
     </sect2>
   </sect1>
 
-  <sect1 xml:id="updating-upgrading-portsnap">
-    <info>
-      <title>Portsnap: a Ports Collection Update Tool</title>
-
-      <authorgroup>
-	<author>
-	  <personname>
-	    <firstname>Tom</firstname>
-	    <surname>Rhodes</surname>
-	  </personname>
-	  <contrib>Written by </contrib>
-	</author>
-      </authorgroup>
-
-      <authorgroup>
-	<author>
-	  <personname>
-	    <firstname>Colin</firstname>
-	    <surname>Percival</surname>
-	  </personname>
-	  <contrib>Based on notes provided by </contrib>
-	</author>
-      </authorgroup>
-    </info>
-
-    <indexterm>
-      <primary>Updating and Upgrading</primary>
-    </indexterm>
-    <indexterm>
-      <primary>Portsnap</primary>
-      <see>Updating and Upgrading</see>
-    </indexterm>
-
-    <para>The base system of &os; includes &man.portsnap.8; for
-      updating the Ports Collection.  This utility connects to a
-      &os; site, verifies the secure key, and downloads a new copy of
-      the Ports Collection.  The key is used to verify the integrity
-      of all downloaded files.  To download the latest Ports
-      Collection files, issue the following command:</para>
-
-    <screen>&prompt.root; <userinput>portsnap fetch</userinput>
-Looking up portsnap.FreeBSD.org mirrors... 9 mirrors found.
-Fetching snapshot tag from geodns-1.portsnap.freebsd.org... done.
-Fetching snapshot metadata... done.
-Updating from Tue May 22 02:12:15 CEST 2012 to Wed May 23 16:28:31 CEST 2012.
-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>What this example shows is that &man.portsnap.8; has found
-      and verified several patches to the current ports data.  This
-      also indicates that the utility was run previously; if it was a
-      first time run, the collection would have simply been
-      downloaded.</para>
-
-    <para>When &man.portsnap.8; successfully completes a
-      <command>fetch</command> operation, the Ports Collection and
-      subsequent patches which exist on the local system have passed
-      verification.  The first time <command>portsnap</command> is
-      executed, use <literal>extract</literal> to install the
-      downloaded files:</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>To update an already installed Ports Collection, use
-      <command>portsnap update</command>:</para>
-
-    <screen>&prompt.root; <userinput>portsnap update</userinput></screen>
-
-    <para>The process is now complete, and applications may be
-      installed or upgraded using the updated Ports Collection.</para>
-
-    <para>When using <literal>fetch</literal>, the
-      <literal>extract</literal> or the <literal>update</literal>
-      operation may be run consecutively:</para>
-
-    <screen>&prompt.root; <userinput>portsnap fetch update</userinput></screen>
-
-    <para>This command downloads the latest version of the Ports
-      Collection and updates the local version under
-      <filename>/usr/ports</filename>.</para>
-  </sect1>
-
   <sect1 xml:id="updating-upgrading-documentation">
     <title>Updating the Documentation Set</title>
 

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 20:45:44 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6BD4E563;
 Tue,  4 Feb 2014 20:45:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 486ED18D2;
 Tue,  4 Feb 2014 20:45:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14Kji4P049791;
 Tue, 4 Feb 2014 20:45:44 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14KjiiJ049790;
 Tue, 4 Feb 2014 20:45:44 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201402042045.s14KjiiJ049790@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Tue, 4 Feb 2014 20:45:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43774 - 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.17
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, 04 Feb 2014 20:45:44 -0000

Author: mat (ports committer)
Date: Tue Feb  4 20:45:43 2014
New Revision: 43774
URL: http://svnweb.freebsd.org/changeset/doc/43774

Log:
  Remove the pkg_install bits in favor of the pkg ones.
  
  Sponsored by:	Absolight

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	Tue Feb  4 20:36:22 2014	(r43773)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Tue Feb  4 20:45:43 2014	(r43774)
@@ -261,7 +261,7 @@ lib/X11/oneko/cat2.xpm
 lib/X11/oneko/mouse.xpm
 @dirrm lib/X11/oneko</programlisting>
 
-	<para>Refer to the &man.pkg.create.1; manual page for details
+	<para>Refer to the &man.pkg-create.8; manual page for details
 	  on the packing list.</para>
 
 	<note>
@@ -314,7 +314,7 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 
 	<para>The price for this way of listing port's files and
 	  directories is that you cannot use command sequences
-	  described in &man.pkg.create.1;.  Therefore, it is suitable
+	  described in &man.pkg-create.8;.  Therefore, it is suitable
 	  only for simple ports and makes them even simpler.  At the
 	  same time, it has the advantage of reducing the number of
 	  files in the ports collection.  Please consider using this
@@ -407,11 +407,7 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 	</step>
 
 	<step>
-	  <para><command>pkg_add package-name</command></para>
-
-	  <para>Or, for users of <emphasis>pkg</emphasis>:</para>
-
-	  <para><command>pkg add package-name</command></para>
+	  <para><command>pkg add package-filename</command></para>
 	</step>
 
 	<step>
@@ -975,8 +971,9 @@ DOS2UNIX_GLOB=	*.c *.cpp *.h</programlis
 	    every time a new official vendor release is made), and
 	    appended to the package name if non-zero.  Changes to
 	    <varname>PORTREVISION</varname> are used by automated
-	    tools (e.g., &man.pkg.version.1;) to highlight the fact
-	    that a new package is available.</para>
+	    tools (e.g., <command>pkg version</command>, see
+	    &man.pkg-version.8;) to highlight the fact that a new
+	    package is available.</para>
 
 	  <para><varname>PORTREVISION</varname> should be increased
 	    each time a change is made to the port that changes the
@@ -1085,16 +1082,9 @@ DOS2UNIX_GLOB=	*.c *.cpp *.h</programlis
 
 	  <tip>
 	    <para>The results of version number comparisons are not
-	      always obvious.  &man.pkg.version.1; can be used to test
-	      the comparison of two version number strings.  The
-	      <application>pkgng</application> equivalent is
-	      <command>pkg version -t</command>.  For example:</para>
-
-	    <screen>&prompt.user; <userinput>pkg_version -t 0.031 0.29</userinput>
-&gt;</screen>
-
-	    <para>Or, for <application>pkgng</application>
-	      users:</para>
+	      always obvious.  <command>pkg version</command> (see
+	      &man.pkg-version.8;) can be used to test the comparison
+	      of two version number strings.  For example:</para>
 
 	    <screen>&prompt.user; <userinput>pkg version -t 0.031 0.29</userinput>
 &gt;</screen>
@@ -3499,9 +3489,9 @@ ALWAYS_KEEP_DISTFILES=	yes
       <orderedlist>
 	<listitem>
 	  <para>Try to keep the COMMENT value at no longer than 70
-	    characters, as this line will be used by the
-	    &man.pkg.info.1; utility to display a one-line summary
-	    of the port;</para>
+	    characters, as this line will be used by <command>pkg
+	      info</command> (see &man.pkg-info.8;) to display a
+	    one-line summary of the port;</para>
 	</listitem>
 
 	<listitem>
@@ -3628,8 +3618,9 @@ ALWAYS_KEEP_DISTFILES=	yes
 	  <buildtarget>build</buildtarget> target and then from within
 	  the <buildtarget>install</buildtarget> target.  Also, the
 	  name of the dependency is put into the package so that
-	  &man.pkg.add.1; will automatically install it if it is not
-	  on the user's system.</para>
+	  <command>pkg install</command> (see &man.pkg-install.8;)
+	  will automatically install it if it is not on the user's
+	  system.</para>
       </sect2>
 
       <sect2>
@@ -3682,9 +3673,10 @@ ALWAYS_KEEP_DISTFILES=	yes
 	<para>The dependency is checked from within the
 	  <buildtarget>install</buildtarget> target.  Also, the name
 	  of the dependency is put into the package so that
-	  &man.pkg.add.1; will automatically install it if it is not
-	  on the user's system.  The <replaceable>target</replaceable>
-	  part can be omitted if it is the same as
+	  <command>pkg install</command> (see &man.pkg-install.8;)
+	  will automatically install it if it is not on the user's
+	  system.  The <replaceable>target</replaceable> part can be
+	  omitted if it is the same as
 	  <varname>DEPENDS_TARGET</varname>.</para>
 
 	<para>A quite common situation is when
@@ -10400,10 +10392,10 @@ lib/X11/oneko/sounds/cat.au
 	<programlisting>@dirrmtry share/doc/gimp</programlisting>
 
 	<para>This will neither print any error messages nor cause
-	  &man.pkg.delete.1; to exit abnormally even if
-	  <filename>${PREFIX}/share/doc/gimp</filename>
-	  is not empty due to other ports installing some files in
-	  there.</para>
+	  <command>pkg delete</command> (see &man.pkg-delete.8;) to
+	  exit abnormally even if
+	  <filename>${PREFIX}/share/doc/gimp</filename> is not empty
+	  due to other ports installing some files in there.</para>
       </sect2>
 
       <sect2 xml:id="plist-dir-empty">
@@ -10412,11 +10404,12 @@ lib/X11/oneko/sounds/cat.au
 	<para>Empty directories created during port installation need
 	  special attention.  They will not get created when
 	  installing the package, because packages only store the
-	  files, and &man.pkg.add.1; creates directories for them as
-	  needed.  To make sure the empty directory is created when
-	  installing the package, add this line to
-	  <filename>pkg-plist</filename> above the corresponding
-	  <literal>@dirrm</literal> line:</para>
+	  files, and both <command>pkg add</command> and <command>pkg
+	    install</command> creates directories for them as needed.
+	  To make sure the empty directory is created when installing
+	  the package, add this line to <filename>pkg-plist</filename>
+	  above the corresponding <literal>@dirrm</literal>
+	  line:</para>
 
 	<programlisting>@exec mkdir -p %D/share/foo/templates</programlisting>
       </sect2>
@@ -10428,9 +10421,9 @@ lib/X11/oneko/sounds/cat.au
       <para>If your port installs configuration files to
 	<filename>PREFIX/etc</filename> (or
 	elsewhere) do <emphasis>not</emphasis> simply list them in the
-	<filename>pkg-plist</filename>.  That will cause
-	&man.pkg.delete.1; to remove the files carefully edited by
-	the user, and a re-installation will wipe them out.</para>
+	<filename>pkg-plist</filename>.  That will cause <command>pkg
+	  delete</command> to remove the files carefully edited by the
+	user, and a re-installation will wipe them out.</para>
 
       <para>Instead, install sample file(s) with a
 	<filename>filename.sample</filename>
@@ -10473,7 +10466,7 @@ etc/orbit.conf.sample
 	<literal>-s</literal> flag to &man.cmp.1; for more
 	output.</para>
 
-      <para>See &man.pkg.create.1; for more information on
+      <para>See &man.pkg-create.8; for more information on
 	<literal>%D</literal> and related substitution markers.</para>
 
       <para>If there is a very good reason not to install a working
@@ -10558,8 +10551,8 @@ etc/orbit.conf.sample
       <para>If you need to display a message to the installer, you may
 	place the message in <filename>pkg-message</filename>.  This
 	capability is often useful to display additional installation
-	steps to be taken after a &man.pkg.add.1; or to display
-	licensing information.</para>
+	steps to be taken after a <command>pkg install</command> or to
+	display licensing information.</para>
 
       <para>When some lines about the build-time knobs or warnings
 	have to be displayed, use <varname>ECHO_MSG</varname>.  The
@@ -10587,18 +10580,18 @@ etc/orbit.conf.sample
       <title><filename>pkg-install</filename></title>
 
       <para>If your port needs to execute commands when the binary
-	package is installed with &man.pkg.add.1; you can do this via
-	the <filename>pkg-install</filename> script.  This script will
+	package is installed with <command>pkg add</command> or
+	<command>pkg install</command> you can do this via the
+	<filename>pkg-install</filename> script.  This script will
 	automatically be added to the package, and will be run twice
-	by &man.pkg.add.1;: the first time as <literal>&dollar;{SH}
-	  pkg-install &dollar;{PKGNAME} PRE-INSTALL</literal> and the
-	second time as <literal>&dollar;{SH} pkg-install
-	  &dollar;{PKGNAME} POST-INSTALL</literal>.
-	<literal>&dollar;2</literal> can be tested to determine which
-	mode the script is being run in.  The
-	<envar>PKG_PREFIX</envar> environmental variable will be set
-	to the package installation directory.  See &man.pkg.add.1;
-	for additional information.</para>
+	by <command>pkg</command> the first time as
+	<literal>&dollar;{SH} pkg-install &dollar;{PKGNAME}
+	  PRE-INSTALL</literal> and the second time as
+	<literal>&dollar;{SH} pkg-install &dollar;{PKGNAME}
+	  POST-INSTALL</literal>.  <literal>&dollar;2</literal> can be
+	tested to determine which mode the script is being run in.
+	The <envar>PKG_PREFIX</envar> environmental variable will be
+	set to the package installation directory.</para>
 
       <note>
 	<para>This script is not run automatically if you install the
@@ -10616,11 +10609,11 @@ etc/orbit.conf.sample
 
       <para>This script executes when a package is removed.</para>
 
-      <para>This script will be run twice by &man.pkg.delete.1;.
-	The first time as <literal>&dollar;{SH} pkg-deinstall
-	  &dollar;{PKGNAME} DEINSTALL</literal> and the second time as
-	<literal>&dollar;{SH} pkg-deinstall &dollar;{PKGNAME}
-	  POST-DEINSTALL</literal>.</para>
+      <para>This script will be run twice by <command>pkg
+	  delete</command> The first time as <literal>&dollar;{SH}
+	  pkg-deinstall &dollar;{PKGNAME} DEINSTALL</literal> and the
+	second time as <literal>&dollar;{SH} pkg-deinstall
+	  &dollar;{PKGNAME} POST-DEINSTALL</literal>.</para>
     </sect1>
 
     <sect1 xml:id="pkg-names">
@@ -11061,8 +11054,8 @@ as .putsy.conf and edit it.</programlist
 	serious fault in the currently committed port, please notify
 	the &a.portmgr; to request immediate rebuilding and
 	redistribution of the port's package.  Unsuspecting users
-	of &man.pkg.add.1; will otherwise continue to install the
-	old version via <command>pkg_add -r</command> for several
+	of <command>pkg</command> will otherwise continue to install
+	the old version via <command>pkg install</command> for several
 	weeks.</para>
     </important>
 

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 20:55:00 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9482A8BC;
 Tue,  4 Feb 2014 20:55:00 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 65A5919B4;
 Tue,  4 Feb 2014 20:55:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14Kt0go053676;
 Tue, 4 Feb 2014 20:55:00 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14Kt0mn053674;
 Tue, 4 Feb 2014 20:55:00 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402042055.s14Kt0mn053674@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 20:55:00 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43775 - head/en_US.ISO8859-1/books/handbook/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.17
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, 04 Feb 2014 20:55:00 -0000

Author: dru
Date: Tue Feb  4 20:54:59 2014
New Revision: 43775
URL: http://svnweb.freebsd.org/changeset/doc/43775

Log:
  Incorporate the missing details from the former updating-upgrading-portsnap into Procedure 5.1.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue Feb  4 20:45:43 2014	(r43774)
+++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue Feb  4 20:54:59 2014	(r43775)
@@ -890,13 +890,16 @@ Deinstalling ca_root_nss-3.15.1_1... don
     <procedure>
       <title>Portsnap Method</title>
 
-      <para><application>Portsnap</application> is a fast and
+      <para>The base system of &os; includes <application>Portsnap</application>. This is a fast and
 	user-friendly tool for retrieving the Ports Collection and
-	is the recommended choice for most users.</para>
+	is the recommended choice for most users.  This utility connects to a
+	&os; site, verifies the secure key, and downloads a new copy of
+	the Ports Collection.  The key is used to verify the integrity
+	of all downloaded files.</para>
 
       <step>
-	<para>Download a compressed snapshot of the Ports Collection
-	  into <filename>/var/db/portsnap</filename>.</para>
+	<para>To download a compressed snapshot of the Ports Collection
+	  into <filename>/var/db/portsnap</filename>:</para>
 
 	<screen>&prompt.root; <userinput>portsnap fetch</userinput></screen>
       </step>
@@ -917,6 +920,12 @@ Deinstalling ca_root_nss-3.15.1_1... don
 
 	<screen>&prompt.root; <userinput>portsnap fetch</userinput>
 &prompt.root; <userinput>portsnap update</userinput></screen>
+      
+	<para>When using <literal>fetch</literal>, the
+	  <literal>extract</literal> or the <literal>update</literal>
+	  operation may be run consecutively, like so:</para>
+
+	<screen>&prompt.root; <userinput>portsnap fetch update</userinput></screen>
       </step>
     </procedure>
 

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 20:57:56 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3D636A26;
 Tue,  4 Feb 2014 20:57:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2859B19D2;
 Tue,  4 Feb 2014 20:57:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14KvutQ054094;
 Tue, 4 Feb 2014 20:57:56 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14Kvt61054092;
 Tue, 4 Feb 2014 20:57:55 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201402042057.s14Kvt61054092@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Tue, 4 Feb 2014 20:57:55 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43776 - 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.17
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, 04 Feb 2014 20:57:56 -0000

Author: mat (ports committer)
Date: Tue Feb  4 20:57:55 2014
New Revision: 43776
URL: http://svnweb.freebsd.org/changeset/doc/43776

Log:
  Fix grammar. Translators can ignore.
  
  Sponsored by:	Absolight

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/book.xml	Tue Feb  4 20:54:59 2014	(r43775)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Tue Feb  4 20:57:55 2014	(r43776)
@@ -496,7 +496,7 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 
       <para>After submitting the port, please be patient.  The time
 	needed to include a new port in &os; can vary from a few days
-	to a a few months.  The list of pending port
+	to a few months.  The list of pending port
 	<acronym>PR</acronym>s can be viewed at <link
 	  xlink:href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi?category=ports"></link>.</para>
 

Modified: head/en_US.ISO8859-1/books/porters-handbook/versions.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/versions.xml	Tue Feb  4 20:54:59 2014	(r43775)
+++ head/en_US.ISO8859-1/books/porters-handbook/versions.xml	Tue Feb  4 20:57:55 2014	(r43776)
@@ -4953,7 +4953,7 @@ it was never committed:
 <row>
   <entry>1100005</entry>
   <entry>December 28, 2013</entry>
-  <entry>11.0-CURRENT after r259951 - Don't coalesce entries in
+  <entry>11.0-CURRENT after r259951 - Do not coalesce entries in
     <function>vm_map_stack()</function> (rev
     <revnumber>260010</revnumber>).</entry>
 </row>

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 20:58:16 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 90C52A84;
 Tue,  4 Feb 2014 20:58:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5F77419D3;
 Tue,  4 Feb 2014 20:58:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14KwGIs054181;
 Tue, 4 Feb 2014 20:58:16 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14KwGec054180;
 Tue, 4 Feb 2014 20:58:16 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402042058.s14KwGec054180@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 20:58:16 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43777 - head/en_US.ISO8859-1/books/handbook/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.17
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, 04 Feb 2014 20:58:16 -0000

Author: dru
Date: Tue Feb  4 20:58:15 2014
New Revision: 43777
URL: http://svnweb.freebsd.org/changeset/doc/43777

Log:
  White space fix only. Translators can ignore.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue Feb  4 20:57:55 2014	(r43776)
+++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue Feb  4 20:58:15 2014	(r43777)
@@ -890,16 +890,18 @@ Deinstalling ca_root_nss-3.15.1_1... don
     <procedure>
       <title>Portsnap Method</title>
 
-      <para>The base system of &os; includes <application>Portsnap</application>. This is a fast and
+      <para>The base system of &os; includes
+	<application>Portsnap</application>. This is a fast and
 	user-friendly tool for retrieving the Ports Collection and
-	is the recommended choice for most users.  This utility connects to a
-	&os; site, verifies the secure key, and downloads a new copy of
-	the Ports Collection.  The key is used to verify the integrity
-	of all downloaded files.</para>
+	is the recommended choice for most users.  This utility
+	connects to a &os; site, verifies the secure key, and
+	downloads a new copy of the Ports Collection.  The key is used
+	to verify the integrity of all downloaded files.</para>
 
       <step>
-	<para>To download a compressed snapshot of the Ports Collection
-	  into <filename>/var/db/portsnap</filename>:</para>
+	<para>To download a compressed snapshot of the Ports
+	  Collection into
+	  <filename>/var/db/portsnap</filename>:</para>
 
 	<screen>&prompt.root; <userinput>portsnap fetch</userinput></screen>
       </step>
@@ -920,7 +922,7 @@ Deinstalling ca_root_nss-3.15.1_1... don
 
 	<screen>&prompt.root; <userinput>portsnap fetch</userinput>
 &prompt.root; <userinput>portsnap update</userinput></screen>
-      
+
 	<para>When using <literal>fetch</literal>, the
 	  <literal>extract</literal> or the <literal>update</literal>
 	  operation may be run consecutively, like so:</para>
@@ -1262,9 +1264,9 @@ ftp://ftp.organization.org/pub/FreeBSD/p
 	<secondary>removing</secondary>
       </indexterm>
 
-      <para>Installed ports can be uninstalled using
-	<command>pkg delete</command>.  Examples for using this command
-	can be found in <xref linkend="pkgng-intro"/></para>
+      <para>Installed ports can be uninstalled using <command>pkg
+	  delete</command>.  Examples for using this command can be
+	found in <xref linkend="pkgng-intro"/></para>
 
       <para>Alternately, <command>make deinstall</command> can be
 	run in the port's directory:</para>

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 21:52:58 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2B34B45F;
 Tue,  4 Feb 2014 21:52:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 119DC10DA;
 Tue,  4 Feb 2014 21:52:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14Lqvbn077094;
 Tue, 4 Feb 2014 21:52:57 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14Lqv6P077093;
 Tue, 4 Feb 2014 21:52:57 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402042152.s14Lqv6P077093@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 21:52:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43778 - head/en_US.ISO8859-1/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.17
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, 04 Feb 2014 21:52:58 -0000

Author: dru
Date: Tue Feb  4 21:52:57 2014
New Revision: 43778
URL: http://svnweb.freebsd.org/changeset/doc/43778

Log:
  Initial shuffle to improve flow and tighten up this section.
  Subsequent commits will review the content.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 20:58:15 2014	(r43777)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 21:52:57 2014	(r43778)
@@ -1137,26 +1137,22 @@ before running "/usr/sbin/freebsd-update
     <indexterm><primary>-CURRENT</primary></indexterm>
     <indexterm><primary>-STABLE</primary></indexterm>
 
-    <para>There are two development branches to &os;: &os.current;
-      and &os.stable;.  This section provides an explanation of each
+    <para>&os; has two development branches: &os.current;
+      and &os.stable;.</para>  
+      
+    <para>This section provides an explanation of each
       and describes how to keep a system up-to-date with each
-      respective tree.  &os.current; will be discussed first, then
+      respective branch.  &os.current; will be discussed first, then
       &os.stable;.</para>
 
-    <sect2 xml:id="current">
-      <title>Staying Current with &os;</title>
-
+      <sect2 xml:id="current">
+	<title>Using &os.current;</title>
       <para>&os.current; is the <quote>bleeding edge</quote> of &os;
 	development.  &os.current; users are expected to have a high
 	degree of technical skill and should be capable of solving
 	difficult system problems on their own.  If you are new to
 	&os;, track &os.stable; instead.</para>
 
-      <sect3>
-	<title>What Is &os.current;?</title>
-
-	<indexterm><primary>snapshot</primary></indexterm>
-
 	<para>&os.current; is the very latest source code for &os;.
 	  This includes work in progress, experimental changes, and
 	  transitional mechanisms that might or might not be present
@@ -1167,10 +1163,6 @@ before running "/usr/sbin/freebsd-update
 	  possible, but whether or not &os.current; brings disaster or
 	  greatly desired functionality can be a matter of when the
 	  source code was synced.</para>
-      </sect3>
-
-      <sect3>
-	<title>Who Needs &os.current;?</title>
 
 	<para>&os.current; is made available for three primary
 	  interest groups:</para>
@@ -1199,10 +1191,8 @@ before running "/usr/sbin/freebsd-update
 	      contribute code.</para>
 	  </listitem>
 	</orderedlist>
-      </sect3>
 
-      <sect3>
-	<title>What Is &os.current; <emphasis>Not</emphasis>?</title>
+	<para>&os.current; is <emphasis>Not</emphasis>:</para>
 
 	<orderedlist>
 	  <listitem>
@@ -1222,10 +1212,6 @@ before running "/usr/sbin/freebsd-update
 		supported</quote>.</para>
 	  </listitem>
 	</orderedlist>
-      </sect3>
-
-      <sect3>
-	<title>Using &os.current;</title>
 
 	<indexterm>
 	  <primary>-CURRENT</primary>
@@ -1327,16 +1313,10 @@ before running "/usr/sbin/freebsd-update
 	      enthusiastically!</para>
 	  </listitem>
 	</orderedlist>
-      </sect3>
     </sect2>
 
     <sect2 xml:id="stable">
-      <title>Staying Stable with &os;</title>
-
-      <sect3>
-	<title>What Is &os.stable;?</title>
-
-	<indexterm><primary>-STABLE</primary></indexterm>
+      <title>Using &os.stable;</title>
 
 	<para>&os.stable; is the development branch from which major
 	  releases are made.  Changes go into this branch at a
@@ -1347,10 +1327,6 @@ before running "/usr/sbin/freebsd-update
 	  &os.stable; may or may not be suitable for any particular
 	  purpose.  It is simply another engineering development
 	  track, not a resource for end-users.</para>
-      </sect3>
-
-      <sect3>
-	<title>Who Needs &os.stable;?</title>
 
 	<para>Those interested in tracking or contributing to the
 	  FreeBSD development process, especially as it relates to the
@@ -1386,10 +1362,6 @@ before running "/usr/sbin/freebsd-update
 	  testing, it is recommended that users instead run the most
 	  recent release of FreeBSD, and use the binary update
 	  mechanism to move from release to release.</para>
-      </sect3>
-
-      <sect3>
-	<title>Using &os.stable;</title>
 
 	<indexterm>
 	  <primary>-STABLE</primary>
@@ -1488,7 +1460,6 @@ before running "/usr/sbin/freebsd-update
 	      release.</para>
 	  </listitem>
 	</orderedlist>
-      </sect3>
     </sect2>
   </sect1>
 

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 21:57:41 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 913CC646;
 Tue,  4 Feb 2014 21:57:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7AAF21115;
 Tue,  4 Feb 2014 21:57:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14Lvfkq077845;
 Tue, 4 Feb 2014 21:57:41 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14LvfFF077844;
 Tue, 4 Feb 2014 21:57:41 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402042157.s14LvfFF077844@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 21:57:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43779 - head/en_US.ISO8859-1/books/handbook/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.17
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, 04 Feb 2014 21:57:41 -0000

Author: dru
Date: Tue Feb  4 21:57:41 2014
New Revision: 43779
URL: http://svnweb.freebsd.org/changeset/doc/43779

Log:
  Add missing period.
  
  Submitted by: wblock
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue Feb  4 21:52:57 2014	(r43778)
+++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Tue Feb  4 21:57:41 2014	(r43779)
@@ -1266,7 +1266,7 @@ ftp://ftp.organization.org/pub/FreeBSD/p
 
       <para>Installed ports can be uninstalled using <command>pkg
 	  delete</command>.  Examples for using this command can be
-	found in <xref linkend="pkgng-intro"/></para>
+	found in <xref linkend="pkgng-intro"/>.</para>
 
       <para>Alternately, <command>make deinstall</command> can be
 	run in the port's directory:</para>

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 22:40:49 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B84B5D39;
 Tue,  4 Feb 2014 22:40:49 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9617115E1;
 Tue,  4 Feb 2014 22:40:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14Mensp095135;
 Tue, 4 Feb 2014 22:40:49 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14MendE095134;
 Tue, 4 Feb 2014 22:40:49 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402042240.s14MendE095134@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 22:40:49 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43780 - head/en_US.ISO8859-1/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.17
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, 04 Feb 2014 22:40:49 -0000

Author: dru
Date: Tue Feb  4 22:40:49 2014
New Revision: 43780
URL: http://svnweb.freebsd.org/changeset/doc/43780

Log:
  Improve flow and clarity of first 1/2 of this section.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 21:57:41 2014	(r43779)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 22:40:49 2014	(r43780)
@@ -1140,28 +1140,28 @@ before running "/usr/sbin/freebsd-update
     <para>&os; has two development branches: &os.current;
       and &os.stable;.</para>  
       
-    <para>This section provides an explanation of each
-      and describes how to keep a system up-to-date with each
-      respective branch.  &os.current; will be discussed first, then
-      &os.stable;.</para>
+    <para>This section provides an explanation of each branch and its
+      intended audience as well as
+      how to keep a system up-to-date with each
+      respective branch.</para>
 
       <sect2 xml:id="current">
 	<title>Using &os.current;</title>
       <para>&os.current; is the <quote>bleeding edge</quote> of &os;
-	development.  &os.current; users are expected to have a high
-	degree of technical skill and should be capable of solving
-	difficult system problems on their own.  If you are new to
-	&os;, track &os.stable; instead.</para>
+	development and  &os.current; users are expected to have a high
+	degree of technical skill.  Less technical users who wish
+	to track a development brach should
+	track &os.stable; instead.</para>
 
-	<para>&os.current; is the very latest source code for &os;.
-	  This includes work in progress, experimental changes, and
+	<para>&os.current; is the very latest source code for &os; and
+	  includes works in progress, experimental changes, and
 	  transitional mechanisms that might or might not be present
-	  in the next official release of the software.  While many
+	  in the next official release.  While many
 	  &os; developers compile the &os.current; source code daily,
-	  there are periods of time when the sources are not
+	  there are short periods of time when the source may not be
 	  buildable.  These problems are resolved as quickly as
 	  possible, but whether or not &os.current; brings disaster or
-	  greatly desired functionality can be a matter of when the
+	  new functionality can be a matter of when the
 	  source code was synced.</para>
 
 	<para>&os.current; is made available for three primary
@@ -1170,53 +1170,40 @@ before running "/usr/sbin/freebsd-update
 	<orderedlist>
 	  <listitem>
 	    <para>Members of the &os; community who are actively
-	      working on some part of the source tree and for whom
-	      keeping <quote>current</quote> is an absolute
-	      requirement.</para>
+	      working on some part of the source tree.</para>
 	  </listitem>
 
 	  <listitem>
 	    <para>Members of the &os; community who are active
-	      testers, willing to spend time solving problems in order
-	      to ensure that &os.current; remains as sane as possible.
-	      These testers wish to make topical suggestions on
-	      changes and the general direction of &os;, and submit
-	      patches to implement them.</para>
+	      testers.  They are willing to spend time solving problems,
+	      making topical suggestions on
+	      changes and the general direction of &os;, and submitting
+	      patches.</para>
 	  </listitem>
 
 	  <listitem>
-	    <para>Those who merely wish to keep an eye on things, or
-	      to use the current sources for reference purposes.
-	      These people also make the occasional comment or
-	      contribute code.</para>
+	    <para>Users who wish to keep an eye on things,
+	      use the current source for reference purposes, or
+	      make the occasional comment or
+	      code contribution.</para>
 	  </listitem>
 	</orderedlist>
 
-	<para>&os.current; is <emphasis>Not</emphasis>:</para>
-
-	<orderedlist>
-	  <listitem>
-	    <para>A fast-track to getting new features before the next
-	      release.  Pre-release features are not yet fully tested
-	      and most likely contain bugs.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>A quick way of getting bug fixes.  Any given commit
+	<para>&os.current; should <emphasis>not</emphasis> be
+	  considered a fast-track to getting new features before the next
+	      release as pre-release features are not yet fully tested
+	      and most likely contain bugs.  It is not a quick way of getting bug fixes as any given commit
 	      is just as likely to introduce new bugs as to fix
-	      existing ones.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>In any way <quote>officially
+	      existing ones.  &os.current; is not in any way <quote>officially
 		supported</quote>.</para>
-	  </listitem>
-	</orderedlist>
 
 	<indexterm>
 	  <primary>-CURRENT</primary>
 	  <secondary>using</secondary>
 	</indexterm>
+
+	<para>To track &os.current;:</para>
+	
 	<orderedlist>
 	  <listitem>
 	    <para>Join the &a.current.name; and the
@@ -1238,57 +1225,30 @@ before running "/usr/sbin/freebsd-update
 	  </listitem>
 
 	  <listitem>
-	    <para>Grab the sources from a &os;
-	      <link linkend="mirrors">mirror site</link> using
-	      one of the following methods:</para>
-
-	    <orderedlist>
-	      <listitem>
-		<para>Use <link linkend="svn">svn</link>
-		  <indexterm>
-		    <primary>Subversion</primary>
-		  </indexterm>
-		  <indexterm>
-		    <primary>-CURRENT</primary>
-		    <secondary>Syncing with
-		      <application>Subversion</application></secondary>
-		  </indexterm>
-		  to check out the desired development or release
-		  branch.  This is the recommended method, providing
-		  access to &os; development as it occurs.  Checkout
+	    <para>Synchronize with the &os.current; sources.  Typically,
+		<link linkend="svn">svn</link> is used
+		  to check out
 		  the -CURRENT code from the <literal>head</literal>
 		  branch of one of the <link
 		    linkend="svn-mirrors">Subversion mirror
-		    sites</link>.  Due to the size of the repository,
-		  it is recommended that only desired subtrees be
-		  checked out.</para>
-	      </listitem>
+		    sites</link>.</para>
 
-	      <listitem>
-		<para>Use the
-		  <application>CTM</application>
-		  <indexterm>
-		    <primary>-CURRENT</primary>
-		    <secondary>Syncing with CTM</secondary>
-		  </indexterm> facility.  If you have bad connectivity
-		  such as high price connections or only email access,
-		  <application>CTM</application> is an option, but it
+		<para>Users with very slow or limited Internet connectivity
+		  can instead use <link linkend="ctm">CTM</link>, but it
 		  is not as reliable as
-		  <application>Subversion</application>.  For this
-		  reason, <application>Subversion</application> is the
-		  recommended method for any system with Internet
-		  connectivity.</para>
+		  <application>svn</application> and
+		  <application>svn</application> is the
+		  recommended method for synchronizing
+		  source.</para>
 	      </listitem>
-	    </orderedlist>
-	  </listitem>
 
 	  <listitem>
-	    <para>If you plan to run, and not just look at the
-	      sources, download <emphasis>all</emphasis> of
-	      &os.current;, not just selected portions.  Various parts
-	      of the source depend on updates elsewhere, and trying to
-	      compile just a subset is almost guaranteed to cause
-	      problems.</para>
+	    <para> Due to the size of the repository, some users choose
+	      to only synchronize the sections of source that interest them 
+	      or which they are contributing patches to.
+	      However, users that plan to compile the operating system from
+	      source must download <emphasis>all</emphasis> of
+	      &os.current;, not just selected portions.</para>
 
 	    <para>Before compiling
 	      &os.current;
@@ -1309,8 +1269,8 @@ before running "/usr/sbin/freebsd-update
 	  <listitem>
 	    <para>Be active! &os.current; users are encouraged to
 	      submit their suggestions for enhancements or bug fixes.
-	      Suggestions with accompanying code are received most
-	      enthusiastically!</para>
+	      Suggestions with accompanying code are always
+	      welcome.</para>
 	  </listitem>
 	</orderedlist>
     </sect2>

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 23:35:46 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F32A1848;
 Tue,  4 Feb 2014 23:35:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D6D751A58;
 Tue,  4 Feb 2014 23:35:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14NZj6o016991;
 Tue, 4 Feb 2014 23:35:45 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14NZj9j016990;
 Tue, 4 Feb 2014 23:35:45 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402042335.s14NZj9j016990@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 23:35:45 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43781 - head/en_US.ISO8859-1/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.17
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, 04 Feb 2014 23:35:46 -0000

Author: dru
Date: Tue Feb  4 23:35:45 2014
New Revision: 43781
URL: http://svnweb.freebsd.org/changeset/doc/43781

Log:
  Editorial pass through second 1/2 of this section.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 22:40:49 2014	(r43780)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 23:35:45 2014	(r43781)
@@ -1150,7 +1150,7 @@ before running "/usr/sbin/freebsd-update
       <para>&os.current; is the <quote>bleeding edge</quote> of &os;
 	development and  &os.current; users are expected to have a high
 	degree of technical skill.  Less technical users who wish
-	to track a development brach should
+	to track a development branch should
 	track &os.stable; instead.</para>
 
 	<para>&os.current; is the very latest source code for &os; and
@@ -1210,8 +1210,8 @@ before running "/usr/sbin/freebsd-update
 	      &a.svn-src-head.name; lists.  This is
 	      <emphasis>essential</emphasis> in order to see the
 	      comments that people are making about the current state
-	      of the system and to receive important bulletins which
-	      may be critical to the system's continued health.</para>
+	      of the system and to receive important bulletins about
+	      the current state of &os.current;.</para>
 
 	    <para>The &a.svn-src-head.name; list records the commit
 	      log entry for each change as it is made, along with any
@@ -1220,7 +1220,7 @@ before running "/usr/sbin/freebsd-update
 	    <para>To join these lists, go to &a.mailman.lists.link;,
 	      click on the list to subscribe to, and follow the
 	      instructions.  In order to track changes to the whole
-	      source tree, subscribe to the &a.svn-src-all.name;
+	      source tree, not just the changes to &os.current;, subscribe to the &a.svn-src-all.name;
 	      list.</para>
 	  </listitem>
 
@@ -1256,10 +1256,9 @@ before running "/usr/sbin/freebsd-update
 		<primary>-CURRENT</primary>
 		<secondary>compiling</secondary>
 	      </indexterm>, read
-	      <filename>/usr/src/Makefile</filename> very carefully.
-	      <link linkend="makeworld">Install a new kernel and
-	      rebuild the world</link> the first time through as part
-	      of the upgrading process.  Read the &a.current; and
+	      <filename>/usr/src/Makefile</filename> very carefully and follow the instructions in
+	      <link linkend="makeworld">Rebuilding
+	      "world"</link>.  Read the &a.current; and
 	      <filename>/usr/src/UPDATING</filename> to stay
 	      up-to-date on other bootstrapping procedures that
 	      sometimes become necessary on the road to the next
@@ -1280,49 +1279,34 @@ before running "/usr/sbin/freebsd-update
 
 	<para>&os.stable; is the development branch from which major
 	  releases are made.  Changes go into this branch at a
-	  different pace, and with the general assumption that they
-	  have first gone into &os.current; for testing.  This is
-	  <emphasis>still</emphasis> a development branch, however,
-	  and this means that at any given time, the sources for
-	  &os.stable; may or may not be suitable for any particular
-	  purpose.  It is simply another engineering development
-	  track, not a resource for end-users.</para>
+	  slower pace and with the general assumption that they
+	  have first been tested in &os.current;.  This is
+	  <emphasis>still</emphasis> a development branch and,
+	  at any given time, the sources for
+	  &os.stable; may or may not be suitable for general use.
+	  It is simply another engineering development
+	  track, not a resource for end-users.  Users who do not have the resources to perform
+	  testing should instead run the most
+	  recent release of &os;.</para>
 
 	<para>Those interested in tracking or contributing to the
-	  FreeBSD development process, especially as it relates to the
-	  next <quote>point</quote> release of FreeBSD, should
+	  &os; development process, especially as it relates to the
+	  next release of &os;, should
 	  consider following &os.stable;.</para>
 
-	<para>While security fixes go into the &os.stable; branch, one
-	  does not <emphasis>need</emphasis> to track &os.stable; to
-	  receive security fixes.  Every security advisory for &os;
-	  explains how to fix the problem for the releases it
-	  affects which are not yet EOL.
-
-	  <footnote>
-	    <para>For a complete description of the current security
-	      policy for old releases of FreeBSD, refer to <link
-		xlink:href="&url.base;/security/">http://www.FreeBSD.org/security/</link>.</para></footnote>.</para>
-
 	<para>While the &os.stable; branch should compile and run at
-	  all times, this cannot be guaranteed.  While code is
-	  developed in &os.current; before including it in
-	  &os.stable;, more people run &os.stable; than &os.current;,
-	  so it is inevitable that bugs and corner cases will
+	  all times, this cannot be guaranteed.  Since
+	  more people run &os.stable; than &os.current;,
+	  it is inevitable that bugs and corner cases will
 	  sometimes be found in &os.stable; that were not apparent in
-	  &os.current;.</para>
-
-	<para>For these reasons, one should <emphasis>not</emphasis>
-	  blindly track &os.stable;.  It is particularly important not
+	  &os.current;.  For this reason, one should not
+	  blindly track &os.stable;.  It is particularly important <emphasis>not</emphasis>
 	  to update any production servers to &os.stable; without
-	  first thoroughly testing the code in a development/testing
+	  thoroughly testing the code in a development or testing
 	  environment.</para>
 
-	<para>Except for those users who have the resources to perform
-	  testing, it is recommended that users instead run the most
-	  recent release of FreeBSD, and use the binary update
-	  mechanism to move from release to release.</para>
-
+	<para>To track &os.stable;:</para>
+	  
 	<indexterm>
 	  <primary>-STABLE</primary>
 	  <secondary>using</secondary>
@@ -1330,7 +1314,7 @@ before running "/usr/sbin/freebsd-update
 	<orderedlist>
 	  <listitem>
 	    <para>Join the &a.stable.name; list in order to stay
-	      informed of build-dependencies that may appear in
+	      informed of build dependencies that may appear in
 	      &os.stable; or any other issues requiring special
 	      attention.  Developers will also make announcements in
 	      this mailing list when they are contemplating some
@@ -1354,66 +1338,35 @@ before running "/usr/sbin/freebsd-update
 	  </listitem>
 
 	  <listitem>
-	    <para>To install a new system running monthly snapshots
-	      built from &os.stable;, refer to <link
+	    <para>To install a new &os.stable; system, install the most recent &os.stable; release from the
+	      <link linkend="mirrors">&os; mirror sites</link> or use a monthly snapshot
+	      built from &os.stable;.  Refer to <link
 		xlink:href="&url.base;/snapshots/">Snapshots</link>
-	      for more information.  Alternatively, it is possible to
-	      install the most recent &os.stable; release from the
-	      <link linkend="mirrors">mirror sites</link> and follow
-	      the instructions below to upgrade the system to the most
-	      up-to-date &os.stable; source code.</para>
-
-	    <para>Several methods are available to upgrade from a &os;
-	      <link linkend="mirrors">mirror site</link> on a system
-	      already running a previous release of &os;:</para>
+	      for more information about snapshots.</para>
 
-	    <orderedlist>
-	      <listitem>
-		<para>Use <link linkend="svn">svn</link>
+	    <para>To compile or upgrade to an existing &os;
+	      system to &os.stable;, use <link linkend="svn">svn</link>
 		  <indexterm>
 		    <primary>Subversion</primary>
-		  </indexterm> to check out the desired development or
-		  release branch.  This is the recommended method,
-		  providing access to &os; development as it occurs.
-		  Branch names include <literal>head</literal> for the
-		  current development head, and branches identified in
+		  </indexterm> to check out the source for the desired
+		  branch. 
+		  Branch names, such as <literal>stable/9</literal>, are identified in
 		  <link xlink:href="&url.base;/releng/">the release
-		    engineering page</link>, such as
-		  <literal>stable/9</literal>
-		  <indexterm>
-		    <primary>-STABLE</primary>
-		    <secondary>syncing with
-		      <application>Subversion</application></secondary>
-		  </indexterm>
-		  or <literal>releng/9.2</literal>.  URL prefixes for
-		  <application>Subversion</application> checkout of
-		  the base system are shown in <link
-		    linkend="svn-mirrors">Subversion mirror
-		    sites</link>.  Because of the size of the
-		  repository, it is recommended that only desired
-		  subtrees be checked out.</para>
-	      </listitem>
-
-	      <listitem>
-		<para>Consider using <application>CTM</application>
+		    engineering page</link>.   <link linkend="ctm">CTM</link> can be used
 		  <indexterm>
 		    <primary>-STABLE</primary>
 		    <secondary>syncing with CTM</secondary>
-		  </indexterm> if you do not have a fast connection to
-		  the Internet.</para>
-	      </listitem>
-	    </orderedlist>
+		  </indexterm> if a reliable Internet connection is not available.</para>
 	  </listitem>
 
 	  <listitem>
-	    <para>Before compiling &os.stable;<indexterm>
+	    <para>Before compiling or upgrading to &os.stable;<indexterm>
 		<primary>-STABLE</primary>
 		<secondary>compiling</secondary>
 	      </indexterm>, read
-	      <filename>/usr/src/Makefile</filename> carefully.
-	      <link linkend="makeworld">Install a new kernel and
-	      rebuild the world</link> the first time through as part
-	      of the upgrading process.  Read &a.stable; and
+	      <filename>/usr/src/Makefile</filename> carefully and follow the instructions in
+	      <link linkend="makeworld">Rebuilding
+	      "world"</link>.  Read &a.stable; and
 	      <filename>/usr/src/UPDATING</filename> to keep
 	      up-to-date on other bootstrapping procedures that
 	      sometimes become necessary on the road to the next

From owner-svn-doc-all@FreeBSD.ORG  Tue Feb  4 23:59:19 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 397C7B7B;
 Tue,  4 Feb 2014 23:59:19 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 233531BFD;
 Tue,  4 Feb 2014 23:59:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14NxJSv024741;
 Tue, 4 Feb 2014 23:59:19 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14NxJ9d024740;
 Tue, 4 Feb 2014 23:59:19 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402042359.s14NxJ9d024740@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 4 Feb 2014 23:59:19 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43782 - head/en_US.ISO8859-1/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.17
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, 04 Feb 2014 23:59:19 -0000

Author: dru
Date: Tue Feb  4 23:59:18 2014
New Revision: 43782
URL: http://svnweb.freebsd.org/changeset/doc/43782

Log:
  Whitespace fix only. Translators can ignore.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 23:35:45 2014	(r43781)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 23:59:18 2014	(r43782)
@@ -1137,242 +1137,233 @@ before running "/usr/sbin/freebsd-update
     <indexterm><primary>-CURRENT</primary></indexterm>
     <indexterm><primary>-STABLE</primary></indexterm>
 
-    <para>&os; has two development branches: &os.current;
-      and &os.stable;.</para>  
-      
+    <para>&os; has two development branches: &os.current; and
+      &os.stable;.</para>
+
     <para>This section provides an explanation of each branch and its
-      intended audience as well as
-      how to keep a system up-to-date with each
-      respective branch.</para>
+      intended audience as well as how to keep a system up-to-date
+      with each respective branch.</para>
+
+    <sect2 xml:id="current">
+      <title>Using &os.current;</title>
 
-      <sect2 xml:id="current">
-	<title>Using &os.current;</title>
       <para>&os.current; is the <quote>bleeding edge</quote> of &os;
-	development and  &os.current; users are expected to have a high
-	degree of technical skill.  Less technical users who wish
-	to track a development branch should
-	track &os.stable; instead.</para>
-
-	<para>&os.current; is the very latest source code for &os; and
-	  includes works in progress, experimental changes, and
-	  transitional mechanisms that might or might not be present
-	  in the next official release.  While many
-	  &os; developers compile the &os.current; source code daily,
-	  there are short periods of time when the source may not be
-	  buildable.  These problems are resolved as quickly as
-	  possible, but whether or not &os.current; brings disaster or
-	  new functionality can be a matter of when the
-	  source code was synced.</para>
-
-	<para>&os.current; is made available for three primary
-	  interest groups:</para>
-
-	<orderedlist>
-	  <listitem>
-	    <para>Members of the &os; community who are actively
-	      working on some part of the source tree.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>Members of the &os; community who are active
-	      testers.  They are willing to spend time solving problems,
-	      making topical suggestions on
-	      changes and the general direction of &os;, and submitting
-	      patches.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>Users who wish to keep an eye on things,
-	      use the current source for reference purposes, or
-	      make the occasional comment or
-	      code contribution.</para>
-	  </listitem>
-	</orderedlist>
-
-	<para>&os.current; should <emphasis>not</emphasis> be
-	  considered a fast-track to getting new features before the next
-	      release as pre-release features are not yet fully tested
-	      and most likely contain bugs.  It is not a quick way of getting bug fixes as any given commit
-	      is just as likely to introduce new bugs as to fix
-	      existing ones.  &os.current; is not in any way <quote>officially
-		supported</quote>.</para>
+	development and  &os.current; users are expected to have a
+	high degree of technical skill.  Less technical users who wish
+	to track a development branch should track &os.stable;
+	instead.</para>
+
+      <para>&os.current; is the very latest source code for &os; and
+	includes works in progress, experimental changes, and
+	transitional mechanisms that might or might not be present in
+	the next official release.  While many &os; developers compile
+	the &os.current; source code daily, there are short periods of
+	time when the source may not be buildable.  These problems are
+	resolved as quickly as possible, but whether or not
+	&os.current; brings disaster or new functionality can be a
+	matter of when the source code was synced.</para>
 
-	<indexterm>
-	  <primary>-CURRENT</primary>
-	  <secondary>using</secondary>
-	</indexterm>
+      <para>&os.current; is made available for three primary interest
+	groups:</para>
 
-	<para>To track &os.current;:</para>
-	
-	<orderedlist>
-	  <listitem>
-	    <para>Join the &a.current.name; and the
-	      &a.svn-src-head.name; lists.  This is
-	      <emphasis>essential</emphasis> in order to see the
-	      comments that people are making about the current state
-	      of the system and to receive important bulletins about
-	      the current state of &os.current;.</para>
-
-	    <para>The &a.svn-src-head.name; list records the commit
-	      log entry for each change as it is made, along with any
-	      pertinent information on possible side-effects.</para>
-
-	    <para>To join these lists, go to &a.mailman.lists.link;,
-	      click on the list to subscribe to, and follow the
-	      instructions.  In order to track changes to the whole
-	      source tree, not just the changes to &os.current;, subscribe to the &a.svn-src-all.name;
-	      list.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>Synchronize with the &os.current; sources.  Typically,
-		<link linkend="svn">svn</link> is used
-		  to check out
-		  the -CURRENT code from the <literal>head</literal>
-		  branch of one of the <link
-		    linkend="svn-mirrors">Subversion mirror
-		    sites</link>.</para>
-
-		<para>Users with very slow or limited Internet connectivity
-		  can instead use <link linkend="ctm">CTM</link>, but it
-		  is not as reliable as
-		  <application>svn</application> and
-		  <application>svn</application> is the
-		  recommended method for synchronizing
-		  source.</para>
-	      </listitem>
+      <orderedlist>
+	<listitem>
+	  <para>Members of the &os; community who are actively
+	    working on some part of the source tree.</para>
+	</listitem>
 
-	  <listitem>
-	    <para> Due to the size of the repository, some users choose
-	      to only synchronize the sections of source that interest them 
-	      or which they are contributing patches to.
-	      However, users that plan to compile the operating system from
-	      source must download <emphasis>all</emphasis> of
-	      &os.current;, not just selected portions.</para>
+	<listitem>
+	  <para>Members of the &os; community who are active testers.
+	    They are willing to spend time solving problems, making
+	    topical suggestions on changes and the general direction
+	    of &os;, and submitting patches.</para>
+	</listitem>
 
-	    <para>Before compiling
-	      &os.current;
-	      <indexterm>
-		<primary>-CURRENT</primary>
+	<listitem>
+	  <para>Users who wish to keep an eye on things, use the
+	    current source for reference purposes, or make the
+	    occasional comment or code contribution.</para>
+	</listitem>
+      </orderedlist>
+
+      <para>&os.current; should <emphasis>not</emphasis> be
+	considered a fast-track to getting new features before the
+	next release as pre-release features are not yet fully tested
+	and most likely contain bugs.  It is not a quick way of
+	getting bug fixes as any given commit is just as likely to
+	introduce new bugs as to fix existing ones.  &os.current; is
+	not in any way <quote>officially supported</quote>.</para>
+
+      <indexterm>
+	<primary>-CURRENT</primary>
+	<secondary>using</secondary>
+      </indexterm>
+
+      <para>To track &os.current;:</para>
+
+      <orderedlist>
+	<listitem>
+	  <para>Join the &a.current.name; and the
+	    &a.svn-src-head.name; lists.  This is
+	    <emphasis>essential</emphasis> in order to see the
+	    comments that people are making about the current state
+	    of the system and to receive important bulletins about
+	    the current state of &os.current;.</para>
+
+	  <para>The &a.svn-src-head.name; list records the commit log
+	    entry for each change as it is made, along with any
+	    pertinent information on possible side-effects.</para>
+
+	  <para>To join these lists, go to &a.mailman.lists.link;,
+	    click on the list to subscribe to, and follow the
+	    instructions.  In order to track changes to the whole
+	    source tree, not just the changes to &os.current;,
+	    subscribe to the &a.svn-src-all.name; list.</para>
+	</listitem>
+
+	<listitem>
+	  <para>Synchronize with the &os.current; sources.  Typically,
+	    <link linkend="svn">svn</link> is used to check out the
+	    -CURRENT code from the <literal>head</literal> branch of
+	    one of the <link linkend="svn-mirrors">Subversion mirror
+	      sites</link>.</para>
+
+	  <para>Users with very slow or limited Internet connectivity
+	    can instead use <link linkend="ctm">CTM</link>, but it is
+	    not as reliable as <application>svn</application> and
+	    <application>svn</application> is the recommended method
+	    for synchronizing source.</para>
+	</listitem>
+
+	<listitem>
+	  <para> Due to the size of the repository, some users choose
+	    to only synchronize the sections of source that interest
+	    them  or which they are contributing patches to.  However,
+	    users that plan to compile the operating system from
+	    source must download <emphasis>all</emphasis> of
+	    &os.current;, not just selected portions.</para>
+
+	  <para>Before compiling &os.current;
+	    <indexterm>
+	      <primary>-CURRENT</primary>
 		<secondary>compiling</secondary>
-	      </indexterm>, read
-	      <filename>/usr/src/Makefile</filename> very carefully and follow the instructions in
-	      <link linkend="makeworld">Rebuilding
-	      "world"</link>.  Read the &a.current; and
-	      <filename>/usr/src/UPDATING</filename> to stay
-	      up-to-date on other bootstrapping procedures that
-	      sometimes become necessary on the road to the next
-	      release.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>Be active! &os.current; users are encouraged to
-	      submit their suggestions for enhancements or bug fixes.
-	      Suggestions with accompanying code are always
-	      welcome.</para>
-	  </listitem>
-	</orderedlist>
+	    </indexterm>, read <filename>/usr/src/Makefile</filename>
+	    very carefully and follow the instructions in
+	    <link linkend="makeworld">Rebuilding "world"</link>.
+	    Read the &a.current; and
+	    <filename>/usr/src/UPDATING</filename> to stay
+	    up-to-date on other bootstrapping procedures that
+	    sometimes become necessary on the road to the next
+	    release.</para>
+	</listitem>
+
+	<listitem>
+	  <para>Be active! &os.current; users are encouraged to
+	    submit their suggestions for enhancements or bug fixes.
+	    Suggestions with accompanying code are always
+	    welcome.</para>
+	</listitem>
+      </orderedlist>
     </sect2>
 
     <sect2 xml:id="stable">
       <title>Using &os.stable;</title>
 
-	<para>&os.stable; is the development branch from which major
-	  releases are made.  Changes go into this branch at a
-	  slower pace and with the general assumption that they
-	  have first been tested in &os.current;.  This is
-	  <emphasis>still</emphasis> a development branch and,
-	  at any given time, the sources for
-	  &os.stable; may or may not be suitable for general use.
-	  It is simply another engineering development
-	  track, not a resource for end-users.  Users who do not have the resources to perform
-	  testing should instead run the most
-	  recent release of &os;.</para>
-
-	<para>Those interested in tracking or contributing to the
-	  &os; development process, especially as it relates to the
-	  next release of &os;, should
-	  consider following &os.stable;.</para>
-
-	<para>While the &os.stable; branch should compile and run at
-	  all times, this cannot be guaranteed.  Since
-	  more people run &os.stable; than &os.current;,
-	  it is inevitable that bugs and corner cases will
-	  sometimes be found in &os.stable; that were not apparent in
-	  &os.current;.  For this reason, one should not
-	  blindly track &os.stable;.  It is particularly important <emphasis>not</emphasis>
-	  to update any production servers to &os.stable; without
-	  thoroughly testing the code in a development or testing
-	  environment.</para>
+      <para>&os.stable; is the development branch from which major
+	releases are made.  Changes go into this branch at a slower
+	pace and with the general assumption that they have first been
+	tested in &os.current;.  This is <emphasis>still</emphasis> a
+	development branch and, at any given time, the sources for
+	&os.stable; may or may not be suitable for general use.  It is
+	simply another engineering development track, not a resource
+	for end-users.  Users who do not have the resources to perform
+	testing should instead run the most recent release of
+	&os;.</para>
+
+      <para>Those interested in tracking or contributing to the &os;
+	development process, especially as it relates to the next
+	release of &os;, should consider following &os.stable;.</para>
+
+      <para>While the &os.stable; branch should compile and run at all
+	times, this cannot be guaranteed.  Since more people run
+	&os.stable; than &os.current;, it is inevitable that bugs and
+	corner cases will sometimes be found in &os.stable; that were
+	not apparent in &os.current;.  For this reason, one should not
+	blindly track &os.stable;.  It is particularly important
+	<emphasis>not</emphasis> to update any production servers to
+	&os.stable; without thoroughly testing the code in a
+	development or testing environment.</para>
 
-	<para>To track &os.stable;:</para>
-	  
-	<indexterm>
-	  <primary>-STABLE</primary>
+      <para>To track &os.stable;:</para>
+
+      <indexterm>
+	<primary>-STABLE</primary>
 	  <secondary>using</secondary>
-	</indexterm>
-	<orderedlist>
-	  <listitem>
-	    <para>Join the &a.stable.name; list in order to stay
-	      informed of build dependencies that may appear in
-	      &os.stable; or any other issues requiring special
-	      attention.  Developers will also make announcements in
-	      this mailing list when they are contemplating some
-	      controversial fix or update, giving the users a chance
-	      to respond if they have any issues to raise concerning
-	      the proposed change.</para>
-
-	    <para>Join the relevant <application>svn</application>
-	      list for the branch being tracked.  For example, users
-	      tracking the 9-STABLE branch should join the
-	      &a.svn-src-stable-9.name; list.  This list records the
-	      commit log entry for each change as it is made, along
-	      with any pertinent information on possible
-	      side-effects.</para>
-
-	    <para>To join these lists,
-	      go to &a.mailman.lists.link;, click on the list to
-	      subscribe to, and follow the instructions.  In order to
-	      track changes for the whole source tree, subscribe to
-	      &a.svn-src-all.name;.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>To install a new &os.stable; system, install the most recent &os.stable; release from the
-	      <link linkend="mirrors">&os; mirror sites</link> or use a monthly snapshot
-	      built from &os.stable;.  Refer to <link
-		xlink:href="&url.base;/snapshots/">Snapshots</link>
-	      for more information about snapshots.</para>
-
-	    <para>To compile or upgrade to an existing &os;
-	      system to &os.stable;, use <link linkend="svn">svn</link>
-		  <indexterm>
-		    <primary>Subversion</primary>
-		  </indexterm> to check out the source for the desired
-		  branch. 
-		  Branch names, such as <literal>stable/9</literal>, are identified in
-		  <link xlink:href="&url.base;/releng/">the release
-		    engineering page</link>.   <link linkend="ctm">CTM</link> can be used
-		  <indexterm>
-		    <primary>-STABLE</primary>
-		    <secondary>syncing with CTM</secondary>
-		  </indexterm> if a reliable Internet connection is not available.</para>
-	  </listitem>
+      </indexterm>
+      <orderedlist>
+	<listitem>
+	  <para>Join the &a.stable.name; list in order to stay
+	    informed of build dependencies that may appear in
+	    &os.stable; or any other issues requiring special
+	    attention.  Developers will also make announcements in
+	    this mailing list when they are contemplating some
+	    controversial fix or update, giving the users a chance to
+	    respond if they have any issues to raise concerning the
+	    proposed change.</para>
+
+	  <para>Join the relevant <application>svn</application> list
+	    for the branch being tracked.  For example, users
+	    tracking the 9-STABLE branch should join the
+	    &a.svn-src-stable-9.name; list.  This list records the
+	    commit log entry for each change as it is made, along
+	    with any pertinent information on possible
+	    side-effects.</para>
+
+	  <para>To join these lists, go to &a.mailman.lists.link;,
+	    click on the list to subscribe to, and follow the
+	    instructions.  In order to track changes for the whole
+	    source tree, subscribe to &a.svn-src-all.name;.</para>
+	</listitem>
 
-	  <listitem>
-	    <para>Before compiling or upgrading to &os.stable;<indexterm>
+	<listitem>
+	  <para>To install a new &os.stable; system, install the most
+	    recent &os.stable; release from the <link
+	      linkend="mirrors">&os; mirror sites</link> or use a
+	    monthly snapshot built from &os.stable;.  Refer to <link
+	      xlink:href="&url.base;/snapshots/">Snapshots</link> for
+	    more information about snapshots.</para>
+
+	  <para>To compile or upgrade to an existing &os; system to
+	    &os.stable;, use <link linkend="svn">svn</link>
+	      <indexterm>
+		<primary>Subversion</primary>
+	      </indexterm> to check out the source for the desired
+	    branch.  Branch names, such as
+	    <literal>stable/9</literal>, are identified in <link
+	      xlink:href="&url.base;/releng/">the release
+	      engineering page</link>.   <link
+	      linkend="ctm">CTM</link> can be used
+	      <indexterm>
 		<primary>-STABLE</primary>
+		  <secondary>syncing with CTM</secondary>
+		</indexterm> if a reliable Internet connection is not
+	    available.</para>
+	</listitem>
+
+	<listitem>
+	  <para>Before compiling or upgrading to &os.stable;
+	    <indexterm>
+	      <primary>-STABLE</primary>
 		<secondary>compiling</secondary>
-	      </indexterm>, read
-	      <filename>/usr/src/Makefile</filename> carefully and follow the instructions in
-	      <link linkend="makeworld">Rebuilding
-	      "world"</link>.  Read &a.stable; and
-	      <filename>/usr/src/UPDATING</filename> to keep
-	      up-to-date on other bootstrapping procedures that
-	      sometimes become necessary on the road to the next
-	      release.</para>
-	  </listitem>
-	</orderedlist>
+	    </indexterm>, read <filename>/usr/src/Makefile</filename>
+	    carefully and follow the instructions in <link
+	      linkend="makeworld">Rebuilding "world"</link>.  Read
+	    &a.stable; and <filename>/usr/src/UPDATING</filename> to
+	    keep up-to-date on other bootstrapping procedures that
+	    sometimes become necessary on the road to the next
+	    release.</para>
+	</listitem>
+      </orderedlist>
     </sect2>
   </sect1>
 

From owner-svn-doc-all@FreeBSD.ORG  Wed Feb  5 00:00:20 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 26DA0BEB;
 Wed,  5 Feb 2014 00:00:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 10F5E1C09;
 Wed,  5 Feb 2014 00:00:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1500Jww025098;
 Wed, 5 Feb 2014 00:00:19 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1500JT0025097;
 Wed, 5 Feb 2014 00:00:19 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402050000.s1500JT0025097@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 5 Feb 2014 00:00:19 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43783 - head/en_US.ISO8859-1/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.17
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, 05 Feb 2014 00:00:20 -0000

Author: dru
Date: Wed Feb  5 00:00:19 2014
New Revision: 43783
URL: http://svnweb.freebsd.org/changeset/doc/43783

Log:
  Un-hyphenate side-effects.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Feb  4 23:59:18 2014	(r43782)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Wed Feb  5 00:00:19 2014	(r43783)
@@ -1212,7 +1212,7 @@ before running "/usr/sbin/freebsd-update
 
 	  <para>The &a.svn-src-head.name; list records the commit log
 	    entry for each change as it is made, along with any
-	    pertinent information on possible side-effects.</para>
+	    pertinent information on possible side effects.</para>
 
 	  <para>To join these lists, go to &a.mailman.lists.link;,
 	    click on the list to subscribe to, and follow the
@@ -1317,7 +1317,7 @@ before running "/usr/sbin/freebsd-update
 	    &a.svn-src-stable-9.name; list.  This list records the
 	    commit log entry for each change as it is made, along
 	    with any pertinent information on possible
-	    side-effects.</para>
+	    side effects.</para>
 
 	  <para>To join these lists, go to &a.mailman.lists.link;,
 	    click on the list to subscribe to, and follow the

From owner-svn-doc-all@FreeBSD.ORG  Wed Feb  5 05:52:38 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ED8486DB;
 Wed,  5 Feb 2014 05:52:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D58DE116E;
 Wed,  5 Feb 2014 05:52:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s155qbsL067099;
 Wed, 5 Feb 2014 05:52:37 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s155qbXl067098;
 Wed, 5 Feb 2014 05:52:37 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201402050552.s155qbXl067098@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 5 Feb 2014 05:52:37 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43784 - head/en_US.ISO8859-1/articles/committers-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.17
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, 05 Feb 2014 05:52:38 -0000

Author: wblock
Date: Wed Feb  5 05:52:37 2014
New Revision: 43784
URL: http://svnweb.freebsd.org/changeset/doc/43784

Log:
  Add an 'svn up' step to the Ports repo copy answer (discussed on IRC
  with zi@).
  
  Add IDs to all the ports qandadiv elements for easy linking.  Other
  minor fixes.

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

Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/committers-guide/article.xml	Wed Feb  5 00:00:19 2014	(r43783)
+++ head/en_US.ISO8859-1/articles/committers-guide/article.xml	Wed Feb  5 05:52:37 2014	(r43784)
@@ -572,7 +572,7 @@ You need a Passphrase to protect your se
 	<programlisting>Host svn.freebsd.org
 	User jarjar</programlisting>
 
-	<para>This is the simplest method, but it's hard to tell just
+	<para>This is the simplest method, but it is hard to tell just
 	  yet how much load it will place on the repository.
 	  Subversion is much faster than <acronym>CVS</acronym>,
 	  however.</para>
@@ -2392,7 +2392,7 @@ ControlPersist yes</screen>
 		username on the &os; cluster.</para>
 
 	      <para>If the submitter is the maintainer of the port
-		to which you are commiting include "(maintainer)"
+		to which you are committing, include "(maintainer)"
 		after the email address.</para>
 
 	      <para>Avoid obfuscating the email address of the
@@ -2685,7 +2685,7 @@ MFC after:          1 month</programlist
   </sect1>
 
   <sect1 xml:id="if-in-doubt">
-    <title>If in doubt...</title>
+    <title>If in Doubt...</title>
 
     <para>When you are not sure about something, whether it be a
       technical issue or a project convention be sure to ask.  If you
@@ -3745,7 +3745,7 @@ MFC after:          1 month</programlist
     <title>Ports Specific FAQ</title>
 
     <qandaset>
-      <qandadiv>
+      <qandadiv xml:id="ports-qa-adding">
 	<title>Adding a New Port</title>
 
 	<qandaentry>
@@ -3819,7 +3819,7 @@ MFC after:          1 month</programlist
 	</qandaentry>
       </qandadiv>
 
-      <qandadiv>
+      <qandadiv xml:id="ports-qa-removing">
 	<title>Removing an Existing Port</title>
 
 	<qandaentry>
@@ -3890,7 +3890,7 @@ MFC after:          1 month</programlist
 	</qandaentry>
       </qandadiv>
 
-      <qandadiv>
+      <qandadiv xml:id="ports-qa-re-adding">
 	<title>Re-adding a Deleted Port</title>
 
 	<qandaentry>
@@ -3959,7 +3959,7 @@ MFC after:          1 month</programlist
 	</qandaentry>
       </qandadiv>
 
-      <qandadiv>
+      <qandadiv xml:id="ports-qa-repocopies">
 	<title>Repository Copies</title>
 
 	<qandaentry>
@@ -4001,12 +4001,17 @@ MFC after:          1 month</programlist
 
 		<procedure>
 		  <step>
-		    <para>First make sure that you were using an up to
-		      date ports tree and the target directory does
+		    <para>Verify that the target directory does
 		      not exist.</para>
 		  </step>
 
 		  <step>
+		    <para>Use <command>svn up</command> to make
+		      certain the original files, directories, and
+		      checkout information is current.</para>
+		  </step>
+
+		  <step>
 		    <para>Use <command>svn move</command> or
 		      <command>svn copy</command> to do the repo
 		      copy.</para>
@@ -4109,7 +4114,7 @@ MFC after:          1 month</programlist
 	</qandaentry>
       </qandadiv>
 
-      <qandadiv>
+      <qandadiv xml:id="ports-qa-freeze">
 	<title>Ports Freeze</title>
 
 	<qandaentry>
@@ -4243,7 +4248,7 @@ MFC after:          1 month</programlist
 	</qandaentry>
       </qandadiv>
 
-      <qandadiv>
+      <qandadiv xml:id="ports-qa-new-category">
 	<title>Creating a New Category</title>
 
 	<qandaentry>
@@ -4449,7 +4454,7 @@ MFC after:          1 month</programlist
 	</qandaentry>
       </qandadiv>
 
-      <qandadiv>
+      <qandadiv xml:id="ports-qa-misc-questions">
 	<title>Miscellaneous Questions</title>
 
 	<qandaentry>

From owner-svn-doc-all@FreeBSD.ORG  Wed Feb  5 08:27:17 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BC19CBA0;
 Wed,  5 Feb 2014 08:27:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9D3471CC4;
 Wed,  5 Feb 2014 08:27:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s158RHBH028932;
 Wed, 5 Feb 2014 08:27:17 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s158RHKa028931;
 Wed, 5 Feb 2014 08:27:17 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201402050827.s158RHKa028931@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 5 Feb 2014 08:27:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43785 - 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.17
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, 05 Feb 2014 08:27:17 -0000

Author: ryusuke
Date: Wed Feb  5 08:27:17 2014
New Revision: 43785
URL: http://svnweb.freebsd.org/changeset/doc/43785

Log:
  - Merge the following from the English version:
  
  	r42802 -> r42809	head/ja_JP.eucJP/books/handbook/ports/chapter.xml
  
  Reviewed by:	Yuta MASUMOTO <owata _at_ club.kyutech.ac.jp>

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

Modified: head/ja_JP.eucJP/books/handbook/ports/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/ports/chapter.xml	Wed Feb  5 05:52:37 2014	(r43784)
+++ head/ja_JP.eucJP/books/handbook/ports/chapter.xml	Wed Feb  5 08:27:17 2014	(r43785)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r42802
+     Original revision: r42809
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="ports">
@@ -347,29 +347,36 @@ Info:   Lists information about open fil
   </sect1>
 
   <sect1 xml:id="packages-using">
-    <info><title>¥Ğ¥¤¥Ê¥ê packages ¤ÎÍøÍÑ</title>
+<!--    <info><title>¥Ğ¥¤¥Ê¥ê packages ¤ÎÍøÍÑ</title>
       <authorgroup>
         <author><personname><firstname>Chern</firstname><surname>Lee</surname></personname><contrib>´ó¹Æ: </contrib></author>
       </authorgroup>
-    
-    </info>
 
-    
+    </info>-->
+
+    <title>¥Ğ¥¤¥Ê¥ê packages ¤ÎÍøÍÑ</title>
 
     <para>¸½ºß &os; ¤Ï¡¢¿·¤·¤¤ packages ´ÉÍı¥Ä¡¼¥ë¤Ø¤È°Ü¹ÔÃæ¤Ç¤¹¡£
-      ºÇ¿·¥ê¥ê¡¼¥¹¤Î¥æ¡¼¥¶¤Ï¡¢
       <link linkend="pkgng-intro">PKGng</link> ¤Ë¤è¤ë &os;
       ¤Î¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥½¥Õ¥È¥¦¥§¥¢´ÉÍı¤ÎÍøÍѤò¸¡Æ¤¤·¤Æ¤¯¤À¤µ¤¤¡£
-      <application>pkgng</application> ¥Ä¡¼¥ë¤Ë°Ü¹Ô¤·¤Æ¤¤¤Ê¤¤¥æ¡¼¥¶¤Ï¡¢
-      ¤³¤ÎÀá¤ÇÀâÌÀ¤¹¤ë¥Ä¡¼¥ë¤òÍѤ¤¤Æ package ¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò´ÉÍı¤·¤Æ¤¯¤À¤µ¤¤¡£
-      <command>sysinstall</command> ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤òÍѤ¤¤ë¤È¡¢
-      ¥¤¥ó¥¹¥È¡¼¥ë¸å¤Î package ´ÉÍı¤ò´Êñ¤Ë¤Ç¤­¤Ş¤¹¡£
-    </para>
-
-    <para>¤¹¤Ù¤Æ¤Î package ¤Î¥¤¥ó¥¹¥È¡¼¥ë¥Õ¥¡¥¤¥ë¤Ï¡¢
-      package ¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹ÍѤΥǥ£¥ì¥¯¥È¥ê¤Ç¤¢¤ë
-      <filename>/var/db/pkg</filename>
-      ¤ËÊݸ¤µ¤ì¤Ş¤¹¡£</para>
+      ¤³¤ÎÀá¤Ç¤Ï¡¢ÅÁÅıŪ¤Ê¥Ğ¥¤¥Ê¥ê packages ¤Î´ÉÍıÊıË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Ş¤¹¡£
+      <application>pkgng</application>
+      ·Á¼°¤Ë°Ü¹Ô¤·¤Æ¤¤¤Ê¤¤¥æ¡¼¥¶¸ş¤±¤Ç¤¹¡£</para>
+
+    <para>¤³¤Î package ´ÉÍıÊıË¡¤Ç¤Ï¡¢package
+      ¥Ç¡¼¥¿¥Ù¡¼¥¹Íѥǥ£¥ì¥¯¥È¥ê¤Î <filename>/var/db/pkg</filename> ¤ò¡¢
+      ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¥½¥Õ¥È¥¦¥§¥¢¤Î¥Ğ¡¼¥¸¥ç¥ó¤ä¡¢
+      ³Æ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤È¤â¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò´ÉÍı¤¹¤ë¤Î¤ËÍѤ¤¤Ş¤¹¡£
+      ¤¤¤¯¤Ä¤«¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ï¡¢
+      ¤³¤Î´ÉÍıÍѤΥǡ¼¥¿¥Ù¡¼¥¹¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òÍѤ¤¤Æ¡¢
+      ¥Ğ¥¤¥Ê¥ê package ¤ò´ÉÍı¤·¤Ş¤¹¡£
+      ¤³¤ì¤é¤Î¥³¥Ş¥ó¥É¤Î̾Á°¤Ï <literal>pkg_</literal> ¤«¤é»Ï¤Ş¤ê¤Ş¤¹¡£
+      ¤³¤ÎÀá¤Ç¤Ï¡¢¥Ğ¥¤¥Ê¥ê package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤ê¡¢ºï½ü¤·¤¿¤ê¡¢
+      ¥Ğ¥¤¥Ê¥ê package ¤Î¾ğÊó¤ò¼ı½¸¤¹¤ëÊıË¡¤Î³µÍפòÀâÌÀ¤·¤Ş¤¹¡£
+      ³Æ¥³¥Ş¥ó¥É¤Ë¤Ï¡¢
+      Áàºî¤ò¥«¥¹¥¿¥Ş¥¤¥º¤¹¤ë¤¿¤á¤Ë¿¤¯¤Î¥ª¥×¥·¥ç¥ó¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Ş¤¹¡£
+      ¾ÜºÙ¤äÍøÍÑÊıË¡¤ÎÎã¤Î°ìÍ÷¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+      ¥Ş¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 
     <sect2>
       <title>package ¤Î¥¤¥ó¥¹¥È¡¼¥ë</title>
@@ -381,49 +388,30 @@ Info:   Lists information about open fil
       <indexterm>
         <primary><command>pkg_add</command></primary>
       </indexterm>
-      <para>&man.pkg.add.1; ¤Ï¡¢¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤ä¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î¥µ¡¼¥Ğ¤«¤é
-	&os; ¥Ğ¥¤¥Ê¥ê package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ç¤¹¡£</para>
-
-      <example>
-	<title>¼êÆ°¤Ç package ¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¥í¡¼¥«¥ë¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë</title>
-
-        <screen>&prompt.root; <userinput>ftp -a ftp2.FreeBSD.org</userinput>
-Connected to ftp2.FreeBSD.org.
-220 ftp2.FreeBSD.org FTP server (Version 6.00LS) ready.
-331 Guest login ok, send your email address as password.
-230-
-230-     This machine is in Vienna, VA, USA, hosted by Verio.
-230-         Questions? E-mail freebsd@vienna.verio.net.
-230-
-230-
-230 Guest login ok, access restrictions apply.
-Remote system type is UNIX.
-Using binary mode to transfer files.
-<prompt>ftp&gt;</prompt> <userinput>cd /pub/FreeBSD/ports/packages/sysutils/</userinput>
-250 CWD command successful.
-<prompt>ftp&gt;</prompt> <userinput>get lsof-4.56.4.tgz</userinput>
-local: lsof-4.56.4.tgz remote: lsof-4.56.4.tgz
-200 PORT command successful.
-150 Opening BINARY mode data connection for 'lsof-4.56.4.tgz' (92375 bytes).
-100% |**************************************************| 92375       00:00 ETA
-226 Transfer complete.
-92375 bytes received in 5.60 seconds (16.11 KB/s)
-<prompt>ftp&gt;</prompt> <userinput>exit</userinput>
-&prompt.root; <userinput>pkg_add lsof-4.56.4.tgz</userinput></screen>
-      </example>
-
-      <para>&os; CD-ROM ¥»¥Ã¥È¤Î¤è¤¦¤Ê¡¢¥í¡¼¥«¥ë¤Ê packages ¤¬¤Ê¤¤¾ì¹ç¤Ï¡¢
-	&man.pkg.add.1; ¤Ë <option>-r</option> ¥ª¥×¥·¥ç¥ó¤òÉÕ¤±²Ã¤¨¤Æ¤¯¤À¤µ¤¤¡£
+      <para>¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤ä¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î¥µ¡¼¥Ğ¤«¤é
+	&os; ¤Î¥Ğ¥¤¥Ê¥ê package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
+	&man.pkg.add.1;	¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
+	&os; ¤Î¥á¥Ç¥£¥¢¤Ï¡¢¥í¡¼¥«¥ë packages ¤Î¥½¡¼¥¹¤òÄ󶡤·¤Æ¤¤¤ë¤Î¤Ç¡¢
+	¥Í¥Ã¥È¥ï¡¼¥¯Àܳ¤ò¤¹¤ëɬÍפϤ¢¤ê¤Ş¤»¤ó¤¬¡¢
+	ºÇ¿·¤Î¥Ğ¥¤¥Ê¥ê packages ¤ò´Ş¤ó¤Ç¤¤¤Ê¤¤²ÄǽÀ­¤¬¤¢¤ê¤Ş¤¹¡£
+	package ¤Ï &os; ¤Î package ¥µ¡¼¥Ğ¤Ç¾ï¤ËºÆ¹½ÃÛ¤µ¤ì¤Æ¤¤¤Ş¤¹¡£
+	package ¥µ¡¼¥Ğ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢
+	&man.pkg.add.1; ¤Ë <option>-r</option> (remote ¤Î°ÕÌ£)
+	¤òÉÕ¤±²Ã¤¨¤Æ¤¯¤À¤µ¤¤¡£
 	¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Æ¼Â¹Ô¤¹¤ë¤È¡¢
         ¼«Æ°Åª¤ËŬÀڤʥª¥Ö¥¸¥§¥¯¥È¤Î·Á¼°¤È¥ê¥ê¡¼¥¹¤òȽÃǤ·¡¢
-        package ¤ò FTP ¥µ¥¤¥È¤«¤é¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ş¤¹¡£
+	package ¥µ¡¼¥Ğ¤«¤é package ¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ş¤¹¡£
 	¥æ¡¼¥¶¤Ï¤³¤Î¤Û¤«¤Ë²¿¤â¤¹¤ëɬÍפϤ¢¤ê¤Ş¤»¤ó¡£</para>
 
       <indexterm>
-        <primary><command>pkg_add</command></primary></indexterm>
-      <screen>&prompt.root; <userinput>pkg_add -r lsof</userinput></screen>
+        <primary><command>pkg_add</command></primary>
+      </indexterm>
+      <screen>&prompt.root; <userinput>pkg_add -r <replaceable>lsof</replaceable></userinput></screen>
 
-      <para>Ê̤Π&os; FTP ¥ß¥é¡¼¥µ¥¤¥È¤ò»È¤¦¤Ë¤Ï¡¢
+      <para>¤³¤ÎÎã¤Ç¤Ï¡¢<literal>lsof</literal> ¤Ï¡¢
+	¥Ğ¡¼¥¸¥ç¥óÈÖ¹æ¤ò»ØÄꤷ¤Ê¤¤¤ÇÍѤ¤¤é¤ì¤Æ¤¤¤Ş¤¹¡£
+	¥ê¥â¡¼¥È¤Ç¥À¥¦¥ó¥í¡¼¥É¤ò¹Ô¤¦¤È¤­¤Ë¥Ğ¡¼¥¸¥ç¥ó¤Ï´Ş¤Ş¤ì¤Ê¤¤¤¿¤á¤Ç¤¹¡£
+	Ê̤Π&os; FTP ¥ß¥é¡¼¥µ¥¤¥È¤ò»È¤¦¤Ë¤Ï¡¢
 	<envar>PACKAGESITE</envar> ´Ä¶­ÊÑ¿ô¤ËÍøÍѤ·¤¿¤¤¥µ¥¤¥È¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
 	&man.pkg.add.1; ¤Ï¡¢<envar>FTP_PASSIVE_MODE</envar>,
 	<envar>FTP_PROXY</envar>, <envar>FTP_PASSWORD</envar>
@@ -432,11 +420,8 @@ local: lsof-4.56.4.tgz remote: lsof-4.56
 	¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤ÎÆ⦤Ǥ¢¤Ã¤¿¤ê¡¢
 	FTP/HTTP ¥×¥í¥­¥·¤ò»È¤¦¾ì¹ç¤Ë¤Ï¡¢
 	¤³¤ì¤é¤Î´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ë¤³¤È¤Ë¤Ê¤ê¤Ş¤¹¡£
-	´Ä¶­ÊÑ¿ô¤Î°ìÍ÷¤Ë¤Ä¤¤¤Æ¤Ï &man.fetch.3; ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
-	¤Ş¤¿¡¢¾å¤ÎÎã¤Ç <literal>lsof-4.56.4</literal> ¤ÎÂå¤ï¤ê¤Ë
-	<literal>lsof</literal> ¤ò»È¤Ã¤Æ¤¤¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-	¥ê¥â¡¼¥È¥Õ¥§¥Ã¥Áµ¡Ç½¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ë¤Ï¡¢
-	package ¤Î¥Ğ¡¼¥¸¥ç¥óÈÖ¹æ¤ò¼è¤ê½ü¤«¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó¡£</para>
+	FTP ¤Ë´ØÏ¢¤·¤¿´Ä¶­ÊÑ¿ô¤Î°ìÍ÷¤Ë¤Ä¤¤¤Æ¤Ï
+	&man.fetch.3; ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 
       <note>
 	<para>&os.current; ¤Ş¤¿¤Ï¡¢&os.stable; ¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¡¢
@@ -444,25 +429,26 @@ local: lsof-4.56.4.tgz remote: lsof-4.56
 	  -RELEASE ¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
 	  ¤½¤Î¥Ğ¡¼¥¸¥ç¥ó¤Î¥ê¥ê¡¼¥¹»ş¤Ë¥Ó¥ë¥É¤µ¤ì¤¿ package ¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Ş¤¹¡£
 	  ¤³¤ÎÀßÄê¤Ï <envar>PACKAGESITE</envar> ¤ò¾å½ñ¤­¤¹¤ë¤³¤È¤ÇÊѹ¹¤Ç¤­¤Ş¤¹¡£
-	  ¤¿¤È¤¨¤Ğ¡¢&os;&nbsp;8.1-RELEASE ¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
+	  ¤¿¤È¤¨¤Ğ¡¢&os;&nbsp;9.1-RELEASE ¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
 	  &man.pkg.add.1; ¤ò¼Â¹Ô¤¹¤ë¤È¥Ç¥Õ¥©¥ë¥È¤Ç
-	  <literal>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-8.1-release/Latest/</literal>
+	  <literal>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-9.1-release/Latest/</literal>.
 	  ¤«¤é packages ¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Ş¤¹¡£
-	  &man.pkg.add.1; ¤ò»È¤Ã¤Æ &os;&nbsp;8-STABLE ¤Î packages
+	  &man.pkg.add.1; ¤ò»È¤Ã¤Æ &os;&nbsp;9-STABLE ¤Î packages
 	  ¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Ë¤Ï¡¢
 	  <envar>PACKAGESITE</envar> ´Ä¶­ÊÑ¿ô¤ò
-	  <literal>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-8-stable/Latest/</literal>
+	  <literal>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-9-stable/Latest/</literal>
 	  ¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
       </note>
 
-      <para>package ¤Ï <filename>.tgz</filename> ¤ä <filename>.tbz</filename>
-	  ¤È¤¤¤¦³ÈÄ¥»Ò¤ò»ı¤Ä¥Õ¥¡¥¤¥ë¤È¤·¤ÆÇÛÉÛ¤µ¤ì¤Æ¤ª¤ê¡¢
-          <uri xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/</uri>
+      <para>package ¤Ï <filename>.tbz</filename>
+	  ¤È¤¤¤¦³ÈÄ¥»Ò¤ò»ı¤Ä¥Õ¥¡¥¤¥ë¤È¤·¤ÆÇÛÉÛ¤µ¤ì¤Æ¤ª¤ê¡¢<uri
+	xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/"></uri>
 	  ¤ä &os; DVD ¤Î <filename>/packages</filename> ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ê¤Ş¤¹¡£
 	  packages ¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ì¥¤¥¢¥¦¥È¤Ï¡¢
-          <filename>/usr/ports</filename> ¥Ä¥ê¡¼¤Î¤â¤Î¤ÈƱÍͤǤ¹¡£
+          <filename class="directory">/usr/ports</filename>
+	  ¥Ä¥ê¡¼¤Î¤â¤Î¤ÈƱÍͤǤ¹¡£
           ¥«¥Æ¥´¥ê¤´¤È¤Ë¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¢¤ê¡¢
-          <filename>All</filename> ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï¤¹¤Ù¤Æ¤Î package
+	  <filename class="directory">All</filename> ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï¤¹¤Ù¤Æ¤Î package
           ¤¬¤¢¤ê¤Ş¤¹¡£</para>
 
       <para>package ¥·¥¹¥Æ¥à¤Î¥Ç¥£¥ì¥¯¥È¥ê¹½Â¤¤Ï ports ¤Î¥ì¥¤¥¢¥¦¥È¤ÈƱ°ì¤Ç¤¹¡£
@@ -479,22 +465,24 @@ local: lsof-4.56.4.tgz remote: lsof-4.56
         <secondary>´ÉÍı</secondary>
       </indexterm>
 
-      <para>&man.pkg.info.1; ¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë
-        packages ¤Î°ìÍ÷¤ÈÀâÌÀ¤òɽ¼¨¤·¤Ş¤¹¡£</para>
+      <para>¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë packages
+	 ¤Î°ìÍ÷¤ÈÀâÌÀ¤òɽ¼¨¤¹¤ë¤Ë¤Ï¡¢&man.pkg.info.1; ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <indexterm>
         <primary><command>pkg_info</command></primary>
       </indexterm>
 
       <screen>&prompt.root; <userinput>pkg_info</userinput>
-colordiff-1.0.13    A tool to colorize diff output
-docbook-1.2         Meta-port for the different versions of the DocBook DTD
+colordiff-1.0.13    Tool to colorize diff output
+docbook-1.4         Meta-port for the different versions of the DocBook DTD
 ...</screen>
 
-      <para>&man.pkg.version.1; ¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë
-	packages ¤Î¥Ğ¡¼¥¸¥ç¥ó¤òÍ×Ìó¤·¤Æɽ¼¨¤·¤Ş¤¹¡£
-	¤Ş¤¿¡¢package ¤Î¥Ğ¡¼¥¸¥ç¥ó¤ò¡¢
-	¸½ºß¤Î ports ¥Ä¥ê¡¼¤Î¥Ğ¡¼¥¸¥ç¥ó¤ÈÈæ³Ó¤·¤Ş¤¹¡£</para>
+      <para>¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î packages
+	¤Î¥Ğ¡¼¥¸¥ç¥ó¤òÍ×Ìó¤·¤Æɽ¼¨¤·¡¢
+	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë package ¤Î¥Ğ¡¼¥¸¥ç¥ó¤ò¡¢
+	¥í¡¼¥«¥ë¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë ports
+	¥Ä¥ê¡¼¤Î¥Ğ¡¼¥¸¥ç¥ó¤ÈÈæ³Ó¤¹¤ë¤Ë¤Ï¡¢&man.pkg.version.1;
+	¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <indexterm>
 	<primary><command>pkg_version</command></primary>
@@ -569,11 +557,12 @@ docbook                     =
 	&man.pkg.delete.1; ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
       </para>
 
-      <screen>&prompt.root; <userinput>pkg_delete xchat-1.7.1</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg_delete <replaceable>xchat-2.8.8_1</replaceable></userinput></screen>
 
-      <para>&man.pkg.delete.1; ¤Ï package ̾¤È¥Ğ¡¼¥¸¥ç¥óÈÖ¹æ¤ÎξÊı¤òɬÍפȤ·¤Ş¤¹¡£
-	¤¹¤Ê¤ï¤Á¡¢Àè¤Û¤É¤ÎÎã¤Ë¤ª¤¤¤Æ
-	<replaceable>xchat-1.7.1</replaceable> ¤ò
+      <para>&man.pkg.delete.1; ¤Ï
+	package ̾¤È¥Ğ¡¼¥¸¥ç¥óÈÖ¹æ¤ÎξÊı¤òɬÍפȤ·¤Ş¤¹¡£
+	¤½¤Î¤¿¤á¡¢Àè¤Û¤É¤ÎÎã¤Ë¤ª¤¤¤Æ
+	<replaceable>xchat-2.8.8_1</replaceable> ¤ò
 	<replaceable>xchat</replaceable> ¤È¤·¤¿¾ì¹ç¤Ë¤ÏÆ°ºî¤·¤Ş¤»¤ó¡£
 	&man.pkg.version.1; ¤ò»È¤Ã¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë package
 	¤Î¥Ğ¡¼¥¸¥ç¥ó¤òÄ´¤Ù¤ë¤«¡¢¥ï¥¤¥ë¥É¥«¡¼¥É¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>

From owner-svn-doc-all@FreeBSD.ORG  Wed Feb  5 09:06:28 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 35C49121;
 Wed,  5 Feb 2014 09:06:28 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 20A6F1188;
 Wed,  5 Feb 2014 09:06:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1596RMU045792;
 Wed, 5 Feb 2014 09:06:27 GMT (envelope-from pgj@svn.freebsd.org)
Received: (from pgj@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1596RmW045790;
 Wed, 5 Feb 2014 09:06:27 GMT (envelope-from pgj@svn.freebsd.org)
Message-Id: <201402050906.s1596RmW045790@svn.freebsd.org>
From: Gabor Pali <pgj@FreeBSD.org>
Date: Wed, 5 Feb 2014 09:06:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43786 - 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.17
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, 05 Feb 2014 09:06:28 -0000

Author: pgj
Date: Wed Feb  5 09:06:27 2014
New Revision: 43786
URL: http://svnweb.freebsd.org/changeset/doc/43786

Log:
  - Add wblock to doceng (per hrs' announcement)

Modified:
  head/en_US.ISO8859-1/htdocs/administration.xml

Modified: head/en_US.ISO8859-1/htdocs/administration.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/administration.xml	Wed Feb  5 08:27:17 2014	(r43785)
+++ head/en_US.ISO8859-1/htdocs/administration.xml	Wed Feb  5 09:06:27 2014	(r43786)
@@ -108,6 +108,7 @@
 
   <ul>
     <li>&a.gjb.email;</li>
+    <li>&a.wblock.email;</li>
     <li>&a.blackend.email;</li>
     <li>&a.gabor.email;</li>
     <li>&a.hrs.email;</li>

From owner-svn-doc-all@FreeBSD.ORG  Wed Feb  5 10:46:27 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6CAB55F3;
 Wed,  5 Feb 2014 10:46:27 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 548C119E7;
 Wed,  5 Feb 2014 10:46:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s15AkRkw085820;
 Wed, 5 Feb 2014 10:46:27 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s15AkQWt085808;
 Wed, 5 Feb 2014 10:46:26 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201402051046.s15AkQWt085808@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 5 Feb 2014 10:46:26 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43787 - in head/ja_JP.eucJP: htdocs/releases
 htdocs/releases/10.0R 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.17
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, 05 Feb 2014 10:46:27 -0000

Author: ryusuke
Date: Wed Feb  5 10:46:25 2014
New Revision: 43787
URL: http://svnweb.freebsd.org/changeset/doc/43787

Log:
  Add 10.0R announcement:
  
    o head/ja_JP.eucJP/htdocs/releases/10.0R/Makefile
    o head/ja_JP.eucJP/htdocs/releases/10.0R/announce.xml
    o head/ja_JP.eucJP/htdocs/releases/10.0R/docbook.css
    o head/ja_JP.eucJP/htdocs/releases/Makefile
    o head/ja_JP.eucJP/share/xml/l10n.ent
    o head/ja_JP.eucJP/share/xml/news.xml

Added:
  head/ja_JP.eucJP/htdocs/releases/10.0R/
  head/ja_JP.eucJP/htdocs/releases/10.0R/Makefile   (contents, props changed)
  head/ja_JP.eucJP/htdocs/releases/10.0R/announce.xml   (contents, props changed)
  head/ja_JP.eucJP/htdocs/releases/10.0R/docbook.css   (contents, props changed)
Modified:
  head/ja_JP.eucJP/htdocs/releases/Makefile
  head/ja_JP.eucJP/share/xml/l10n.ent
  head/ja_JP.eucJP/share/xml/news.xml

Added: head/ja_JP.eucJP/htdocs/releases/10.0R/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ja_JP.eucJP/htdocs/releases/10.0R/Makefile	Wed Feb  5 10:46:25 2014	(r43787)
@@ -0,0 +1,23 @@
+# $FreeBSD$
+# The FreeBSD Japanese Documentation Project
+# Original revision: r43580
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
+DOCS=	announce.xml
+#DOCS+=	schedule.xml
+
+DATA=	docbook.css \
+#	errata.html \
+#	hardware.html \
+#	installation.html \
+#	readme.html \
+#	relnotes.html
+
+
+.include "${DOC_PREFIX}/share/mk/web.site.mk"

Added: head/ja_JP.eucJP/htdocs/releases/10.0R/announce.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ja_JP.eucJP/htdocs/releases/10.0R/announce.xml	Wed Feb  5 10:46:25 2014	(r43787)
@@ -0,0 +1,377 @@
+<?xml version="1.0" encoding="euc-jp"?>
+<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
+"http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
+<!ENTITY title "FreeBSD 10.0-RELEASE ¥¢¥Ê¥¦¥ó¥¹">
+]>
+<!-- The FreeBSD Japanese Documentation Project -->
+<!-- Original revision: r43579 -->
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>&title;</title>
+
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
+  </head>
+
+  <body class="navinclude.download">
+
+    <p>&os; ¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¥Á¡¼¥à¤è¤ê¡¢
+      &os; 10.0-RELEASE ¤Î¸ø³«¤ò¤ªÃΤ餻¤·¤Ş¤¹¡£
+      ¤³¤ì¤Ï¡¢stable/10 ¥Ö¥é¥ó¥Á¤«¤é¤ÎºÇ½é¤Î¥ê¥ê¡¼¥¹¤Ç¤¹¡£</p>
+ 
+    <p>¤³¤Î¥ê¥ê¡¼¥¹¤Î¼ç¤ÊÊѹ¹ÅÀ¤Ï¡¢°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£</p>
+
+    <ul>
+      <li><p>clang(1) ¤¬¥Ç¥Õ¥©¥ë¥È¥³¥ó¥Ñ¥¤¥é¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç¤Ï¡¢
+	  GCC ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Ê¤¯¤Ê¤ê¤Ş¤·¤¿¡£</p></li>
+      <li><p>¥í¡¼¥«¥ë¥­¥ã¥Ã¥·¥å DNS ¥ê¥¾¥ë¥Ğ¤È¤·¤Æ¡¢
+	  Unbound ¤¬¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Ë¼è¤ê¹ş¤Ş¤ì¤Ş¤·¤¿¡£</p></li>
+      <li><p>¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤«¤é BIND ¤¬ºï½ü¤µ¤ì¤Ş¤·¤¿¡£</p></li>
+      <li><p>make(1) ¤¬ NetBSD ¥×¥í¥¸¥§¥¯¥È¤Î bmake(1)
+	  ¤ËÃÖ¤­´¹¤¨¤é¤ì¤Ş¤·¤¿¡£</p></li>
+      <li><p>¥Ç¥Õ¥©¥ë¥È¤Î package ´ÉÍı¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤¬
+	  pkg(7) ¤Ë¤Ê¤ê¤Ş¤·¤¿¡£</p></li>
+      <li><p>pkg_add(1), pkg_delete(1)
+	  ¤Ê¤É¤Î´ØÏ¢¥Ä¡¼¥ë¤¬ºï½ü¤µ¤ì¤Ş¤·¤¿¡£</p></li>
+      <li><p>bhyve(8), virtio(4) ¤ª¤è¤Ó
+	  Microsoft Hyper-V ¤Î¥²¥¹¥È¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤È¤·¤Æ
+	  &os; ¤ò¥µ¥İ¡¼¥È¤¹¤ë¤¿¤á¤Î¥Í¥¤¥Æ¥£¥Ö¤Ê½à²¾ÁÛ²½¥É¥é¥¤¥Ğ¤ÎÄɲá¢
+	  ¤È¤¤¤Ã¤¿²¾ÁÛ²½¤Ë¤ª¤¤¤ÆÂ礭¤Êµ¡Ç½³ÈÄ¥¤¬¹Ô¤ï¤ì¤Ş¤·¤¿¡£</p></li>
+      <li><p>ZFS ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤¬ SSD ¤Î TRIM ¤ËÂбş¤·¤Ş¤·¤¿¡£</p></li>
+      <li><p>ZFS ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤¬¹âÀ­Ç½¤Ê lz4 °µ½Ì¥¢¥ë¥´¥ê¥º¥à¤ËÂбş¤·¤Ş¤·¤¿¡£</p></li>
+    </ul>
+
+    <p>¿·µ¡Ç½¤ä´ûÃΤÎÌäÂêÅÀ¤Î°ìÍ÷¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+      °Ê²¼¤«¤é¥ê¥ê¡¼¥¹¥Î¡¼¥È¤äÀµ¸íɽ¤ò¥ª¥ó¥é¥¤¥ó¤Ç¤´Í÷¤¯¤À¤µ¤¤¡£</p>
+
+    <ul>
+      <li><p><tt><a href="http://www.FreeBSD.org/releases/10.0R/relnotes.html">http://www.FreeBSD.org/releases/10.0R/relnotes.html</a></tt></p></li>
+      <li><p><tt><a href="http://www.FreeBSD.org/releases/10.0R/errata.html">http://www.FreeBSD.org/releases/10.0R/errata.html</a></tt></p></li>
+    </ul>
+
+    <p>&os; ¤Î¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°³èÆ°¤Î¾Ü¤·¤¤¾ğÊó¤Ï¡¢</p>
+
+    <ul>
+      <li><p><tt><a href="http://www.FreeBSD.org/releng/">http://www.FreeBSD.org/releng/</a></tt></p></li>
+    </ul>
+
+    <p>¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</p>
+
+    <h2 id="availability">Æş¼êÊıË¡</h2>
+
+    <p>&os; 10.0-RELEASE ¤Ï¡¢amd64, i386, ia64,
+      powerpc, powerpc64, ¤ª¤è¤Ó sparc64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤ÇÍøÍѤǤ­¤Ş¤¹¡£</p>
+
+    <p>&os; 10.0 ¤Ï¡¢µ¯Æ°²Äǽ¤Ê ISO ¥¤¥á¡¼¥¸¡¢
+      ¤â¤·¤¯¤Ï¥Í¥Ã¥È¥ï¡¼¥¯·Ğͳ¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Ş¤¹¡£
+      °ìÉô¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç¤Ï
+      USB ¥á¥â¥ê¥¹¥Æ¥£¥Ã¥¯¤ò»È¤Ã¤¿¥¤¥ó¥¹¥È¡¼¥ë¤â²Äǽ¤Ç¤¹¡£
+      ¸å¤Î¾Ï¤ËÀâÌÀ¤¬¤¢¤ë¤è¤¦¤Ë¡¢É¬Íפʥե¡¥¤¥ë¤Ï
+      FTP ·Ğͳ¤Ç¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Ş¤¹¡£
+      ¤¿¤À¤·¡¢µ¬ÌϤµ¤Ê FTP ¥ß¥é¡¼¥µ¥¤¥È¤Ç¤Ï¡¢ÃÖ¤«¤ì¤Æ¤¤¤ëÇÛÉÛʪ¤¬
+      amd64 ¤ä i386 ¤È¤¤¤Ã¤¿¼çÍפʥ¢¡¼¥­¥Æ¥¯¥Á¥ãÍѤΤߤǡ¢
+      ¤¹¤Ù¤Æ¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤ÎÇÛÉÛʪ¤¬ÃÖ¤«¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤â¤¢¤ê¤Ş¤¹¡£</p>
+
+    <p>¥ê¥ê¡¼¥¹ ISO ¥¤¥á¡¼¥¸¤È¥á¥â¥ê¥¹¥Æ¥£¥Ã¥¯¤Î
+      SHA256 ¤ª¤è¤Ó MD5 ¥Ï¥Ã¥·¥åÃͤϡ¢¤³¤Î¥¢¥Ê¥¦¥ó¥¹¤ÎºÇ¸å¤Ë¤¢¤ê¤Ş¤¹¡£</p>
+
+    <p>¥ê¥ê¡¼¥¹¤Ë¤ª¤¤¤ÆÍÑ°Õ¤µ¤ì¤ë³Æ¥¤¥á¡¼¥¸¤ÎÍÑÅӤϰʲ¼¤Î¤È¤ª¤ê¤Ç¤¹¡£</p>
+
+    <dl>
+      <dt>dvd1</dt>
+
+      <dd>
+        <p>&os; ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¥Ù¡¼¥¹¥·¥¹¥Æ¥à¡¢¥É¥­¥å¥á¥ó¥È¡¢
+	  ¤ª¤è¤Ó¥°¥é¥Õ¥£¥«¥ë¤Ê¥ï¡¼¥¯¥¹¥Æ¡¼¥·¥ç¥ó¤ò¹½ÃÛ¤·¤Æµ¯Æ°¤¹¤ë¤¿¤á¤ÎºÇ¾®¸Â¤Î
+	  package ¥»¥Ã¥È¡¢
+	  ¤³¤ì¤é¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤ËɬÍפʤ¹¤Ù¤Æ¤¬´Ş¤Ş¤ì¤Æ¤¤¤Ş¤¹¡£
+	  "livefs"¡¡¥Ù¡¼¥¹¤Î¥ì¥¹¥­¥å¡¼¥â¡¼¥É¤Çµ¯Æ°¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£
+	  DVD ¥µ¥¤¥º¤Î¥á¥Ç¥£¥¢¤Ë½ñ¤­¹ş¤à¤³¤È¤¬¤Ç¤­¡¢DVD ¤òÍøÍѲÄǽ¤Ê´Ä¶­¤Ç¤Ï¡¢
+	  ¤³¤Î¥¤¥á¡¼¥¸¤À¤±¤Ç½½Ê¬¤Ç¤¹¡£</p>
+      </dd>
+
+      <dt>disc1</dt>
+
+      <dd>
+        <p>&os; ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤¬Æş¤Ã¤Æ¤¤¤Ş¤¹¡£
+	  "livefs" ¥Ù¡¼¥¹¤Î¥ì¥¹¥­¥å¡¼¥â¡¼¥É¤Ç¤âµ¯Æ°¤Ç¤­¤ë¥¤¥á¡¼¥¸¤Ç¤¹¡£
+	  package ¤Ï´Ş¤Ş¤ì¤Æ¤¤¤Ş¤»¤ó¡£</p>
+      </dd>
+
+      <dt>bootonly</dt>
+
+      <dd>
+	<p>CDROM ¥É¥é¥¤¥Ö¤òÈ÷¤¨¤¿¥Ş¥·¥ó¤Çµ¯Æ°¤Ç¤­¤ë¥¤¥á¡¼¥¸¤Ç¤¹¤¬¡¢
+	  ¤³¤Î CD ¤Î¤ß¤ò»È¤Ã¤Æ &os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Ş¤»¤ó¡£
+	  ¤³¤Î CD ¤ò»È¤Ã¤Æµ¯Æ°¤·¤¿¸å¤Ï¡¢(FTP ¥µ¡¼¥Ğ¤Ê¤É¤«¤é)
+	  ¥Í¥Ã¥È¥ï¡¼¥¯·Ğͳ¤Ç¥¤¥ó¥¹¥È¡¼¥ëºî¶È¤ò¹Ô¤¦É¬Íפ¬¤¢¤ê¤Ş¤¹¡£</p>
+      </dd>
+
+      <dt>memstick</dt>
+
+      <dd>
+	<p>USB ¥á¥â¥ê¥¹¥Æ¥£¥Ã¥¯ (¥Õ¥é¥Ã¥·¥å¥É¥é¥¤¥Ö)
+	  ¤Ë½ñ¤­¹ş¤á¤ë¥¤¥á¡¼¥¸¤Ç¤¹¡£
+	  USB ¥É¥é¥¤¥Ö¤«¤é¤Îµ¯Æ°²Äǽ¤Ê¥³¥ó¥Ô¥å¡¼¥¿¤Ë¤ª¤¤¤Æ¡¢
+	  ¥¤¥ó¥¹¥È¡¼¥ë¤Ë»È¤¦¤³¤È¤¬¤Ç¤­¤Ş¤¹¡£
+	  "livefs" ¥Ù¡¼¥¹¤Î¥ì¥¹¥­¥å¡¼¥â¡¼¥É¤Çµ¯Æ°¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£
+	  package ¤Ï´Ş¤Ş¤ì¤Æ¤¤¤Ş¤»¤ó¡£</p>
+
+	<p>memstick ¥¤¥á¡¼¥¸¤Î»ÈÍÑÎã¤ò²¼¤Ë¼¨¤·¤Ş¤¹¡£
+	  USB ¥É¥é¥¤¥Ö¤¬ /dev/da0 ¤È¤·¤Æǧ¼±¤µ¤ì¤ë¥³¥ó¥Ô¥å¡¼¥¿¤Ç¤Ï¡¢
+	  ¼¡¤Î¤è¤¦¤Ê¥³¥Ş¥ó¥É¤Ç½ñ¤­¹ş¤à¤³¤È¤¬²Äǽ¤Ç¤¹¡£</p>
+
+	<pre># dd if=FreeBSD-10.0-RELEASE-amd64-memstick.img of=/dev/da0 bs=10240 conv=sync</pre>
+
+	<p>¥¿¡¼¥²¥Ã¥È (of=)
+	  ¤ÎÉôʬ¤¬Å¬ÀÚ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¤³¤È¤ËºÙ¿´¤ÎÃí°Õ¤òʧ¤Ã¤Æ¤¯¤À¤µ¤¤¡£</p>
+      </dd>
+    </dl>
+
+    <p>&os; 10.0-RELEASE ¤Î CD-ROM ¤È DVD ¤Ï¡¢¥Ù¥ó¥À¤«¤é¤â¹ØÆş¤Ç¤­¤Ş¤¹¡£
+      &os; 10.0 ¥Ù¡¼¥¹¤ÎÀ½ÉʤòÈÎÇ䤷¤Æ¤¤¤ë¥Ù¥ó¥À¤Î¤Ò¤È¤Ä¤¬¡¢°Ê²¼¤Î
+      FreeBSD Mall ¤Ç¤¹¡£</p>
+
+    <ul>
+      <li>
+	<p>&os; Mall, Inc.<tt><a
+	    href="http://www.freebsdmall.com/">http://www.freebsdmall.com</a></tt></p></li>
+    </ul>
+
+    <h2>FTP</h2>
+
+    <p>¼¡¤Î FTP ¥µ¥¤¥È¤«¤é &os; 10.0-RELEASE ¤ò¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Ş¤¹¡£</p>
+
+    <ul>
+      <li><p><tt><a href="ftp://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/10.0/">ftp://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/10.0/</a></tt></p></li>
+    </ul>
+
+    <p>¤·¤«¤·¤Ê¤¬¤é¡¢¤³¤ì¤é¤Î¥µ¥¤¥È¤òÍøÍѤ¹¤ëÁ°¤Ë¡¢¤Ş¤º¡¢
+      ¤¢¤Ê¤¿¤Î½»¤ó¤Ç¤¤¤ëºÇ´ó¤ê¤Î¥ß¥é¡¼¥µ¥¤¥È¤ÎÍøÍѤò»î¤ß¤Æ¤¯¤À¤µ¤¤¡£</p>
+
+    <ul>
+      <li><p><tt><a>ftp://ftp.&lt;¤¢¤Ê¤¿¤Î½»¤ó¤Ç¤¤¤ëÃÏ°è&gt;.FreeBSD.org/pub/FreeBSD</a></tt></p></li>
+    </ul>
+
+    <p>¾¤Ë ftp2, ftp3 ¤È¤¤¤¦½ç¤Ë̾Á°¤¬¤Ä¤±¤é¤ì¤Æ¤¤¥ß¥é¡¼¥µ¥¤¥È¤â¤¢¤ê¤Ş¤¹¡£</p>
+
+    <p>&os; ¥ß¥é¡¼¥µ¥¤¥È¤Î¾ÜºÙ¤Ï¡¢°Ê²¼¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
+
+    <ul>
+      <li><p><tt><a
+	  href="http://www.FreeBSD.org/doc/ja_JP.eucJP/books/handbook/mirrors-ftp.html">http://www.FreeBSD.org/doc/ja_JP.eucJP/books/handbook/mirrors-ftp.html</a></tt> (ÆüËܸì)</p></li>
+
+      <li><p><tt><a
+	  href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html">http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html</a></tt> (±Ñ¸ì)</p></li>
+    </ul>
+
+    <p>&os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢¤Ş¤¿¤Ï¡¢
+      ´û¸¤Î¥·¥¹¥Æ¥à¤ò 10.0-RELEASE ¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¼ê½ç¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+      °Ê²¼¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</p>
+
+    <ul>
+      <li><p><tt><a href="http://www.FreeBSD.org/releases/10.0R/installation.html">http://www.FreeBSD.org/releases/10.0R/installation.html</a></tt></p></li>
+    </ul>
+
+    <p><strong>freebsd-update(8) ¥æ¡¼¥¶¤Ø¤Î½ÅÍפÊÃí°ÕÅÀ:</strong>
+      ¥·¥¹¥Æ¥à¤ò 10.0-RELEASE ¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ëÁ°¤Ë¡¢
+      °Ê²¼¤Î &os; Àµ¸íɽ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤Ë½¾¤Ã¤Æ¤¯¤À¤µ¤¤¡£</p>
+
+    <ul>
+      <li><p><a href="http://www.freebsd.org/security/advisories/FreeBSD-EN-13:04.freebsd-update.asc">EN-13:04.freebsd-update</a></p></li>
+      <li><p><a href="http://www.freebsd.org/security/advisories/FreeBSD-EN-13:05.freebsd-update.asc">EN-13:05.freebsd-update</a></p></li>
+    </ul>
+
+    <h2>¥µ¥İ¡¼¥È</h2>
+
+    <p>&os; 10.0-RELEASE ¤ÎÊݼ齪λͽÄêÆü¤Ï 2015 ǯ 1 ·î 31 Æü¤Ç¤¹¡£
+      Êݼ齪λÆü¤Ë´Ø¤·¤Æ¤Ï°Ê²¼¤Î¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</p>
+
+    <ul>
+      <li><p><tt><a
+	    href="http://www.FreeBSD.org/ja/security/">http://www.FreeBSD.org/ja/security/</a></tt> (ÆüËܸì)</p></li>
+      <li><p><tt><a
+	    href="http://www.FreeBSD.org/security/">http://www.FreeBSD.org/security/</a></tt> (±Ñ¸ì)</p></li>
+    </ul>
+
+    <h2>&os; ¥Ù¡¼¥¹¤Î¾¤Î¥×¥í¥¸¥§¥¯¥È</h2>
+
+    <p>&os; ¤ò¥Ù¡¼¥¹¤È¤·¤¿ &quot;¥µ¡¼¥É¥Ñ¡¼¥Æ¥£&quot;
+      ¥×¥í¥¸¥§¥¯¥È¤¬¿ô¿¤¯¤¢¤ê¤Ş¤¹¡£
+      ¤½¤ì¤é¤Î¥×¥í¥¸¥§¥¯¥È¤Ë¤Ï¡¢&os; ¤òºÆ¥Ñ¥Ã¥±¡¼¥¸¥ó¥°¤·¤¿¤â¤Î¤«¤é¡¢
+      Amazon EC2 ¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¤Ç &os; ¤òÍøÍѤǤ­¤ë¤è¤¦¤Ë¤¹¤ë¤È¤¤¤¦¡¢
+      ¤è¤ê &quot;½é¿´¼Ô¸ş¤±¤Î&quot; ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ş¤Ç¤¢¤ê¤Ş¤¹¡£
+      ¥µ¡¼¥É¥Ñ¡¼¥Æ¥£¤Î¥×¥í¥¸¥§¥¯¥È¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï°Ê²¼¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</p>
+
+    <ul>
+      <li><p><tt><a href="http://wiki.FreeBSD.org/3rdPartyProjects">http://wiki.FreeBSD.org/3rdPartyProjects</a></tt></p></li>
+    </ul>
+
+    <h2>¸¥¼­</h2>
+
+    <p>&os; Foundation, Yahoo!, NetApp, Internet Systems
+      Consortium, ByteMark Hosting, Sentex Communications, New York
+      Internet, Juniper Networks, NLNet ¤ª¤è¤Ó iXsystems
+      ¤ò¤Ï¤¸¤á¤È¤¹¤ë¿¤¯¤Î´ë¶È¤«¤é¡¢
+      &os; 10.0 ¤Î¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°³èÆ°¤ËɬÍפʵ¡ºà¡¢
+      ¥Í¥Ã¥È¥ï¡¼¥¯¥¢¥¯¥»¥¹¡¢¿ÍŪ»ñ¸»¤òÄ󶡤·¤Æ¤¤¤¿¤À¤­¤Ş¤·¤¿¡£</p>
+
+    <p>10.0-RELEASE ¤Î¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¥Á¡¼¥à¤Ï¡¢
+      °Ê²¼¤Î¥á¥ó¥Ğ¤Ç¹½À®¤µ¤ì¤Æ¤¤¤Ş¤¹¡£</p>
+
+    <table border="0">
+      <tbody>
+	<tr>
+	  <td>Ken&nbsp;Smith&nbsp;&lt;<a href="mailto:kensmith@FreeBSD.org">kensmith@FreeBSD.org</a>&gt;</td>
+	  <td>¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¥ê¡¼¥É</td>
+	</tr>
+
+	<tr>
+	  <td>Marcus&nbsp;von&nbsp;Appen&nbsp;&lt;<a href="mailto:mva@FreeBSD.org">mva@FreeBSD.org</a>&gt;</td>
+	  <td>¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°Ã´Åö</td>
+	</tr>
+
+	<tr>
+	  <td>Glen&nbsp;Barber&nbsp;&lt;<a href="mailto:gjb@FreeBSD.org">gjb@FreeBSD.org</a>&gt;</td>
+	  <td>¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°Ã´Åö, 10.0-RELEASE ¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢</td>
+	</tr>
+
+	<tr>
+	  <td>Konstantin&nbsp;Belousov&nbsp;&lt;<a href="mailto:kib@FreeBSD.org">kib@FreeBSD.org</a>&gt;</td>
+	  <td>¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°Ã´Åö</td>
+	</tr>
+
+	<tr>
+	  <td>Joel&nbsp;Dahl&nbsp;&lt;<a href="mailto:joel@FreeBSD.org">joel@FreeBSD.org</a>&gt;</td>
+	  <td>¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°Ã´Åö</td>
+	</tr>
+
+	<tr>
+	  <td>Baptiste&nbsp;Daroussin&nbsp;&lt;<a href="mailto:bapt@FreeBSD.org">bapt@FreeBSD.org</a>&gt;</td>
+	  <td>package ¹½ÃÛôÅö</td>
+	</tr>
+
+	<tr>
+	  <td>Bryan&nbsp;Drewery&nbsp;&lt;<a href="mailto:bdrewery@FreeBSD.org">bdrewery@FreeBSD.org</a>&gt;</td>
+	  <td>package ¹½ÃÛôÅö</td>
+	</tr>
+
+	<tr>
+	  <td>Marc&nbsp;Fonvieille&nbsp;&lt;<a href="mailto:blackend@FreeBSD.org">blackend@FreeBSD.org</a>&gt;</td>
+	  <td>¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¡¢Ê¸½ñôÅö</td>
+	</tr>
+
+	<tr>
+	  <td>Steven&nbsp;Kreuzer&nbsp;&lt;<a href="mailto:skreuzer@FreeBSD.org">skreuzer@FreeBSD.org</a>&gt;</td>
+	  <td>¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°Ã´Åö</td>
+	</tr>
+
+	<tr>
+	  <td>Xin&nbsp;Li&nbsp;&lt;<a href="mailto:delphij@FreeBSD.org">delphij@FreeBSD.org</a>&gt;</td>
+	  <td>¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¡¢¥»¥­¥å¥ê¥Æ¥£Ã´Åö</td>
+	</tr>
+
+	<tr>
+	  <td>Josh&nbsp;Paetzel&nbsp;&lt;<a href="mailto:jpaetzel@FreeBSD.org">jpaetzel@FreeBSD.org</a>&gt;</td>
+	  <td>¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°Ã´Åö</td>
+	</tr>
+
+	<tr>
+	  <td>Colin&nbsp;Percival&nbsp;&lt;<a href="mailto:cperciva@FreeBSD.org">cperciva@FreeBSD.org</a>&gt;</td>
+	  <td>̾ÍÀ¥»¥­¥å¥ê¥Æ¥£¥ª¥Õ¥£¥µ</td>
+	</tr>
+
+	<tr>
+	  <td>Craig&nbsp;Rodrigues&nbsp;&lt;<a href="mailto:rodrigc@FreeBSD.org">rodrigc@FreeBSD.org</a>&gt;</td>
+	  <td>¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°Ã´Åö</td>
+	</tr>
+
+	<tr>
+	  <td>º´Æ£&nbsp;¹­À¸&nbsp;&lt;<a href="mailto:hrs@FreeBSD.org">hrs@FreeBSD.org</a>&gt;</td>
+	  <td>¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¡¢Ê¸½ñôÅö</td>
+	</tr>
+
+	<tr>
+	  <td>Gleb&nbsp;Smirnoff&nbsp;&lt;<a href="mailto:glebius@FreeBSD.org">glebius@FreeBSD.org</a>&gt;</td>
+	  <td>¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°Ã´Åö</td>
+	</tr>
+
+	<tr>
+	  <td>Dag-Erling&nbsp;Sm&oslash;rgrav&nbsp;&lt;<a href="mailto:des@FreeBSD.org">des@FreeBSD.org</a>&gt;</td>
+	  <td>¥»¥­¥å¥ê¥Æ¥£¥ª¥Õ¥£¥µ</td>
+	</tr>
+
+	<tr>
+	  <td>Marius&nbsp;Strobl&nbsp;&lt;<a href="mailto:marius@FreeBSD.org">marius@FreeBSD.org</a>&gt;</td>
+	  <td>¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°Ã´Åö</td>
+	</tr>
+
+	<tr>
+	  <td>Robert&nbsp;Watson&nbsp;&lt;<a href="mailto:rwatson@FreeBSD.org">rwatson@FreeBSD.org</a>&gt;</td>
+	  <td>¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¡¢¥»¥­¥å¥ê¥Æ¥£Ã´Åö</td>
+	</tr>
+      </tbody>
+    </table>
+
+  <h2>ÅĞÏ¿¾¦É¸</h2>
+
+  <p>&os; ¤Ï The &os; Foundation ¤ÎÅĞÏ¿¾¦É¸¤Ç¤¹¡£</p>
+
+  <h2>ISO ¥¤¥á¡¼¥¸¤Î¥Á¥§¥Ã¥¯¥µ¥à</h2>
+
+  <pre>SHA256 (FreeBSD-10.0-RELEASE-amd64-bootonly.iso) = a005b55a7d25e00b247b1e1bddbb9279faaecfa01f1a42846a92f62908229aa0
+SHA256 (FreeBSD-10.0-RELEASE-amd64-disc1.iso) = 9c377b4a4e63443c0b210080694de26133e6a276eddb07c7e00e1c9aebd84109
+SHA256 (FreeBSD-10.0-RELEASE-amd64-dvd1.iso) = b0f25ae6f165132525cdda690de7b762ba6bcec3a77e784ca293a49a520fe8f5
+SHA256 (FreeBSD-10.0-RELEASE-amd64-memstick.img) = 8cfd48c35d968f4f7a7e34376fd77af351fbbf2a37f4654843845bdb2cd51bbe</pre>
+
+  <pre>MD5 (FreeBSD-10.0-RELEASE-amd64-bootonly.iso) = d27f835c01be0318936051abc0dfa3ce
+MD5 (FreeBSD-10.0-RELEASE-amd64-disc1.iso) = fd25619fa0d69c29bea8347b1070ac75
+MD5 (FreeBSD-10.0-RELEASE-amd64-dvd1.iso) = 26d11e2d6f24ff1d97dffeaa3c500c03
+MD5 (FreeBSD-10.0-RELEASE-amd64-memstick.img) = f083747bd1aa3922aa9b92b37836fa97</pre>
+
+  <pre>SHA256 (FreeBSD-10.0-RELEASE-i386-bootonly.iso) = 26c667ab930ddc2fa9f060518ec63cee7b0a63e97186ff5640919b431db09648
+SHA256 (FreeBSD-10.0-RELEASE-i386-disc1.iso) = 2c09643b3f79c703e424c03408882369025cec655c24a6d81ee073081ee75ebc
+SHA256 (FreeBSD-10.0-RELEASE-i386-dvd1.iso) = dd81af12cfdfd72162e5238ad8241e1ff249398574ca6922d5581ea3274ea66a
+SHA256 (FreeBSD-10.0-RELEASE-i386-memstick.img) = cd471b30a8fa9eb0c86c222cc4035396b08c3daf8b6f0489672afff9703ca6e7</pre>
+
+  <pre>MD5 (FreeBSD-10.0-RELEASE-i386-bootonly.iso) = 1d481dd6972700160b305c21cfece123
+MD5 (FreeBSD-10.0-RELEASE-i386-disc1.iso) = 9d12797f008f6c180a2a514476c2dede
+MD5 (FreeBSD-10.0-RELEASE-i386-dvd1.iso) = 53e905031bf58e105e9842ef8c8f89da
+MD5 (FreeBSD-10.0-RELEASE-i386-memstick.img) = ec366c5b83fc2b1dd93a521c1a323a10</pre>
+
+  <pre>SHA256 (FreeBSD-10.0-RELEASE-ia64-bootonly.iso) = ff9e1573bcef36bc6e5a132aeb8620b6f87671dfeaaf18ad31fbda5fcf0d0c7a
+SHA256 (FreeBSD-10.0-RELEASE-ia64-disc1.iso) = 547d8e78621af787ca351adf2d4c7edcf9490e63884fe9be34d69418e5fc1ae8
+SHA256 (FreeBSD-10.0-RELEASE-ia64-memstick.img) = 60ea1fb0311e4d4eb4300a2a3bef24adcbc23ee022dc65b46d7aee1d313db61f</pre>
+
+  <pre>MD5 (FreeBSD-10.0-RELEASE-ia64-bootonly.iso) = de709ae289827b862bb18f3224174158
+MD5 (FreeBSD-10.0-RELEASE-ia64-disc1.iso) = 789db226af47a3107711709c49125b7d
+MD5 (FreeBSD-10.0-RELEASE-ia64-memstick.img) = 085f1eb284b3976d076220ebff44bd4c</pre>
+
+  <pre>SHA256 (FreeBSD-10.0-RELEASE-powerpc-bootonly.iso) = a24685ed70287d6d0c708178946f19cf67b1d2512b2d873708d3da0b6b1e137e
+SHA256 (FreeBSD-10.0-RELEASE-powerpc-disc1.iso) = 78d733791533a48ea90d442f677666ba8017070445a2b936b21f57c054e9b024
+SHA256 (FreeBSD-10.0-RELEASE-powerpc-memstick.img) = 9139598f6ef8c1bf53dcf4a7e7866fcfc5b5fbbf9b36a357f58654cffb71767d</pre>
+
+  <pre>MD5 (FreeBSD-10.0-RELEASE-powerpc-bootonly.iso) = 378b02e51928fc2306d937be77c02add
+MD5 (FreeBSD-10.0-RELEASE-powerpc-disc1.iso) = b71e4ea904dacadeed9154c5396e4bf8
+MD5 (FreeBSD-10.0-RELEASE-powerpc-memstick.img) = 17b1addf7261f507ab05a6ff0fc67467</pre>
+
+  <pre>SHA256 (FreeBSD-10.0-RELEASE-powerpc-powerpc64-bootonly.iso) = 95984c806defff5b3e066b06af5437f80b9348b1134098acf0b174b3359c431c
+SHA256 (FreeBSD-10.0-RELEASE-powerpc-powerpc64-disc1.iso) = 38b03ef2620544e71af7c46ec001b6d63a2ffbe850f33a6f08e1b9da4b682c34
+SHA256 (FreeBSD-10.0-RELEASE-powerpc-powerpc64-memstick.img) = ac268349d1642400136be2827a81222ad4e7d75a287e895622482189b643b015</pre>
+
+  <pre>MD5 (FreeBSD-10.0-RELEASE-powerpc-powerpc64-bootonly.iso) = a215b48b78481b4ff399f54c95024e79
+MD5 (FreeBSD-10.0-RELEASE-powerpc-powerpc64-disc1.iso) = f0081ae54e8677c090a1b88838c5cd94
+MD5 (FreeBSD-10.0-RELEASE-powerpc-powerpc64-memstick.img) = 08b260573677f925da20498fe714c245</pre>
+
+  <pre>SHA256 (FreeBSD-10.0-RELEASE-sparc64-bootonly.iso) = 773bc7d438e89ce8f2f4fee90db59b17025f6da5c61259bbd02c275305cc968d
+SHA256 (FreeBSD-10.0-RELEASE-sparc64-disc1.iso) = 0e7fc117dfa785e6df793898c2fdccd9054c81523d7a734fc2c4b5e5baac6999</pre>
+
+  <pre>MD5 (FreeBSD-10.0-RELEASE-sparc64-bootonly.iso) = 10ab6d0462d6e6fc876655e0a1c1d202
+MD5 (FreeBSD-10.0-RELEASE-sparc64-disc1.iso) = ebcf423b5e610ca0448c44c65901e3f2</pre>
+
+  <p>Love FreeBSD?  The &os;&nbsp;Foundation ¤Ë <a
+      href="https://www.freebsdfoundation.org/donate/">´óÉÕ</a>
+    ¤ò¤·¤Æ¡¢ º£²ó¤Î¥ê¥ê¡¼¥¹¤ä¾­Íè¤Î¥ê¥ê¡¼¥¹¤ò¥µ¥İ¡¼¥È¤·¤Æ¤¯¤À¤µ¤¤!</p>
+
+  </body>
+</html>

Added: head/ja_JP.eucJP/htdocs/releases/10.0R/docbook.css
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ja_JP.eucJP/htdocs/releases/10.0R/docbook.css	Wed Feb  5 10:46:25 2014	(r43787)
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2001, 2003, 2010 The FreeBSD Documentation Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ * The FreeBSD Japanese Documentation Project
+ * Original revision: r42537
+ */
+
+BODY ADDRESS {
+	line-height: 1.3;
+	margin: .6em 0;
+}
+
+BODY BLOCKQUOTE {
+	margin-top: .75em;
+	line-height: 1.5;
+	margin-bottom: .75em;
+}
+
+HTML BODY {
+	margin: 1em 8% 1em 10%;
+	line-height: 1.2;
+}
+
+.LEGALNOTICE {
+	font-size: small;
+	font-variant: small-caps;
+}
+
+BODY DIV {
+	margin: 0;
+}
+
+DL {
+	margin: .8em 0;
+	line-height: 1.2;
+}
+
+BODY FORM {
+	margin: .6em 0;
+}
+
+H1, H2, H3, H4, H5, H6,
+DIV.EXAMPLE P B,
+.QUESTION,
+DIV.TABLE P B,
+DIV.PROCEDURE P B {
+	color: #990000;
+}
+
+BODY H1, BODY H2, BODY H3, BODY H4, BODY H5, BODY H6 {
+	line-height: 1.3;
+	margin-left: 0;
+}
+
+BODY H1, BODY H2 {
+	margin: .8em 0 0 -4%;
+}
+
+BODY H3, BODY H4 {
+	margin: .8em 0 0 -3%;
+}
+
+BODY H5 {
+	margin: .8em 0 0 -2%;
+}
+
+BODY H6 {
+	margin: .8em 0 0 -1%;
+}
+
+BODY HR {
+	margin: .6em;
+	border-width: 0 0 1px 0;
+	border-style: solid;
+	border-color: #cecece;
+}
+
+BODY IMG.NAVHEADER {
+	margin: 0 0 0 -4%;
+}
+
+OL {
+	margin: 0 0 0 5%;
+	line-height: 1.2;
+}
+
+BODY PRE {
+	margin: .75em 0;
+	line-height: 1.0;
+	font-family: monospace;
+}
+
+BODY TD, BODY TH {
+	line-height: 1.2;
+}
+
+UL, BODY DIR, BODY MENU {
+	margin: 0 0 0 5%;
+	line-height: 1.2;
+}
+
+HTML {
+	margin: 0; 
+	padding: 0;
+}
+
+BODY P B.APPLICATION {
+	color: #000000;
+}
+
+.FILENAME {
+	color: #007a00;
+}
+
+.GUIMENU, .GUIMENUITEM, .GUISUBMENU,
+.GUILABEL, .INTERFACE,
+.SHORTCUT, .SHORTCUT .KEYCAP {
+	font-weight: bold;
+}
+
+.GUIBUTTON {
+	background-color: #CFCFCF;
+	padding: 2px;
+}
+
+.ACCEL {
+	background-color: #F0F0F0;
+	text-decoration: underline;
+} 
+
+.SCREEN {
+	padding: 1ex;
+}
+
+.PROGRAMLISTING {
+	padding: 1ex;
+	background-color: #eee;
+	border: 1px solid #ccc;
+}
+
+@media screen {  /* hide from IE3 */
+	a[href]:hover { background: #ffa }
+}
+
+BLOCKQUOTE.NOTE {
+	color: #222;
+	background: #eee;
+	border: 1px solid #ccc;
+	padding: 0.4em 0.4em;
+	width: 85%;
+}
+
+BLOCKQUOTE.TIP {
+	color: #004F00;
+	background: #d8ecd6;
+	border: 1px solid green;
+	padding: 0.2em 2em;
+	width: 85%;
+}
+
+BLOCKQUOTE.IMPORTANT {
+	font-style:italic;
+	border: 1px solid #a00;
+	border-left: 12px solid #c00;
+	padding: 0.1em 1em;
+}
+
+BLOCKQUOTE.WARNING {
+	color: #9F1313;
+	background: #f8e8e8;
+	border: 1px solid #e59595;
+	padding: 0.2em 2em;
+	width: 85%;
+}
+
+.EXAMPLE {
+	background: #fefde6;
+	border: 1px solid #f1bb16;
+	margin: 1em 0;
+	padding: 0.2em 2em;
+	width: 90%;
+}
+
+.INFORMALTABLE TABLE.CALSTABLE TR TD {
+        padding-left: 1em;
+        padding-right: 1em;
+}

Modified: head/ja_JP.eucJP/htdocs/releases/Makefile
==============================================================================
--- head/ja_JP.eucJP/htdocs/releases/Makefile	Wed Feb  5 09:06:27 2014	(r43786)
+++ head/ja_JP.eucJP/htdocs/releases/Makefile	Wed Feb  5 10:46:25 2014	(r43787)
@@ -24,7 +24,7 @@ SUBDIR+=	5.0R 5.1R 5.2R 5.2.1R 5.3R 5.4R
 SUBDIR+=	8.2R 8.3R 8.4R
 #SUBDIR+=	9.0R 9.1R 9.2R
 SUBDIR+=	9.0R 9.2R
-#SUBDIR+=	10.0R
+SUBDIR+=	10.0R
 
 .if defined(NEW_BUILD)
 SUBDIR=

Modified: head/ja_JP.eucJP/share/xml/l10n.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/l10n.ent	Wed Feb  5 09:06:27 2014	(r43786)
+++ head/ja_JP.eucJP/share/xml/l10n.ent	Wed Feb  5 10:46:25 2014	(r43787)
@@ -28,7 +28,7 @@
 
 <!-- URLs to information on the latest release -->
 <!ENTITY u.rel.notes '&enbase;/releases/&rel.current;R/relnotes.html'>
-<!ENTITY u.rel.announce '&enbase;/releases/&rel.current;R/announce.html'>
+<!ENTITY u.rel.announce '&base;/releases/&rel.current;R/announce.html'>
 <!ENTITY u.rel.errata '&enbase;/releases/&rel.current;R/errata.html'>
 <!ENTITY u.rel.hardware '&enbase;/releases/&rel.current;R/hardware.html'>
 <!ENTITY u.rel.installation '&enbase;/releases/&rel.current;R/installation.html'>

Modified: head/ja_JP.eucJP/share/xml/news.xml
==============================================================================
--- head/ja_JP.eucJP/share/xml/news.xml	Wed Feb  5 09:06:27 2014	(r43786)
+++ head/ja_JP.eucJP/share/xml/news.xml	Wed Feb  5 10:46:25 2014	(r43787)
@@ -73,7 +73,7 @@
 	<event>
 	  <title>&os; 10.0-RELEASE ¸ø³«</title>
 
-	  <p><a href="&enbase;/releases/10.0R/announce.html">FreeBSD
+	  <p><a href="&base;/releases/10.0R/announce.html">FreeBSD
 		10.0-RELEASE</a> ¤¬¸ø³«¤µ¤ì¤Ş¤·¤¿¡£
 	      ¥¤¥ó¥¹¥È¡¼¥ëÁ°¤Ë <a
 		href="&enbase;/releases/10.0R/relnotes.html">¥ê¥ê¡¼¥¹¥Î¡¼¥È</a>

From owner-svn-doc-all@FreeBSD.ORG  Wed Feb  5 11:26:29 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 18D92DEE;
 Wed,  5 Feb 2014 11:26:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 011271CC9;
 Wed,  5 Feb 2014 11:26:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s15BQS1G001547;
 Wed, 5 Feb 2014 11:26:28 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s15BQSoR001546;
 Wed, 5 Feb 2014 11:26:28 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201402051126.s15BQSoR001546@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 5 Feb 2014 11:26:28 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43788 - head/ja_JP.eucJP/books/handbook/desktop
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.17
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, 05 Feb 2014 11:26:29 -0000

Author: ryusuke
Date: Wed Feb  5 11:26:28 2014
New Revision: 43788
URL: http://svnweb.freebsd.org/changeset/doc/43788

Log:
  - Merge the following from the English version:
  
  	r43126 -> r43754	head/ja_JP.eucJP/books/handbook/desktop/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/desktop/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/desktop/chapter.xml	Wed Feb  5 10:46:25 2014	(r43787)
+++ head/ja_JP.eucJP/books/handbook/desktop/chapter.xml	Wed Feb  5 11:26:28 2014	(r43788)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r43126
+     Original revision: r43754
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="desktop">
@@ -304,13 +304,13 @@
       <para>ºÇ¿·¤Î <application>Firefox</application> ¤Î package
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤ËÆşÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r firefox</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install firefox</userinput></screen>
 
       <para><application>Firefox</application> ±äĹ¥µ¥İ¡¼¥ÈÈÇ
 	(ESR: Extended Support Release)	¤òÍøÍѤ·¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢
 	¤«¤ï¤ê¤Ë°Ê²¼¤Î¤è¤¦¤ËÆşÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r firefox-esr</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install firefox-esr</userinput></screen>
 
       <para>¥í¡¼¥«¥é¥¤¥ºÈǤϡ¢<package>www/firefox-i18n</package>
 	¤ª¤è¤Ó <package>www/firefox-esr-i18n</package>
@@ -430,7 +430,7 @@
 
       <para>package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r swfdec-plugin</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install swfdec-plugin</userinput></screen>
 
       <para>package ¤òÍøÍѤǤ­¤Ê¤¤¾ì¹ç¤Ï¡¢Ports Collection
 	¤«¤é¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -463,7 +463,7 @@
 	<literal>opera</literal> ¤ò <literal>linux-opera</literal>
 	¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r opera</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install opera</userinput></screen>
 
       <para>¤¢¤ë¤¤¤Ï Ports Collection ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
 	°Ê²¼¤Î¥³¥Ş¥ó¥É¤Ç¡¢¥Í¥¤¥Æ¥£¥ÖÈǤ¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Ş¤¹¡£</para>      
@@ -559,7 +559,7 @@
       <para><application>Chromium</application> ¤Ï¡¢
 	°Ê²¼¤Î¤è¤¦¤ËÆşÎϤ¹¤ë¤³¤È¤Ç package ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Ş¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r chromium</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install chromium</userinput></screen>
 
       <para>¤Ş¤¿¤Ï¡¢Ports Collection ¤òÍѤ¤¤Æ
 	¥½¡¼¥¹¤«¤é <application>Chromium</application>
@@ -714,7 +714,7 @@
 	<package>editors/calligra</package> ¤ò¥¤¥ó¥¹¥È¡¼¥ë½ĞÍè¤Ş¤¹¡£
 	package ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Ş¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r calligra</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install calligra</userinput></screen>
 
       <para>package ¤òÆş¼ê¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢¤«¤ï¤ê¤Ë Ports Collection
 	¤òÍøÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -742,7 +742,7 @@
       <para><application>AbiWord</application> package
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r abiword</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install abiword</userinput></screen>
 
       <para>package ¤òÆş¼ê¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢
 	Ports Collection ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -771,7 +771,7 @@
 
       <para>package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r gimp</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install gimp</userinput></screen>
 
       <para>¤â¤·¤¯¤Ï¡¢Ports Collection ¤òÍøÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -831,7 +831,7 @@
       <para><application>Apache OpenOffice</application> package
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤ËÆşÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r apache-openoffice</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install apache-openoffice</userinput></screen>
 
       <para>package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢°Ê²¼¤Î¥³¥Ş¥ó¥É¤òÆşÎϤ·¤Æ
 	<application>Apache OpenOffice</application> ¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -910,7 +910,7 @@
       <para>±Ñ¸ìÈǤΠ<application>LibreOffice</application> package
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤ËÆşÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r libreoffice</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install libreoffice</userinput></screen>
 
       <para>Ports Collection ¤Î edtors ¥«¥Æ¥´¥ê
 	(<link xlink:href="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</link>)
@@ -1063,7 +1063,7 @@
       <para>package ¤«¤é <application>gv</application>
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Ş¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r gv</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install gv</userinput></screen>
 
       <para>package ¤òÍøÍѤǤ­¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢Ports Collection
 	¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1093,7 +1093,7 @@
       <para><application>Xpdf</application> ¤Î
 	package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¥³¥Ş¥ó¥É¤òÆşÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r xpdf</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install xpdf</userinput></screen>
 
       <para>package ¤òÆş¼ê¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢
 	Ports Collection ¤òÍøÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1126,7 +1126,7 @@
       <para><application>GQview</application>
 	package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¥³¥Ş¥ó¥É¤òÆşÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r gqview</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install gqview</userinput></screen>
 
       <para>package ¤òÆş¼ê¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢
 	Ports Collection ¤òÍøÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1211,7 +1211,7 @@
       <para><application>GnuCash</application> package
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r gnucash</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install gnucash</userinput></screen>
 
       <para>package ¤¬¼ê¤ËÆş¤é¤Ê¤±¤ì¤Ğ¡¢Ports Collection
 	¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1246,7 +1246,7 @@
       <para><application>Gnumeric</application> package
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤ËÆşÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r gnumeric</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install gnumeric</userinput></screen>
 
       <para>package ¤¬¼ê¤ËÆş¤é¤Ê¤±¤ì¤Ğ¡¢Ports Collection
 	¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1278,7 +1278,7 @@
       <para>package ¤«¤é <application>KMyMoney</application>
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤Ş¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r kmymoney-kde4</userinput></screen>
+      <screen>&prompt.root; <userinput>pkg install kmymoney-kde4</userinput></screen>
 
       <para>package ¤¬¼ê¤ËÆş¤é¤Ê¤¤¾ì¹ç¤Ï¡¢
 	Ports Collection ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>

From owner-svn-doc-all@FreeBSD.ORG  Wed Feb  5 11:40:30 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1062317E;
 Wed,  5 Feb 2014 11:40:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id EBCE91DB3;
 Wed,  5 Feb 2014 11:40:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s15BeTfI006467;
 Wed, 5 Feb 2014 11:40:29 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s15BeT1l006466;
 Wed, 5 Feb 2014 11:40:29 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201402051140.s15BeT1l006466@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 5 Feb 2014 11:40:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43789 - head/ja_JP.eucJP/books/handbook/desktop
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.17
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, 05 Feb 2014 11:40:30 -0000

Author: ryusuke
Date: Wed Feb  5 11:40:29 2014
New Revision: 43789
URL: http://svnweb.freebsd.org/changeset/doc/43789

Log:
  - Merge the following from the English version:
  
  	r43754 -> r43756	head/ja_JP.eucJP/books/handbook/desktop/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/desktop/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/desktop/chapter.xml	Wed Feb  5 11:26:28 2014	(r43788)
+++ head/ja_JP.eucJP/books/handbook/desktop/chapter.xml	Wed Feb  5 11:40:29 2014	(r43789)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r43754
+     Original revision: r43756
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="desktop">
@@ -35,7 +35,8 @@
     <note>
       <para>°ì¤«¤é¹½ÃÛ¤¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢
 	»öÁ°¤Ë¹½ÃÛ¤µ¤ì¤¿¥Ç¥¹¥¯¥È¥Ã¥×¥Ğ¡¼¥¸¥ç¥ó¤Î FreeBSD
-	¤ò¤ªË¾¤ß¤Î¥æ¡¼¥¶¤Ï¡¢<link xlink:href="http://www.pcbsd.org/">pcbsd.org
+	¤ò¤ªË¾¤ß¤Î¥æ¡¼¥¶¤Ï¡¢<link
+	  xlink:href="http://www.pcbsd.org/">pcbsd.org
 	¥¦¥§¥Ö¥µ¥¤¥È</link> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
     </note>
 
@@ -220,8 +221,8 @@
     </indexterm>
 
     <para>&os; ¤Ç¤Ï Web ¥Ö¥é¥¦¥¶¤Ï»öÁ°¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤»¤ó¡£
-      ¤½¤Î¤«¤ï¤ê¡¢Ports Collection ¤Î
-      <link xlink:href="http://www.FreeBSD.org/ja/ports/www.html">www</link>
+      ¤½¤Î¤«¤ï¤ê¡¢Ports Collection ¤Î <link
+	xlink:href="http://www.FreeBSD.org/ja/ports/www.html">www</link>
       ¥«¥Æ¥´¥ê¤Ë¤Ï¿ô¿¤¯¤Î Web ¥Ö¥é¥¦¥¶ ¤¬ÍÑ°Õ¤µ¤ì¤Æ¤ª¤ê¡¢
       ¿¤¯¤Î¥×¥í¥°¥é¥à¤ò packages ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤ê¡¢
       Ports Collection ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤Ç¤­¤Ş¤¹¡£</para>
@@ -232,8 +233,9 @@
       ¤³¤ì¤é¤Î¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤òÀßÄꤹ¤ë¤¿¤á¤Î¾ğÊó¤Ë¤Ä¤¤¤Æ¤Ï
       <xref linkend="x11-wm"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-    <para>·ÚÎ̤ʥ֥饦¥¶¤Ë¤Ï¡¢<package>www/dillo2</package>,
-      <package>www/links</package>, ¤ª¤è¤Ó <package>www/w3m</package>
+    <para>·ÚÎ̤ʥ֥饦¥¶¤Ë¤Ï¡¢
+      <package>www/dillo2</package>, <package>www/links</package>, ¤ª¤è¤Ó
+      <package>www/w3m</package>
       ¤È¤¤¤Ã¤¿¤â¤Î¤¬¤¢¤ê¤Ş¤¹¡£</para>
 
     <para>¤³¤ÎÀá¤Ç¤Ï¡¢¹­¤¯»È¤ï¤ì¤Æ¤¤¤ë°Ê²¼¤Î web
@@ -392,7 +394,8 @@
 	  <screen>&prompt.root; <userinput>ln -s /usr/local/lib/npapi/linux-f10-flashplugin/libflashplayer.so \
   /usr/local/lib/browser_plugins/</userinput></screen>
 
-	  <para><filename>/usr/local/lib/browser_plugins</filename>
+	  <para>
+	    <filename>/usr/local/lib/browser_plugins</filename>
 	    ¥Ç¥£¥ì¥¯¥È¥ê¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢ºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 	</step>
 
@@ -535,8 +538,8 @@
 	<application>&flash;</application> ¤Ë¤âÂбş¤·¤Æ¤¤¤Ş¤¹¡£
 	<application>Konqueror</application> ¤Ë
 	<application>&flash;</application>
-	¤òÆ³Æş¤¹¤ë¤¿¤á¤Î <quote>How To</quote> ¥¬¥¤¥É¤¬
-	<uri xlink:href="http://freebsd.kde.org/howtos/konqueror-flash.php">http://freebsd.kde.org/howtos/konqueror-flash.php</uri>
+	¤òÆ³Æş¤¹¤ë¤¿¤á¤Î <quote>How To</quote> ¥¬¥¤¥É¤¬	<uri
+	  xlink:href="http://freebsd.kde.org/howtos/konqueror-flash.php">http://freebsd.kde.org/howtos/konqueror-flash.php</uri>
 	¤Ë¤¢¤ê¤Ş¤¹¡£</para>
     </sect2>
 
@@ -779,7 +782,7 @@
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <para>Ports Collection ¤Î graphics ¥«¥Æ¥´¥ê (<link
-	xlink:href="http://www.FreeBSD.org/ports/graphics.html">freebsd.org/ports/graphics.html</link>)
+	  xlink:href="http://www.FreeBSD.org/ja/ports/graphics.html">freebsd.org/ja/ports/graphics.html</link>)
 	¤Ë¤Ï¡¢<application>GIMP</application> ¤Ë´ØÏ¢¤·¤¿¥×¥é¥°¥¤¥ó¡¢
 	¥Ø¥ë¥×¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥æ¡¼¥¶¥Ş¥Ë¥å¥¢¥ë¤Ê¤É¤¬¤¢¤ê¤Ş¤¹¡£</para>
 
@@ -825,7 +828,8 @@
 	¤Ë¤Ä¤¤¤Æ¤Î¤è¤ê¾Ü¤·¤¤¾ğÊó¤Ï¡¢
 	<link xlink:href="http://openoffice.org/">openoffice.org</link>
 	¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
-	¤Ş¤¿¡¢<link xlink:href="http://porting.openoffice.org/freebsd/">porting.openoffice.org/freebsd/</link>
+	¤Ş¤¿¡¢<link
+	  xlink:href="http://porting.openoffice.org/freebsd/">porting.openoffice.org/freebsd/</link>
 	¤«¤é¡¢&os; ÆÃÍ­¤Î¾ğÊó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <para><application>Apache OpenOffice</application> package
@@ -879,8 +883,8 @@
 	<secondary><application>LibreOffice</application></secondary>
       </indexterm>
 
-      <para><application>LibreOffice</application> ¤Ï¡¢
-	<link xlink:href="http://www.documentfoundation.org/">documentfoundation.org</link>
+      <para><application>LibreOffice</application> ¤Ï¡¢<link
+	  xlink:href="http://www.documentfoundation.org/">documentfoundation.org</link>
 	¤¬³«È¯¤·¤Æ¤¤¤ë¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Î¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤Ç¤¹¡£
 	¾¤Î¥á¥¸¥ã¡¼¤Ê¥ª¥Õ¥£¥¹¥¹¥¤¡¼¥È¤È¸ß´¹À­¤¬¤¢¤ê¡¢
 	¤µ¤Ş¤¶¤Ş¤Ê¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤ÇÍøÍѤǤ­¤Ş¤¹¡£
@@ -903,8 +907,8 @@
 	&windows;, &solaris;, &linux;, &os;, &macos;&nbsp;X
 	¤Ë¤ª¤¤¤Æ°ÂÄꤷ¤Æ¥Í¥¤¥Æ¥£¥Ö¤ËÆ°ºî¤·¤Æ¤¤¤Ş¤¹¡£
 	<application>LibreOffice</application>
-	¤Ë¤Ä¤¤¤Æ¤Î¾Ü¤·¤¤¾ğÊó¤Ï¡¢
-	<link xlink:href="http://www.libreoffice.org/">libreoffice.org</link>
+	¤Ë¤Ä¤¤¤Æ¤Î¾Ü¤·¤¤¾ğÊó¤Ï¡¢<link
+	  xlink:href="http://www.libreoffice.org/">libreoffice.org</link>
 	¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 
       <para>±Ñ¸ìÈǤΠ<application>LibreOffice</application> package
@@ -912,8 +916,8 @@
 
       <screen>&prompt.root; <userinput>pkg install libreoffice</userinput></screen>
 
-      <para>Ports Collection ¤Î edtors ¥«¥Æ¥´¥ê
-	(<link xlink:href="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</link>)
+      <para>Ports Collection ¤Î edtors ¥«¥Æ¥´¥ê (<link
+	  xlink:href="http://www.FreeBSD.org/ja/ports/editors.html">freebsd.org/ja/ports/editors.html</link>)
 	¥«¥Æ¥´¥ê¤Ë¤Ï¡¢ÃÏ°è²½¤µ¤ì¤¿ <application>LibreOffice</application>
 	¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Ş¤¹¡£
 	ÃÏ°è²½¤µ¤ì¤¿ package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
@@ -942,8 +946,8 @@
 	<para>ÃÏ°è²½¤µ¤ì¤¿¥Ğ¡¼¥¸¥ç¥ó¤ò¥Ó¥ë¥É¤·¤¿¤¤¤Î¤Ê¤é¡¢
 	  ´õ˾¤Î¸À¸ì¤Î port ¥Ç¥£¥ì¥¯¥È¥ê¤Ë <application>cd</application>
 	  ¥³¥Ş¥ó¥É¤Ç°ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£
-	  Âбş¤·¤Æ¤¤¤ë¸À¸ì¤Ï¡¢Ports Collection ¤Î editors ¥«¥Æ¥´¥ê
-	  (<link xlink:href="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</link>)
+	  Âбş¤·¤Æ¤¤¤ë¸À¸ì¤Ï¡¢Ports Collection ¤Î editors ¥«¥Æ¥´¥ê (<link
+	    xlink:href="http://www.FreeBSD.org/ja/ports/editors.html">freebsd.org/ja/ports/editors.html</link>)
 	  ¤Ë¤¢¤ê¤Ş¤¹¡£</para>
       </note>
     </sect2>
@@ -1021,8 +1025,8 @@
 	&os; ¤Ç¤â¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÍøÍѤǤ­¤Ş¤¹¡£
 	¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤«¤é package ¤ÏÍøÍѤǤ­¤Ê¤¤¤¿¤á¡¢
 	ports ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Ş¤¹¡£
-	ÃÏ°è²½¤µ¤ì¤¿¤â¤Î¤¬ Ports Collection ¤Î print ¥«¥Æ¥´¥ê
-	(<link xlink:href="http://www.FreeBSD.org/ports/print.html">freebsd.org/ports/print.html</link>)
+	ÃÏ°è²½¤µ¤ì¤¿¤â¤Î¤¬ Ports Collection ¤Î print ¥«¥Æ¥´¥ê (<link
+	  xlink:href="http://www.FreeBSD.org/ja/ports/print.html">freebsd.org/ja/ports/print.html</link>)
 	¤ËÍÑ°Õ¤µ¤ì¤Æ¤¤¤Ş¤¹¡£</para>
 
       <para>°Ê²¼¤Î¥³¥Ş¥ó¥É¤Ï¡¢Ports Collection ¤«¤é¡¢

From owner-svn-doc-all@FreeBSD.ORG  Wed Feb  5 16:34:40 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 80C01F2;
 Wed,  5 Feb 2014 16:34:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 69E8F1C7A;
 Wed,  5 Feb 2014 16:34:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s15GYekc029875;
 Wed, 5 Feb 2014 16:34:40 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s15GYe34029874;
 Wed, 5 Feb 2014 16:34:40 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201402051634.s15GYe34029874@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 5 Feb 2014 16:34:40 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43790 - 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.17
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, 05 Feb 2014 16:34:40 -0000

Author: wblock
Date: Wed Feb  5 16:34:39 2014
New Revision: 43790
URL: http://svnweb.freebsd.org/changeset/doc/43790

Log:
  Add myself to doceng.

Modified:
  head/share/xml/authors.ent

Modified: head/share/xml/authors.ent
==============================================================================
--- head/share/xml/authors.ent	Wed Feb  5 11:40:29 2014	(r43789)
+++ head/share/xml/authors.ent	Wed Feb  5 16:34:39 2014	(r43790)
@@ -2290,7 +2290,7 @@
 <!ENTITY a.core.members '&a.tabthorpe;, &a.gavin;, &a.jhb;, &a.kib;, &a.theraven;, &a.hrs;, &a.peter;, &a.miwi;'>
 
 <!-- FreeBSD Doc Engineering Team -->
-<!ENTITY a.doceng.members '&a.gjb;, &a.blackend;, &a.gabor;, &a.hrs;'>
+<!ENTITY a.doceng.members '&a.gjb;, &a.wblock;, &a.blackend;, &a.gabor;, &a.hrs;'>
 
 <!-- FreeBSD Donations Liaison -->
 <!ENTITY a.donations.members '&a.tabthorpe;, &a.gjb;, &a.gahr;, &a.pgollucci;, &a.skreuzer;, &a.obrien;, &a.trhodes;, &a.ds;, &a.rwatson;'>

From owner-svn-doc-all@FreeBSD.ORG  Wed Feb  5 17:31:48 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B32DCD95;
 Wed,  5 Feb 2014 17:31:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9E5CC137B;
 Wed,  5 Feb 2014 17:31:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s15HVmct055471;
 Wed, 5 Feb 2014 17:31:48 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s15HVmn8055470;
 Wed, 5 Feb 2014 17:31:48 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201402051731.s15HVmn8055470@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 5 Feb 2014 17:31:48 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43791 - head/share/misc
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.17
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, 05 Feb 2014 17:31:48 -0000

Author: wblock
Date: Wed Feb  5 17:31:48 2014
New Revision: 43791
URL: http://svnweb.freebsd.org/changeset/doc/43791

Log:
  Improve the spacing of callout lists.  Thanks to Allan Jude for his help.

Modified:
  head/share/misc/docbook.css

Modified: head/share/misc/docbook.css
==============================================================================
--- head/share/misc/docbook.css	Wed Feb  5 16:34:39 2014	(r43790)
+++ head/share/misc/docbook.css	Wed Feb  5 17:31:48 2014	(r43791)
@@ -139,6 +139,17 @@ div.calloutlist dd {
 	margin-bottom: 1ex;
 }
 
+body .calloutlist td {
+	padding-right: 0.5em;
+	width: auto;
+}
+
+body .calloutlist td p {
+	line-height: 1.2;
+	margin-top: 4px;
+	margin-bottom: 4px;
+}
+
 body form {
 	margin: .6em 0;
 }

From owner-svn-doc-all@FreeBSD.ORG  Wed Feb  5 20:19:42 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E8EBE912;
 Wed,  5 Feb 2014 20:19:42 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D2BB814CA;
 Wed,  5 Feb 2014 20:19:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s15KJgZ7023378;
 Wed, 5 Feb 2014 20:19:42 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s15KJg1Y023377;
 Wed, 5 Feb 2014 20:19:42 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201402052019.s15KJg1Y023377@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Wed, 5 Feb 2014 20:19:42 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43792 - 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.17
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, 05 Feb 2014 20:19:43 -0000

Author: mat (ports committer)
Date: Wed Feb  5 20:19:42 2014
New Revision: 43792
URL: http://svnweb.freebsd.org/changeset/doc/43792

Log:
  Correct spelling in id's
  
  Reviewed by:	wblock
  Sponsored by:	Absolight

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	Wed Feb  5 17:31:48 2014	(r43791)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Wed Feb  5 20:19:42 2014	(r43792)
@@ -12072,7 +12072,7 @@ exec %%LOCALBASE%%/bin/java -jar %%DATAD
       </note>
     </sect1>
 
-    <sect1 xml:id="dads-freedback">
+    <sect1 xml:id="dads-feedback">
       <title>Feedback</title>
 
       <para>Do send applicable changes/patches to the original
@@ -12606,7 +12606,7 @@ pre-install:
 	and associated files.</para>
     </sect1>
 
-    <sect1 xml:id="ports-mailling-list">
+    <sect1 xml:id="ports-mailing-list">
       <title>The &os; Ports Mailing List</title>
 
       <para>If you maintain ports, you should consider following the

From owner-svn-doc-all@FreeBSD.ORG  Wed Feb  5 20:59:59 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1B21D2D6;
 Wed,  5 Feb 2014 20:59:59 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 05E8B18CB;
 Wed,  5 Feb 2014 20:59:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s15KxwKJ039557;
 Wed, 5 Feb 2014 20:59:58 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s15Kxw7t039556;
 Wed, 5 Feb 2014 20:59:58 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201402052059.s15Kxw7t039556@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 5 Feb 2014 20:59:58 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43793 - 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.17
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, 05 Feb 2014 20:59:59 -0000

Author: wblock
Date: Wed Feb  5 20:59:58 2014
New Revision: 43793
URL: http://svnweb.freebsd.org/changeset/doc/43793

Log:
  Whitespace-only fixes, translators please ignore.

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses.xml	Wed Feb  5 20:19:42 2014	(r43792)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses.xml	Wed Feb  5 20:59:58 2014	(r43793)
@@ -487,9 +487,8 @@
     <para>Add PostgreSQL component dependency, using
       <literal>WANT_PGSQL=component[:target]</literal>.  e.g.,
       <literal>WANT_PGSQL=server:configure pltcl plperl</literal> For
-      the full list use <command>make -V
-	_USE_PGSQL_DEP</command>.</para>
-  </entry>
+      the full list use
+      <command>make -V _USE_PGSQL_DEP</command>.</para></entry>
 </row>
 
 <row>
@@ -723,6 +722,7 @@
     <varname>EXAMPLESDIR</varname>, <varname>DATADIR</varname>,
     <varname>WWWDIR</varname>, <varname>ETCDIR</varname>.  The
     following variables are available for ports:
+
     <itemizedlist>
       <listitem><para><varname>UNIQUE_PREFIX</varname>: The prefix to
 	be used for directories and files.  Default:
@@ -739,8 +739,7 @@
       <listitem><para><varname>UNIQUE_SUFFIX_FILES</varname>: A list
 	of files that need to be suffixed.  Default:
 	empty.</para></listitem>
-    </itemizedlist>
-  </entry>
+    </itemizedlist></entry>
 </row>
 
 <row>

From owner-svn-doc-all@FreeBSD.ORG  Wed Feb  5 23:11:37 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 17C4574C;
 Wed,  5 Feb 2014 23:11:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E8B3015EE;
 Wed,  5 Feb 2014 23:11:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s15NBauq096563;
 Wed, 5 Feb 2014 23:11:36 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s15NBaiI096561;
 Wed, 5 Feb 2014 23:11:36 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402052311.s15NBaiI096561@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 5 Feb 2014 23:11:36 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43794 - head/en_US.ISO8859-1/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.17
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, 05 Feb 2014 23:11:37 -0000

Author: dru
Date: Wed Feb  5 23:11:36 2014
New Revision: 43794
URL: http://svnweb.freebsd.org/changeset/doc/43794

Log:
  Initial shuffle in this section, much more to come in order to improve its flow.
  Place pre-build tasks at beginning and format as a procedure.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Wed Feb  5 20:59:58 2014	(r43793)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Wed Feb  5 23:11:36 2014	(r43794)
@@ -1437,46 +1437,53 @@ before running "/usr/sbin/freebsd-update
     </indexterm>
     <para>Once the local source tree is synchronized against a
       particular version of &os; such as &os.stable; or &os.current;,
-      the source tree can be used to rebuild the system.</para>
-
-    <warning>
-      <title>Make a Backup</title>
-
-      <para>It cannot be stressed enough how important it is to make a
+      the source tree can be used to rebuild the system.  This process
+      is known as rebuilding world.</para>
+      
+    <para><emphasis>Before</emphasis> rebuilding world, be sure to
+      perform the following tasks:</para>
+
+    <procedure>
+      <title>Perform These Tasks Before Building World</title>
+
+      <step>
+	<para>Backup all important data to another system or removable
+	media, verify the integrity of the backup, and have a bootable
+	installation media at hand.  It cannot be
+	stressed enough how important it is to make a
 	backup of the system <emphasis>before</emphasis> rebuilding
-	the system.  While rebuilding the world is an easy task, there
+	the system.  While rebuilding world is an easy task, there
 	will inevitably be times when mistakes in the source tree
-	render the system unbootable.</para>
-
-      <para>Create and verify a backup and have a bootable
-	installation media at hand.  You will probably never have
-	to use it, but it is better to be safe than sorry!</para>
-    </warning>
-
-    <warning>
-      <title>Subscribe to the Right Mailing List</title>
+	render the system unbootable.  You will probably never have
+	to use the backup, but it is better to be safe than sorry!</para>
+    </step>
 
+    <step>
       <indexterm><primary>mailing list</primary></indexterm>
-      <para>The &os.stable; and &os.current; branches are, by their
-	nature, <emphasis>in development</emphasis>.  People that
-	contribute to &os; are human, and mistakes occasionally
-	happen.</para>
-
-      <para>Sometimes these mistakes can be quite harmless, just
-	causing the system to print a new diagnostic warning.  Or the
-	change may be catastrophic, and render the system unbootable
-	or destroy file systems.</para>
-
-      <para>When problems occur, a <quote>heads up</quote> is
-	posted to the appropriate mailing list, explaining the nature
-	of the problem and which systems it affects.  An <quote>all
-	  clear</quote> announcement is posted when the problem has
-	been solved.</para>
-
-      <para>Users who track &os.stable; or &os.current; and do
-	not read &a.stable; or &a.current; respectively, are asking
-	for trouble.</para>
-    </warning>
+      <para>Review the recent &a.stable.name; or &a.current.name; entries, depending
+	upon the branch being tracked.  Be aware of any known
+	problems and which systems are affected.  If a known issue
+	affects the version of synchronized code, wait for an <quote>all
+	  clear</quote> announcement to be posted stating that the problem has
+	been solved.  Resynchronize the sources to ensure that the
+	local version of source has the needed fix.</para>
+    </step>
+    
+    <step>
+      <para>Read
+	<filename>/usr/src/UPDATING</filename> for any pre-buildworld
+	  steps necessary for that version of the source.  This file contains
+	important information about potential problems and may specify
+	the order to run certain commands.  Many upgrades require
+	specific additional steps such as renaming or deleting
+	specific files prior to installworld.  These will be listed
+	at the end of this file where the currently recommended upgrade sequence
+	is explicitly spelled out.  If
+	<filename>UPDATING</filename> contradicts any steps in
+	this chapter, the instructions in <filename>UPDATING</filename> take
+	precedence and should be followed.</para>
+	</step>
+  </procedure>
 
     <warning>
       <title>Do Not Use <command>make world</command></title>
@@ -1492,10 +1499,8 @@ before running "/usr/sbin/freebsd-update
     <sect2 xml:id="canonical-build">
       <title>The Canonical Way to Update Your System</title>
 
-      <para>Before updating the system, read
-	<filename>/usr/src/UPDATING</filename> for any pre-buildworld
-	steps necessary for that version of the sources.  Then, use
-	the procedure outlined here.</para>
+      <para>Once the above tasks have been performed,  use
+	the procedure outlined here to update the system.</para>
 
       <para>These upgrade steps assume an upgrade from an older &os;
 	version, consisting of an old compiler, old kernel,
@@ -1685,13 +1690,6 @@ before running "/usr/sbin/freebsd-update
       <para>When upgrading across major releases, people who do not
 	follow this procedure should expect some problems.</para>
 
-      <para>It is also worth noting that many upgrades may require
-	specific additional steps such as renaming or deleting
-	specific files prior to installworld.  Read
-	<filename>/usr/src/UPDATING</filename> carefully, especially
-	at the end, where the currently recommended upgrade sequence
-	is explicitly spelled out.</para>
-
       <para>This procedure has evolved over time as the developers
 	have found it impossible to completely prevent certain kinds
 	of mismatch problems.  Hopefully, the current procedure will
@@ -1749,25 +1747,6 @@ before running "/usr/sbin/freebsd-update
     </sect2>
 
     <sect2 xml:id="src-updating">
-      <title>Read <filename>/usr/src/UPDATING</filename></title>
-
-      <para>Before updating, read
-	<filename>/usr/src/UPDATING</filename>.  This file contains
-	important information about potential problems and may specify
-	the order to run certain commands.  If
-	<filename>UPDATING</filename> contradicts the procedure in
-	this section, <filename>UPDATING</filename> takes
-	precedence.</para>
-
-      <important>
-	<para>Reading <filename>UPDATING</filename> is not an
-	  acceptable substitute for subscribing to the correct mailing
-	  list.  The two requirements are complementary, not
-	  exclusive.</para>
-      </important>
-    </sect2>
-
-    <sect2 xml:id="make-conf">
       <title>Check <filename>/etc/make.conf</filename></title>
 
       <indexterm>
@@ -1917,12 +1896,9 @@ before running "/usr/sbin/freebsd-update
 &prompt.root; <userinput>rm -rf *</userinput></screen>
     </sect2>
 
-    <sect2 xml:id="updating-upgrading-compilebase">
+    <sect2 xml:id="make-buildworld">
       <title>Recompile the Base System</title>
 
-      <sect3>
-	<title>Saving the Output</title>
-
 	<para>It is a good idea to save the output from running
 	  &man.make.1; to a file.  If something goes wrong, a copy of
 	  the error message can be posted to one of the &os; mailing
@@ -1948,10 +1924,6 @@ Script done, &hellip;</screen>
 	  <filename>/var/tmp</filename> or in
 	  <systemitem class="username">root</systemitem>'s home
 	  directory.</para>
-      </sect3>
-
-      <sect3 xml:id="make-buildworld">
-	<title>Compile the Base System</title>
 
 	<para>While in <filename>/usr/src</filename>
 	  type:</para>
@@ -2068,10 +2040,6 @@ Script done, &hellip;</screen>
 	<para>On a multi-CPU machine using an SMP configured kernel,
 	  try values between 6 and 10 and see how they speed things
 	  up.</para>
-      </sect3>
-
-      <sect3>
-	<title>Timings</title>
 
 	<indexterm>
 	  <primary>rebuilding <quote>world</quote></primary>
@@ -2083,7 +2051,6 @@ Script done, &hellip;</screen>
 	  &os.stable; tree, with no tricks or shortcuts used during
 	  the process.  A &os.current; tree will take somewhat
 	  longer.</para>
-      </sect3>
     </sect2>
 
     <sect2 xml:id="new-kernel">

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 00:22:36 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 24E226E5;
 Thu,  6 Feb 2014 00:22:36 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0D3A21B5A;
 Thu,  6 Feb 2014 00:22:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s160MZdK026508;
 Thu, 6 Feb 2014 00:22:35 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s160MZZa026507;
 Thu, 6 Feb 2014 00:22:35 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402060022.s160MZZa026507@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 6 Feb 2014 00:22:35 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43795 - head/en_US.ISO8859-1/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.17
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, 06 Feb 2014 00:22:36 -0000

Author: dru
Date: Thu Feb  6 00:22:35 2014
New Revision: 43795
URL: http://svnweb.freebsd.org/changeset/doc/43795

Log:
  More shuffling to improve the flow. Still a WIP with much more to come.
  Format the build world process as a Procedure.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Wed Feb  5 23:11:36 2014	(r43794)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Thu Feb  6 00:22:35 2014	(r43795)
@@ -1444,7 +1444,7 @@ before running "/usr/sbin/freebsd-update
       perform the following tasks:</para>
 
     <procedure>
-      <title>Perform These Tasks Before Building World</title>
+      <title>Perform These Tasks <emphasis>Before</emphasis> Building World</title>
 
       <step>
 	<para>Backup all important data to another system or removable
@@ -1497,91 +1497,47 @@ before running "/usr/sbin/freebsd-update
     </warning>
 
     <sect2 xml:id="canonical-build">
-      <title>The Canonical Way to Update Your System</title>
+      <title>Overview of Process</title>
 
-      <para>Once the above tasks have been performed,  use
-	the procedure outlined here to update the system.</para>
-
-      <para>These upgrade steps assume an upgrade from an older &os;
-	version, consisting of an old compiler, old kernel,
-	old world, and old configuration files.
-	<quote>World</quote> includes the core system binaries,
-	libraries, and programming files.  The compiler is part of
-	<quote>world</quote>, but has a few special concerns.</para>
-
-      <para>These steps also assume that the sources to a newer
-	version have already been obtained.  If the sources are not
-	up-to-date, refer to <xref linkend="synching"/> for detailed
-	help about synchronizing to a newer version.</para>
-
-      <para>Updating the system from source is a more subtle process
-	than it might initially seem to be, and the &os; developers
-	have found it necessary over the years to change the
-	recommended approach fairly dramatically as new kinds of
-	unavoidable dependencies come to light.  The rest of this
-	section describes the rationale behind the currently
-	recommended upgrade sequence.</para>
-
-      <para>Any successful update sequence must deal with the
-	following issues:</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para>The old compiler might have a bug and not be able to
-	    compile the new kernel.  So, the new kernel should be
-	    built with the new compiler, meaning that the new compiler
-	    must be built before the new kernel is built.  This does
-	    not necessarily mean that the new compiler must be
-	    <emphasis>installed</emphasis> before building the new
-	    kernel.</para>
-	</listitem>
-
-	<listitem>
-	  <para>The new world might rely on new kernel features.  So,
-	    the new kernel must be installed before the new world is
-	    installed.</para>
-	</listitem>
-      </itemizedlist>
-
-      <para>These first two issues are the basis for the
-	core <buildtarget>buildworld</buildtarget>,
-	<buildtarget>buildkernel</buildtarget>,
-	<buildtarget>installkernel</buildtarget>,
-	<buildtarget>installworld</buildtarget> sequence described in
-	the following paragraphs.  Other reasons for using these
-	steps are listed below:</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para>The old world might not run correctly on the new
+      <para>The build world process assumes an upgrade from an older &os;
+	version using the sources to a newer
+	version that were obtained using the instructions in 
+	<xref linkend="synching"/>.</para>
+	
+      <para><quote>World</quote> includes the &os; kernel, core system binaries,
+	libraries, programming files, and built-in compiler. The order in which these
+	components are built and installed is important.</para>
+	
+      <para>For example, the old compiler might have a bug and not be able to
+	    compile the new kernel.  Since the new kernel should be
+	    built with the new compiler, the new compiler
+	    must be built, but not necessarily installed, before the new kernel is built.</para>
+
+	    <para>The new world might rely on new kernel features,
+	    so the new kernel must be installed before the new world is
+	    installed.  The old world might not run correctly on the new
 	    kernel, so the new world must be installed immediately
 	    upon installing the new kernel.</para>
-	</listitem>
 
-	<listitem>
 	  <para>Some configuration changes must be made before the new
 	    world is installed, but others might break the old world.
 	    Hence, two different configuration upgrade steps are
-	    generally needed.</para>
-	</listitem>
-
-	<listitem>
-	  <para>For the most part, the update process only replaces or
+	    generally needed.  For the most part, the update process only replaces or
 	    adds files and existing old files are not deleted.  In a
 	    few cases, this can cause problems.  As a result, the
 	    update procedure will sometimes specify certain files that
-	    should be manually deleted at certain steps.  This may or
-	    may not be automated in the future.</para>
-	</listitem>
-      </itemizedlist>
-
-      <para>These concerns have led to the following recommended
-	sequence.  Note that the detailed sequence for particular
-	updates may require additional steps, but this core process
-	should remain unchanged for some time:</para>
+	    should be manually deleted at certain steps.</para>
+
+      <para>These concerns have led to the following recommended upgrade
+	sequence  described in
+	the following procedure.</para>
 
-      <orderedlist>
-	<listitem>
+    <procedure>
+      <title>Overview of Build World Process</title>
+
+    <para>The commands used in the build world process should be run in the order specified
+	here.  This section summarizes the function of each command.</para>
+      <step>
 	  <para><command>make
 	      buildworld</command></para>
 
@@ -1589,36 +1545,36 @@ before running "/usr/sbin/freebsd-update
 	    tools, then uses the new compiler to compile the rest of
 	    the new world.  The result ends up in
 	    <filename>/usr/obj</filename>.</para>
-	</listitem>
+	</step>
 
-	<listitem>
+	<step>
 	  <para><command>make
 	      buildkernel</command></para>
 
 	  <para>This uses the <emphasis>new</emphasis> compiler
 	    residing in <filename>/usr/obj</filename> in order to
 	    protect against compiler-kernel mismatches.</para>
-	</listitem>
+	</step>
 
-	<listitem>
+	<step>
 	  <para><command>make
 	      installkernel</command></para>
 
 	  <para>Place the new kernel and kernel modules onto the disk,
 	    making it possible to boot with the newly updated
 	    kernel.</para>
-	</listitem>
+	</step>
 
-	<listitem>
+	<step>
 	  <para>Reboot into single user mode.</para>
 
 	  <para>Single user mode minimizes problems from updating
 	    software that is already running.  It also minimizes any
 	    problems from running the old world on a new
 	    kernel.</para>
-	</listitem>
+	</step>
 
-	<listitem>
+	<step>
 	  <para><command>mergemaster
 	      -p</command></para>
 
@@ -1631,25 +1587,25 @@ before running "/usr/sbin/freebsd-update
 	    <buildtarget>installworld</buildtarget> step will be able
 	    to use the newly installed system user or system group
 	    names without problems.</para>
-	</listitem>
+	</step>
 
-	<listitem>
+	<step>
 	  <para><command>make
 	      installworld</command></para>
 
 	  <para>Copies the world
 	    from <filename>/usr/obj</filename>.  The
 	    new kernel and new world are now installed on disk.</para>
-	</listitem>
+	</step>
 
-	<listitem>
+	<step>
 	  <para><command>mergemaster</command></para>
 
 	  <para>Repeated to update the remaining configuration files,
 	    now that the new world is on disk.</para>
-	</listitem>
+	</step>
 
-	<listitem>
+	<step>
 	  <para><command>make
 	      delete-old</command></para>
 
@@ -1659,24 +1615,24 @@ before running "/usr/sbin/freebsd-update
 	    <filename>utmp.h</filename> causes problems in some ports
 	    when the new <filename>utmpx.h</filename> is
 	    installed.</para>
-	</listitem>
+	</step>
 
-	<listitem>
+	<step>
 	  <para>Reboot.</para>
 
 	  <para>A full machine reboot is needed now to load the new
 	    kernel and new world with new configuration files.</para>
-	</listitem>
+	</step>
 
-	<listitem>
+	<step>
 	  <para><command>make
 	      delete-old-libs</command></para>
 
 	  <para>Remove any obsolete libraries to avoid conflicts with
 	    newer ones.  Make sure that all ports have been rebuilt
 	    before old libraries are removed.</para>
-	</listitem>
-      </orderedlist>
+	</step>
+      </procedure>
 
       <para>Upgrades from one release of the same &os; branch to a
 	more recent release of the same branch, such as from 9.0 to

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 01:40:33 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 13C0AA86;
 Thu,  6 Feb 2014 01:40:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F03F711E2;
 Thu,  6 Feb 2014 01:40:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s161eWRK056369;
 Thu, 6 Feb 2014 01:40:32 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s161eWrk056368;
 Thu, 6 Feb 2014 01:40:32 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402060140.s161eWrk056368@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 6 Feb 2014 01:40:32 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43796 - head/en_US.ISO8859-1/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.17
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, 06 Feb 2014 01:40:33 -0000

Author: dru
Date: Thu Feb  6 01:40:32 2014
New Revision: 43796
URL: http://svnweb.freebsd.org/changeset/doc/43796

Log:
  All the required steps are now in order, in one place, and in a Procedure.
  Next round will improve the flow of the next subsection.
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Thu Feb  6 00:22:35 2014	(r43795)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Thu Feb  6 01:40:32 2014	(r43796)
@@ -1500,11 +1500,11 @@ before running "/usr/sbin/freebsd-update
       <title>Overview of Process</title>
 
       <para>The build world process assumes an upgrade from an older &os;
-	version using the sources to a newer
-	version that were obtained using the instructions in 
+	version using the source of a newer
+	version that was obtained using the instructions in 
 	<xref linkend="synching"/>.</para>
 	
-      <para><quote>World</quote> includes the &os; kernel, core system binaries,
+      <para>In &os;, the term <quote>world</quote> includes the kernel, core system binaries,
 	libraries, programming files, and built-in compiler. The order in which these
 	components are built and installed is important.</para>
 	
@@ -1522,13 +1522,13 @@ before running "/usr/sbin/freebsd-update
 	  <para>Some configuration changes must be made before the new
 	    world is installed, but others might break the old world.
 	    Hence, two different configuration upgrade steps are
-	    generally needed.  For the most part, the update process only replaces or
-	    adds files and existing old files are not deleted.  In a
-	    few cases, this can cause problems.  As a result, the
-	    update procedure will sometimes specify certain files that
-	    should be manually deleted at certain steps.</para>
+	    used.  For the most part, the update process only replaces or
+	    adds files and existing old files are not deleted.  Since
+	    this can cause problems, <filename>/usr/src/UPDATING</filename>
+	    will indicate if any files
+	    need to be manually deleted and at which step to do so.</para>
 
-      <para>These concerns have led to the following recommended upgrade
+      <para>These concerns have led to the recommended upgrade
 	sequence  described in
 	the following procedure.</para>
 
@@ -1537,169 +1537,110 @@ before running "/usr/sbin/freebsd-update
 
     <para>The commands used in the build world process should be run in the order specified
 	here.  This section summarizes the function of each command.</para>
-      <step>
-	  <para><command>make
-	      buildworld</command></para>
-
-	  <para>This first compiles the new compiler and a few related
-	    tools, then uses the new compiler to compile the rest of
-	    the new world.  The result ends up in
-	    <filename>/usr/obj</filename>.</para>
+
+	<step>
+	  <para>Compile the new compiler and a few related
+	    tools, then use the new compiler to compile the rest of
+	    the new world.  The result is saved to
+	    <filename class="directory">/usr/obj</filename>.</para>
+	    
+	  <screen>&prompt.root; <userinput>cd /usr/src</userinput>
+&prompt.root; <userinput>make buildworld</userinput></screen>
 	</step>
 
 	<step>
-	  <para><command>make
-	      buildkernel</command></para>
+	  <para>Use the new compiler
+	    residing in <filename class="directory">/usr/obj</filename>
+	    to build the new kernel, in order to
+	    protect against compiler-kernel mismatches:</para>
 
-	  <para>This uses the <emphasis>new</emphasis> compiler
-	    residing in <filename>/usr/obj</filename> in order to
-	    protect against compiler-kernel mismatches.</para>
+	  <screen>&prompt.root; <userinput>make buildkernel</userinput></screen>
 	</step>
 
 	<step>
-	  <para><command>make
-	      installkernel</command></para>
-
-	  <para>Place the new kernel and kernel modules onto the disk,
+	  <para>Install the new kernel and kernel modules,
 	    making it possible to boot with the newly updated
-	    kernel.</para>
+	    kernel:</para>
+
+	  <screen>&prompt.root; <userinput>make installkernel</userinput></screen>
 	</step>
 
 	<step>
-	  <para>Reboot into single user mode.</para>
-
-	  <para>Single user mode minimizes problems from updating
-	    software that is already running.  It also minimizes any
+	  <para>Drop the system into single user mode in order to minimize problems from updating
+	    any binaries that are already running.  It also minimizes any
 	    problems from running the old world on a new
 	    kernel.</para>
-	</step>
 
-	<step>
-	  <para><command>mergemaster
-	      -p</command></para>
+	  <screen>&prompt.root; <userinput>shutdown now</userinput></screen>
+
+	  <para>Once in single-user mode, run this command if the
+	    system is formatted with UFS:</para>
+
+      <screen>&prompt.root; <userinput>mount -u /</userinput>
+&prompt.root; <userinput>mount -a -t ufs</userinput></screen>
 
-	  <para>This does some initial configuration file updates in
-	    preparation for the new world.  For instance, it may add
-	    new user groups to the system, or new user names to the
-	    password database.  This is often necessary when new
-	    groups or special system-user accounts have been added
-	    since the last update, so that the
+      <para>If the system is instead formatted with ZFS, run these
+	two commands.  This example assumes a zpool name of <literal>zroot</literal>:</para>
+
+      <screen>&prompt.root; <userinput>zfs set readonly=off zroot</userinput>
+&prompt.root; <userinput>zfs mount -a</userinput></screen>
+	  </step>
+
+	<step>
+	  <para>Then, for either filesystem, run:</para>
+	  <screen>&prompt.root; <userinput>adjkerntz -i</userinput></screen>
+	</step>
+	  
+	<step>
+	  <para>Next, perform some initial configuration file updates in
+	    preparation for the new world.  For instance, this step may add
+	    new groups or new system accounts which have been added
+	    to &os; since the last update.  This is necessary so that the
 	    <buildtarget>installworld</buildtarget> step will be able
-	    to use the newly installed system user or system group
-	    names without problems.</para>
+	    to use the new system accounts and groups.</para>
+
+	  <screen>&prompt.root; <userinput>mergemaster -p</userinput></screen>
 	</step>
 
 	<step>
-	  <para><command>make
-	      installworld</command></para>
+	  <para>Install the new world
+	    from <filename class="directory">/usr/obj</filename>.</para>
 
-	  <para>Copies the world
-	    from <filename>/usr/obj</filename>.  The
-	    new kernel and new world are now installed on disk.</para>
+	  <screen>&prompt.root; <userinput>cd /usr/src</userinput>
+&prompt.root; <userinput>make installworld</userinput></screen>
 	</step>
 
 	<step>
-	  <para><command>mergemaster</command></para>
+	  <para>Update any remaining configuration files.</para>
 
-	  <para>Repeated to update the remaining configuration files,
-	    now that the new world is on disk.</para>
+	  <screen>&prompt.root; <userinput>mergemaster -p</userinput></screen>
 	</step>
 
 	<step>
-	  <para><command>make
-	      delete-old</command></para>
+	  <para>Delete any obsolete files.  This is
+	    important as they may cause problems if left on
+	    the disk.</para>
 
-	  <para>This target deletes old (obsolete) files.  This is
-	    important because sometimes they cause problems if left on
-	    the disk, for example the presence of the old
-	    <filename>utmp.h</filename> causes problems in some ports
-	    when the new <filename>utmpx.h</filename> is
-	    installed.</para>
+	  <screen>&prompt.root; <userinput>make delete-old</userinput></screen>
 	</step>
 
 	<step>
-	  <para>Reboot.</para>
+	  <para>A full reboot is now needed to load the new
+	    kernel and new world with the new configuration files.</para>
 
-	  <para>A full machine reboot is needed now to load the new
-	    kernel and new world with new configuration files.</para>
+	  <screen>&prompt.root; <userinput>reboot</userinput></screen>
 	</step>
 
 	<step>
-	  <para><command>make
-	      delete-old-libs</command></para>
+	  <para>Make sure that all installed ports have first been rebuilt
+	    before old libraries are removed using the instructions in 
+	    <xref linkend="ports-upgrading"/>.  When finished,
+	    remove any obsolete libraries to avoid conflicts with
+	    newer ones.</para>
 
-	  <para>Remove any obsolete libraries to avoid conflicts with
-	    newer ones.  Make sure that all ports have been rebuilt
-	    before old libraries are removed.</para>
+	  <screen>&prompt.root; <userinput>make delete-old-libs</userinput></screen>
 	</step>
       </procedure>
-
-      <para>Upgrades from one release of the same &os; branch to a
-	more recent release of the same branch, such as from 9.0 to
-	9.1, may not need this procedure since it is less likely to
-	run into serious mismatches between compiler, kernel,
-	userland, and configuration files.  The approach of
-	<command>make world</command>
-	followed by building and installing a new kernel might work
-	well enough for minor updates.</para>
-
-      <para>When upgrading across major releases, people who do not
-	follow this procedure should expect some problems.</para>
-
-      <para>This procedure has evolved over time as the developers
-	have found it impossible to completely prevent certain kinds
-	of mismatch problems.  Hopefully, the current procedure will
-	remain stable for a long time.</para>
-
-      <para>To summarize, the currently recommended way of upgrading
-	&os; from sources is:</para>
-
-      <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>shutdown -r now</userinput></screen>
-
-      <note>
-	<para>There are a few rare cases when an extra run of
-	  <command>mergemaster -p</command> is needed before the
-	  <buildtarget>buildworld</buildtarget> step.  These are
-	  described in <filename>UPDATING</filename>.  In general,
-	  though, this step can safely be omitted when not updating
-	  across one or more major &os; versions.</para>
-      </note>
-
-      <para>After <buildtarget>installkernel</buildtarget> finishes
-	successfully, boot into single user mode using <command>boot
-	  -s</command> from the loader prompt.</para>
-
-      <para>If using UFS, run:</para>
-
-      <screen>&prompt.root; <userinput>mount -u /</userinput>
-&prompt.root; <userinput>mount -a -t ufs</userinput></screen>
-
-      <para>If using ZFS(assuming a zpool name of zroot), run:</para>
-
-      <screen>&prompt.root; <userinput>zfs set readonly=off zroot</userinput>
-&prompt.root; <userinput>zfs mount -a</userinput></screen>
-
-      <para>Then run:</para>
-
-      <screen>&prompt.root; <userinput>adjkerntz -i</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>make delete-old</userinput>
-&prompt.root; <userinput>reboot</userinput>
-&prompt.root; <userinput>make delete-old-libs</userinput></screen>
-
-      <warning>
-	<title>Read Further Explanations</title>
-
-	<para>The following sections clearly describe each step,
-	  especially when using a custom kernel configuration.</para>
-      </warning>
     </sect2>
 
     <sect2 xml:id="src-updating">
@@ -1709,6 +1650,8 @@ before running "/usr/sbin/freebsd-update
 	<primary><filename>make.conf</filename></primary>
       </indexterm>
 
+      <para>The following sections clearly describe each step,
+	  especially when using a custom kernel configuration.</para>
       <para>Available &man.make.1; options are shown in
 	&man.make.conf.5; and
 	<filename>/usr/share/examples/etc/make.conf</filename>.  These

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 01:58:11 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 390CCD5F;
 Thu,  6 Feb 2014 01:58:11 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 078411311;
 Thu,  6 Feb 2014 01:58:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s161wAx0061540;
 Thu, 6 Feb 2014 01:58:10 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s161wA1g061539;
 Thu, 6 Feb 2014 01:58:10 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402060158.s161wA1g061539@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 6 Feb 2014 01:58:10 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43797 - head/en_US.ISO8859-1/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.17
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, 06 Feb 2014 01:58:11 -0000

Author: dru
Date: Thu Feb  6 01:58:10 2014
New Revision: 43797
URL: http://svnweb.freebsd.org/changeset/doc/43797

Log:
  White space fix only. Translators can ignore.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Thu Feb  6 01:40:32 2014	(r43796)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Thu Feb  6 01:58:10 2014	(r43797)
@@ -1439,51 +1439,53 @@ before running "/usr/sbin/freebsd-update
       particular version of &os; such as &os.stable; or &os.current;,
       the source tree can be used to rebuild the system.  This process
       is known as rebuilding world.</para>
-      
+
     <para><emphasis>Before</emphasis> rebuilding world, be sure to
       perform the following tasks:</para>
 
     <procedure>
-      <title>Perform These Tasks <emphasis>Before</emphasis> Building World</title>
+      <title>Perform These Tasks <emphasis>Before</emphasis>
+	Building World</title>
 
       <step>
 	<para>Backup all important data to another system or removable
-	media, verify the integrity of the backup, and have a bootable
-	installation media at hand.  It cannot be
-	stressed enough how important it is to make a
-	backup of the system <emphasis>before</emphasis> rebuilding
-	the system.  While rebuilding world is an easy task, there
-	will inevitably be times when mistakes in the source tree
-	render the system unbootable.  You will probably never have
-	to use the backup, but it is better to be safe than sorry!</para>
-    </step>
-
-    <step>
-      <indexterm><primary>mailing list</primary></indexterm>
-      <para>Review the recent &a.stable.name; or &a.current.name; entries, depending
-	upon the branch being tracked.  Be aware of any known
-	problems and which systems are affected.  If a known issue
-	affects the version of synchronized code, wait for an <quote>all
-	  clear</quote> announcement to be posted stating that the problem has
-	been solved.  Resynchronize the sources to ensure that the
-	local version of source has the needed fix.</para>
-    </step>
-    
-    <step>
-      <para>Read
-	<filename>/usr/src/UPDATING</filename> for any pre-buildworld
-	  steps necessary for that version of the source.  This file contains
-	important information about potential problems and may specify
-	the order to run certain commands.  Many upgrades require
-	specific additional steps such as renaming or deleting
-	specific files prior to installworld.  These will be listed
-	at the end of this file where the currently recommended upgrade sequence
-	is explicitly spelled out.  If
-	<filename>UPDATING</filename> contradicts any steps in
-	this chapter, the instructions in <filename>UPDATING</filename> take
-	precedence and should be followed.</para>
-	</step>
-  </procedure>
+	  media, verify the integrity of the backup, and have a
+	  bootable installation media at hand.  It cannot be stressed
+	  enough how important it is to make a backup of the system
+	  <emphasis>before</emphasis> rebuilding the system.  While
+	  rebuilding world is an easy task, there will inevitably be
+	  times when mistakes in the source tree render the system
+	  unbootable.  You will probably never have to use the backup,
+	  but it is better to be safe than sorry!</para>
+      </step>
+
+      <step>
+	<indexterm><primary>mailing list</primary></indexterm>
+	<para>Review the recent &a.stable.name; or &a.current.name;
+	  entries, depending upon the branch being tracked.  Be aware
+	  of any known problems and which systems are affected.  If a
+	  known issue affects the version of synchronized code, wait
+	  for an <quote>all clear</quote> announcement to be posted
+	  stating that the problem has been solved.  Resynchronize the
+	  sources to ensure that the local version of source has the
+	  needed fix.</para>
+      </step>
+
+      <step>
+	<para>Read <filename>/usr/src/UPDATING</filename> for any
+	  pre-buildworld steps necessary for that version of the
+	  source.  This file contains important information about
+	  potential problems and may specify the order to run certain
+	  commands.  Many upgrades require specific additional steps
+	  such as renaming or deleting specific files prior to
+	  installworld.  These will be listed at the end of this file
+	  where the currently recommended upgrade sequence is
+	  explicitly spelled out.  If
+	  <filename>UPDATING</filename> contradicts any steps in this
+	  chapter, the instructions in <filename>UPDATING</filename>
+	  take precedence and should be followed.</para>
+      </step>
+    </procedure>
 
     <warning>
       <title>Do Not Use <command>make world</command></title>
@@ -1499,112 +1501,116 @@ before running "/usr/sbin/freebsd-update
     <sect2 xml:id="canonical-build">
       <title>Overview of Process</title>
 
-      <para>The build world process assumes an upgrade from an older &os;
-	version using the source of a newer
-	version that was obtained using the instructions in 
+      <para>The build world process assumes an upgrade from an older
+	&os; version using the source of a newer version that was
+	obtained using the instructions in
 	<xref linkend="synching"/>.</para>
-	
-      <para>In &os;, the term <quote>world</quote> includes the kernel, core system binaries,
-	libraries, programming files, and built-in compiler. The order in which these
-	components are built and installed is important.</para>
-	
-      <para>For example, the old compiler might have a bug and not be able to
-	    compile the new kernel.  Since the new kernel should be
-	    built with the new compiler, the new compiler
-	    must be built, but not necessarily installed, before the new kernel is built.</para>
-
-	    <para>The new world might rely on new kernel features,
-	    so the new kernel must be installed before the new world is
-	    installed.  The old world might not run correctly on the new
-	    kernel, so the new world must be installed immediately
-	    upon installing the new kernel.</para>
-
-	  <para>Some configuration changes must be made before the new
-	    world is installed, but others might break the old world.
-	    Hence, two different configuration upgrade steps are
-	    used.  For the most part, the update process only replaces or
-	    adds files and existing old files are not deleted.  Since
-	    this can cause problems, <filename>/usr/src/UPDATING</filename>
-	    will indicate if any files
-	    need to be manually deleted and at which step to do so.</para>
+
+      <para>In &os;, the term <quote>world</quote> includes the
+	kernel, core system binaries, libraries, programming files,
+	and built-in compiler.  The order in which these components
+	are built and installed is important.</para>
+
+      <para>For example, the old compiler might have a bug and not be
+	able to compile the new kernel.  Since the new kernel should
+	be built with the new compiler, the new compiler must be
+	built, but not necessarily installed, before the new kernel is
+	built.</para>
+
+      <para>The new world might rely on new kernel features, so the
+	new kernel must be installed before the new world is
+	installed.  The old world might not run correctly on the new
+	kernel, so the new world must be installed immediately upon
+	installing the new kernel.</para>
+
+      <para>Some configuration changes must be made before the new
+	world is installed, but others might break the old world.
+	Hence, two different configuration upgrade steps are used.
+	For the most part, the update process only replaces or adds
+	files and existing old files are not deleted.  Since this can
+	cause problems, <filename>/usr/src/UPDATING</filename> will
+	indicate if any files need to be manually deleted and at which
+	step to do so.</para>
 
       <para>These concerns have led to the recommended upgrade
 	sequence  described in
 	the following procedure.</para>
 
-    <procedure>
-      <title>Overview of Build World Process</title>
+      <procedure>
+	<title>Overview of Build World Process</title>
 
-    <para>The commands used in the build world process should be run in the order specified
-	here.  This section summarizes the function of each command.</para>
+	<para>The commands used in the build world process should be
+	  run in the order specified here.  This section summarizes
+	  the function of each command.</para>
 
 	<step>
 	  <para>Compile the new compiler and a few related
 	    tools, then use the new compiler to compile the rest of
 	    the new world.  The result is saved to
 	    <filename class="directory">/usr/obj</filename>.</para>
-	    
+
 	  <screen>&prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make buildworld</userinput></screen>
 	</step>
 
 	<step>
-	  <para>Use the new compiler
-	    residing in <filename class="directory">/usr/obj</filename>
-	    to build the new kernel, in order to
-	    protect against compiler-kernel mismatches:</para>
+	  <para>Use the new compiler residing in <filename
+	      class="directory">/usr/obj</filename> to build the new
+	    kernel, in order to protect against compiler-kernel
+	    mismatches:</para>
 
 	  <screen>&prompt.root; <userinput>make buildkernel</userinput></screen>
 	</step>
 
 	<step>
-	  <para>Install the new kernel and kernel modules,
-	    making it possible to boot with the newly updated
-	    kernel:</para>
+	  <para>Install the new kernel and kernel modules, making it
+	    possible to boot with the newly updated kernel:</para>
 
 	  <screen>&prompt.root; <userinput>make installkernel</userinput></screen>
 	</step>
 
 	<step>
-	  <para>Drop the system into single user mode in order to minimize problems from updating
-	    any binaries that are already running.  It also minimizes any
-	    problems from running the old world on a new
-	    kernel.</para>
+	  <para>Drop the system into single user mode in order to
+	    minimize problems from updating any binaries that are
+	    already running.  It also minimizes any problems from
+	    running the old world on a new kernel.</para>
 
 	  <screen>&prompt.root; <userinput>shutdown now</userinput></screen>
 
 	  <para>Once in single-user mode, run this command if the
 	    system is formatted with UFS:</para>
 
-      <screen>&prompt.root; <userinput>mount -u /</userinput>
+	  <screen>&prompt.root; <userinput>mount -u /</userinput>
 &prompt.root; <userinput>mount -a -t ufs</userinput></screen>
 
-      <para>If the system is instead formatted with ZFS, run these
-	two commands.  This example assumes a zpool name of <literal>zroot</literal>:</para>
+	  <para>If the system is instead formatted with ZFS, run these
+	    two commands.  This example assumes a zpool name of
+	    <literal>zroot</literal>:</para>
 
-      <screen>&prompt.root; <userinput>zfs set readonly=off zroot</userinput>
+	  <screen>&prompt.root; <userinput>zfs set readonly=off zroot</userinput>
 &prompt.root; <userinput>zfs mount -a</userinput></screen>
-	  </step>
+	</step>
 
 	<step>
 	  <para>Then, for either filesystem, run:</para>
+
 	  <screen>&prompt.root; <userinput>adjkerntz -i</userinput></screen>
 	</step>
-	  
+
 	<step>
-	  <para>Next, perform some initial configuration file updates in
-	    preparation for the new world.  For instance, this step may add
-	    new groups or new system accounts which have been added
-	    to &os; since the last update.  This is necessary so that the
-	    <buildtarget>installworld</buildtarget> step will be able
-	    to use the new system accounts and groups.</para>
+	  <para>Next, perform some initial configuration file updates
+	    in preparation for the new world.  For instance, this step
+	    may add new groups or new system accounts which have been
+	    added to &os; since the last update.  This is necessary so
+	    that the <buildtarget>installworld</buildtarget> step will
+	    be able to use the new system accounts and groups.</para>
 
 	  <screen>&prompt.root; <userinput>mergemaster -p</userinput></screen>
 	</step>
 
 	<step>
-	  <para>Install the new world
-	    from <filename class="directory">/usr/obj</filename>.</para>
+	  <para>Install the new world from <filename
+	      class="directory">/usr/obj</filename>.</para>
 
 	  <screen>&prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make installworld</userinput></screen>
@@ -1617,26 +1623,25 @@ before running "/usr/sbin/freebsd-update
 	</step>
 
 	<step>
-	  <para>Delete any obsolete files.  This is
-	    important as they may cause problems if left on
-	    the disk.</para>
+	  <para>Delete any obsolete files.  This is important as they
+	    may cause problems if left on the disk.</para>
 
 	  <screen>&prompt.root; <userinput>make delete-old</userinput></screen>
 	</step>
 
 	<step>
-	  <para>A full reboot is now needed to load the new
-	    kernel and new world with the new configuration files.</para>
+	  <para>A full reboot is now needed to load the new kernel and
+	    new world with the new configuration files.</para>
 
 	  <screen>&prompt.root; <userinput>reboot</userinput></screen>
 	</step>
 
 	<step>
-	  <para>Make sure that all installed ports have first been rebuilt
-	    before old libraries are removed using the instructions in 
-	    <xref linkend="ports-upgrading"/>.  When finished,
-	    remove any obsolete libraries to avoid conflicts with
-	    newer ones.</para>
+	  <para>Make sure that all installed ports have first been
+	    rebuilt before old libraries are removed using the
+	    instructions in  <xref linkend="ports-upgrading"/>.  When
+	    finished, remove any obsolete libraries to avoid conflicts
+	    with newer ones.</para>
 
 	  <screen>&prompt.root; <userinput>make delete-old-libs</userinput></screen>
 	</step>

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 04:03:29 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7CB684FA;
 Thu,  6 Feb 2014 04:03:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 627D61102;
 Thu,  6 Feb 2014 04:03:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1643Tus014319;
 Thu, 6 Feb 2014 04:03:29 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1643Tpe014318;
 Thu, 6 Feb 2014 04:03:29 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201402060403.s1643Tpe014318@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 6 Feb 2014 04:03:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43798 - head/en_US.ISO8859-1/books/handbook/disks
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.17
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, 06 Feb 2014 04:03:29 -0000

Author: wblock
Date: Thu Feb  6 04:03:28 2014
New Revision: 43798
URL: http://svnweb.freebsd.org/changeset/doc/43798

Log:
  Add a new section on growing disks.  Modified version of patch submitted
  with PR.
  
  PR:		docs/186377
  Submitted by:	Allan Jude <freebsd@allanjude.com>

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

Modified: head/en_US.ISO8859-1/books/handbook/disks/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Thu Feb  6 01:58:10 2014	(r43797)
+++ head/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Thu Feb  6 04:03:28 2014	(r43798)
@@ -252,6 +252,154 @@
     <screen>&prompt.root; <userinput>mount /newdisk</userinput></screen>
   </sect1>
 
+  <sect1 xml:id="disks-growing">
+    <info>
+      <title>Resizing and Growing Disks</title>
+
+      <authorgroup>
+	<author>
+	  <personname>
+	    <firstname>Allan</firstname>
+	    <surname>Jude</surname>
+	  </personname>
+	  <contrib>Originally contributed by </contrib>
+	</author>
+      </authorgroup>
+    </info>
+
+    <indexterm>
+      <primary>disks</primary>
+      <secondary>resizing</secondary>
+    </indexterm>
+
+    <para>A disk's capacity can increase without any changes to the
+      data already present.  This happens commonly with virtual
+      machines, when the virtual disk turns out to be too small and is
+      enlarged.  Sometimes a disk image is written to a
+      <acronym>USB</acronym> memory stick, but does not use the full
+      capacity.  Here we describe how to resize or
+      <emphasis>grow</emphasis> disk contents to take advantage of
+      increased capacity.</para>
+
+    <para>Determine the device name of the disk to be resized by
+      inspecting <filename>/var/run/dmesg.boot</filename>.  In this
+      example, there is only one <acronym>SATA</acronym> disk in the
+      system, so the drive will appear as
+      <filename>ada0</filename>.</para>
+
+    <indexterm><primary>partitions</primary></indexterm>
+    <indexterm>
+      <primary><command>gpart</command></primary>
+    </indexterm>
+
+    <para>List the partitions on the disk to see the current
+      configuration:</para>
+
+    <screen>&prompt.root; <command>gpart show <replaceable>ada0</replaceable></command>
+=>      34  83886013  ada0  GPT  (48G) [CORRUPT]
+        34       128     1  freebsd-boot  (64k)
+       162  79691648     2  freebsd-ufs  (38G)
+  79691810   4194236     3  freebsd-swap  (2G)
+  83886046         1        - free -  (512B)</screen>
+
+    <note>
+      <para>If the disk was formatted with the <link
+	  xlink:href="http://en.wikipedia.org/wiki/GUID_Partition_Table">
+	<acronym>GPT</acronym></link> partitioning scheme, it may show
+	as <quote>corrupted</quote> because the <acronym>GPT</acronym>
+	backup partition table is no longer at the end of the
+	drive.  Fix the backup
+	partition table with
+	<command>gpart</command>:</para>
+
+      <screen>&prompt.root; <command>gpart recover <replaceable>ada0</replaceable></command>
+ada0 recovered</screen>
+    </note>
+
+    <para>Now the additional space on the disk is available for
+      use by a new partition, or an existing partition can be
+      expanded:</para>
+
+    <screen>&prompt.root; <command>gpart show <replaceable>ada0</replaceable></command>
+=>       34  102399933  ada0  GPT  (48G)
+         34        128     1  freebsd-boot  (64k)
+        162   79691648     2  freebsd-ufs  (38G)
+   79691810    4194236     3  freebsd-swap  (2G)
+   83886046   18513921        - free -  (8.8G)</screen>
+
+    <para>Partitions can only be resized into contiguous free space.
+      Here, the last partition on the disk is the swap partition, but
+      the second partition is the one that needs to be resized.  Swap
+      partitions only contain temporary data, so it can safely be
+      unmounted, deleted, and then recreated after resizing other
+      partitions.</para>
+
+    <screen>&prompt.root; <command>swapoff <replaceable>/dev/ada0p3</replaceable></command>
+&prompt.root; <command>gpart delete -i <replaceable>3</replaceable> <replaceable>ada0</replaceable></command>
+ada0p3 deleted
+&prompt.root; <command>gpart show <replaceable>ada0</replaceable></command>
+=>       34  102399933  ada0  GPT  (48G)
+         34        128     1  freebsd-boot  (64k)
+        162   79691648     2  freebsd-ufs  (38G)
+   79691810   22708157        - free -  (10G)</screen>
+
+    <warning>
+      <para>There is risk of data loss when modifying the partition
+	table of a mounted file system.  It is best to perform the
+	following steps on an unmounted file system while running from
+	a live <acronym>CD-ROM</acronym> or <acronym>USB</acronym>
+	device.  However, if absolutely necessary, a mounted file
+	system can be  resized after disabling GEOM safety
+	features:</para>
+
+      <screen>&prompt.root; <command>sysctl kern.geom.debugflags=16</command></screen>
+    </warning>
+
+    <para>Resize the partition, leaving room to recreate a swap
+      partition of the desired size.  This only modifies the size of
+      the partition.  The file system in the partition will be
+      expanded in a separate step.</para>
+
+    <screen>&prompt.root; <command>gpart resize -i <replaceable>2</replaceable> -a 4k -s <replaceable>47G</replaceable> <replaceable>ada0</replaceable></command>
+ada0p2 resized
+&prompt.root; <command>gpart show <replaceable>ada0</replaceable></command>
+=>       34  102399933  ada0  GPT  (48G)
+         34        128     1  freebsd-boot  (64k)
+        162   98566144     2  freebsd-ufs  (47G)
+   98566306    3833661        - free -  (1.8G)</screen>
+
+    <para>Recreate the swap partition:</para>
+
+    <screen>&prompt.root; <command>gpart add -t freebsd-swap -a 4k <replaceable>ada0</replaceable></command>
+ada0p3 added
+&prompt.root; <command>gpart show <replaceable>ada0</replaceable></command>
+=>       34  102399933  ada0  GPT  (48G)
+         34        128     1  freebsd-boot  (64k)
+        162   98566144     2  freebsd-ufs  (47G)
+   98566306    3833661     3  freebsd-swap  (1.8G)
+&prompt.root; <command>swapon <replaceable>/dev/ada0p3</replaceable></command></screen>
+
+    <para>Grow the <acronym>UFS</acronym> file system to use the new
+      capacity of the resized partition:</para>
+
+    <note>
+      <para>Growing a live <acronym>UFS</acronym> file system is only
+	possible in &os; 10.0-RELEASE and later.  For earlier
+	versions, the file system must not be mounted.</para>
+    </note>
+
+    <screen>&prompt.root; <command>growfs <replaceable>/dev/ada0p2</replaceable></command>
+Device is mounted read-write; resizing will result in temporary write suspension for /.
+It's strongly recommended to make a backup before growing the file system.
+OK to grow file system on /dev/ada0p2, mounted on /, from 38GB to 47GB? [Yes/No] <userinput>Yes</userinput>
+super-block backups (for fsck -b #) at:
+ 80781312, 82063552, 83345792, 84628032, 85910272, 87192512, 88474752,
+ 89756992, 91039232, 92321472, 93603712, 94885952, 96168192, 97450432</screen>
+
+    <para>Both the partition and the file system on it have now been
+      resized to use the newly-available disk space.</para>
+  </sect1>
+
   <sect1 xml:id="usb-disks">
     <info>
       <title>USB Storage Devices</title>

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 09:38:02 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 10CFE9EA;
 Thu,  6 Feb 2014 09:38:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E54DD1A0B;
 Thu,  6 Feb 2014 09:38:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s169c1QC045560;
 Thu, 6 Feb 2014 09:38:01 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s169c1E0045558;
 Thu, 6 Feb 2014 09:38:01 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201402060938.s169c1E0045558@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Thu, 6 Feb 2014 09:38:01 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43799 - in head/ja_JP.eucJP: 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.17
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, 06 Feb 2014 09:38:02 -0000

Author: ryusuke
Date: Thu Feb  6 09:38:01 2014
New Revision: 43799
URL: http://svnweb.freebsd.org/changeset/doc/43799

Log:
  - Merge the following from the English version:
  
  	r42297 -> r42933	head/ja_JP.eucJP/share/xml/mailing-lists.ent
  	r42297 -> r42935	head/ja_JP.eucJP/books/handbook/eresources/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/eresources/chapter.xml
  head/ja_JP.eucJP/share/xml/mailing-lists.ent

Modified: head/ja_JP.eucJP/books/handbook/eresources/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/eresources/chapter.xml	Thu Feb  6 04:03:28 2014	(r43798)
+++ head/ja_JP.eucJP/books/handbook/eresources/chapter.xml	Thu Feb  6 09:38:01 2014	(r43799)
@@ -317,12 +317,6 @@
 	      <entry>¥â¡¼¥Ğ¥¤¥ë¥³¥ó¥Ô¥å¡¼¥Æ¥£¥ó¥°¤Ë¤Ä¤¤¤Æ¤ÎµÄÏÀ</entry>
 	    </row>
 
-	    <row>
-	      <entry>&a.mozilla.name;</entry>
-	      <entry><application>Mozilla</application> ¤Î
-		FreeBSD ¤Ø¤Î°Ü¿¢¤Ë´Ø¤¹¤ëµÄÏÀ</entry>
-	    </row>
-
  	    <row>
 	      <entry>&a.newbus.name;</entry>
 	      <entry>¥Ğ¥¹¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë´Ø¤¹¤ëµ»½ÑŪ¤ÊµÄÏÀ</entry>
@@ -639,6 +633,13 @@
 	    </row>
 
 	    <row>
+	      <entry>&a.svn-src-stable-10.name;</entry>
+	      <entry><filename>/usr/src</filename></entry>
+	      <entry>src subversion ¥ê¥İ¥¸¥È¥ê¤Î <filename>stable/10</filename>
+		¥Ö¥é¥ó¥Á¤Ë²Ã¤¨¤é¤ì¤¿¤¹¤Ù¤Æ¤ÎÊѹ¹</entry>
+	    </row>
+
+	    <row>
 	      <entry>&a.svn-src-stable-other.name;</entry>
 	      <entry><filename>/usr/src</filename></entry>
 	      <entry>src subversion ¥ê¥İ¥¸¥È¥ê¤Î¸Å¤¤ <filename>stable</filename>

Modified: head/ja_JP.eucJP/share/xml/mailing-lists.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/mailing-lists.ent	Thu Feb  6 04:03:28 2014	(r43798)
+++ head/ja_JP.eucJP/share/xml/mailing-lists.ent	Thu Feb  6 09:38:01 2014	(r43799)
@@ -114,6 +114,10 @@
 <!ENTITY a.ctm-src-9 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-9.url;'>CTM 9-STABLE src branch distribution ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</link>">
 <!ENTITY a.ctm-src-9.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-9.url;'>ctm-src-9</link>">
 
+<!ENTITY a.ctm-src-10.url "&a.mailman.listinfo;/ctm-src-10">
+<!ENTITY a.ctm-src-10 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-10.url;'>CTM 10-STABLE src branch distribution ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</link>">
+<!ENTITY a.ctm-src-10.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-10.url;'>ctm-src-10</link>">
+
 <!ENTITY a.ctm-src-cur.url "&a.mailman.listinfo;/ctm-src-cur">
 <!ENTITY a.ctm-src-cur "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-cur.url;'>CTM -CURRENT src branch distribution ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</link>">
 <!ENTITY a.ctm-src-cur.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-cur.url;'>ctm-src-cur</link>">
@@ -288,10 +292,6 @@
 <!ENTITY a.mono "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mono.url;'>Mono and C# applications on FreeBSD</link>">
 <!ENTITY a.mono.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mono.url;'>freebsd-mono</link>">
 
-<!ENTITY a.mozilla.url "&a.mailman.listinfo;/freebsd-mozilla">
-<!ENTITY a.mozilla "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mozilla.url;'>FreeBSD port of the Mozilla browser ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</link>">
-<!ENTITY a.mozilla.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.mozilla.url;'>freebsd-mozilla</link>">
-
 <!ENTITY a.multimedia.url "&a.mailman.listinfo;/freebsd-multimedia">
 <!ENTITY a.multimedia "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.multimedia.url;'>FreeBSD multimedia ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</link>">
 <!ENTITY a.multimedia.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.multimedia.url;'>freebsd-multimedia</link>">
@@ -496,6 +496,10 @@
 <!ENTITY a.svn-src-stable-9 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-9.url;'>9-stable ¥½¡¼¥¹¥Ä¥ê¡¼¤Î SVN ¥³¥ß¥Ã¥È¥á¥Ã¥»¡¼¥¸</link>">
 <!ENTITY a.svn-src-stable-9.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-9.url;'>svn-src-stable-9</link>">
 
+<!ENTITY a.svn-src-stable-10.url "&a.mailman.listinfo;/svn-src-stable-10">
+<!ENTITY a.svn-src-stable-10 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-10.url;'>10-stable ¥½¡¼¥¹¥Ä¥ê¡¼¤Î SVN ¥³¥ß¥Ã¥È¥á¥Ã¥»¡¼¥¸</link>">
+<!ENTITY a.svn-src-stable-10.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-10.url;'>svn-src-stable-10</link>">
+
 <!ENTITY a.svn-src-stable-other.url "&a.mailman.listinfo;/svn-src-stable-other">
 <!ENTITY a.svn-src-stable-other "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-other.url;'>SVN commit messages for the old stable src trees</link>">
 <!ENTITY a.svn-src-stable-other.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-other.url;'>svn-src-stable-other</link>">

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 10:14:06 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F27B3E21;
 Thu,  6 Feb 2014 10:14:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DB4F11DE6;
 Thu,  6 Feb 2014 10:14:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s16AE537061706;
 Thu, 6 Feb 2014 10:14:05 GMT (envelope-from taras@svn.freebsd.org)
Received: (from taras@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s16AE57L061705;
 Thu, 6 Feb 2014 10:14:05 GMT (envelope-from taras@svn.freebsd.org)
Message-Id: <201402061014.s16AE57L061705@svn.freebsd.org>
From: Taras Korenko <taras@FreeBSD.org>
Date: Thu, 6 Feb 2014 10:14:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43800 - head/en_US.ISO8859-1/books/handbook/kernelconfig
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.17
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, 06 Feb 2014 10:14:06 -0000

Author: taras
Date: Thu Feb  6 10:14:05 2014
New Revision: 43800
URL: http://svnweb.freebsd.org/changeset/doc/43800

Log:
    This patch introduces minor rewordings and corrections to "Configuring
  the FreeBSD Kernel" chapter; those were discussed with pluknet and wblock
  in ML [1].  To be followed by whitespace fixes.
  
  1. http://lists.freebsd.org/pipermail/freebsd-doc/2014-February/023240.html

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

Modified: head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Thu Feb  6 09:38:01 2014	(r43799)
+++ head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Thu Feb  6 10:14:05 2014	(r43800)
@@ -139,10 +139,10 @@
       wireless Ethernet driver has the following information in its
       manual page:</para>
 
-    <programlisting>Alternatively, to load the driver as a module at boot time, place the
+    <screen>Alternatively, to load the driver as a module at boot time, place the
 following line in &man.loader.conf.5;:
 
-    if_ath_load="YES"</programlisting>
+    if_ath_load="YES"</screen>
 
     <para>Adding <literal>if_ath_load="YES"</literal> to
       <filename>/boot/loader.conf</filename> will load this
@@ -188,10 +188,10 @@ following line in &man.loader.conf.5;:
       example, the following lines indicate that the &man.psm.4;
       driver found a mouse:</para>
 
-    <programlisting>psm0: &lt;PS/2 Mouse&gt; irq 12 on atkbdc0
+    <screen>psm0: &lt;PS/2 Mouse&gt; irq 12 on atkbdc0
 psm0: [GIANT-LOCKED]
 psm0: [ITHREAD]
-psm0: model Generic PS/2 mouse, device ID 0</programlisting>
+psm0: model Generic PS/2 mouse, device ID 0</screen>
 
     <para>Since this hardware exists, this driver should not be removed from a custom kernel
       configuration file.</para>
@@ -204,12 +204,12 @@ psm0: model Generic PS/2 mouse, device I
       &man.pciconf.8;, which provides more verbose output.  For
       example:</para>
 
-    <programlisting><command>pciconf -lv</command>
-    ath0@pci0:3:0:0:        class=0x020000 card=0x058a1014 chip=0x1014168c rev=0x01 hdr=0x00
+    <screen>&prompt.user; pciconf -lv
+ath0@pci0:3:0:0:        class=0x020000 card=0x058a1014 chip=0x1014168c rev=0x01 hdr=0x00
     vendor     = 'Atheros Communications Inc.'
     device     = 'AR5212 Atheros AR5212 802.11abg wireless'
     class      = network
-    subclass   = ethernet</programlisting>
+    subclass   = ethernet</screen>
 
     <para>This output shows that the
       <filename>ath</filename> driver located a wireless Ethernet
@@ -226,8 +226,7 @@ psm0: model Generic PS/2 mouse, device I
 ath_hal(4)               - Atheros Hardware Access Layer (HAL)</programlisting>
 
     <para>Once the hardware inventory list is created, refer to it
-      to ensure that installed hardware is not removed as you edit the custom
-      kernel configuration file.</para>
+      to ensure that drivers for installed hardware are not removed as the custom kernel configuration is edited.</para>
   </sect1>
 
   <sect1 xml:id="kernelconfig-config">
@@ -250,11 +249,7 @@ ath_hal(4)               - Atheros Hardw
       <para>If <filename>/usr/src/</filename> does
 	not exist or it is empty, source has not been installed.
 	Source can be installed using
-	<application>svn</application>, which is described in <xref linkend="svn"/>, or by installing the
-	<literal>src</literal> distribution using &man.sysinstall.8;.  This
-	distribution can be selected by navigating to the 
-	<literal>Configuration</literal> and then to the
-	<literal>Distributions</literal> menu within &man.sysinstall.8;.</para>
+	<application>Subversion</application>, which is described in <xref linkend="svn"/>.</para>
 
     <para>Once source is installed, review the contents of <filename>/usr/src/sys</filename>.  This directory contains a
       number of subdirectories, including those which represent the following
@@ -350,7 +345,7 @@ options         IPDIVERT</programlisting
     <note>
       <para>To build a file which contains all available options,
 	run the following command as <systemitem class="username">root</systemitem>:</para>
-      <screen>&prompt.root; <userinput>cd /usr/src/sys/i386/conf &amp;&amp; make LINT</userinput></screen>
+      <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>arch</replaceable>/conf &amp;&amp; make LINT</userinput></screen>
     </note>
 
 
@@ -521,10 +516,11 @@ options          NFS_ROOT          # NFS
     <programlisting>options          SCSI_DELAY=5000  # Delay (in ms) before probing SCSI</programlisting>
 
     <para>This causes the kernel to pause for 5 seconds before probing
-      each SCSI device in the system.  If the system only has IDE hard
-      drives, ignore this or lower the number to speed up booting.
-      However, if &os; has trouble recognizing the SCSI devices, the
-      number will have to be raised again.</para>
+      each <acronym>SCSI</acronym> device in the system.  If
+      <acronym>SCSI</acronym> drives are not recognized, increase the
+      number.  If the system does not have any <acronym>SCSI</acronym>
+      drives, this value can be ignored or decreased to speed up
+      booting.</para>
 
     <programlisting>options          KTRACE            # ktrace(1) support</programlisting>
 
@@ -577,7 +573,7 @@ options          NFS_ROOT          # NFS
       processors.</para>
 
     <note>
-      <para>This device exists only on the i386 architecture and this
+      <para>This device exists only on the &i386; architecture and this
 	configuration line should not be used on other
 	architectures.</para>
     </note>
@@ -743,8 +739,7 @@ device          atkbdc     # AT keyboard
 
     <para>The &man.vga.4; video card driver.</para>
 
-    <programlisting>
-device          splash     # Splash screen and screen saver support</programlisting>
+    <programlisting>device          splash     # Splash screen and screen saver support</programlisting>
 
     <para>Required by the boot splash screen and screen savers.</para>
 
@@ -926,7 +921,7 @@ device          xe         # Xircom pcca
 #device         le</programlisting>
 
     <para>ISA Ethernet drivers.  See
-      <filename>/usr/src/sys/i386/conf/NOTES</filename>
+      <filename>/usr/src/sys/<replaceable>arch</replaceable>/conf/NOTES</filename>
       for details of which cards are supported by which driver.</para>
 
     <programlisting># Wireless NIC cards
@@ -1065,7 +1060,7 @@ device          fwe           # Ethernet
 
     <para>For more information and additional devices supported by
       &os;, see
-      <filename>/usr/src/sys/i386/conf/NOTES</filename>.</para>
+      <filename>/usr/src/sys/<replaceable>arch</replaceable>/conf/NOTES</filename>.</para>
 
     <sect2>
       <title>Large Memory Configurations

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 10:26:11 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D50EE2ED;
 Thu,  6 Feb 2014 10:26:11 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id BD5C11FC9;
 Thu,  6 Feb 2014 10:26:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s16AQBFc066258;
 Thu, 6 Feb 2014 10:26:11 GMT (envelope-from taras@svn.freebsd.org)
Received: (from taras@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s16AQBSj066257;
 Thu, 6 Feb 2014 10:26:11 GMT (envelope-from taras@svn.freebsd.org)
Message-Id: <201402061026.s16AQBSj066257@svn.freebsd.org>
From: Taras Korenko <taras@FreeBSD.org>
Date: Thu, 6 Feb 2014 10:26:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43801 - head/en_US.ISO8859-1/books/handbook/kernelconfig
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.17
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, 06 Feb 2014 10:26:12 -0000

Author: taras
Date: Thu Feb  6 10:26:11 2014
New Revision: 43801
URL: http://svnweb.freebsd.org/changeset/doc/43801

Log:
  Whitespace changes only.  Translators, please ignore.

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

Modified: head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Thu Feb  6 10:14:05 2014	(r43800)
+++ head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Thu Feb  6 10:26:11 2014	(r43801)
@@ -193,8 +193,8 @@ psm0: [GIANT-LOCKED]
 psm0: [ITHREAD]
 psm0: model Generic PS/2 mouse, device ID 0</screen>
 
-    <para>Since this hardware exists, this driver should not be removed from a custom kernel
-      configuration file.</para>
+    <para>Since this hardware exists, this driver should not be
+      removed from a custom kernel configuration file.</para>
 
     <para>If the output of <command>dmesg</command> does not display
       the results of the boot probe output, instead read the contents of
@@ -226,7 +226,8 @@ ath0@pci0:3:0:0:        class=0x020000 c
 ath_hal(4)               - Atheros Hardware Access Layer (HAL)</programlisting>
 
     <para>Once the hardware inventory list is created, refer to it
-      to ensure that drivers for installed hardware are not removed as the custom kernel configuration is edited.</para>
+      to ensure that drivers for installed hardware are not removed
+      as the custom kernel configuration is edited.</para>
   </sect1>
 
   <sect1 xml:id="kernelconfig-config">
@@ -244,14 +245,16 @@ ath_hal(4)               - Atheros Hardw
     <title>The Configuration File</title>
 
     <para>In order to create a custom kernel configuration file and
-      build a custom kernel, the full &os; source tree must first be installed.</para>
+      build a custom kernel, the full &os; source tree must first be
+      installed.</para>
 
-      <para>If <filename>/usr/src/</filename> does
-	not exist or it is empty, source has not been installed.
-	Source can be installed using
-	<application>Subversion</application>, which is described in <xref linkend="svn"/>.</para>
-
-    <para>Once source is installed, review the contents of <filename>/usr/src/sys</filename>.  This directory contains a
+    <para>If <filename>/usr/src/</filename> does not exist or it is
+      empty, source has not been installed.  Source can be installed
+      using <application>Subversion</application>, which is described
+      in <xref linkend="svn"/>.</para>
+      
+    <para>Once source is installed, review the contents of
+      <filename>/usr/src/sys</filename>.  This directory contains a
       number of subdirectories, including those which represent the following
       supported architectures: <filename>amd64</filename>, <filename>i386</filename>, <filename>ia64</filename>, <filename>pc98</filename>, <filename>powerpc</filename>, and <filename>sparc64</filename>.  Everything inside a
       particular architecture's directory deals with that architecture
@@ -573,8 +576,8 @@ options          NFS_ROOT          # NFS
       processors.</para>
 
     <note>
-      <para>This device exists only on the &i386; architecture and this
-	configuration line should not be used on other
+      <para>This device exists only on the &i386; architecture and
+	this configuration line should not be used on other
 	architectures.</para>
     </note>
 

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 10:56:52 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EEE66B7A;
 Thu,  6 Feb 2014 10:56:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C9C8D13E2;
 Thu,  6 Feb 2014 10:56:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s16AupTa079821;
 Thu, 6 Feb 2014 10:56:51 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s16Aup3n079820;
 Thu, 6 Feb 2014 10:56:51 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201402061056.s16Aup3n079820@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Thu, 6 Feb 2014 10:56:51 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43802 - head/ja_JP.eucJP/books/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.17
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, 06 Feb 2014 10:56:52 -0000

Author: ryusuke
Date: Thu Feb  6 10:56:51 2014
New Revision: 43802
URL: http://svnweb.freebsd.org/changeset/doc/43802

Log:
  - Merge the following from the English version:
  
  	r42899 -> r43687	head/ja_JP.eucJP/books/handbook/book.xml

Modified:
  head/ja_JP.eucJP/books/handbook/book.xml

Modified: head/ja_JP.eucJP/books/handbook/book.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/book.xml	Thu Feb  6 10:26:11 2014	(r43801)
+++ head/ja_JP.eucJP/books/handbook/book.xml	Thu Feb  6 10:56:51 2014	(r43802)
@@ -1,23 +1,30 @@
 <?xml version="1.0" encoding="euc-jp"?>
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
 	"http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd" [
-<!ENTITY % chapters SYSTEM "chapters.ent">
-%chapters;
-<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
-%txtfiles;
-]>
 <!--
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r42899
+     Original revision: r43687
      $FreeBSD$
 -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ja">
-  <info><title>FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯</title>
-    
 
-    <author><orgname>FreeBSD ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È</orgname></author>
+<!ENTITY % chapters SYSTEM "chapters.ent">
+%chapters;
+<!ENTITY % txtfiles SYSTEM "txtfiles.ent">
+%txtfiles;
+]>
+
+<book xmlns="http://docbook.org/ns/docbook"
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:lang="ja">
+
+  <info>
+    <title>FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯</title>
+
+    <author>
+      <orgname>FreeBSD ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È</orgname>
+    </author>
 
     <pubdate>$FreeBSD$</pubdate>
 
@@ -43,6 +50,7 @@
       <year>2011</year>
       <year>2012</year>
       <year>2013</year>
+      <year>2014</year>
       <holder>The FreeBSD Documentation Project</holder>
     </copyright>
 
@@ -99,17 +107,18 @@
         FreeBSD ¥¦¥§¥Ö¥µ¥¤¥È</link> ¤ª¤è¤Ó
 	<link xlink:href="http://www.FreeBSD.org/">FreeBSD ¥¦¥§¥Ö¥µ¥¤¥È</link>
 	¤«¤éÆş¼ê¤Ç¤­¤Ş¤¹
-	(¤³¤Îʸ½ñ¤Î°ÊÁ°¤Î¥Ğ¡¼¥¸¥ç¥ó¤Ï
-	<uri xlink:href="http://docs.FreeBSD.org/doc/">http://docs.FreeBSD.org/doc/</uri>
+	(¤³¤Îʸ½ñ¤Î°ÊÁ°¤Î¥Ğ¡¼¥¸¥ç¥ó¤Ï <uri
+	  xlink:href="http://docs.FreeBSD.org/doc/">http://docs.FreeBSD.org/doc/</uri>
 	¤«¤éÆş¼ê¤Ç¤­¤Ş¤¹)¡£
-        ¤Ş¤¿¡¢Â¾¤Î¤µ¤Ş¤¶¤Ş¤Êʸ½ñ·Á¼°¡¢°µ½Ì·Á¼°¤Î¤â¤Î¤¬
-	<link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc">FreeBSD FTP
-	¥µ¡¼¥Ğ</link> ¤ä¿ô¿¤¯¤Î <link linkend="mirrors">¥ß¥é¡¼¥µ¥¤¥È</link>
+        ¤Ş¤¿¡¢Â¾¤Î¤µ¤Ş¤¶¤Ş¤Êʸ½ñ·Á¼°¡¢°µ½Ì·Á¼°¤Î¤â¤Î¤¬ <link
+	  xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD
+	  FTP ¥µ¡¼¥Ğ</link> ¤ä¿ô¿¤¯¤Î
+	<link linkend="mirrors">¥ß¥é¡¼¥µ¥¤¥È</link>
 	¤«¤é¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Ş¤¹¡£
 	¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤Î½ñÀÒÈÇ (±Ñ¸ìÈÇ) ¤Ï¡¢
-	<link xlink:href="http://www.freebsdmall.com/">FreeBSD Mall</link>
-	¤«¤é¹ØÆş¤Ç¤­¤Ş¤¹¡£
-	¤Ş¤¿¡¢<link xlink:href="&url.base;/search/index.html">¥Ï¥ó¥É¥Ö¥Ã¥¯¤Î¸¡º÷</link>
+	<link xlink:href="http://www.freebsdmall.com/">FreeBSD
+	  Mall</link> ¤«¤é¹ØÆş¤Ç¤­¤Ş¤¹¡£¤Ş¤¿¡¢<link
+	  xlink:href="&url.base;/search/index.html">¥Ï¥ó¥É¥Ö¥Ã¥¯¤Î¸¡º÷</link>
 	¤ò¹Ô¤Ê¤¦¤³¤È¤â¤Ç¤­¤Ş¤¹¡£</para>
 
       <para>FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯ÆüËܸìÈǤκîÀ®¤Ï FreeBSD

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 11:07:24 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 55C375AD;
 Thu,  6 Feb 2014 11:07:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3311015D0;
 Thu,  6 Feb 2014 11:07:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s16B7OmA084450;
 Thu, 6 Feb 2014 11:07:24 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s16B7OXd084449;
 Thu, 6 Feb 2014 11:07:24 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201402061107.s16B7OXd084449@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Thu, 6 Feb 2014 11:07:24 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43803 - head/ja_JP.eucJP/books/handbook
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Mailman-Approved-At: Thu, 06 Feb 2014 14:27:30 +0000
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.17
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, 06 Feb 2014 11:07:24 -0000

Author: ryusuke
Date: Thu Feb  6 11:07:23 2014
New Revision: 43803
URL: http://svnweb.freebsd.org/changeset/doc/43803

Log:
  o Whitespace cleanup.

Modified:
  head/ja_JP.eucJP/books/handbook/book.xml

Modified: head/ja_JP.eucJP/books/handbook/book.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/book.xml	Thu Feb  6 10:56:51 2014	(r43802)
+++ head/ja_JP.eucJP/books/handbook/book.xml	Thu Feb  6 11:07:23 2014	(r43803)
@@ -93,24 +93,24 @@
 
     <abstract>
       <para>FreeBSD ¤Ø¤è¤¦¤³¤½!
-        ¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤Ï <emphasis>FreeBSD &rel2.current;-RELEASE</emphasis>
-        ¤È <emphasis>FreeBSD &rel.current;-RELEASE</emphasis>
+	¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤Ï <emphasis>FreeBSD &rel2.current;-RELEASE</emphasis>
+	¤È <emphasis>FreeBSD &rel.current;-RELEASE</emphasis>
 	¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ª¤è¤Ó¡¢Æü¾ï¤Ç¤Î»È¤¤Êı¤Ë¤Ä¤¤¤Æµ­½Ò¤·¤¿¤â¤Î¤Ç¤¹¡£
 	Ëܥϥó¥É¥Ö¥Ã¥¯¤Ï<emphasis>²şÊÔºî¶ÈÃæ</emphasis>¤Ç¤¢¤ê¡¢
-        ¤µ¤Ş¤¶¤Ş¤Ê¿Í¡¹¤¬ÊÔ½¸¤Ë·È¤ï¤Ã¤Æ¤¤¤Ş¤¹¡£
+	¤µ¤Ş¤¶¤Ş¤Ê¿Í¡¹¤¬ÊÔ½¸¤Ë·È¤ï¤Ã¤Æ¤¤¤Ş¤¹¡£
 	¤¤¤ŞÂ¸ºß¤¹¤ë¥»¥¯¥·¥ç¥ó¤ÎÃæ¤Ë¤Ï¾ğÊ󤬸Ť¯¤Ê¤Ã¤Æ¤·¤Ş¤Ã¤¿¤¿¤á¡¢
 	¹¹¿·ºî¶È¤ÎɬÍפ¬¤¢¤ë¤â¤Î¤â´Ş¤Ş¤ì¤Æ¤¤¤Ş¤¹¡£
-        ¤â¤·¡¢¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤òÊÔ½¸¤¹¤ë¥×¥í¥¸¥§¥¯¥È¤Ë¶¨ÎϤ·¤¿¤¤¤È¤ª¹Í¤¨¤Ê¤é¡¢
+	¤â¤·¡¢¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤òÊÔ½¸¤¹¤ë¥×¥í¥¸¥§¥¯¥È¤Ë¶¨ÎϤ·¤¿¤¤¤È¤ª¹Í¤¨¤Ê¤é¡¢
 	&a.doc; ¤Ş¤ÇÅŻҥ᡼¥ë¤ò(±Ñ¸ì¤Ç)Á÷¤Ã¤Æ¤¯¤À¤µ¤¤¡£
 	¤³¤Îʸ½ñ¤ÎºÇ¿·¥Ğ¡¼¥¸¥ç¥ó¤Ï¡¢¤¤¤Ä¤Ç¤â
 	<link xlink:href="http://www.jp.FreeBSD.org/">ÆüËܹñÆâÈǤÎ
-        FreeBSD ¥¦¥§¥Ö¥µ¥¤¥È</link> ¤ª¤è¤Ó
+	FreeBSD ¥¦¥§¥Ö¥µ¥¤¥È</link> ¤ª¤è¤Ó
 	<link xlink:href="http://www.FreeBSD.org/">FreeBSD ¥¦¥§¥Ö¥µ¥¤¥È</link>
 	¤«¤éÆş¼ê¤Ç¤­¤Ş¤¹
 	(¤³¤Îʸ½ñ¤Î°ÊÁ°¤Î¥Ğ¡¼¥¸¥ç¥ó¤Ï <uri
 	  xlink:href="http://docs.FreeBSD.org/doc/">http://docs.FreeBSD.org/doc/</uri>
 	¤«¤éÆş¼ê¤Ç¤­¤Ş¤¹)¡£
-        ¤Ş¤¿¡¢Â¾¤Î¤µ¤Ş¤¶¤Ş¤Êʸ½ñ·Á¼°¡¢°µ½Ì·Á¼°¤Î¤â¤Î¤¬ <link
+	¤Ş¤¿¡¢Â¾¤Î¤µ¤Ş¤¶¤Ş¤Êʸ½ñ·Á¼°¡¢°µ½Ì·Á¼°¤Î¤â¤Î¤¬ <link
 	  xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD
 	  FTP ¥µ¡¼¥Ğ</link> ¤ä¿ô¿¤¯¤Î
 	<link linkend="mirrors">¥ß¥é¡¼¥µ¥¤¥È</link>
@@ -122,13 +122,13 @@
 	¤ò¹Ô¤Ê¤¦¤³¤È¤â¤Ç¤­¤Ş¤¹¡£</para>
 
       <para>FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯ÆüËܸìÈǤκîÀ®¤Ï FreeBSD
-        ÆüËܸì¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È (FreeBSD doc-jp) ¤¬¤ª¤³¤Ê¤Ã¤Æ¤¤¤Ş¤¹¡£
-        ¥Ï¥ó¥É¥Ö¥Ã¥¯¤ÎÆüËܸìÌõ¤Ë´Ø¤¹¤ë¤³¤È¤Ï FreeBSD &a.jp.doc-jp;
+	ÆüËܸì¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È (FreeBSD doc-jp) ¤¬¤ª¤³¤Ê¤Ã¤Æ¤¤¤Ş¤¹¡£
+	¥Ï¥ó¥É¥Ö¥Ã¥¯¤ÎÆüËܸìÌõ¤Ë´Ø¤¹¤ë¤³¤È¤Ï FreeBSD &a.jp.doc-jp;
 	¤Ë¤ª¤¤¤ÆÆüËܸì¤ÇµÄÏÀ¤µ¤ì¤Æ¤¤¤Ş¤¹¡£</para>
 
       <para>ʸ½ñ¤ÎÆüËܸìÌõ¤Ë´Ø¤¹¤ë¤ªÌ䤤¹ç¤ï¤»¤ä¡¢
-        ʸ½ñ¤Î¸¶Ê¸¤Ë´Ø¤¹¤ëÌ䤤¹ç¤ï¤»¤ò¤·¤¿¤¤¤¬±Ñ¸ì¤¬ÆÀ°Õ¤Ç¤Ê¤¤¤È¤¤¤¦Êı¤Ï
-        FreeBSD &a.jp.doc-jp; ¤Ş¤Ç¡¢ÆüËܸì¤Ç¥³¥á¥ó¥È¤ò¤ª´ó¤»¤¯¤À¤µ¤¤¡£</para>
+	ʸ½ñ¤Î¸¶Ê¸¤Ë´Ø¤¹¤ëÌ䤤¹ç¤ï¤»¤ò¤·¤¿¤¤¤¬±Ñ¸ì¤¬ÆÀ°Õ¤Ç¤Ê¤¤¤È¤¤¤¦Êı¤Ï
+	FreeBSD &a.jp.doc-jp; ¤Ş¤Ç¡¢ÆüËܸì¤Ç¥³¥á¥ó¥È¤ò¤ª´ó¤»¤¯¤À¤µ¤¤¡£</para>
     </abstract>
   </info>
 
@@ -139,35 +139,35 @@
 
     <partintro>
       <para>FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯¤ÎÂè 1 Éô¤Ï¥æ¡¼¥¶¤È
-        FreeBSD ¤¬½é¤á¤Æ¤Î´ÉÍı¼Ô¸ş¤±¤Ç¤¹¡£³Æ¾Ï¤ÎÆâÍƤϰʲ¼¤Î¤È¤ª¤ê¤Ç¤¹¡£</para>
+	FreeBSD ¤¬½é¤á¤Æ¤Î´ÉÍı¼Ô¸ş¤±¤Ç¤¹¡£³Æ¾Ï¤ÎÆâÍƤϰʲ¼¤Î¤È¤ª¤ê¤Ç¤¹¡£</para>
 
       <itemizedlist>
-        <listitem>
-          <para>FreeBSD ¤Î¾Ò²ğ</para>
-        </listitem>
-
-        <listitem>
-          <para>¥¤¥ó¥¹¥È¡¼¥ë¤Î¼ê½ç¤Î²òÀâ</para>
-        </listitem>
-
-        <listitem>
-          <para>&unix; ¤Î´ğÁÃ</para>
-        </listitem>
-
-        <listitem>
-          <para>FreeBSD ¤ÇÍøÍѤǤ­¤ëË­É٤ʥµ¡¼¥É¥Ñ¡¼¥Æ¥£À½¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î
-            ¥¤¥ó¥¹¥È¡¼¥ëÊıË¡</para>
-        </listitem>
-
-        <listitem>
-          <para>&unix; ¤Ë¤ª¤±¤ë¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à X¡¢
-            ¤ª¤è¤Ó¥¯¥ê¥¨¥¤¥Æ¥£¥Ö¤Ê¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤ÎÀßÄê¤Î¾ÜºÙ¤Î¾Ò²ğ</para>
-        </listitem>
+	<listitem>
+	  <para>FreeBSD ¤Î¾Ò²ğ</para>
+	</listitem>
+
+	<listitem>
+	  <para>¥¤¥ó¥¹¥È¡¼¥ë¤Î¼ê½ç¤Î²òÀâ</para>
+	</listitem>
+
+	<listitem>
+	  <para>&unix; ¤Î´ğÁÃ</para>
+	</listitem>
+
+	<listitem>
+	  <para>FreeBSD ¤ÇÍøÍѤǤ­¤ëË­É٤ʥµ¡¼¥É¥Ñ¡¼¥Æ¥£À½¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î
+	    ¥¤¥ó¥¹¥È¡¼¥ëÊıË¡</para>
+	</listitem>
+
+	<listitem>
+	  <para>&unix; ¤Ë¤ª¤±¤ë¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à X¡¢
+	    ¤ª¤è¤Ó¥¯¥ê¥¨¥¤¥Æ¥£¥Ö¤Ê¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤ÎÀßÄê¤Î¾ÜºÙ¤Î¾Ò²ğ</para>
+	</listitem>
       </itemizedlist>
 
       <para>¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤Ç¤ÏÉÑÈˤ˥ڡ¼¥¸¤òÈô¤¹¤³¤È¤Ê¤¯Á°¤«¤é¸å¤Ø¤È
-        ¥¹¥à¡¼¥º¤ËÆɤ߿ʤá¤ë¤è¤¦¤Ë¡¢
-        ¸åÊı¤Ø¤Î»²¾È¤ò¶ËÎÏÍŞ¤¨¤ë¤è¤¦¤Ë¤·¤Æ¤¤¤Ş¤¹¡£</para>
+	¥¹¥à¡¼¥º¤ËÆɤ߿ʤá¤ë¤è¤¦¤Ë¡¢
+	¸åÊı¤Ø¤Î»²¾È¤ò¶ËÎÏÍŞ¤¨¤ë¤è¤¦¤Ë¤·¤Æ¤¤¤Ş¤¹¡£</para>
     </partintro>
 
     &chap.introduction;
@@ -202,20 +202,18 @@
 	    ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤¹¤ë¼ê½ç¤ÎÀâÌÀ</para>
 	</listitem>
 
-        <listitem>
-          <para>¥Ç¥¹¥¯¥È¥Ã¥×¤ª¤è¤Ó¥Í¥Ã¥È¥ï¡¼¥¯ÀܳξÊı¤Î¥×¥ê¥ó¥¿¤ÎÀßÄê¤Ë´Ø¤¹¤ë¡¢
+	<listitem>
+	  <para>¥Ç¥¹¥¯¥È¥Ã¥×¤ª¤è¤Ó¥Í¥Ã¥È¥ï¡¼¥¯ÀܳξÊı¤Î¥×¥ê¥ó¥¿¤ÎÀßÄê¤Ë´Ø¤¹¤ë¡¢
 	    °õºş¥·¥¹¥Æ¥à¤Î¾ÜºÙ¤ÊÀâÌÀ</para>
-        </listitem>
-
-        <listitem>
-          <para>FreeBSD ¥·¥¹¥Æ¥à¤Ç Linux ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¼Â¹Ô¤¹¤ëÊıË¡</para>
-        </listitem>
+	</listitem>
 
+	<listitem>
+	  <para>FreeBSD ¥·¥¹¥Æ¥à¤Ç Linux ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¼Â¹Ô¤¹¤ëÊıË¡</para>
+	</listitem>
       </itemizedlist>
 
       <para>¤³¤ì¤é¤Î¾Ï¤Ç¤Ï¡¢ÆɤßÈô¤Ğ¤·¤ò¿ä¾©¤·¤Æ¤¤¤ë¤â¤Î¤â¤¢¤ê¤Ş¤¹¡£
 	¤³¤ì¤Ë¤Ä¤¤¤Æ¤Ï¤½¤ì¤¾¤ì¤Î¾Ï¤Î»Ï¤á¤Ë¤¢¤ë³µÍפ˽ñ¤«¤ì¤Æ¤¤¤Ş¤¹¡£</para>
-
     </partintro>
 
     &chap.desktop;
@@ -230,13 +228,13 @@
 
     <partintro>
       <para>FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯¤Î°Ê²¼¤Î¾Ï¤Ï¡¢
-        FreeBSD ¤Î¥·¥¹¥Æ¥à´ÉÍı¤ÎÌ̤ˤĤ¤¤Æ½ñ¤«¤ì¤Æ¤¤¤Ş¤¹¡£
-        ³Æ¾Ï¤Î¤Ï¤¸¤á¤Ç¤Ï¡¢¤½¤Î¾Ï¤Ç³Ø¤ÖÆâÍƤä
-        ¼Âºİ¤Ë¼è¤êÁȤàÁ°¤ËÃΤäƤª¤¯¤Ù¤­¤³¤È¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Ş¤¹¡£</para>
+	FreeBSD ¤Î¥·¥¹¥Æ¥à´ÉÍı¤ÎÌ̤ˤĤ¤¤Æ½ñ¤«¤ì¤Æ¤¤¤Ş¤¹¡£
+	³Æ¾Ï¤Î¤Ï¤¸¤á¤Ç¤Ï¡¢¤½¤Î¾Ï¤Ç³Ø¤ÖÆâÍƤä
+	¼Âºİ¤Ë¼è¤êÁȤàÁ°¤ËÃΤäƤª¤¯¤Ù¤­¤³¤È¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Ş¤¹¡£</para>
 
       <para>³Æ¾Ï¤Ï¡¢É¬Íפˤʤä¿»ş¤Ë¸ÄÊ̤˻²¾È¤Ç¤­¤ë¤è¤¦¤Ë¹½À®¤µ¤ì¤Æ¤¤¤Ş¤¹¡£
-        ¤É¤Î½çÈÖ¤ÇÆɤó¤Ç¤â¹½¤¤¤Ş¤»¤ó¤·¡¢FreeBSD ¤ò»È¤¦¤Î¤Ë¡¢
-        ¤¹¤Ù¤Æ¤òÆɤßÄ̤¹É¬Íפ¬¤¢¤ë¡¢¤È¤¤¤¦¤ï¤±¤Ç¤â¤¢¤ê¤Ş¤»¤ó¡£</para>
+	¤É¤Î½çÈÖ¤ÇÆɤó¤Ç¤â¹½¤¤¤Ş¤»¤ó¤·¡¢FreeBSD ¤ò»È¤¦¤Î¤Ë¡¢
+	¤¹¤Ù¤Æ¤òÆɤßÄ̤¹É¬Íפ¬¤¢¤ë¡¢¤È¤¤¤¦¤ï¤±¤Ç¤â¤¢¤ê¤Ş¤»¤ó¡£</para>
     </partintro>
 
     &chap.config;
@@ -265,37 +263,37 @@
 
     <partintro>
       <para>FreeBSD ¤Ï¡¢¹âÀ­Ç½¤Ê¥Í¥Ã¥È¥ï¡¼¥¯¥µ¡¼¥Ğ¤È¤·¤ÆºÇ¤â¹­¤¯»ÈÍѤµ¤ì¤Æ¤¤¤ë¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î 1 ¤Ä¤Ç¤¹¡£
-        ³Æ¾Ï¤ÎÆâÍƤϰʲ¼¤ÎÄ̤ê¤Ç¤¹¡£</para>
+	³Æ¾Ï¤ÎÆâÍƤϰʲ¼¤ÎÄ̤ê¤Ç¤¹¡£</para>
 
       <itemizedlist>
-        <listitem>
-          <para>¥·¥ê¥¢¥ëÄÌ¿®</para>
-        </listitem>
-
-        <listitem>
-          <para>PPP ¤È PPP ¥ª¡¼¥Ğ¥¤¡¼¥µ¥Í¥Ã¥È (PPPoE)</para>
-        </listitem>
-
-        <listitem>
-          <para>ÅŻҥ᡼¥ë</para>
-        </listitem>
-
-        <listitem>
-          <para>¥Í¥Ã¥È¥ï¡¼¥¯¥µ¡¼¥Ğ¤Î±¿ÍÑ</para>
-        </listitem>
-
-        <listitem>
-          <para>¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë</para>
-        </listitem>
-
-        <listitem>
-          <para>¤½¤Î¾¤Î¹âÅ٤ʥͥåȥ¥¯¤Ë´Ø¤¹¤ëÏÃÂê</para>
-        </listitem>
+	<listitem>
+	  <para>¥·¥ê¥¢¥ëÄÌ¿®</para>
+	</listitem>
+
+	<listitem>
+	  <para>PPP ¤È PPP ¥ª¡¼¥Ğ¥¤¡¼¥µ¥Í¥Ã¥È (PPPoE)</para>
+	</listitem>
+
+	<listitem>
+	  <para>ÅŻҥ᡼¥ë</para>
+	</listitem>
+
+	<listitem>
+	  <para>¥Í¥Ã¥È¥ï¡¼¥¯¥µ¡¼¥Ğ¤Î±¿ÍÑ</para>
+	</listitem>
+
+	<listitem>
+	  <para>¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë</para>
+	</listitem>
+
+	<listitem>
+	  <para>¤½¤Î¾¤Î¹âÅ٤ʥͥåȥ¥¯¤Ë´Ø¤¹¤ëÏÃÂê</para>
+	</listitem>
       </itemizedlist>
 
       <para>³Æ¾Ï¤Ï¡¢É¬Íפˤʤä¿»ş¤Ë¸ÄÊ̤˻²¾È¤Ç¤­¤ë¤è¤¦¤Ë¹½À®¤µ¤ì¤Æ¤¤¤Ş¤¹¡£
-        ¤É¤Î½çÈÖ¤ÇÆɤó¤Ç¤â¹½¤¤¤Ş¤»¤ó¤·¡¢¥Í¥Ã¥È¥ï¡¼¥¯´Ä¶­¤Ç FreeBSD ¤ò»È¤¦¤Î¤Ë¡¢
-        ¤¹¤Ù¤Æ¤òÆɤßÄ̤¹É¬Íפ¬¤¢¤ë¡¢¤È¤¤¤¦¤ï¤±¤Ç¤â¤¢¤ê¤Ş¤»¤ó¡£</para>
+	¤É¤Î½çÈÖ¤ÇÆɤó¤Ç¤â¹½¤¤¤Ş¤»¤ó¤·¡¢¥Í¥Ã¥È¥ï¡¼¥¯´Ä¶­¤Ç FreeBSD ¤ò»È¤¦¤Î¤Ë¡¢
+	¤¹¤Ù¤Æ¤òÆɤßÄ̤¹É¬Íפ¬¤¢¤ë¡¢¤È¤¤¤¦¤ï¤±¤Ç¤â¤¢¤ê¤Ş¤»¤ó¡£</para>
     </partintro>
 
     &chap.serialcomms;
@@ -306,6 +304,7 @@
     &chap.firewalls;
 -->
     &chap.advanced-networking;
+
   </part>
 
   <part xml:id="appendices">

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 16:03:49 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4BA6BA16;
 Thu,  6 Feb 2014 16:03:49 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 334A0163B;
 Thu,  6 Feb 2014 16:03:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s16G3n9X006505;
 Thu, 6 Feb 2014 16:03:49 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s16G3n3B006504;
 Thu, 6 Feb 2014 16:03:49 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402061603.s16G3n3B006504@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 6 Feb 2014 16:03:49 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43804 - head/en_US.ISO8859-1/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.17
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, 06 Feb 2014 16:03:49 -0000

Author: dru
Date: Thu Feb  6 16:03:48 2014
New Revision: 43804
URL: http://svnweb.freebsd.org/changeset/doc/43804

Log:
  Tighten up this sub-section and format as an itemized list.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Thu Feb  6 11:07:23 2014	(r43803)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Thu Feb  6 16:03:48 2014	(r43804)
@@ -2441,18 +2441,16 @@ Script done, &hellip;</screen>
     </sect2>
 
     <sect2 xml:id="updating-questions">
-      <title>Questions</title>
+      <title>Common Questions</title>
 
-      <qandaset>
-	<qandaentry>
-	  <question>
-	    <para>Do I need to re-make the world for every
-	      change?</para>
-	  </question>
-
-	  <answer>
-	    <para>There is no easy answer, as it depends on the nature
-	      of the change.  For example, if running
+      <variablelist>
+	<varlistentry>
+	  <term>Do I need to re-make the world for every
+	      change?</term>
+
+	  <listitem>
+	    <para>It depends upon the nature
+	      of the change.  For example, if
 	      <application>svn</application> only shows the following
 	      files as being updated:</para>
 
@@ -2465,108 +2463,77 @@ Script done, &hellip;</screen>
 	    <para>it probably is not worth rebuilding the entire
 	      world.  Instead, go into the appropriate sub-directories
 	      and run <command>make all install</command>.  But if
-	      something major changed, such as
-	      <filename>src/lib/libc/stdlib</filename>, either
-	      re-make world, or at least those parts of it that are
-	      statically linked.</para>
+	      something major changes, such as
+	      <filename>src/lib/libc/stdlib</filename>, consider
+	      rebuilding world.</para>
 
-	    <para>At the end of the day, it is your call.  Some users
-	      re-make the world every fortnight and let changes
+	    <para>Some users
+	      rebuild world every fortnight and let changes
 	      accumulate over that fortnight.  Others only re-make
 	      those things that have changed and are careful to spot
-	      all the dependencies.</para>
-
-	    <para>It all depends on how often a user wants to upgrade
+	      all the dependencies.  It all depends on how often a user wants to upgrade
 	      and whether they are tracking &os.stable; or
 	      &os.current;.</para>
-	  </answer>
-	</qandaentry>
+	  </listitem>
+	</varlistentry>
 
-	<qandaentry>
-	  <question>
-	    <para>My compile failed with lots of
+	<varlistentry>
+	    <term>What would cause a compile to fail with lots of
 	      signal 11<indexterm>
 		<primary>signal 11</primary>
 	      </indexterm>
-	      (or other signal number) errors.  What happened?</para>
-	  </question>
-
-	  <answer>
-	    <para>This normally indicates hardware problems.
-	      (Re)making world is an effective way to stress test
-	      hardware, and will frequently throw up memory
-	      problems which normally manifest themselves as the
-	      compiler mysteriously aborts.</para>
+	      (or other signal number) errors?</term>
 
-	    <para>A sure indicator of this occurs when
+	  <listitem>
+	    <para>This normally indicates a hardware problem.
+	      Building world is an effective way to stress test
+	      hardware, especially memory.  A sure indicator of a hardware issue is when
 	      <application>make</application> is restarted and it
 	      dies at a different point in the process.</para>
 
-	    <para>To resolve this error, start swapping around the
-	      components in the machine to determine which one is
+	    <para>To resolve this error, swap out the
+	      components in the machine, starting with RAM, to determine which component is
 	      failing.</para>
-	  </answer>
-	</qandaentry>
+	  </listitem>
+	</varlistentry>
 
-	<qandaentry>
-	  <question>
-	    <para>Can <filename>/usr/obj</filename>
-	      be removed when finished?</para>
-	  </question>
+	<varlistentry>
+	    <term>Can <filename class="directory">/usr/obj</filename>
+	      be removed when finished?</term>
 
-	  <answer>
-	    <para>The short answer is yes.</para>
+	  <listitem>
 
-	    <para><filename>/usr/obj</filename>
+	    <para>This directory
 	      contains all the object files that were produced during
 	      the compilation phase.  Normally, one of the first steps
 	      in the <command>make buildworld</command> process is to
 	      remove this directory and start afresh.  Keeping
 	      <filename>/usr/obj</filename> around
 	      when finished makes little sense, and its removal frees
-	      up a approximately 2&nbsp;GB of disk space.</para>
+	      up a approximately 2GB of disk space.</para>
+	  </listitem>
+	</varlistentry>
 
-	    <para>Advances users can instruct
-	      <command>make buildworld</command> to skip this step.
-	      This speeds up subsequent builds, since most of the
-	      sources will not need to be recompiled.  The flip side
-	      is that subtle dependency problems can creep in, causing
-	      the build to fail in odd ways.  This frequently
-	      generates noise on the &os; mailing lists, when one
-	      person complains that their build has failed, not
-	      realizing that it is because they have tried to cut
-	      corners.</para>
-	  </answer>
-	</qandaentry>
-
-	<qandaentry>
-	  <question>
-	    <para>Can interrupted builds be resumed?</para>
-	  </question>
+	<varlistentry>
+	    <term>Can interrupted builds be resumed?</term>
 
-	  <answer>
+	  <listitem>
 	    <para>This depends on how far into the process the
-	      problem occurs.</para>
-
-	    <para>In general, <command>make buildworld</command>
-	      builds new copies of essential tools, such as
-	      &man.gcc.1; and &man.make.1;, and the system libraries.
+	      problem occurs.  In general, <command>make buildworld</command>
+	      builds new copies of essential tools and the system libraries.
 	      These tools and libraries are then installed, used to
-	      rebuild themselves, and are installed again.  The entire
-	      system, including regular user programs such as
-	      &man.ls.1; or &man.grep.1;, is then rebuilt with the new
-	      system files.</para>
+	      rebuild themselves, and are installed again.  The rest of the
+	      system is then rebuilt with the new
+	      system tools.</para>
+
+	    <para>During the last stage, it is fairly safe to run
+	      these commands as they will not undo the work of the previous
+	      <command>make buildworld</command>:</para>
 
-	    <para>During the last stage, it is fairly safe to:</para>
-
-	    <screen><emphasis>&hellip; fix the problem &hellip;</emphasis>
-&prompt.root; <userinput>cd /usr/src</userinput>
+	    <screen>&prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make -DNO_CLEAN all</userinput></screen>
 
-	    <para>This will not undo the work of the previous
-	      <command>make buildworld</command>.</para>
-
-	    <para>If you see the message:</para>
+	    <para>If this message appears:</para>
 
 	    <screen>--------------------------------------------------------------
 Building everything..
@@ -2575,72 +2542,36 @@ Building everything..
 	    <para>in the <command>make buildworld</command> output,
 	      it is probably fairly safe to do so.</para>
 
-	    <para>If that message is not displayed, or you are not
-	      sure, it is always better to be safe than sorry, and
+	    <para>If that message is not displayed,
+	      it is always better to be safe than sorry and to
 	      restart the build from scratch.</para>
-	  </answer>
-	</qandaentry>
-
-	<qandaentry>
-	  <question>
-	    <para>How can I speed up making the world?</para>
-	  </question>
-
-	  <answer>
-	    <itemizedlist>
-	      <listitem>
-		<para>Run it in single user mode.</para>
-	      </listitem>
-
-	      <listitem>
-		<para>Put <filename>/usr/src</filename> and
-		  <filename>/usr/obj</filename>
-		  on separate file systems held on separate disks.  If
-		  possible, put these disks on separate disk
-		  controllers.</para>
-	      </listitem>
+	  </listitem>
+	</varlistentry>
 
-	      <listitem>
-		<para>Alternately, put these file systems across
-		  multiple disks using &man.ccd.4;.</para>
-	      </listitem>
+	<varlistentry>
+	    <term>Is it possible to speed up making the world?</term>
 
-	      <listitem>
-		<para>Turn off profiling by setting
-		  <quote>NO_PROFILE=true</quote> in
-		  <filename>/etc/make.conf</filename>.</para>
-	      </listitem>
+	  <listitem>
+		<para>Several actions can speed up the build world
+		  process.  For example, the entire process can be run from
+		  single-user mode.  However, this will prevent users
+		  from having access
+		  to the system until the process is complete.</para>
+
+		<para>Careful file system design or the use of ZFS
+		  datasets can make a difference.  Consider putting <filename class="directory">/usr/src</filename> and
+		  <filename class="directory">/usr/obj</filename>
+		  on separate file systems.  If possible, place the file systems on separate disks on separate disk
+		  controllers.  When mounting
+		  <filename class="directory">/usr/src</filename>, use
+		  <option>noatime</option> which
+		  prevents the file system from recording the
+		  file access time.  If <filename
+		  class="directory">/usr/src</filename> is not on its
+		  own file system, consider remounting <filename
+		  class="directory">/usr</filename> with <option>noatime</option>.</para>
 
-	      <listitem>
-		<para>Pass
-		  <option>-j<replaceable>n</replaceable></option>
-		  to &man.make.1; to run multiple processes in
-		  parallel.  This usually helps on both single and
-		  multi processor machines.</para>
-	      </listitem>
-
-	      <listitem>
-		<para>The file system holding
-		  <filename>/usr/src</filename> can
-		  be mounted or remounted with
-		  <option>noatime</option>.
-		  This prevents the file system from recording the
-		  file access time which is probably not
-		  needed.</para>
-
-		<screen>&prompt.root; <userinput>mount -u -o noatime /usr/src</userinput></screen>
-
-		<warning>
-		  <para>This example assumes
-		    <filename>/usr/src</filename> is on its own file
-		    system.  If it is part of
-		    <filename>/usr</filename>, then use that file
-		    system mount point instead.</para>
-		</warning>
-	      </listitem>
-
-	      <listitem>
-		<para>The file system holding
+		  <para>The file system holding
 		  <filename>/usr/obj</filename> can be mounted or
 		  remounted with <option>async</option> so that disk
 		  writes happen asynchronously.  The write completes
@@ -2663,25 +2594,22 @@ Building everything..
 		    backups before enabling this option.</para>
 		</warning>
 
-		<screen>&prompt.root; <userinput>mount -u -o async /usr/obj</userinput></screen>
+		<para>Turn off profiling by setting
+		  <quote>NO_PROFILE=true</quote> in
+		  <filename>/etc/make.conf</filename>.</para>
 
-		<warning>
-		  <para>If <filename>/usr/obj</filename> is
-		    not on its own file system, replace it in the
-		    example with the name of the appropriate mount
-		    point.</para>
-		</warning>
+		<para>Pass
+		  <option>-j<replaceable>n</replaceable></option>
+		  to &man.make.1; to run multiple processes in
+		  parallel.  This usually helps on both single- and
+		  multi-processor machines.</para>
 	      </listitem>
-	    </itemizedlist>
-	  </answer>
-	</qandaentry>
-
-	<qandaentry>
-	  <question>
-	    <para>What do I do if something goes wrong?</para>
-	  </question>
+	</varlistentry>
+
+	<varlistentry>
+	    <term>What do I do if something goes wrong?</term>
 
-	  <answer>
+	  <listitem>
 	    <para>Make absolutely sure that the environment has no
 	      extraneous cruft from earlier builds:</para>
 
@@ -2701,9 +2629,9 @@ Building everything..
 	      output of <command>uname -a</command> to &a.questions;.
 	      Be prepared to answer other questions about the
 	      setup!</para>
-	  </answer>
-	</qandaentry>
-      </qandaset>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
     </sect2>
   </sect1>
 

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 16:49:51 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 032E5611;
 Thu,  6 Feb 2014 16:49:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E109A1A95;
 Thu,  6 Feb 2014 16:49:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s16GnoLa024241;
 Thu, 6 Feb 2014 16:49:50 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s16Gnoc7024240;
 Thu, 6 Feb 2014 16:49:50 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201402061649.s16Gnoc7024240@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 6 Feb 2014 16:49:50 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43805 - 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.17
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, 06 Feb 2014 16:49:51 -0000

Author: wblock
Date: Thu Feb  6 16:49:50 2014
New Revision: 43805
URL: http://svnweb.freebsd.org/changeset/doc/43805

Log:
  Add examples of using diff(1), move mention of makepatch into that
  section.
  
  PR:		docs/186499
  Submitted by:	Ondra Knezour <knezour@weboutsourcing.cz>

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	Thu Feb  6 16:03:48 2014	(r43804)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Thu Feb  6 16:49:50 2014	(r43805)
@@ -756,21 +756,43 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
       <title>Patching</title>
 
       <para>In the preparation of the port, files that have been added
-	or changed can be picked up with a &man.diff.1; for later
-	feeding to &man.patch.1;.  Each patch you wish to apply should
-	be saved into a file named
+	or changed can be recorded with &man.diff.1; for later
+	feeding to &man.patch.1;.  Doing this with a typical file
+	involves saving a copy of the original file before making any
+	changes.</para>
+
+      <screen>&prompt.user; <userinput>cp <replaceable>file</replaceable> <replaceable>file</replaceable>.orig</userinput></screen>
+
+      <para>Patches are
+	saved into files named
 	<filename>patch-*</filename> where
 	<replaceable>*</replaceable> indicates the pathname of the
 	file that is patched, such as
 	<filename>patch-Imakefile</filename> or
-	<filename>patch-src-config.h</filename>.  These files should
-	be stored in <varname>PATCHDIR</varname> (usually
-	<filename>files/</filename>, from where they will be
+	<filename>patch-src-config.h</filename>.</para>
+
+      <para>After the file has been modified, &man.diff.1; is used to
+	record the differences between the original and the modified
+	version.  <option>-u</option> causes &man.diff.1; to produce
+	<quote>unified</quote> diffs, the preferred form.</para>
+
+      <screen>&prompt.user; <userinput>diff -u <replaceable>file</replaceable>.orig <replaceable>file</replaceable> &gt; patch-<replaceable>pathname-file</replaceable></userinput></screen>
+
+      <para>When generating patches for new, added files,
+	<option>-N</option> is added to tell &man.diff.1; to treat the
+	non-existent original file as if it existed but was
+	empty:</para>
+
+      <screen>&prompt.user; <userinput>diff -u -N <replaceable>newfile</replaceable>.orig <replaceable>newfile</replaceable> &gt; patch-<replaceable>pathname-newfile</replaceable></userinput></screen>
+
+      <para>Patch files are
+	stored in <varname>PATCHDIR</varname> (usually
+	<filename class="directory">files/</filename>, from where they will be
 	automatically applied.  All patches must be relative to
-	<varname>WRKSRC</varname> (generally the directory your port's
+	<varname>WRKSRC</varname> (generally the directory the port's
 	tarball unpacks itself into, that being where the build is
-	done).  To make fixes and upgrades easier, you should avoid
-	having more than one patch fix the same file (e.g.,
+	done).  To make fixes and upgrades easier, avoid
+	having more than one patch fix the same file (that is,
 	<filename>patch-file</filename> and
 	<filename>patch-file2</filename> both changing
 	<filename>WRKSRC/foobar.c</filename>).
@@ -788,6 +810,13 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 	<filename>patch-ab</filename> etc, always mention the path and
 	file name in patch names.</para>
 
+      <para>There is an alternate, easier method for creating patches to existing files.
+	The first steps are the same, make a copy of the unmodified file with an
+	<filename>.orig</filename> extension, then make modifications.
+	Then use <command>make makepatch</command>
+	to write updated patch files to the
+	<filename>files</filename> directory of the port.</para>
+
       <para>Do not put RCS strings in patches.
 	<application>Subversion</application> will mangle them when we
 	put the files into the ports tree, and when we check them out
@@ -798,23 +827,23 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 	<literal>&dollar;RCS</literal>.</para>
 
       <para>Using the recurse (<option>-r</option>) option to
-	&man.diff.1; to generate patches is fine, but please take a
-	look at the resulting patches to make sure you do not have any
+	&man.diff.1; to generate patches is fine, but please
+	look at the resulting patches to make sure there is no
 	unnecessary junk in there.  In particular, diffs between two
 	backup files, <filename>Makefile</filename>s when the port
 	uses <command>Imake</command> or GNU
 	<command>configure</command>, etc., are unnecessary and should
-	be deleted.  If you had to edit
+	be deleted.  If it was necessary to edit
 	<filename>configure.in</filename> and run
 	<command>autoconf</command> to regenerate
 	<command>configure</command>, do not take the diffs of
 	<command>configure</command> (it often grows to a few thousand
-	lines!); define <literal>USE_AUTOTOOLS=autoconf:261</literal>
+	lines!).  Instead, define <literal>USE_AUTOTOOLS=autoconf:261</literal>
 	and take the diffs of
 	<filename>configure.in</filename>.</para>
 
-      <para>Also, try to minimize the amount of non-functional
-	whitespace changes in your patches.  It is common in the Open
+      <para>Try to minimize the amount of non-functional
+	whitespace changes in patches.  It is common in the Open
 	Source world for projects to share large amounts of a code
 	base, but obey different style and indenting rules.  If you
 	take a working piece of functionality from one project to fix
@@ -822,7 +851,7 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 	line patch may be full of non-functional changes.  It not only
 	increases the size of the
 	<application>Subversion</application> repository but makes it
-	hard to find out what exactly caused the problem and what you
+	hard to find out what exactly caused the problem and what was
 	changed at all.</para>
 
       <para>If you had to delete a file, then you can do it in the
@@ -865,13 +894,6 @@ DOS2UNIX_REGEX=	.*\.([ch]|cpp)</programl
 
       <programlisting>USES=	dos2unix
 DOS2UNIX_GLOB=	*.c *.cpp *.h</programlisting>
-
-      <para>If you want to create a patch file based off of an
-	existing file, you can copy it with an
-	<filename>.orig</filename> extension, and then modify the
-	original one.  The <buildtarget>makepatch</buildtarget> target
-	will write out an appropriate patch file to the
-	<filename>files</filename> directory of the port.</para>
     </sect1>
 
     <sect1 xml:id="slow-configure">

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 17:20:15 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A21FAFAC;
 Thu,  6 Feb 2014 17:20:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 815B21DD0;
 Thu,  6 Feb 2014 17:20:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s16HKFAc036680;
 Thu, 6 Feb 2014 17:20:15 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s16HKFqR036679;
 Thu, 6 Feb 2014 17:20:15 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402061720.s16HKFqR036679@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 6 Feb 2014 17:20:15 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43806 - head/en_US.ISO8859-1/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.17
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, 06 Feb 2014 17:20:15 -0000

Author: dru
Date: Thu Feb  6 17:20:15 2014
New Revision: 43806
URL: http://svnweb.freebsd.org/changeset/doc/43806

Log:
  More incorporation of redundant information. Definitely very much a WIP.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Thu Feb  6 16:49:50 2014	(r43805)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Thu Feb  6 17:20:15 2014	(r43806)
@@ -1544,6 +1544,18 @@ before running "/usr/sbin/freebsd-update
 	  the function of each command.</para>
 
 	<step>
+	  <para>If the build world process has previously been run on
+	    this system, a copy of the previous build may still exist
+	    in <filename class="directory">/usr/obj</filename>.  To speed up the new build world
+	process, and possibly save some dependency headaches,
+	remove this directory if it already exists:</para>
+
+	  <screen>&prompt.root; <userinput>cd /usr/obj</userinput>
+&prompt.root; <userinput>chflags -R noschg *</userinput>
+&prompt.root; <userinput>rm -rf *</userinput></screen>
+	</step>
+
+	<step>
 	  <para>Compile the new compiler and a few related
 	    tools, then use the new compiler to compile the rest of
 	    the new world.  The result is saved to
@@ -1577,11 +1589,12 @@ before running "/usr/sbin/freebsd-update
 
 	  <screen>&prompt.root; <userinput>shutdown now</userinput></screen>
 
-	  <para>Once in single-user mode, run this command if the
+	  <para>Once in single-user mode, run these commands if the
 	    system is formatted with UFS:</para>
 
 	  <screen>&prompt.root; <userinput>mount -u /</userinput>
-&prompt.root; <userinput>mount -a -t ufs</userinput></screen>
+&prompt.root; <userinput>mount -a -t ufs</userinput>
+&prompt.root; <userinput>swapon -a</userinput></screen>
 
 	  <para>If the system is instead formatted with ZFS, run these
 	    two commands.  This example assumes a zpool name of
@@ -1592,18 +1605,22 @@ before running "/usr/sbin/freebsd-update
 	</step>
 
 	<step>
-	  <para>Then, for either filesystem, run:</para>
+	  <para>Then, for either file system, if the <acronym>CMOS</acronym> clock is set to local time
+	  (this is true if the output of &man.date.1; does not show
+	  the correct time and zone), run:</para>
 
 	  <screen>&prompt.root; <userinput>adjkerntz -i</userinput></screen>
 	</step>
 
 	<step>
-	  <para>Next, perform some initial configuration file updates
-	    in preparation for the new world.  For instance, this step
-	    may add new groups or new system accounts which have been
+	  <para>Next, perform some initial configuration file updates to <filename class="directory">/etc</filename>
+	    in preparation for the new world.  The following command compares
+	only those files that are essential for the success of
+	<buildtarget>installworld</buildtarget>.  For instance, this step
+	    may add new groups, system accounts, or startup scripts which have been
 	    added to &os; since the last update.  This is necessary so
 	    that the <buildtarget>installworld</buildtarget> step will
-	    be able to use the new system accounts and groups.</para>
+	    be able to use any new system accounts, groups, and scripts.</para>
 
 	  <screen>&prompt.root; <userinput>mergemaster -p</userinput></screen>
 	</step>
@@ -1646,42 +1663,51 @@ before running "/usr/sbin/freebsd-update
 	  <screen>&prompt.root; <userinput>make delete-old-libs</userinput></screen>
 	</step>
       </procedure>
+      
+     <indexterm><primary>single-user mode</primary></indexterm>
+
+      <para>If the system can have a window of down-time, consider compiling the system in single user mode instead
+	of compiling the system in multi-user
+	mode, and then dropping into single user mode for the
+	installation.
+	Reinstalling the system touches a lot of important system
+	files, all the standard system binaries, libraries, and
+	include files.  Changing these on a running system,
+	particularly one with active users, is asking for
+	trouble.</para>
     </sect2>
 
     <sect2 xml:id="src-updating">
-      <title>Check <filename>/etc/make.conf</filename></title>
+      <title>Configuration Files</title>
 
       <indexterm>
 	<primary><filename>make.conf</filename></primary>
       </indexterm>
 
-      <para>The following sections clearly describe each step,
-	  especially when using a custom kernel configuration.</para>
-      <para>Available &man.make.1; options are shown in
-	&man.make.conf.5; and
-	<filename>/usr/share/examples/etc/make.conf</filename>.  These
-	settings can be added to <filename>/etc/make.conf</filename>
-	to control the way &man.make.1; runs and how it builds
-	programs.  Changes to some settings can have far-reaching and
-	potentially surprising effects.  Read the comments in both
-	locations and keep in mind that the defaults have been chosen
-	for a combination of performance and safety.</para>
+      <para>This section describes the configuration files used by the
+	build world process.</para>
 
-      <para>Options set in <filename>/etc/make.conf</filename> take
+      <para>The options available to &man.make.1; are described in
+	&man.make.conf.5; and some common examples are included in
+	<filename>/usr/share/examples/etc/make.conf</filename>.
+	Any options which are added to <filename>/etc/make.conf</filename>
+	will control the way &man.make.1; runs and how it builds
+	programs.  Such options take
 	effect every time &man.make.1; is used, including compiling
-	applications from the Ports Collection or user-written C
+	applications from the Ports Collection, compiling custom C
 	programs, or building the &os; operating system.</para>
-    </sect2>
-
-    <sect2 xml:id="src-conf">
-      <title>Check <filename>/etc/src.conf</filename></title>
+	
+      <para>Changes to some settings can have far-reaching and
+	potentially surprising effects.  Read the comments in both
+	locations and keep in mind that the defaults have been chosen
+	for a combination of performance and safety.</para>
 
       <indexterm>
 	<primary><filename>src.conf</filename></primary>
       </indexterm>
 
-      <para><filename>/etc/src.conf</filename> controls the building
-	of the operating system from source code.  Unlike
+      <para>How
+	the operating system is built from source code is controlled by <filename>/etc/src.conf</filename>.  Unlike
 	<filename>/etc/make.conf</filename>, the contents of
 	<filename>/etc/src.conf</filename> only take effect when the
 	&os; operating system itself is being built.  Descriptions of
@@ -1689,116 +1715,7 @@ before running "/usr/sbin/freebsd-update
 	&man.src.conf.5;.  Be cautious about disabling seemingly
 	unneeded kernel modules and build options.  Sometimes there
 	are unexpected or subtle interactions.</para>
-    </sect2>
-
-    <sect2 xml:id="updating-etc">
-      <title>Update the Files in <filename>/etc</filename></title>
-
-      <para><filename>/etc</filename> contains a
-	large part of the system's configuration information, as well
-	as scripts that are run at system startup.  Some of these
-	scripts change between &os; versions.</para>
-
-      <para>Some of the configuration files are used in the day to
-	day running of the system, such as
-	<filename>/etc/group</filename>.</para>
-
-      <para>There have been occasions when the installation part of
-	<command>make installworld</command> expected certain
-	usernames or groups to exist.  When performing an upgrade, it
-	is likely that these users or groups do not yet exist.  In
-	some cases <command>make buildworld</command> will check to
-	see if these users or groups exist.</para>
-
-      <para>The solution is to run &man.mergemaster.8; in
-	pre-buildworld mode with <option>-p</option>.  This compares
-	only those files that are essential for the success of
-	<buildtarget>buildworld</buildtarget> or
-	<buildtarget>installworld</buildtarget>.</para>
-
-      <tip>
-	<para>To check which files are owned by the group being
-	  renamed or deleted:</para>
-
-	<screen>&prompt.root; <userinput>find / -group GID -print</userinput></screen>
-
-	<para>This command will show all files owned by group
-	  <replaceable>GID</replaceable>, which can be either a group
-	  name or a numeric group ID.</para>
-      </tip>
-    </sect2>
-
-    <sect2 xml:id="makeworld-singleuser">
-      <title>Drop to Single User Mode</title>
-
-      <indexterm><primary>single-user mode</primary></indexterm>
-
-      <para>Consider compiling the system in single user mode.
-	Reinstalling the system touches a lot of important system
-	files, all the standard system binaries, libraries, and
-	include files.  Changing these on a running system,
-	particularly one with active users, is asking for
-	trouble.</para>
-
-      <indexterm><primary>multi-user mode</primary></indexterm>
-      <para>Another method is to compile the system in multi-user
-	mode, and then drop into single user mode for the
-	installation.  With this method, hold off on the following
-	steps until the build has completed.  Drop to single user mode
-	in order to run <buildtarget>installkernel</buildtarget> or
-	<buildtarget>installworld</buildtarget>.</para>
-
-      <para>To enter single user mode from a running system:</para>
-
-      <screen>&prompt.root; <userinput>shutdown now</userinput></screen>
-
-      <para>Alternatively, reboot the system, and at the boot prompt,
-	select the <quote>single user</quote> option.  Once at the
-	single user mode shell prompt, run:</para>
-
-      <screen>&prompt.root; <userinput>fsck -p</userinput>
-&prompt.root; <userinput>mount -u /</userinput>
-&prompt.root; <userinput>mount -a -t ufs</userinput>
-&prompt.root; <userinput>swapon -a</userinput></screen>
-
-      <para>This checks the file systems, remounts
-	<filename>/</filename> read/write, mounts all the other UFS
-	file systems referenced in <filename>/etc/fstab</filename>,
-	and turns swapping on.</para>
-
-      <note>
-	<para>If the CMOS clock is set to local time and not to GMT
-	  (this is true if the output of &man.date.1; does not show
-	  the correct time and zone), run the following
-	  command:</para>
-
-	<screen>&prompt.root; <userinput>adjkerntz -i</userinput></screen>
-
-	<para>This ensures that the local time-zone settings get set
-	  up correctly.</para>
-      </note>
-    </sect2>
-
-    <sect2 xml:id="cleaning-usr-obj">
-      <title>Remove <filename>/usr/obj</filename></title>
-
-      <para>As parts of the system are rebuilt, they are, by default,
-	placed in subdirectories of <filename>/usr/obj</filename>.
-	The directories shadow those under
-	<filename>/usr/src</filename>.</para>
-
-      <para>To speed up the <command>make buildworld</command>
-	process, and possibly save some dependency headaches,
-	remove this directory if it already exists.</para>
-
-      <para>Some files below <filename>/usr/obj</filename> may have
-	the immutable flag set which must be removed first using
-	&man.chflags.1;.</para>
-
-      <screen>&prompt.root; <userinput>cd /usr/obj</userinput>
-&prompt.root; <userinput>chflags -R noschg *</userinput>
-&prompt.root; <userinput>rm -rf *</userinput></screen>
-    </sect2>
+      </sect2>
 
     <sect2 xml:id="make-buildworld">
       <title>Recompile the Base System</title>
@@ -2005,16 +1922,9 @@ Script done, &hellip;</screen>
 	problems.  See &man.init.8; for details about
 	<varname>kern.securelevel</varname> and &man.chflags.1; for
 	details about the various file flags.</para>
-    </sect2>
-
-    <sect2 xml:id="new-kernel-singleuser">
-      <title>Reboot into Single User Mode</title>
-
-      <indexterm><primary>single-user mode</primary></indexterm>
 
       <para>Reboot into single user mode to test that the new kernel
-	works using the instructions in
-	<xref linkend="makeworld-singleuser"/>.</para>
+	works.</para>
     </sect2>
 
     <sect2 xml:id="make-installworld">
@@ -2160,11 +2070,6 @@ Script done, &hellip;</screen>
 	  <filename>/etc</filename> are not in
 	  <filename>/usr/src/etc</filename>.</para>
 
-	<para>If you are using &man.mergemaster.8; (as recommended),
-	  you can skip forward to the
-	  <link linkend="updating-upgrading-rebooting">next
-	    section</link>.</para>
-
 	<para>The simplest way to merge files by hand is to install
 	  the files into a new directory, and then work through them
 	  looking for differences.</para>
@@ -2376,15 +2281,6 @@ Script done, &hellip;</screen>
       <screen>&prompt.root; <userinput>yes|make delete-old</userinput></screen>
     </sect2>
 
-    <sect2 xml:id="updating-upgrading-rebooting">
-      <title>Rebooting</title>
-
-      <para>Verify that everything appears to be in the right place,
-	then reboot the system using &man.shutdown.8;:</para>
-
-      <screen>&prompt.root; <userinput>shutdown -r now</userinput></screen>
-    </sect2>
-
     <sect2 xml:id="make-delete-old-libs">
       <title>Deleting obsolete libraries</title>
 
@@ -2607,10 +2503,10 @@ Building everything..
 	</varlistentry>
 
 	<varlistentry>
-	    <term>What do I do if something goes wrong?</term>
+	    <term>What if something goes wrong?</term>
 
 	  <listitem>
-	    <para>Make absolutely sure that the environment has no
+	    <para>First, make absolutely sure that the environment has no
 	      extraneous cruft from earlier builds:</para>
 
 	    <screen>&prompt.root; <userinput>chflags -R noschg /usr/obj/usr</userinput>

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 17:42:21 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F0A0667B;
 Thu,  6 Feb 2014 17:42:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D694A113D;
 Thu,  6 Feb 2014 17:42:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s16HgLaY046868;
 Thu, 6 Feb 2014 17:42:21 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s16HgLZN046867;
 Thu, 6 Feb 2014 17:42:21 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201402061742.s16HgLZN046867@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Thu, 6 Feb 2014 17:42:21 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43807 - 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.17
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, 06 Feb 2014 17:42:22 -0000

Author: mat (ports committer)
Date: Thu Feb  6 17:42:21 2014
New Revision: 43807
URL: http://svnweb.freebsd.org/changeset/doc/43807

Log:
  Add xml:id to all uses so they can be referenced from elsewhere.
  
  Sponsored by:	Absolight

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses.xml	Thu Feb  6 17:20:15 2014	(r43806)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses.xml	Thu Feb  6 17:42:21 2014	(r43807)
@@ -9,7 +9,7 @@
   this scheme below as a skeleton):
 
 <row>
-  <entry><literal>FEATURE</literal></entry>
+  <entry xml:id="uses-FEATURE"><literal>FEATURE</literal></entry>
   <entry>ARGUMENTS</entry>
   <entry>DESCRIPTION</entry>
 </row>
@@ -17,7 +17,7 @@
 -->
 
 <row>
-  <entry><literal>ada</literal></entry>
+  <entry xml:id="uses-ada"><literal>ada</literal></entry>
 
   <entry>(none)</entry>
 
@@ -26,7 +26,7 @@
 </row>
 
 <row>
-  <entry><literal>bison</literal></entry>
+  <entry xml:id="uses-bison"><literal>bison</literal></entry>
 
   <entry>(none), <literal>build</literal>, <literal>run</literal>,
     <literal>both</literal></entry>
@@ -41,7 +41,8 @@
 </row>
 
 <row>
-  <entry><literal>charsetfix</literal></entry>
+  <entry
+    xml:id="uses-charsetfix"><literal>charsetfix</literal></entry>
 
   <entry>(none)</entry>
 
@@ -55,7 +56,7 @@
 </row>
 
 <row>
-  <entry><literal>cmake</literal></entry>
+  <entry xml:id="uses-cmake"><literal>cmake</literal></entry>
 
   <entry>(none), <literal>outsource</literal>,
     <literal>run</literal></entry>
@@ -69,7 +70,7 @@
 </row>
 
 <row>
-  <entry><literal>compiler</literal></entry>
+  <entry xml:id="uses-compiler"><literal>compiler</literal></entry>
 
   <entry>(none), <literal>c++0x</literal>,
     <literal>c++11-lang</literal>, <literal>c++11-lib</literal>,
@@ -125,7 +126,7 @@
 </row>
 
 <row>
-  <entry><literal>cran</literal></entry>
+  <entry xml:id="uses-cran"><literal>cran</literal></entry>
 
   <entry>(none), <literal>auto-plist</literal></entry>
 
@@ -135,7 +136,8 @@
 </row>
 
 <row>
-  <entry><literal>desktop-file-utils</literal></entry>
+  <entry
+    xml:id="uses-desktop-file-utils"><literal>desktop-file-utils</literal></entry>
 
   <entry>(none)</entry>
 
@@ -149,7 +151,7 @@
 </row>
 
 <row>
-  <entry><literal>desthack</literal></entry>
+  <entry xml:id="uses-desthack"><literal>desthack</literal></entry>
 
   <entry>(none)</entry>
 
@@ -159,7 +161,7 @@
 </row>
 
 <row>
-  <entry><literal>display</literal></entry>
+  <entry xml:id="uses-display"><literal>display</literal></entry>
 
   <entry>(none), ARGS</entry>
 
@@ -174,7 +176,7 @@
 </row>
 
 <row>
-  <entry><literal>dos2unix</literal></entry>
+  <entry xml:id="uses-dos2unix"><literal>dos2unix</literal></entry>
 
   <entry>(none)</entry>
 
@@ -203,7 +205,7 @@
 </row>
 
 <row>
-  <entry><literal>fam</literal></entry>
+  <entry xml:id="uses-fam"><literal>fam</literal></entry>
 
   <entry>(none), fam, gamin</entry>
 
@@ -214,7 +216,7 @@
 </row>
 
 <row>
-  <entry><literal>fmake</literal></entry>
+  <entry xml:id="uses-fmake"><literal>fmake</literal></entry>
 
   <entry>(none)</entry>
 
@@ -223,7 +225,7 @@
 </row>
 
 <row>
-  <entry><literal>fortran</literal></entry>
+  <entry xml:id="uses-fortran"><literal>fortran</literal></entry>
 
   <entry><literal>gcc</literal> (default),
     <literal>ifort</literal></entry>
@@ -232,7 +234,7 @@
 </row>
 
 <row>
-  <entry><literal>fuse</literal></entry>
+  <entry xml:id="uses-fuse"><literal>fuse</literal></entry>
 
   <entry>(none)</entry>
 
@@ -242,7 +244,7 @@
 </row>
 
 <row>
-  <entry><literal>gettext</literal></entry>
+  <entry xml:id="uses-gettext"><literal>gettext</literal></entry>
 
   <entry>(none), <literal>lib</literal> (default),
     <literal>build</literal>, <literal>run</literal></entry>
@@ -256,7 +258,7 @@
 </row>
 
 <row>
-  <entry><literal>gmake</literal></entry>
+  <entry xml:id="uses-gmake"><literal>gmake</literal></entry>
 
   <entry>(none)</entry>
 
@@ -267,7 +269,7 @@
 </row>
 
 <row>
-  <entry><literal>iconv</literal></entry>
+  <entry xml:id="uses-iconv"><literal>iconv</literal></entry>
 
   <entry>(none), <literal>lib</literal>, <literal>build</literal>,
     <literal>patch</literal></entry>
@@ -286,7 +288,7 @@
 </row>
 
 <row>
-  <entry><literal>imake</literal></entry>
+  <entry xml:id="uses-imake"><literal>imake</literal></entry>
 
   <entry>(none), <literal>env</literal>,
     <literal>notall</literal></entry>
@@ -299,7 +301,7 @@
 </row>
 
 <row>
-  <entry><literal>kmod</literal></entry>
+  <entry xml:id="uses-kmod"><literal>kmod</literal></entry>
 
   <entry>(none)</entry>
 
@@ -344,7 +346,7 @@
 </row>
 
 <row>
-  <entry><literal>libtool</literal></entry>
+  <entry xml:id="uses-libtool"><literal>libtool</literal></entry>
 
   <entry>(none)</entry>
 
@@ -353,7 +355,7 @@
 </row>
 
 <row>
-  <entry><literal>lua</literal></entry>
+  <entry xml:id="uses-lua"><literal>lua</literal></entry>
 
   <entry>(none), <literal>XY+</literal>, <literal>XY</literal>,
     <literal>build</literal>, <literal>run</literal></entry>
@@ -367,7 +369,7 @@
 </row>
 
 <row>
-  <entry><literal>motif</literal></entry>
+  <entry xml:id="uses-motif"><literal>motif</literal></entry>
 
   <entry>(none)</entry>
 
@@ -379,7 +381,7 @@
 </row>
 
 <row>
-  <entry><literal>ncurses</literal></entry>
+  <entry xml:id="uses-ncurses"><literal>ncurses</literal></entry>
 
   <entry>(none), <literal>base</literal>,
     <literal>port</literal></entry>
@@ -389,7 +391,7 @@
 </row>
 
 <row>
-  <entry><literal>ninja</literal></entry>
+  <entry xml:id="uses-ninja"><literal>ninja</literal></entry>
 
   <entry>(none)</entry>
 
@@ -399,7 +401,7 @@
 </row>
 
 <row>
-  <entry><literal>openal</literal></entry>
+  <entry xml:id="uses-openal"><literal>openal</literal></entry>
 
   <entry><literal>al</literal>, <literal>soft</literal> (default),
     <literal>si</literal>, <literal>alut</literal></entry>
@@ -413,7 +415,7 @@
 </row>
 
 <row>
-  <entry><literal>pathfix</literal></entry>
+  <entry xml:id="uses-pathfix"><literal>pathfix</literal></entry>
 
   <entry>(none)</entry>
 
@@ -424,7 +426,7 @@
 </row>
 
 <row>
-  <entry><literal>perl5</literal></entry>
+  <entry xml:id="uses-perl5"><literal>perl5</literal></entry>
 
   <entry>(none)</entry>
 
@@ -474,7 +476,7 @@
 </row>
 
 <row>
-  <entry><literal>pgsql</literal></entry>
+  <entry xml:id="uses-pgsql"><literal>pgsql</literal></entry>
 
   <entry>(none), <literal>X.Y</literal>, <literal>X.Y+</literal>,
     <literal>X.Y-</literal></entry>
@@ -492,7 +494,7 @@
 </row>
 
 <row>
-  <entry><literal>pkgconfig</literal></entry>
+  <entry xml:id="uses-pkgconfig"><literal>pkgconfig</literal></entry>
 
   <entry>(none), <literal>build</literal> (default),
     <literal>run</literal>, <literal>both</literal></entry>
@@ -506,7 +508,7 @@
 </row>
 
 <row>
-  <entry><literal>pure</literal></entry>
+  <entry xml:id="uses-pure"><literal>pure</literal></entry>
 
   <entry>(none), <literal>ffi</literal></entry>
 
@@ -518,7 +520,7 @@
 </row>
 
 <row>
-  <entry><literal>qmail</literal></entry>
+  <entry xml:id="uses-qmail"><literal>qmail</literal></entry>
 
   <entry>(none), <literal>build</literal>, <literal>run</literal>,
     <literal>both</literal>, <literal>vars</literal></entry>
@@ -533,7 +535,7 @@
 </row>
 
 <row>
-  <entry><literal>qmake</literal></entry>
+  <entry xml:id="uses-qmake"><literal>qmake</literal></entry>
 
   <entry>(none), <literal>norecursive</literal>,
     <literal>outsource</literal></entry>
@@ -543,7 +545,7 @@
 </row>
 
 <row>
-  <entry><literal>readline</literal></entry>
+  <entry xml:id="uses-readline"><literal>readline</literal></entry>
 
   <entry>(none), <literal>port</literal></entry>
 
@@ -555,7 +557,7 @@
 </row>
 
 <row>
-  <entry><literal>scons</literal></entry>
+  <entry xml:id="uses-scons"><literal>scons</literal></entry>
 
   <entry>(none)</entry>
 
@@ -564,7 +566,8 @@
 </row>
 
 <row>
-  <entry><literal>shared-mime-info</literal></entry>
+  <entry
+    xml:id="uses-shared-mime-info"><literal>shared-mime-info</literal></entry>
 
   <entry>(none)</entry>
 
@@ -578,7 +581,8 @@
 </row>
 
 <row>
-  <entry><literal>shebangfix</literal></entry>
+  <entry
+    xml:id="uses-shebangfix"><literal>shebangfix</literal></entry>
 
   <entry>(none)</entry>
 
@@ -597,7 +601,7 @@
 </row>
 
 <row>
-  <entry><literal>tcl</literal></entry>
+  <entry xml:id="uses-tcl"><literal>tcl</literal></entry>
 
   <entry><literal>PORT</literal></entry>
 
@@ -660,7 +664,7 @@
 </row>
 
 <row>
-  <entry><literal>tk</literal></entry>
+  <entry xml:id="uses-tk"><literal>tk</literal></entry>
 
   <entry>Same as arguments for <literal>tcl</literal></entry>
 
@@ -670,7 +674,7 @@
 </row>
 
 <row>
-  <entry><literal>twisted</literal></entry>
+  <entry xml:id="uses-twisted"><literal>twisted</literal></entry>
 
   <entry>(none), <literal>ARGS</literal></entry>
 
@@ -699,7 +703,7 @@
 </row>
 
 <row>
-  <entry><literal>uidfix</literal></entry>
+  <entry xml:id="uses-uidfix"><literal>uidfix</literal></entry>
 
   <entry>(none)</entry>
 
@@ -710,7 +714,8 @@
 </row>
 
 <row>
-  <entry><literal>uniquefiles</literal></entry>
+  <entry
+    xml:id="uses-uniquefiles"><literal>uniquefiles</literal></entry>
 
   <entry>(none), <literal>dirs</literal></entry>
 
@@ -743,7 +748,7 @@
 </row>
 
 <row>
-  <entry><literal>webplugin</literal></entry>
+  <entry xml:id="uses-webplugin"><literal>webplugin</literal></entry>
 
   <entry>(none), <literal>ARGS</literal></entry>
 
@@ -804,7 +809,7 @@
 </row>
 
 <row>
-  <entry><literal>zenoss</literal></entry>
+  <entry xml:id="uses-zenoss"><literal>zenoss</literal></entry>
 
   <entry>(none)</entry>
 
@@ -814,7 +819,7 @@
 </row>
 
 <row>
-  <entry><literal>zope</literal></entry>
+  <entry xml:id="uses-zope"><literal>zope</literal></entry>
 
   <entry>(none)</entry>
 

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 17:43:17 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BA462759;
 Thu,  6 Feb 2014 17:43:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A18CE1155;
 Thu,  6 Feb 2014 17:43:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s16HhH5O046991;
 Thu, 6 Feb 2014 17:43:17 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s16HhHEb046990;
 Thu, 6 Feb 2014 17:43:17 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201402061743.s16HhHEb046990@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 6 Feb 2014 17:43:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43808 - 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.17
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, 06 Feb 2014 17:43:17 -0000

Author: wblock
Date: Thu Feb  6 17:43:17 2014
New Revision: 43808
URL: http://svnweb.freebsd.org/changeset/doc/43808

Log:
  Improve this section grammatically and systematically.
  
  Reviewed by:	bapt, mat (in slightly earlier forms)

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	Thu Feb  6 17:42:21 2014	(r43807)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Thu Feb  6 17:43:17 2014	(r43808)
@@ -804,10 +804,10 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 	<filename>patch-src-freeglut__joystick.c</filename>.</para>
 
       <para>Please only use characters
-	<literal>[-+._a-zA-Z0-9]</literal> for naming your patches.
+	<literal>[-+._a-zA-Z0-9]</literal> for naming patches.
 	Do not use any other characters besides them.  Do not name
-	your patches like <filename>patch-aa</filename> or
-	<filename>patch-ab</filename> etc, always mention the path and
+	patches like <filename>patch-aa</filename> or
+	<filename>patch-ab</filename>, always mention the path and
 	file name in patch names.</para>
 
       <para>There is an alternate, easier method for creating patches to existing files.
@@ -845,8 +845,8 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
       <para>Try to minimize the amount of non-functional
 	whitespace changes in patches.  It is common in the Open
 	Source world for projects to share large amounts of a code
-	base, but obey different style and indenting rules.  If you
-	take a working piece of functionality from one project to fix
+	base, but obey different style and indenting rules.  When
+	taking a working piece of functionality from one project to fix
 	similar areas in another, please be careful: the resulting
 	line patch may be full of non-functional changes.  It not only
 	increases the size of the
@@ -854,35 +854,39 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 	hard to find out what exactly caused the problem and what was
 	changed at all.</para>
 
-      <para>If you had to delete a file, then you can do it in the
+      <para>If a file must be deleted, do it in the
 	<buildtarget>post-extract</buildtarget> target rather than as
 	part of the patch.</para>
 
       <para>Simple replacements can be performed directly from the
 	port <filename>Makefile</filename> using the in-place mode of
-	&man.sed.1;.  This is very useful when you need to patch in a
-	variable value.  Example:</para>
+	&man.sed.1;.  This is useful when changes use the value of a variable:</para>
 
       <programlisting>post-patch:
 	@${REINPLACE_CMD} -e 's|for Linux|for FreeBSD|g' ${WRKSRC}/README</programlisting>
 
       <para>Quite often, software being ported uses the CR/LF
-	convention for its source files.  This may cause problems with
-	further patching, compiler warnings, scripts execution (e.g.,
-	<command>/bin/sh^M</command> not found.) To quickly convert
-	all files from CR/LF to just LF, add
-	<literal>USES=dos2unix</literal> to the port
-	<filename>Makefile</filename>.  A list of files to convert can
-	be specified:</para>
-
-      <programlisting>DOS2UNIX_FILES=	util.c util.h</programlisting>
-
-      <para>If you want to convert a group of files across
-	subdirectories, <varname>DOS2UNIX_REGEX</varname> can be used.
-	Its argument is a <command>find</command> compatible regular
+	convention in source files.  This may cause problems with
+	further patching, compiler warnings, or script execution (like
+	<literal>/bin/sh^M not found</literal>.) To quickly convert
+	all files from CR/LF to just LF, add this entry
+	to the port
+	<filename>Makefile</filename>:</para>
+
+      <programlisting>USES=	dos2unix</programlisting>
+
+      <para>A list of specific files to convert can
+	be given:</para>
+
+      <programlisting>USES=	dos2unix
+DOS2UNIX_FILES=	util.c util.h</programlisting>
+
+      <para>Use <varname>DOS2UNIX_REGEX</varname> to convert a group
+	of files across subdirectories.
+	Its argument is a &man.find.1;-compatible regular
 	expression.  More on the format is in &man.re.format.7;.  This
 	option is useful for converting all files of a given
-	extension, for example all source code files leaving binary
+	extension.  For example, convert all source code files, leaving binary
 	files intact:</para>
 
       <programlisting>USES=	dos2unix

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 17:44:02 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1FCE87C5;
 Thu,  6 Feb 2014 17:44:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F0070115B;
 Thu,  6 Feb 2014 17:44:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s16Hi1mV047141;
 Thu, 6 Feb 2014 17:44:01 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s16Hi13Y047140;
 Thu, 6 Feb 2014 17:44:01 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201402061744.s16Hi13Y047140@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 6 Feb 2014 17:44:01 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43809 - head/en_US.ISO8859-1/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.17
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, 06 Feb 2014 17:44:02 -0000

Author: dru
Date: Thu Feb  6 17:44:01 2014
New Revision: 43809
URL: http://svnweb.freebsd.org/changeset/doc/43809

Log:
  White space fix only. Translators can ignore.
  
  Sponsored by: iXsystems

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Thu Feb  6 17:43:17 2014	(r43808)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Thu Feb  6 17:44:01 2014	(r43809)
@@ -1546,9 +1546,10 @@ before running "/usr/sbin/freebsd-update
 	<step>
 	  <para>If the build world process has previously been run on
 	    this system, a copy of the previous build may still exist
-	    in <filename class="directory">/usr/obj</filename>.  To speed up the new build world
-	process, and possibly save some dependency headaches,
-	remove this directory if it already exists:</para>
+	    in <filename class="directory">/usr/obj</filename>.  To
+	    speed up the new build world process, and possibly save
+	    some dependency headaches, remove this directory if it
+	    already exists:</para>
 
 	  <screen>&prompt.root; <userinput>cd /usr/obj</userinput>
 &prompt.root; <userinput>chflags -R noschg *</userinput>
@@ -1556,10 +1557,10 @@ before running "/usr/sbin/freebsd-update
 	</step>
 
 	<step>
-	  <para>Compile the new compiler and a few related
-	    tools, then use the new compiler to compile the rest of
-	    the new world.  The result is saved to
-	    <filename class="directory">/usr/obj</filename>.</para>
+	  <para>Compile the new compiler and a few related tools, then
+	    use the new compiler to compile the rest of the new world.
+	    The result is saved to <filename
+	      class="directory">/usr/obj</filename>.</para>
 
 	  <screen>&prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make buildworld</userinput></screen>
@@ -1605,22 +1606,26 @@ before running "/usr/sbin/freebsd-update
 	</step>
 
 	<step>
-	  <para>Then, for either file system, if the <acronym>CMOS</acronym> clock is set to local time
-	  (this is true if the output of &man.date.1; does not show
-	  the correct time and zone), run:</para>
+	  <para>Then, for either file system, if the
+	    <acronym>CMOS</acronym> clock is set to local time (this
+	    is true if the output of &man.date.1; does not show the
+	    correct time and zone), run:</para>
 
 	  <screen>&prompt.root; <userinput>adjkerntz -i</userinput></screen>
 	</step>
 
 	<step>
-	  <para>Next, perform some initial configuration file updates to <filename class="directory">/etc</filename>
-	    in preparation for the new world.  The following command compares
-	only those files that are essential for the success of
-	<buildtarget>installworld</buildtarget>.  For instance, this step
-	    may add new groups, system accounts, or startup scripts which have been
-	    added to &os; since the last update.  This is necessary so
-	    that the <buildtarget>installworld</buildtarget> step will
-	    be able to use any new system accounts, groups, and scripts.</para>
+	  <para>Next, perform some initial configuration file updates
+	    to <filename class="directory">/etc</filename> in
+	    preparation for the new world.  The following command
+	    compares only those files that are essential for the
+	    success of <buildtarget>installworld</buildtarget>.  For
+	    instance, this step may add new groups, system accounts,
+	    or startup scripts which have been added to &os; since the
+	    last update.  This is necessary so that the
+	    <buildtarget>installworld</buildtarget> step will be able
+	    to use any new system accounts, groups, and
+	    scripts.</para>
 
 	  <screen>&prompt.root; <userinput>mergemaster -p</userinput></screen>
 	</step>
@@ -1663,18 +1668,17 @@ before running "/usr/sbin/freebsd-update
 	  <screen>&prompt.root; <userinput>make delete-old-libs</userinput></screen>
 	</step>
       </procedure>
-      
-     <indexterm><primary>single-user mode</primary></indexterm>
 
-      <para>If the system can have a window of down-time, consider compiling the system in single user mode instead
-	of compiling the system in multi-user
-	mode, and then dropping into single user mode for the
-	installation.
-	Reinstalling the system touches a lot of important system
-	files, all the standard system binaries, libraries, and
-	include files.  Changing these on a running system,
-	particularly one with active users, is asking for
-	trouble.</para>
+      <indexterm><primary>single-user mode</primary></indexterm>
+
+      <para>If the system can have a window of down-time, consider
+	compiling the system in single user mode instead of compiling
+	the system in multi-user mode, and then dropping into
+	single user mode for the installation.  Reinstalling the
+	system touches a lot of important system files, all the
+	standard system binaries, libraries, and include files.
+	Changing these on a running system, particularly one with
+	active users, is asking for trouble.</para>
     </sect2>
 
     <sect2 xml:id="src-updating">
@@ -1689,14 +1693,14 @@ before running "/usr/sbin/freebsd-update
 
       <para>The options available to &man.make.1; are described in
 	&man.make.conf.5; and some common examples are included in
-	<filename>/usr/share/examples/etc/make.conf</filename>.
-	Any options which are added to <filename>/etc/make.conf</filename>
+	<filename>/usr/share/examples/etc/make.conf</filename>.  Any
+	options which are added to <filename>/etc/make.conf</filename>
 	will control the way &man.make.1; runs and how it builds
-	programs.  Such options take
-	effect every time &man.make.1; is used, including compiling
-	applications from the Ports Collection, compiling custom C
-	programs, or building the &os; operating system.</para>
-	
+	programs.  Such options take effect every time &man.make.1; is
+	used, including compiling applications from the Ports
+	Collection, compiling custom C programs, or building the &os;
+	operating system.</para>
+
       <para>Changes to some settings can have far-reaching and
 	potentially surprising effects.  Read the comments in both
 	locations and keep in mind that the defaults have been chosen
@@ -1706,8 +1710,8 @@ before running "/usr/sbin/freebsd-update
 	<primary><filename>src.conf</filename></primary>
       </indexterm>
 
-      <para>How
-	the operating system is built from source code is controlled by <filename>/etc/src.conf</filename>.  Unlike
+      <para>How the operating system is built from source code is
+	controlled by <filename>/etc/src.conf</filename>.  Unlike
 	<filename>/etc/make.conf</filename>, the contents of
 	<filename>/etc/src.conf</filename> only take effect when the
 	&os; operating system itself is being built.  Descriptions of
@@ -1715,24 +1719,23 @@ before running "/usr/sbin/freebsd-update
 	&man.src.conf.5;.  Be cautious about disabling seemingly
 	unneeded kernel modules and build options.  Sometimes there
 	are unexpected or subtle interactions.</para>
-      </sect2>
+    </sect2>
 
     <sect2 xml:id="make-buildworld">
       <title>Recompile the Base System</title>
 
-	<para>It is a good idea to save the output from running
-	  &man.make.1; to a file.  If something goes wrong, a copy of
-	  the error message can be posted to one of the &os; mailing
-	  lists.</para>
-
-	<para>The easiest way to do this is to use &man.script.1;
-	  with a parameter that specifies the name of the file to save
-	  all output to.  Run this command immediately before
-	  rebuilding the world, and then type
-	  <userinput>exit</userinput> when the process has
-	  finished:</para>
+      <para>It is a good idea to save the output from running
+	&man.make.1; to a file.  If something goes wrong, a copy of
+	the error message can be posted to one of the &os; mailing
+	lists.</para>
+
+      <para>The easiest way to do this is to use &man.script.1; with a
+	parameter that specifies the name of the file to save all
+	output to.  Run this command immediately before rebuilding
+	the world, and then type <userinput>exit</userinput> when the
+	process has finished:</para>
 
-	<screen>&prompt.root; <userinput>script /var/tmp/mw.out</userinput>
+      <screen>&prompt.root; <userinput>script /var/tmp/mw.out</userinput>
 Script started, output file is /var/tmp/mw.out
 &prompt.root; <userinput>make TARGET</userinput>
 <emphasis>&hellip; compile, compile, compile &hellip;</emphasis>
@@ -2345,10 +2348,9 @@ Script done, &hellip;</screen>
 	      change?</term>
 
 	  <listitem>
-	    <para>It depends upon the nature
-	      of the change.  For example, if
-	      <application>svn</application> only shows the following
-	      files as being updated:</para>
+	    <para>It depends upon the nature of the change.  For
+	      example, if <application>svn</application> only shows
+	      the following files as being updated:</para>
 
 	    <screen><filename>src/games/cribbage/instr.c</filename>
 <filename>src/games/sail/pl_main.c</filename>
@@ -2363,68 +2365,68 @@ Script done, &hellip;</screen>
 	      <filename>src/lib/libc/stdlib</filename>, consider
 	      rebuilding world.</para>
 
-	    <para>Some users
-	      rebuild world every fortnight and let changes
-	      accumulate over that fortnight.  Others only re-make
-	      those things that have changed and are careful to spot
-	      all the dependencies.  It all depends on how often a user wants to upgrade
-	      and whether they are tracking &os.stable; or
-	      &os.current;.</para>
+	    <para>Some users rebuild world every fortnight and let
+	      changes accumulate over that fortnight.  Others only
+	      re-make those things that have changed and are careful
+	      to spot all the dependencies.  It all depends on how
+	      often a user wants to upgrade and whether they are
+	      tracking &os.stable; or &os.current;.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	    <term>What would cause a compile to fail with lots of
-	      signal 11<indexterm>
-		<primary>signal 11</primary>
-	      </indexterm>
-	      (or other signal number) errors?</term>
+	  <term>What would cause a compile to fail with lots of
+	    signal 11<indexterm>
+	      <primary>signal 11</primary>
+	    </indexterm>
+	    (or other signal number) errors?</term>
 
 	  <listitem>
 	    <para>This normally indicates a hardware problem.
 	      Building world is an effective way to stress test
-	      hardware, especially memory.  A sure indicator of a hardware issue is when
-	      <application>make</application> is restarted and it
-	      dies at a different point in the process.</para>
-
-	    <para>To resolve this error, swap out the
-	      components in the machine, starting with RAM, to determine which component is
-	      failing.</para>
+	      hardware, especially memory.  A sure indicator of a
+	      hardware issue is when <application>make</application>
+	      is restarted and it dies at a different point in the
+	      process.</para>
+
+	    <para>To resolve this error, swap out the components in
+	      the machine, starting with RAM, to determine which
+	      component is failing.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	    <term>Can <filename class="directory">/usr/obj</filename>
+	  <term>Can <filename class="directory">/usr/obj</filename>
 	      be removed when finished?</term>
 
 	  <listitem>
-
-	    <para>This directory
-	      contains all the object files that were produced during
-	      the compilation phase.  Normally, one of the first steps
-	      in the <command>make buildworld</command> process is to
-	      remove this directory and start afresh.  Keeping
-	      <filename>/usr/obj</filename> around
-	      when finished makes little sense, and its removal frees
-	      up a approximately 2GB of disk space.</para>
+	    <para>This directory contains all the object files that
+	      were produced during the compilation phase.  Normally,
+	      one of the first steps in the <command>make
+		buildworld</command> process is to remove this
+	      directory and start afresh.  Keeping
+	      <filename>/usr/obj</filename> around when finished makes
+	      little sense, and its removal frees up a approximately
+	      2GB of disk space.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	    <term>Can interrupted builds be resumed?</term>
+	  <term>Can interrupted builds be resumed?</term>
 
 	  <listitem>
 	    <para>This depends on how far into the process the
-	      problem occurs.  In general, <command>make buildworld</command>
-	      builds new copies of essential tools and the system libraries.
-	      These tools and libraries are then installed, used to
-	      rebuild themselves, and are installed again.  The rest of the
-	      system is then rebuilt with the new
-	      system tools.</para>
+	      problem occurs.  In general, <command>make
+		buildworld</command> builds new copies of essential
+	      tools and the system libraries.  These tools and
+	      libraries are then installed, used to rebuild
+	      themselves, and are installed again.  The rest of the
+	      system is then rebuilt with the new system
+	      tools.</para>
 
 	    <para>During the last stage, it is fairly safe to run
-	      these commands as they will not undo the work of the previous
-	      <command>make buildworld</command>:</para>
+	      these commands as they will not undo the work of the
+	      previous <command>make buildworld</command>:</para>
 
 	    <screen>&prompt.root; <userinput>cd /usr/src</userinput>
 &prompt.root; <userinput>make -DNO_CLEAN all</userinput></screen>
@@ -2438,76 +2440,78 @@ Building everything..
 	    <para>in the <command>make buildworld</command> output,
 	      it is probably fairly safe to do so.</para>
 
-	    <para>If that message is not displayed,
-	      it is always better to be safe than sorry and to
-	      restart the build from scratch.</para>
+	    <para>If that message is not displayed, it is always
+	      better to be safe than sorry and to restart the build
+	      from scratch.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	    <term>Is it possible to speed up making the world?</term>
+	  <term>Is it possible to speed up making the world?</term>
 
 	  <listitem>
-		<para>Several actions can speed up the build world
-		  process.  For example, the entire process can be run from
-		  single-user mode.  However, this will prevent users
-		  from having access
-		  to the system until the process is complete.</para>
-
-		<para>Careful file system design or the use of ZFS
-		  datasets can make a difference.  Consider putting <filename class="directory">/usr/src</filename> and
-		  <filename class="directory">/usr/obj</filename>
-		  on separate file systems.  If possible, place the file systems on separate disks on separate disk
-		  controllers.  When mounting
-		  <filename class="directory">/usr/src</filename>, use
-		  <option>noatime</option> which
-		  prevents the file system from recording the
-		  file access time.  If <filename
-		  class="directory">/usr/src</filename> is not on its
-		  own file system, consider remounting <filename
-		  class="directory">/usr</filename> with <option>noatime</option>.</para>
-
-		  <para>The file system holding
-		  <filename>/usr/obj</filename> can be mounted or
-		  remounted with <option>async</option> so that disk
-		  writes happen asynchronously.  The write completes
-		  immediately, and the data is written to the disk a
-		  few seconds later.  This allows writes to be
-		  clustered together, and can provide a dramatic
-		  performance boost.</para>
-
-		<warning>
-		  <para>Keep in mind that this option makes the file
-		    system more fragile.  With this option, there is
-		    an increased chance that, should power fail, the
-		    file system will be in an unrecoverable state when
-		    the machine restarts.</para>
-
-		  <para>If <filename>/usr/obj</filename> is the
-		    only directory on this file system, this is not a
-		    problem.  If you have other, valuable data on the
-		    same file system, ensure that there are verified
-		    backups before enabling this option.</para>
-		</warning>
-
-		<para>Turn off profiling by setting
-		  <quote>NO_PROFILE=true</quote> in
-		  <filename>/etc/make.conf</filename>.</para>
-
-		<para>Pass
-		  <option>-j<replaceable>n</replaceable></option>
-		  to &man.make.1; to run multiple processes in
-		  parallel.  This usually helps on both single- and
-		  multi-processor machines.</para>
-	      </listitem>
+	    <para>Several actions can speed up the build world
+	      process.  For example, the entire process can be run
+	      from single-user mode.  However, this will prevent users
+	      from having access to the system until the process is
+	      complete.</para>
+
+	    <para>Careful file system design or the use of ZFS
+	      datasets can make a difference.  Consider putting
+	      <filename class="directory">/usr/src</filename> and
+	      <filename class="directory">/usr/obj</filename> on
+	      separate file systems.  If possible, place the file
+	      systems on separate disks on separate disk controllers.
+	      When mounting <filename
+		class="directory">/usr/src</filename>, use
+	      <option>noatime</option> which prevents the file system
+	      from recording the file access time.  If <filename
+		class="directory">/usr/src</filename> is not on its
+	      own file system, consider remounting <filename
+		class="directory">/usr</filename> with
+	      <option>noatime</option>.</para>
+
+	    <para>The file system holding
+	      <filename>/usr/obj</filename> can be mounted or
+	      remounted with <option>async</option> so that disk
+	      writes happen asynchronously.  The write completes
+	      immediately, and the data is written to the disk a
+	      few seconds later.  This allows writes to be
+	      clustered together, and can provide a dramatic
+	      performance boost.</para>
+
+	    <warning>
+	      <para>Keep in mind that this option makes the file
+		system more fragile.  With this option, there is an
+		increased chance that, should power fail, the file
+		system will be in an unrecoverable state when the
+		machine restarts.</para>
+
+	      <para>If <filename>/usr/obj</filename> is the only
+		directory on this file system, this is not a
+		problem.  If you have other, valuable data on the
+		same file system, ensure that there are verified
+		backups before enabling this option.</para>
+	    </warning>
+
+	    <para>Turn off profiling by setting
+	      <quote>NO_PROFILE=true</quote> in
+	      <filename>/etc/make.conf</filename>.</para>
+
+	    <para>Pass
+	      <option>-j<replaceable>n</replaceable></option> to
+	      &man.make.1; to run multiple processes in parallel.
+	      This usually helps on both single- and
+	      multi-processor machines.</para>
+	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	    <term>What if something goes wrong?</term>
+	  <term>What if something goes wrong?</term>
 
 	  <listitem>
-	    <para>First, make absolutely sure that the environment has no
-	      extraneous cruft from earlier builds:</para>
+	    <para>First, make absolutely sure that the environment has
+	      no extraneous cruft from earlier builds:</para>
 
 	    <screen>&prompt.root; <userinput>chflags -R noschg /usr/obj/usr</userinput>
 &prompt.root; <userinput>rm -rf /usr/obj/usr</userinput>
@@ -2518,12 +2522,12 @@ Building everything..
 	    <para>Yes, <command>make cleandir</command> really should
 	      be run twice.</para>
 
-	    <para>Then, restart the whole process, starting
-	      with <command>make buildworld</command>.</para>
+	    <para>Then, restart the whole process, starting with
+	      <command>make buildworld</command>.</para>
 
-	    <para>If problems persist, send the error and the
-	      output of <command>uname -a</command> to &a.questions;.
-	      Be prepared to answer other questions about the
+	    <para>If problems persist, send the error and the output
+	      of <command>uname -a</command> to &a.questions;.  Be
+	      prepared to answer other questions about the
 	      setup!</para>
 	  </listitem>
 	</varlistentry>

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 17:47:55 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 36A728FC;
 Thu,  6 Feb 2014 17:47:55 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1380A118D;
 Thu,  6 Feb 2014 17:47:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s16HlsN3047592;
 Thu, 6 Feb 2014 17:47:54 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s16HlsmN047591;
 Thu, 6 Feb 2014 17:47:54 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201402061747.s16HlsmN047591@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 6 Feb 2014 17:47:54 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43810 - 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.17
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, 06 Feb 2014 17:47:55 -0000

Author: wblock
Date: Thu Feb  6 17:47:54 2014
New Revision: 43810
URL: http://svnweb.freebsd.org/changeset/doc/43810

Log:
  Whitespace-only fixes, translators please ignore.

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	Thu Feb  6 17:44:01 2014	(r43809)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Thu Feb  6 17:47:54 2014	(r43810)
@@ -763,8 +763,7 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 
       <screen>&prompt.user; <userinput>cp <replaceable>file</replaceable> <replaceable>file</replaceable>.orig</userinput></screen>
 
-      <para>Patches are
-	saved into files named
+      <para>Patches are saved into files named
 	<filename>patch-*</filename> where
 	<replaceable>*</replaceable> indicates the pathname of the
 	file that is patched, such as
@@ -785,18 +784,17 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 
       <screen>&prompt.user; <userinput>diff -u -N <replaceable>newfile</replaceable>.orig <replaceable>newfile</replaceable> &gt; patch-<replaceable>pathname-newfile</replaceable></userinput></screen>
 
-      <para>Patch files are
-	stored in <varname>PATCHDIR</varname> (usually
-	<filename class="directory">files/</filename>, from where they will be
-	automatically applied.  All patches must be relative to
-	<varname>WRKSRC</varname> (generally the directory the port's
-	tarball unpacks itself into, that being where the build is
-	done).  To make fixes and upgrades easier, avoid
+      <para>Patch files are stored in <varname>PATCHDIR</varname>
+	(usually <filename class="directory">files/</filename>, from
+	where they will be automatically applied.  All patches must be
+	relative to <varname>WRKSRC</varname> (generally the directory
+	the port's tarball unpacks itself into, that being where the
+	build is done).  To make fixes and upgrades easier, avoid
 	having more than one patch fix the same file (that is,
 	<filename>patch-file</filename> and
 	<filename>patch-file2</filename> both changing
-	<filename>WRKSRC/foobar.c</filename>).
-	Note that if the path of a patched file contains an underscore
+	<filename>WRKSRC/foobar.c</filename>).  Note that if the path
+	of a patched file contains an underscore
 	(<literal>_</literal>) character, the patch needs to have two
 	underscores instead in its name.  For example, to patch a file
 	named <filename>src/freeglut_joystick.c</filename>, the
@@ -804,18 +802,19 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 	<filename>patch-src-freeglut__joystick.c</filename>.</para>
 
       <para>Please only use characters
-	<literal>[-+._a-zA-Z0-9]</literal> for naming patches.
-	Do not use any other characters besides them.  Do not name
-	patches like <filename>patch-aa</filename> or
+	<literal>[-+._a-zA-Z0-9]</literal> for naming patches.  Do not
+	use any other characters besides them.  Do not name patches
+	like <filename>patch-aa</filename> or
 	<filename>patch-ab</filename>, always mention the path and
 	file name in patch names.</para>
 
-      <para>There is an alternate, easier method for creating patches to existing files.
-	The first steps are the same, make a copy of the unmodified file with an
-	<filename>.orig</filename> extension, then make modifications.
-	Then use <command>make makepatch</command>
-	to write updated patch files to the
-	<filename>files</filename> directory of the port.</para>
+      <para>There is an alternate, easier method for creating patches
+	to existing files.  The first steps are the same, make a copy
+	of the unmodified file with an <filename>.orig</filename>
+	extension, then make modifications.  Then use
+	<command>make makepatch</command> to write updated patch files
+	to the <filename>files</filename> directory of the
+	port.</para>
 
       <para>Do not put RCS strings in patches.
 	<application>Subversion</application> will mangle them when we
@@ -838,21 +837,20 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 	<command>autoconf</command> to regenerate
 	<command>configure</command>, do not take the diffs of
 	<command>configure</command> (it often grows to a few thousand
-	lines!).  Instead, define <literal>USE_AUTOTOOLS=autoconf:261</literal>
-	and take the diffs of
-	<filename>configure.in</filename>.</para>
-
-      <para>Try to minimize the amount of non-functional
-	whitespace changes in patches.  It is common in the Open
-	Source world for projects to share large amounts of a code
-	base, but obey different style and indenting rules.  When
-	taking a working piece of functionality from one project to fix
-	similar areas in another, please be careful: the resulting
-	line patch may be full of non-functional changes.  It not only
-	increases the size of the
-	<application>Subversion</application> repository but makes it
-	hard to find out what exactly caused the problem and what was
-	changed at all.</para>
+	lines!).  Instead, define
+	<literal>USE_AUTOTOOLS=autoconf:261</literal> and take the
+	diffs of <filename>configure.in</filename>.</para>
+
+      <para>Try to minimize the amount of non-functional whitespace
+	changes in patches.  It is common in the Open Source world for
+	projects to share large amounts of a code base, but obey
+	different style and indenting rules.  When taking a working
+	piece of functionality from one project to fix similar areas
+	in another, please be careful: the resulting line patch may be
+	full of non-functional changes.  It not only increases the
+	size of the <application>Subversion</application> repository
+	but makes it hard to find out what exactly caused the problem
+	and what was changed at all.</para>
 
       <para>If a file must be deleted, do it in the
 	<buildtarget>post-extract</buildtarget> target rather than as
@@ -860,7 +858,8 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 
       <para>Simple replacements can be performed directly from the
 	port <filename>Makefile</filename> using the in-place mode of
-	&man.sed.1;.  This is useful when changes use the value of a variable:</para>
+	&man.sed.1;.  This is useful when changes use the value of a
+	variable:</para>
 
       <programlisting>post-patch:
 	@${REINPLACE_CMD} -e 's|for Linux|for FreeBSD|g' ${WRKSRC}/README</programlisting>
@@ -869,8 +868,7 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 	convention in source files.  This may cause problems with
 	further patching, compiler warnings, or script execution (like
 	<literal>/bin/sh^M not found</literal>.) To quickly convert
-	all files from CR/LF to just LF, add this entry
-	to the port
+	all files from CR/LF to just LF, add this entry to the port
 	<filename>Makefile</filename>:</para>
 
       <programlisting>USES=	dos2unix</programlisting>
@@ -882,12 +880,12 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 DOS2UNIX_FILES=	util.c util.h</programlisting>
 
       <para>Use <varname>DOS2UNIX_REGEX</varname> to convert a group
-	of files across subdirectories.
-	Its argument is a &man.find.1;-compatible regular
-	expression.  More on the format is in &man.re.format.7;.  This
-	option is useful for converting all files of a given
-	extension.  For example, convert all source code files, leaving binary
-	files intact:</para>
+	of files across subdirectories.  Its argument is a
+	&man.find.1;-compatible regular expression.  More on the
+	format is in &man.re.format.7;.  This option is useful for
+	converting all files of a given extension.  For example,
+	convert all source code files, leaving binary files
+	intact:</para>
 
       <programlisting>USES=	dos2unix
 DOS2UNIX_REGEX=	.*\.([ch]|cpp)</programlisting>

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 18:45:15 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 102DF52A;
 Thu,  6 Feb 2014 18:45:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E1F14178F;
 Thu,  6 Feb 2014 18:45:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s16IjEnY071338;
 Thu, 6 Feb 2014 18:45:14 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s16IjE7K071337;
 Thu, 6 Feb 2014 18:45:14 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201402061845.s16IjE7K071337@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Thu, 6 Feb 2014 18:45:14 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43811 - 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.17
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, 06 Feb 2014 18:45:15 -0000

Author: mat (ports committer)
Date: Thu Feb  6 18:45:14 2014
New Revision: 43811
URL: http://svnweb.freebsd.org/changeset/doc/43811

Log:
  Move the xml:id to the row.
  
  Sponsored by:	Absolight

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses.xml	Thu Feb  6 17:47:54 2014	(r43810)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses.xml	Thu Feb  6 18:45:14 2014	(r43811)
@@ -8,16 +8,16 @@
   format is easy to grasp from the already-added entries below (or use
   this scheme below as a skeleton):
 
-<row>
-  <entry xml:id="uses-FEATURE"><literal>FEATURE</literal></entry>
+<row xml:id="uses-FEATURE">
+  <entry><literal>FEATURE</literal></entry>
   <entry>ARGUMENTS</entry>
   <entry>DESCRIPTION</entry>
 </row>
 
 -->
 
-<row>
-  <entry xml:id="uses-ada"><literal>ada</literal></entry>
+<row xml:id="uses-ada">
+  <entry><literal>ada</literal></entry>
 
   <entry>(none)</entry>
 
@@ -25,8 +25,8 @@
     compiler, and sets <varname>CC</varname> accordingly.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-bison"><literal>bison</literal></entry>
+<row xml:id="uses-bison">
+  <entry><literal>bison</literal></entry>
 
   <entry>(none), <literal>build</literal>, <literal>run</literal>,
     <literal>both</literal></entry>
@@ -40,9 +40,8 @@
     dependencies.</entry>
 </row>
 
-<row>
-  <entry
-    xml:id="uses-charsetfix"><literal>charsetfix</literal></entry>
+<row xml:id="uses-charsetfix">
+  <entry><literal>charsetfix</literal></entry>
 
   <entry>(none)</entry>
 
@@ -55,8 +54,8 @@
     <varname>WRKSRC</varname>/<filename>Makefile.in</filename>.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-cmake"><literal>cmake</literal></entry>
+<row xml:id="uses-cmake">
+  <entry><literal>cmake</literal></entry>
 
   <entry>(none), <literal>outsource</literal>,
     <literal>run</literal></entry>
@@ -69,8 +68,8 @@
     <xref linkend="using-cmake"/>.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-compiler"><literal>compiler</literal></entry>
+<row xml:id="uses-compiler">
+  <entry><literal>compiler</literal></entry>
 
   <entry>(none), <literal>c++0x</literal>,
     <literal>c++11-lang</literal>, <literal>c++11-lib</literal>,
@@ -125,8 +124,8 @@
     </itemizedlist></entry>
 </row>
 
-<row>
-  <entry xml:id="uses-cran"><literal>cran</literal></entry>
+<row xml:id="uses-cran">
+  <entry><literal>cran</literal></entry>
 
   <entry>(none), <literal>auto-plist</literal></entry>
 
@@ -135,9 +134,8 @@
     <filename>pkg-plist</filename>.</entry>
 </row>
 
-<row>
-  <entry
-    xml:id="uses-desktop-file-utils"><literal>desktop-file-utils</literal></entry>
+<row xml:id="uses-desktop-file-utils">
+  <entry><literal>desktop-file-utils</literal></entry>
 
   <entry>(none)</entry>
 
@@ -150,8 +148,8 @@
     package install or removal.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-desthack"><literal>desthack</literal></entry>
+<row xml:id="uses-desthack">
+  <entry><literal>desthack</literal></entry>
 
   <entry>(none)</entry>
 
@@ -160,8 +158,8 @@
     not.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-display"><literal>display</literal></entry>
+<row xml:id="uses-display">
+  <entry><literal>display</literal></entry>
 
   <entry>(none), ARGS</entry>
 
@@ -175,8 +173,8 @@
     phase around which to start and stop the virtual display.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-dos2unix"><literal>dos2unix</literal></entry>
+<row xml:id="uses-dos2unix">
+  <entry><literal>dos2unix</literal></entry>
 
   <entry>(none)</entry>
 
@@ -204,8 +202,8 @@
     </itemizedlist></entry>
 </row>
 
-<row>
-  <entry xml:id="uses-fam"><literal>fam</literal></entry>
+<row xml:id="uses-fam">
+  <entry><literal>fam</literal></entry>
 
   <entry>(none), fam, gamin</entry>
 
@@ -215,8 +213,8 @@
     WITH_FAM_SYSTEM to specify their preference.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-fmake"><literal>fmake</literal></entry>
+<row xml:id="uses-fmake">
+  <entry><literal>fmake</literal></entry>
 
   <entry>(none)</entry>
 
@@ -224,8 +222,8 @@
     build-time dependency.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-fortran"><literal>fortran</literal></entry>
+<row xml:id="uses-fortran">
+  <entry><literal>fortran</literal></entry>
 
   <entry><literal>gcc</literal> (default),
     <literal>ifort</literal></entry>
@@ -233,8 +231,8 @@
   <entry>Uses the Fortran compiler from either GNU or Intel.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-fuse"><literal>fuse</literal></entry>
+<row xml:id="uses-fuse">
+  <entry><literal>fuse</literal></entry>
 
   <entry>(none)</entry>
 
@@ -243,8 +241,8 @@
     &os;.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-gettext"><literal>gettext</literal></entry>
+<row xml:id="uses-gettext">
+  <entry><literal>gettext</literal></entry>
 
   <entry>(none), <literal>lib</literal> (default),
     <literal>build</literal>, <literal>run</literal></entry>
@@ -257,8 +255,8 @@
     run-time dependency on <filename>xgettext</filename>.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-gmake"><literal>gmake</literal></entry>
+<row xml:id="uses-gmake">
+  <entry><literal>gmake</literal></entry>
 
   <entry>(none)</entry>
 
@@ -268,8 +266,8 @@
     for the build.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-iconv"><literal>iconv</literal></entry>
+<row xml:id="uses-iconv">
+  <entry><literal>iconv</literal></entry>
 
   <entry>(none), <literal>lib</literal>, <literal>build</literal>,
     <literal>patch</literal></entry>
@@ -287,8 +285,8 @@
     <xref linkend="using-iconv"/>.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-imake"><literal>imake</literal></entry>
+<row xml:id="uses-imake">
+  <entry><literal>imake</literal></entry>
 
   <entry>(none), <literal>env</literal>,
     <literal>notall</literal></entry>
@@ -300,8 +298,8 @@
     <literal>-a</literal> to <command>xmkmf</command>.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-kmod"><literal>kmod</literal></entry>
+<row xml:id="uses-kmod">
+  <entry><literal>kmod</literal></entry>
 
   <entry>(none)</entry>
 
@@ -345,8 +343,8 @@
     </itemizedlist></entry>
 </row>
 
-<row>
-  <entry xml:id="uses-libtool"><literal>libtool</literal></entry>
+<row xml:id="uses-libtool">
+  <entry><literal>libtool</literal></entry>
 
   <entry>(none)</entry>
 
@@ -354,8 +352,8 @@
     added to all ports that use <command>libtool</command>.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-lua"><literal>lua</literal></entry>
+<row xml:id="uses-lua">
+  <entry><literal>lua</literal></entry>
 
   <entry>(none), <literal>XY+</literal>, <literal>XY</literal>,
     <literal>build</literal>, <literal>run</literal></entry>
@@ -368,8 +366,8 @@
     <literal>52+</literal>).</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-motif"><literal>motif</literal></entry>
+<row xml:id="uses-motif">
+  <entry><literal>motif</literal></entry>
 
   <entry>(none)</entry>
 
@@ -380,8 +378,8 @@
     <package role="port">x11-toolkits/open-motif</package>.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-ncurses"><literal>ncurses</literal></entry>
+<row xml:id="uses-ncurses">
+  <entry><literal>ncurses</literal></entry>
 
   <entry>(none), <literal>base</literal>,
     <literal>port</literal></entry>
@@ -390,8 +388,8 @@
     useful variables to be set.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-ninja"><literal>ninja</literal></entry>
+<row xml:id="uses-ninja">
+  <entry><literal>ninja</literal></entry>
 
   <entry>(none)</entry>
 
@@ -400,8 +398,8 @@
     output.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-openal"><literal>openal</literal></entry>
+<row xml:id="uses-openal">
+  <entry><literal>openal</literal></entry>
 
   <entry><literal>al</literal>, <literal>soft</literal> (default),
     <literal>si</literal>, <literal>alut</literal></entry>
@@ -414,8 +412,8 @@
     <literal>si</literal>.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-pathfix"><literal>pathfix</literal></entry>
+<row xml:id="uses-pathfix">
+  <entry><literal>pathfix</literal></entry>
 
   <entry>(none)</entry>
 
@@ -425,8 +423,8 @@
     hierarchy.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-perl5"><literal>perl5</literal></entry>
+<row xml:id="uses-perl5">
+  <entry><literal>perl5</literal></entry>
 
   <entry>(none)</entry>
 
@@ -475,8 +473,8 @@
     </itemizedlist></entry>
 </row>
 
-<row>
-  <entry xml:id="uses-pgsql"><literal>pgsql</literal></entry>
+<row xml:id="uses-pgsql">
+  <entry><literal>pgsql</literal></entry>
 
   <entry>(none), <literal>X.Y</literal>, <literal>X.Y+</literal>,
     <literal>X.Y-</literal></entry>
@@ -493,8 +491,8 @@
       <command>make -V _USE_PGSQL_DEP</command>.</para></entry>
 </row>
 
-<row>
-  <entry xml:id="uses-pkgconfig"><literal>pkgconfig</literal></entry>
+<row xml:id="uses-pkgconfig">
+  <entry><literal>pkgconfig</literal></entry>
 
   <entry>(none), <literal>build</literal> (default),
     <literal>run</literal>, <literal>both</literal></entry>
@@ -507,8 +505,8 @@
     dependencies.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-pure"><literal>pure</literal></entry>
+<row xml:id="uses-pure">
+  <entry><literal>pure</literal></entry>
 
   <entry>(none), <literal>ffi</literal></entry>
 
@@ -519,8 +517,8 @@
     dependency.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-qmail"><literal>qmail</literal></entry>
+<row xml:id="uses-qmail">
+  <entry><literal>qmail</literal></entry>
 
   <entry>(none), <literal>build</literal>, <literal>run</literal>,
     <literal>both</literal>, <literal>vars</literal></entry>
@@ -534,8 +532,8 @@
     will only set QMAIL variables for the port to use.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-qmake"><literal>qmake</literal></entry>
+<row xml:id="uses-qmake">
+  <entry><literal>qmake</literal></entry>
 
   <entry>(none), <literal>norecursive</literal>,
     <literal>outsource</literal></entry>
@@ -544,8 +542,8 @@
     more information see <xref linkend="using-qmake"/>.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-readline"><literal>readline</literal></entry>
+<row xml:id="uses-readline">
+  <entry><literal>readline</literal></entry>
 
   <entry>(none), <literal>port</literal></entry>
 
@@ -556,8 +554,8 @@
     <package role="port">devel/readline</package></entry>
 </row>
 
-<row>
-  <entry xml:id="uses-scons"><literal>scons</literal></entry>
+<row xml:id="uses-scons">
+  <entry><literal>scons</literal></entry>
 
   <entry>(none)</entry>
 
@@ -565,9 +563,8 @@
     <package role="port">devel/scons</package></entry>
 </row>
 
-<row>
-  <entry
-    xml:id="uses-shared-mime-info"><literal>shared-mime-info</literal></entry>
+<row xml:id="uses-shared-mime-info">
+  <entry><literal>shared-mime-info</literal></entry>
 
   <entry>(none)</entry>
 
@@ -580,9 +577,8 @@
     with the correct arguments.</entry>
 </row>
 
-<row>
-  <entry
-    xml:id="uses-shebangfix"><literal>shebangfix</literal></entry>
+<row xml:id="uses-shebangfix">
+  <entry><literal>shebangfix</literal></entry>
 
   <entry>(none)</entry>
 
@@ -600,8 +596,8 @@
     <varname>lua_CMD</varname>.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-tcl"><literal>tcl</literal></entry>
+<row xml:id="uses-tcl">
+  <entry><literal>tcl</literal></entry>
 
   <entry><literal>PORT</literal></entry>
 
@@ -663,8 +659,8 @@
     </itemizedlist></entry>
 </row>
 
-<row>
-  <entry xml:id="uses-tk"><literal>tk</literal></entry>
+<row xml:id="uses-tk">
+  <entry><literal>tk</literal></entry>
 
   <entry>Same as arguments for <literal>tcl</literal></entry>
 
@@ -673,8 +669,8 @@
     returned as when using <application>Tcl</application>.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-twisted"><literal>twisted</literal></entry>
+<row xml:id="uses-twisted">
+  <entry><literal>twisted</literal></entry>
 
   <entry>(none), <literal>ARGS</literal></entry>
 
@@ -702,8 +698,8 @@
     <filename>Uses/twisted.mk</filename>.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-uidfix"><literal>uidfix</literal></entry>
+<row xml:id="uses-uidfix">
+  <entry><literal>uidfix</literal></entry>
 
   <entry>(none)</entry>
 
@@ -713,9 +709,8 @@
     <literal>NEED_ROOT=yes</literal></entry>
 </row>
 
-<row>
-  <entry
-    xml:id="uses-uniquefiles"><literal>uniquefiles</literal></entry>
+<row xml:id="uses-uniquefiles">
+  <entry><literal>uniquefiles</literal></entry>
 
   <entry>(none), <literal>dirs</literal></entry>
 
@@ -747,8 +742,8 @@
     </itemizedlist></entry>
 </row>
 
-<row>
-  <entry xml:id="uses-webplugin"><literal>webplugin</literal></entry>
+<row xml:id="uses-webplugin">
+  <entry><literal>webplugin</literal></entry>
 
   <entry>(none), <literal>ARGS</literal></entry>
 
@@ -808,8 +803,8 @@
     </itemizedlist></entry>
 </row>
 
-<row>
-  <entry xml:id="uses-zenoss"><literal>zenoss</literal></entry>
+<row xml:id="uses-zenoss">
+  <entry><literal>zenoss</literal></entry>
 
   <entry>(none)</entry>
 
@@ -818,8 +813,8 @@
     related <application>zenpack</application> ports.</entry>
 </row>
 
-<row>
-  <entry xml:id="uses-zope"><literal>zope</literal></entry>
+<row xml:id="uses-zope">
+  <entry><literal>zope</literal></entry>
 
   <entry>(none)</entry>
 

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 20:46:42 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8513138A;
 Thu,  6 Feb 2014 20:46:42 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7097513D3;
 Thu,  6 Feb 2014 20:46:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s16Kkgop020552;
 Thu, 6 Feb 2014 20:46:42 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s16Kkg0W020551;
 Thu, 6 Feb 2014 20:46:42 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201402062046.s16Kkg0W020551@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 6 Feb 2014 20:46:42 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43812 -
 head/en_US.ISO8859-1/books/handbook/advanced-networking
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.17
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, 06 Feb 2014 20:46:42 -0000

Author: eadler
Date: Thu Feb  6 20:46:41 2014
New Revision: 43812
URL: http://svnweb.freebsd.org/changeset/doc/43812

Log:
  Mention USB tethering and include the name of the drivers which are required.
  
  Reviewed by:	nox

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

Modified: head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Thu Feb  6 18:45:14 2014	(r43811)
+++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Thu Feb  6 20:46:41 2014	(r43812)
@@ -21,6 +21,10 @@
       </listitem>
 
       <listitem>
+	<para>How to set up USB tethering.</para>
+      </listitem>
+
+      <listitem>
 	<para>How to set up &ieee; 802.11 and &bluetooth;
 	  devices.</para>
       </listitem>
@@ -2202,6 +2206,31 @@ freebsdap       00:11:95:c3:0d:ac    1  
     </sect2>
   </sect1>
 
+  <sect1 xml:id="network-usb-tethering">
+    <info>
+      <title>USB Tethering</title>
+    </info>
+
+    <indexterm><primary>tether</primary></indexterm>
+
+    <para>Many cellphones provide the option to share their data
+      connection over USB (often called "tethering").  This feature
+      uses the <acronym>RNDIS</acronym> or <acronym>CDC</acronym>
+      protocol.</para>
+
+    <para>Before attaching a device, load the appropriate driver
+      into the kernel:</para>
+
+    <screen>&prompt.root; <userinput>kldload if_urndis
+&prompt.root; kldload cdce</userinput></screen>
+
+    <para>Once the device is attached
+      <literal>ue</literal><replaceable>0</replaceable> will be
+      available for use like a normal network device.  Be sure that
+      the <quote>USB tethering</quote> option is enabled on the
+      device.</para>
+  </sect1>
+
   <sect1 xml:id="network-bluetooth">
     <info><title>Bluetooth</title>
       <authorgroup>

From owner-svn-doc-all@FreeBSD.ORG  Thu Feb  6 22:14:51 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ADB04E23;
 Thu,  6 Feb 2014 22:14:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7B73C1ADA;
 Thu,  6 Feb 2014 22:14:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s16MEp6o056578;
 Thu, 6 Feb 2014 22:14:51 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s16MEpO5056577;
 Thu, 6 Feb 2014 22:14:51 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201402062214.s16MEpO5056577@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 6 Feb 2014 22:14:51 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43813 - 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.17
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, 06 Feb 2014 22:14:51 -0000

Author: wblock
Date: Thu Feb  6 22:14:50 2014
New Revision: 43813
URL: http://svnweb.freebsd.org/changeset/doc/43813

Log:
  Miscellaneous fixes from danfe@.
  
  Submitted by:	Alexey Dokuchaev <danfe@FreeBSD.org>

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	Thu Feb  6 20:46:41 2014	(r43812)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Thu Feb  6 22:14:50 2014	(r43813)
@@ -201,7 +201,7 @@ COMMENT=	Cat chasing a mouse all over th
 	    <filename>README</filename> or manpage</emphasis>; too
 	    often they are not a concise description of the port or
 	    are in an awkward format (e.g., manpages have justified
-	    spacing, as it looks particularly bad with monospaced
+	    spacing, which looks particularly bad with monospaced
 	    fonts).</para>
 	</note>
 
@@ -511,7 +511,7 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
   <chapter xml:id="slow">
     <title>Slow Porting</title>
 
-    <para>Ok, so it was not that simple, and the port required some
+    <para>Okay, so it was not that simple, and the port required some
       modifications to get it to work.  In this section, we will
       explain, step by step, how to modify it to get it to work with
       the ports paradigm.</para>
@@ -4109,7 +4109,7 @@ LIB_DEPENDS=	libbar.so:${PORTSDIR}/foo/b
 
 	<para>Available <varname>USE_</varname> and
 	  <varname>WANT_</varname> variables are defined in the files
-	  in <filename>/usr/ports/Mk</filename>.</para>
+	  in <filename class="directory">/usr/ports/Mk</filename>.</para>
       </sect2>
     </sect1>
 
@@ -12732,7 +12732,7 @@ pre-install:
     <sect1 xml:id="uses-values">
       <title>Values of <varname>USES</varname></title>
 
-      <table frame="none">
+      <table>
 	<title>Values of <varname>USES</varname></title>
 
 	<tgroup cols="3">

From owner-svn-doc-all@FreeBSD.ORG  Fri Feb  7 02:15:45 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 34C7524C;
 Fri,  7 Feb 2014 02:15:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 048F71F90;
 Fri,  7 Feb 2014 02:15:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s172FiIE058037;
 Fri, 7 Feb 2014 02:15:44 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s172FigY058036;
 Fri, 7 Feb 2014 02:15:44 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201402070215.s172FigY058036@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 7 Feb 2014 02:15:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43814 - 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.17
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, 07 Feb 2014 02:15:45 -0000

Author: gjb
Date: Fri Feb  7 02:15:44 2014
New Revision: 43814
URL: http://svnweb.freebsd.org/changeset/doc/43814

Log:
  Force rebuild of doceng charter page.
  Previous change affecting this page is external, and does
  not cause this page to reflect the change.
  
  Approved by:	doceng (implicit)
  Sponsored by:	The FreeBSD Foundation

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

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

From owner-svn-doc-all@FreeBSD.ORG  Fri Feb  7 05:23:56 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 16492118;
 Fri,  7 Feb 2014 05:23:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F30B71179;
 Fri,  7 Feb 2014 05:23:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s175NtWK032120;
 Fri, 7 Feb 2014 05:23:55 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s175NtaL032119;
 Fri, 7 Feb 2014 05:23:55 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201402070523.s175NtaL032119@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Fri, 7 Feb 2014 05:23:55 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43815 - head/share/mk
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.17
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, 07 Feb 2014 05:23:56 -0000

Author: hrs
Date: Fri Feb  7 05:23:55 2014
New Revision: 43815
URL: http://svnweb.freebsd.org/changeset/doc/43815

Log:
  Add authors.ent as a dependency for wwwstd.

Modified:
  head/share/mk/doc.xml.mk

Modified: head/share/mk/doc.xml.mk
==============================================================================
--- head/share/mk/doc.xml.mk	Fri Feb  7 02:15:44 2014	(r43814)
+++ head/share/mk/doc.xml.mk	Fri Feb  7 05:23:55 2014	(r43815)
@@ -31,7 +31,8 @@ _XML_INCLIST=	libcommon.l10n.xsl \
 		iso8879.ent \
 		l10n.ent \
 		release.ent \
-		release.l10n.ent
+		release.l10n.ent \
+		authors.ent
 .for F in ${_XML_INCLIST}
 .if exists(${DOC_PREFIX}/${LANGCODE}/share/xml/${F})
 XML_INCLUDES+=	${DOC_PREFIX}/${LANGCODE}/share/xml/${F}

From owner-svn-doc-all@FreeBSD.ORG  Fri Feb  7 07:21:58 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 949D3859;
 Fri,  7 Feb 2014 07:21:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7CD9919F6;
 Fri,  7 Feb 2014 07:21:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s177LwuZ080682;
 Fri, 7 Feb 2014 07:21:58 GMT (envelope-from jkois@svn.freebsd.org)
Received: (from jkois@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s177Lwtu080681;
 Fri, 7 Feb 2014 07:21:58 GMT (envelope-from jkois@svn.freebsd.org)
Message-Id: <201402070721.s177Lwtu080681@svn.freebsd.org>
From: Johann Kois <jkois@FreeBSD.org>
Date: Fri, 7 Feb 2014 07:21:58 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43816 - head/de_DE.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.17
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, 07 Feb 2014 07:21:58 -0000

Author: jkois
Date: Fri Feb  7 07:21:58 2014
New Revision: 43816
URL: http://svnweb.freebsd.org/changeset/doc/43816

Log:
  r43643 -> r43658
  
  MFde:   Resync the project news.
  
  Obtained from:  The FreeBSD German Documentation Project

Modified:
  head/de_DE.ISO8859-1/share/xml/news.xml

Modified: head/de_DE.ISO8859-1/share/xml/news.xml
==============================================================================
--- head/de_DE.ISO8859-1/share/xml/news.xml	Fri Feb  7 05:23:55 2014	(r43815)
+++ head/de_DE.ISO8859-1/share/xml/news.xml	Fri Feb  7 07:21:58 2014	(r43816)
@@ -4,7 +4,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r43643
+     basiert auf: r43658
 -->
 
 <!-- Simple schema for FreeBSD Project news.
@@ -54,6 +54,15 @@
       </day>
 
       <day>
+	<name>23</name>
+
+	<event>
+	  <p>Neuer Committer: <a
+	    href="mailto:rodrigo@FreeBSD.org">Rodrigo Osorio</a> (ports)</p>
+	</event>
+      </day>
+
+      <day>
         <name>21</name>
 
 	<event>

From owner-svn-doc-all@FreeBSD.ORG  Fri Feb  7 07:59:01 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 32B96857;
 Fri,  7 Feb 2014 07:59:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1D98D1C80;
 Fri,  7 Feb 2014 07:59:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s177x0gH093449;
 Fri, 7 Feb 2014 07:59:00 GMT (envelope-from taras@svn.freebsd.org)
Received: (from taras@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s177x0KA093448;
 Fri, 7 Feb 2014 07:59:00 GMT (envelope-from taras@svn.freebsd.org)
Message-Id: <201402070759.s177x0KA093448@svn.freebsd.org>
From: Taras Korenko <taras@FreeBSD.org>
Date: Fri, 7 Feb 2014 07:59:00 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43817 - head/en_US.ISO8859-1/books/handbook/kernelconfig
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.17
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, 07 Feb 2014 07:59:01 -0000

Author: taras
Date: Fri Feb  7 07:59:00 2014
New Revision: 43817
URL: http://svnweb.freebsd.org/changeset/doc/43817

Log:
  Add <userinput> tags.
  
  Noted by:  wblock

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

Modified: head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Fri Feb  7 07:21:58 2014	(r43816)
+++ head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Fri Feb  7 07:59:00 2014	(r43817)
@@ -204,7 +204,7 @@ psm0: model Generic PS/2 mouse, device I
       &man.pciconf.8;, which provides more verbose output.  For
       example:</para>
 
-    <screen>&prompt.user; pciconf -lv
+    <screen>&prompt.user; <userinput>pciconf -lv</userinput>
 ath0@pci0:3:0:0:        class=0x020000 card=0x058a1014 chip=0x1014168c rev=0x01 hdr=0x00
     vendor     = 'Atheros Communications Inc.'
     device     = 'AR5212 Atheros AR5212 802.11abg wireless'
@@ -220,7 +220,7 @@ ath0@pci0:3:0:0:        class=0x020000 c
       display a list of manual pages which contain the specified
       word:</para>
 
-    <screen>&prompt.root; man -k <replaceable>Atheros</replaceable></screen>
+    <screen>&prompt.root; <userinput>man -k <replaceable>Atheros</replaceable></userinput></screen>
 
     <programlisting>ath(4)                   - Atheros IEEE 802.11 wireless network driver
 ath_hal(4)               - Atheros Hardware Access Layer (HAL)</programlisting>

From owner-svn-doc-all@FreeBSD.ORG  Fri Feb  7 08:51:50 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3FE3853F;
 Fri,  7 Feb 2014 08:51:50 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1D0381295;
 Fri,  7 Feb 2014 08:51:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s178pnSM017146;
 Fri, 7 Feb 2014 08:51:49 GMT (envelope-from jkois@svn.freebsd.org)
Received: (from jkois@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s178pn3p017143;
 Fri, 7 Feb 2014 08:51:49 GMT (envelope-from jkois@svn.freebsd.org)
Message-Id: <201402070851.s178pn3p017143@svn.freebsd.org>
From: Johann Kois <jkois@FreeBSD.org>
Date: Fri, 7 Feb 2014 08:51:49 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43818 - in head/de_DE.ISO8859-1/htdocs: . releases
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.17
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, 07 Feb 2014 08:51:50 -0000

Author: jkois
Date: Fri Feb  7 08:51:49 2014
New Revision: 43818
URL: http://svnweb.freebsd.org/changeset/doc/43818

Log:
  MFde:   Resync the release information pages to match reality.
  
  Obtained from:  The FreeBSD German Documentation Project

Modified:
  head/de_DE.ISO8859-1/htdocs/index.xsl
  head/de_DE.ISO8859-1/htdocs/releases/index.xml
  head/de_DE.ISO8859-1/htdocs/where.xml

Modified: head/de_DE.ISO8859-1/htdocs/index.xsl
==============================================================================
--- head/de_DE.ISO8859-1/htdocs/index.xsl	Fri Feb  7 07:59:00 2014	(r43817)
+++ head/de_DE.ISO8859-1/htdocs/index.xsl	Fri Feb  7 08:51:49 2014	(r43818)
@@ -6,7 +6,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: 41116
+     basiert auf: 43575
 -->
 
 <xsl:stylesheet version="1.0"
@@ -39,27 +39,23 @@
 		<div id="frontfeatureleft">
 			<div id="frontfeaturecontent">
 				<h1>
-				  Auf BSD UNIX&reg; basierend
+				  The &os; Project
 				</h1>
 				<p>FreeBSD&reg; ist ein modernes Betriebssystem für
 				  Server, Desktops und eingebettete Systeme, das auf
 				  zahlreichen <a
 				  href="&base;/platforms/index.html">Plattformen</a>
-				  läuft.  Der Quellcode von FreeBSD wird seit
-				  mehr als 30 Jahren kontinuierlich weiterentwickelt,
-				  verbessert und optimiert.  Das System wird
-				  von einer <a
+				  läuft.  Der Quellcode von FreeBSD wird von einer <a
 				  href="&enbase;/doc/en_US.ISO8859-1/articles/contributors/staff-committers.html">
-				  großen Entwicklergruppe</a> gepflegt und erweitert.
-				  FreeBSD bietet Ihnen leistungsfähige
-				  und beeindruckende Netzwerk- und
-				  Sicherheitsfunktionen und eine exzellente
-				  Performance und wird deswegen beispielsweise von
-				  einigen der größten <a
+				  großen Entwicklergruppe</a> seit mehr als 30 Jahren
+				  kontinuierlich weiterentwickelt, verbessert und
+				  optimiert.  Seine leistungsfähigen und
+				  und beeindruckende Netzwerk-, Sicherheits- und
+				  Speicherfunktionen machen &os; zum Betriebssystem
+				  der Wahl für einige der größten <a
 				  href="&enbase;/doc/&url.doc.langcode;/books/handbook/nutshell.html#introduction-nutshell-users">
-				  Internet-Seiten</a> und von zahlreichen Anbietern
-				  eingebetteter Netzwerk- und Speichergeräte
-				  eingesetzt.</p>
+				  Internet-Seiten</a> und für zahlreiche Anbieter
+				  eingebetteter Netzwerk- und Speichergeräte.</p>
 
 				  <div id="txtfrontfeaturelink"> »<a
 				    href="&base;/about.html" title="Learn More">Mehr Informationen</a>
@@ -71,7 +67,7 @@
 			<div class="frontgetroundbox">
 			  <div class="frontgettop"><div>&nbsp;</div>&nbsp;</div>
 				<div class="frontgetcontent">
-				  <a href="&base;/where.html">FreeBSD beziehen</a>
+				  <a href="&base;/where.html">Download FreeBSD</a>
 				</div> <!-- frontgetcontent -->
 			  <div class="frontgetbot"><div>&nbsp;</div>&nbsp;</div>
 			</div> <!-- frontgetroundbox -->
@@ -84,7 +80,8 @@
 					  Produktion:&nbsp;<a href="&u.rel.announce;">&rel.current;</a>
 					</li>
 					<li>
-					  Produktion (alt):&nbsp;<a href="&u.rel2.announce;">&rel2.current;</a>
+					  Produktion (alt):&nbsp;<a href="&u.rel2.announce;">&rel2.current;</a>,
+					  <a href="&u.rel3.announce;">&rel3.current;</a>
 					</li>
 			    <xsl:if test="'&beta.testing;' != 'IGNORE'">
 					  <li>

Modified: head/de_DE.ISO8859-1/htdocs/releases/index.xml
==============================================================================
--- head/de_DE.ISO8859-1/htdocs/releases/index.xml	Fri Feb  7 07:59:00 2014	(r43817)
+++ head/de_DE.ISO8859-1/htdocs/releases/index.xml	Fri Feb  7 08:51:49 2014	(r43818)
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY dedate "$FreeBSDde$">
-<!ENTITY reference "basiert auf: r42928">
+<!ENTITY reference "basiert auf: r43583">
 <!ENTITY title "Release Information">
 ]>
 
@@ -50,7 +50,7 @@
 
     <h3>Produktion</h3>
 
-    <p><b>Release &rel.current;</b> (September 2013) <!--(&rel.current.date;) -->
+    <p><b>Release &rel.current;</b> (Januar 2014) <!--(&rel.current.date;) -->
       <em>
         <a href="&u.rel.announce;">Announcement</a> :
         <a href="&u.rel.notes;">Release Notes</a> :
@@ -62,7 +62,7 @@
 
     <h3>Produktion (alt)</h3>
 
-    <p><b>Release &rel2.current;</b> (Juni 2013) <!-- (&rel2.current.date;) -->
+    <p><b>Release &rel2.current;</b> (September 2013) <!-- (&rel2.current.date;) -->
       <em>
 	<a href="&u.rel2.announce;">Announcement</a> :
 	<a href="&u.rel2.notes;">Release Notes</a> :
@@ -72,6 +72,16 @@
 	<a href="&u.rel2.errata;">Errata</a>
       </em></p>
 
+    <p><b>Release &rel3.current;</b> (Juni 2013) <!-- (&rel3.current.date;) -->
+      <em>
+	<a href="&u.rel3.announce;">Announcement</a> :
+	<a href="&u.rel3.notes;">Release Notes</a> :
+	<a href="&u.rel3.installation;">Installation Instructions</a> :
+	<a href="&u.rel3.hardware;">Hardware Notes</a> :
+	<a href="&u.rel3.readme;">Readme</a> :
+	<a href="&u.rel3.errata;">Errata</a>
+      </em></p>
+
     <a name="future"></a>
 
     <h2>Zukünftige Versionen</h2>

Modified: head/de_DE.ISO8859-1/htdocs/where.xml
==============================================================================
--- head/de_DE.ISO8859-1/htdocs/where.xml	Fri Feb  7 07:59:00 2014	(r43817)
+++ head/de_DE.ISO8859-1/htdocs/where.xml	Fri Feb  7 08:51:49 2014	(r43818)
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY dedate "$FreeBSDde$">
-<!ENTITY reference "basiert auf: r42767">
+<!ENTITY reference "basiert auf: r43575">
 <!ENTITY title "FreeBSD Bezugsquellen">
 <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
 ]>
@@ -26,24 +26,16 @@
 
     <a name="install"></a>
 
-    <h2><a href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/install.html">FreeBSD installieren</a></h2>
+    <h2><a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/install.html">FreeBSD installieren</a></h2>
 
     <p>FreeBSD kann von mehreren Medien installiert werden,
-      beispielsweise von CD-ROM, DVD, Disketten, einer MS-DOS&reg;-Partition,
-      Bandlaufwerken, Anonymous-FTP und NFS.  Bevor Sie FreeBSD
+      beispielsweise von CD-ROM, DVD, USB-Stick oder sogar direkt über das
+      Netzwerk mittels anonymen FTP, HTTP oder NFS.  Bevor Sie FreeBSD
       herunterladen, lesen Sie bitte die <a
-      href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/install.html">Installationsanleitung</a>.</p>
+      href="&enbase;/doc/en_US.ISO8859-1/books/handbook/install.html">Installationsanleitung</a>.</p>
 
     <a name="distribution"></a>
 
-    <h2>FreeBSD kaufen</h2>
-
-    <p>FreeBSD-CD-ROMs oder DVDs können bei <a
-      href="http://www.freebsdmall.com/">FreeBSD Mall</a> oder
-      einem der anderen <a
-      href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/mirrors.html">CD-ROM
-      und DVD-Verleger</a> erworben werden.</p>
-
     <a name="download"></a>
 
     <h2>FreeBSD herunterladen</h2>
@@ -110,48 +102,84 @@
           <td><a href="&url.rel;/sparc64/sparc64/&rel.current;-RELEASE">[Distribution]</a></td>
           <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
         </tr>
-        <tr>
-          <td colspan="2">FreeBSD &rel2.current;-RELEASE</td>
-          <td colspan="2"></td>
-          <td rowspan="5"><a href="&enbase;/releases/&rel2.current;R/relnotes.html">[Lesen]</a></td>
-          <td rowspan="5"><a href="&enbase;/releases/&rel2.current;R/hardware.html">[Lesen]</a></td>
-          <td rowspan="5"><a href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/install.html">[Lesen]</a></td>
-          <td rowspan="5"><a href="&enbase;/releases/&rel2.current;R/errata.html">[Lesen]</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>amd64<br/>(x86-64, x64)</td>
-          <td><a href="&url.rel;/amd64/&rel2.current;-RELEASE">[Distribution]</a></td>
-          <td><a href="&url.rel;/amd64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>i386</td>
-          <td><a href="&url.rel;/i386/&rel2.current;-RELEASE">[Distribution]</a></td>
-          <td><a href="&url.rel;/i386/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
-        </tr>
-
-        <tr>
-          <td></td>
-          <td>pc98</td>
-          <td><a href="&url.rel;/pc98/&rel2.current;-RELEASE">[Distribution]</a></td>
-          <td><a href="&url.rel;/pc98/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
-        </tr>
+	<tr>
+	  <td colspan="2">FreeBSD &rel2.current;-RELEASE</td>
+	  <td colspan="2"></td>
+	  <td rowspan="7"><a href="&enbase;/releases/&rel2.current;R/relnotes.html">[Lesen]</a></td>
+	  <td rowspan="7"><a href="&enbase;/releases/&rel2.current;R/hardware.html">[Lesen]</a></td>
+	  <td rowspan="7"><a href="&enbase;/releases/&rel2.current;R/installation.html">[Lesen]</a></td>
+	  <td rowspan="7"><a href="&enbase;/releases/&rel2.current;R/errata.html">[Lesen]</a></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <td>amd64<br/>(x86-64, x64)</td>
+	  <td><a href="&url.rel;/amd64/amd64/&rel2.current;-RELEASE">[Distribution]</a></td>
+	  <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <td>i386</td>
+	  <td><a href="&url.rel;/i386/i386/&rel2.current;-RELEASE">[Distribution]</a></td>
+	  <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <td>ia64</td>
+	  <td><a href="&url.rel;/ia64/ia64/&rel2.current;-RELEASE">[Distribution]</a></td>
+	  <td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <td>powerpc</td>
+	  <td><a href="&url.rel;/powerpc/powerpc/&rel2.current;-RELEASE">[Distribution]</a></td>
+	  <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <td>powerpc64</td>
+	  <td><a href="&url.rel;/powerpc/powerpc64/&rel2.current;-RELEASE">[Distribution]</a></td>
+	  <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <td>sparc64</td>
+	  <td><a href="&url.rel;/sparc64/sparc64/&rel2.current;-RELEASE">[Distribution]</a></td>
+	  <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
+	</tr>
+	<tr>
+	  <td colspan="2">FreeBSD &rel3.current;-RELEASE</td>
+	  <td colspan="2"></td>
+	  <td rowspan="5"><a href="&enbase;/releases/&rel3.current;R/relnotes.html">[Lesen]</a></td>
+	  <td rowspan="5"><a href="&enbase;/releases/&rel3.current;R/hardware.html">[Lesen]</a></td>
+	  <td rowspan="5"><a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/install.html">[Lesen]</a></td>
+	  <td rowspan="5"><a href="&enbase;/releases/&rel3.current;R/errata.html">[Lesen]</a></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <td>amd64<br/>(x86-64, x64)</td>
+	  <td><a href="&url.rel;/amd64/&rel3.current;-RELEASE">[Distribution]</a></td>
+	  <td><a href="&url.rel;/amd64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <td>i386</td>
+	  <td><a href="&url.rel;/i386/&rel3.current;-RELEASE">[Distribution]</a></td>
+	  <td><a href="&url.rel;/i386/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
+	</tr>
+	<tr>
+	  <td></td>
+	  <td>pc98</td>
+	  <td><a href="&url.rel;/pc98/&rel3.current;-RELEASE">[Distribution]</a></td>
+	  <td><a href="&url.rel;/pc98/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
+	</tr>
 	<!--
-        <tr>
-          <td></td>
-          <td>sparc64</td>
-          <td><a href="&url.rel;/sparc64/&rel2.current;-RELEASE">[Distribution]</a></td>
-          <td><a href="&url.rel;/sparc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
-        </tr>
-
 	<tr>
 	  <td colspan="2">FreeBSD &rel3.current;-RELEASE</td>
 	  <td colspan="2"></td>
-	  <td rowspan="7"><a href="&enbase;/releases/&rel3.current;R/relnotes.html">[Lesen]</a></td>
-	  <td rowspan="7"><a href="&enbase;/releases/&rel3.current;R/hardware.html">[Lesen]</a></td>
-	  <td rowspan="7"><a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/install.html">[Lesen]</a></td>
-	  <td rowspan="7"><a href="&enbase;/releases/&rel3.current;R/errata.html">[Lesen]</a></td>
+	  <td rowspan="7"><a href="&base;/releases/&rel3.current;R/relnotes.html">[Lesen]</a></td>
+	  <td rowspan="7"><a href="&base;/releases/&rel3.current;R/hardware.html">[Lesen]</a></td>
+	  <td rowspan="7"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install.html">[Lesen]</a></td>
+	  <td rowspan="7"><a href="&base;/releases/&rel3.current;R/errata.html">[Lesen]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
@@ -174,7 +202,7 @@
 	<tr>
 	  <td></td>
 	  <td>sparc64</td>
-	  <td><<a href="&url.rel;/sparc64/&rel3.current;-RELEASE">[Distribution]</a></td>
+	  <td><a href="&url.rel;/sparc64/&rel3.current;-RELEASE">[Distribution]</a></td>
 	  <td colspan="2" align="right"><a href="&url.rel;/sparc64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
 	</tr>
 	-->
@@ -198,6 +226,14 @@
       enthält Informationen über
       frühere, aktuelle und künftige Releases.</p>
 
+    <h2>FreeBSD-Installationsmedien kaufen</h2>
+
+    <p>FreeBSD-CD-ROMs oder DVDs können bei der <a
+      href="http://www.freebsdmall.com/">FreeBSD Mall</a> oder
+      einem der anderen <a
+      href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/mirrors.html">CD-ROM
+      und DVD-Verleger</a> erworben werden.</p>
+
     <a name="past"></a>
       <h2>Alte (nicht mehr unterstützte) Versionen</h2>
 

From owner-svn-doc-all@FreeBSD.ORG  Fri Feb  7 09:44:56 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AE23F886;
 Fri,  7 Feb 2014 09:44:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 965D3170B;
 Fri,  7 Feb 2014 09:44:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s179iuWN037701;
 Fri, 7 Feb 2014 09:44:56 GMT (envelope-from jkois@svn.freebsd.org)
Received: (from jkois@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s179iu3h037700;
 Fri, 7 Feb 2014 09:44:56 GMT (envelope-from jkois@svn.freebsd.org)
Message-Id: <201402070944.s179iu3h037700@svn.freebsd.org>
From: Johann Kois <jkois@FreeBSD.org>
Date: Fri, 7 Feb 2014 09:44:56 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43819 - 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.17
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, 07 Feb 2014 09:44:56 -0000

Author: jkois
Date: Fri Feb  7 09:44:56 2014
New Revision: 43819
URL: http://svnweb.freebsd.org/changeset/doc/43819

Log:
  Point the user to the correct version of the installation guide (8.X or 9.X-and-later).

Modified:
  head/en_US.ISO8859-1/htdocs/where.xml

Modified: head/en_US.ISO8859-1/htdocs/where.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/where.xml	Fri Feb  7 08:51:49 2014	(r43818)
+++ head/en_US.ISO8859-1/htdocs/where.xml	Fri Feb  7 09:44:56 2014	(r43819)
@@ -25,14 +25,16 @@
 
     <a name="install"></a>
 
-    <h2><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install.html">Installing
-	FreeBSD</a></h2>
+    <h2>Install FreeBSD</h2> 
 
     <p>There are many options for installing FreeBSD, including
       installation from CD-ROM, DVD, USB stick or even directly using
-      anonymous FTP, HTTP, or NFS.  Please read through the
-      <a href="&base;/doc/en_US.ISO8859-1/books/handbook/install.html">installation
-	guide</a> before downloading the entire FreeBSD distribution.</p>
+      anonymous FTP, HTTP, or NFS.  Depending on the &os; version you want
+      to install, please read through the <a
+      href="&base;/doc/en_US.ISO8859-1/books/handbook/bsdinstall.html">&os;&nbsp;9.X/10.X
+      installation guide</a> or the <a
+      href="&base;/doc/en_US.ISO8859-1/books/handbook/install.html">&os;&nbsp;8.X
+      installation guide</a> before downloading the entire FreeBSD distribution.</p>
 
     <a name="distribution"></a>
 

From owner-svn-doc-all@FreeBSD.ORG  Fri Feb  7 12:04:47 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5D65AB96;
 Fri,  7 Feb 2014 12:04:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 47BEC1348;
 Fri,  7 Feb 2014 12:04:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s17C4l2D095259;
 Fri, 7 Feb 2014 12:04:47 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s17C4lgL095258;
 Fri, 7 Feb 2014 12:04:47 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201402071204.s17C4lgL095258@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 7 Feb 2014 12:04:47 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43820 - 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.17
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, 07 Feb 2014 12:04:47 -0000

Author: ryusuke
Date: Fri Feb  7 12:04:46 2014
New Revision: 43820
URL: http://svnweb.freebsd.org/changeset/doc/43820

Log:
  - Merge the following from the English version:
  
  	r43575 -> r43819	head/ja_JP.eucJP/htdocs/where.xml

Modified:
  head/ja_JP.eucJP/htdocs/where.xml

Modified: head/ja_JP.eucJP/htdocs/where.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/where.xml	Fri Feb  7 09:44:56 2014	(r43819)
+++ head/ja_JP.eucJP/htdocs/where.xml	Fri Feb  7 12:04:46 2014	(r43820)
@@ -5,7 +5,7 @@
 <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r43575 -->
+<!-- Original revision: r43819 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -26,14 +26,20 @@
 
     <a name="install"></a>
 
-    <h2><a href="&enbase;/doc/ja_JP.eucJP/books/handbook/install.html">FreeBSD ¤Î¥¤¥ó¥¹¥È¡¼¥ë</a></h2>
+    <h2>FreeBSD ¤Î¥¤¥ó¥¹¥È¡¼¥ë</h2>
 
     <p>FreeBSD ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ï¡¢CD-ROM, DVD¡¢USB ¥¹¥Æ¥£¥Ã¥¯¡¢
       ¤½¤·¤Æ¡¢anonymous FTP, HTTP, NFS
       ·Ğͳ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤È¿ô¿¤¯¤Î¥ª¥×¥·¥ç¥ó¤¬¤¢¤ê¤Ş¤¹¡£
+
+<a href="&enbase;/doc/ja_JP.eucJP/books/handbook/install.html"></a>
+
       FreeBSD ¤ÎÁ´ÇÛÉÛʪ¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ëÁ°¤Ë¡¢<a
-       href="&enbase;/doc/ja_JP.eucJP/books/handbook/install.html">¥¤¥ó¥¹¥È¡¼¥ë¥¬¥¤¥É</a>
-      ¤òÄÌÆɤ·¤Æ¤¯¤À¤µ¤¤¡£</p>
+      href="&enbase;/doc/ja_JP.eucJP/books/handbook/bsdinstall.html">&os;&nbsp;9.X/10.X
+      ¥¤¥ó¥¹¥È¡¼¥ë¥¬¥¤¥É</a> ¤Ş¤¿¤Ï <a
+      href="&enbase;/doc/ja_JP.eucJP/books/handbook/install.html">&os;&nbsp;8.X
+      ¥¤¥ó¥¹¥È¡¼¥ë¥¬¥¤¥É</a> ¤ò¡¢
+      ¥¤¥ó¥¹¥È¡¼¥ë¥Ğ¡¼¥¸¥ç¥ó¤Ë¹ç¤ï¤»¤ÆÄÌÆɤ·¤Æ¤¯¤À¤µ¤¤¡£</p>
 
     <a name="distribution"></a>
 

From owner-svn-doc-all@FreeBSD.ORG  Fri Feb  7 12:41:09 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B8E214F7;
 Fri,  7 Feb 2014 12:41:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A160B174F;
 Fri,  7 Feb 2014 12:41:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s17Cf9BY008505;
 Fri, 7 Feb 2014 12:41:09 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s17Cf9Il008504;
 Fri, 7 Feb 2014 12:41:09 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201402071241.s17Cf9Il008504@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 7 Feb 2014 12:41:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43821 - head/ja_JP.eucJP/books/handbook/kernelconfig
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.17
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, 07 Feb 2014 12:41:09 -0000

Author: ryusuke
Date: Fri Feb  7 12:41:09 2014
New Revision: 43821
URL: http://svnweb.freebsd.org/changeset/doc/43821

Log:
  - Merge the following from the English version:
  
  	r42925 -> r43800	head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml	Fri Feb  7 12:04:46 2014	(r43820)
+++ head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml	Fri Feb  7 12:41:09 2014	(r43821)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r42925
+     Original revision: r43800
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="kernelconfig">
@@ -151,10 +151,10 @@
       ¤¿¤È¤¨¤Ğ¡¢&man.ath.4;
       ¥ï¥¤¥ä¥ì¥¹¥¤¡¼¥µ¥Í¥Ã¥È¥É¥é¥¤¥Ğ¤Î¥Ş¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤Êµ­½Ò¤¬¤¢¤ê¤Ş¤¹¡£</para>
 
-    <programlisting>Alternatively, to load the driver as a module at boot time, place the
+    <screen>Alternatively, to load the driver as a module at boot time, place the
 following line in &man.loader.conf.5;:
 
-    if_ath_load="YES"</programlisting>
+    if_ath_load="YES"</screen>
 
     <para><filename>/boot/loader.conf</filename> ¤Ë
       <literal>if_ath_load="YES"</literal> ¤òÄɲ乤ë¤È¡¢
@@ -203,10 +203,10 @@ following line in &man.loader.conf.5;:
       ¤¿¤È¤¨¤Ğ¡¢°Ê²¼¤Î¹Ô¤Ï¡¢&man.psm.4;
       ¥É¥é¥¤¥Ğ¤¬¥Ş¥¦¥¹¤ò¸¡½Ğ¤·¤¿¤³¤È¤ò¼¨¤·¤Æ¤¤¤Ş¤¹¡£</para>
 
-    <programlisting>psm0: &lt;PS/2 Mouse&gt; irq 12 on atkbdc0
+    <screen>psm0: &lt;PS/2 Mouse&gt; irq 12 on atkbdc0
 psm0: [GIANT-LOCKED]
 psm0: [ITHREAD]
-psm0: model Generic PS/2 mouse, device ID 0</programlisting>
+psm0: model Generic PS/2 mouse, device ID 0</screen>
 
     <para>¤³¤Î¥Ï¡¼¥É¥¦¥§¥¢¤Ï¥·¥¹¥Æ¥à¤Ë¸ºß¤¹¤ë¤Î¤Ç¡¢
       ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤«¤é¤³¤Î¥É¥é¥¤¥Ğ¤ò³°¤µ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</para>
@@ -219,12 +219,12 @@ psm0: model Generic PS/2 mouse, device I
       ¤è¤ê¾éĹ¤Ê½ĞÎϤò¹Ô¤¦ &man.pciconf.8; ¤Ç¤¹¡£
       ¤¿¤È¤¨¤Ğ¡¢°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Ş¤¹¡£</para>
 
-    <programlisting><command>pciconf -lv</command>
-    ath0@pci0:3:0:0:        class=0x020000 card=0x058a1014 chip=0x1014168c rev=0x01 hdr=0x00
+    <screen>&prompt.user; pciconf -lv
+ath0@pci0:3:0:0:        class=0x020000 card=0x058a1014 chip=0x1014168c rev=0x01 hdr=0x00
     vendor     = 'Atheros Communications Inc.'
     device     = 'AR5212 Atheros AR5212 802.11abg wireless'
     class      = network
-    subclass   = ethernet</programlisting>
+    subclass   = ethernet</screen>
 
     <para>¤³¤Î½ĞÎϤϡ¢<filename>ath</filename>
       ¥É¥é¥¤¥Ğ¤¬¥ï¥¤¥ä¥ì¥¹¥¤¡¼¥µ¥Í¥Ã¥È¥Ç¥Ğ¥¤¥¹¤Ë¤¢¤ë¤³¤È¤ò¼¨¤·¤Æ¤¤¤Ş¤¹¡£</para>
@@ -240,9 +240,9 @@ psm0: model Generic PS/2 mouse, device I
 ath_hal(4)               - Atheros Hardware Access Layer (HAL)</programlisting>
 
     <para>¥Ï¡¼¥É¥¦¥§¥¢¤Î°ìÍ÷¤òºîÀ®¤·¤¿¤é¡¢
-      ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Æ¤¤¤ë»ş¤Ë¡¢
       ¤³¤Î°ìÍ÷¤òÍøÍѤ·¤Æ¡¢
-      ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ï¡¼¥É¥¦¥§¥¢¤¬ºï½ü¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Æ¤¤¤ë»ş¤Ë¡¢
+      ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ï¡¼¥É¥¦¥§¥¢¤Î¥É¥é¥¤¥Ğ¤¬ºï½ü¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
   </sect1>
 
   <sect1 xml:id="kernelconfig-config">
@@ -267,13 +267,8 @@ ath_hal(4)               - Atheros Hardw
 	¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤«¤Ã¤¿¤ê¡¢¶õ¤Ç¤¢¤ì¤Ğ¡¢
 	¥«¡¼¥Í¥ë¤Î¥½¡¼¥¹¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤»¤ó¡£
 	<xref linkend="svn"/> ¤ÇÀâÌÀ¤·¤¿
-	<application>svn</application> ¤ò»È¤Ã¤Æ¥½¡¼¥¹¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Ş¤¹¡£
-	¤Ş¤¿¡¢&man.sysinstall.8; ¤ò»È¤Ã¤Æ¡¢
-	<literal>src</literal>
-	¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Ş¤¹¡£
-	¤³¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ï¡¢&man.sysinstall.8; ¤Ç
-	<literal>Configuration</literal> ¤òÁªÂò¤·¡¢
-	<literal>Distributions</literal> ¥á¥Ë¥å¡¼¤«¤éÁªÂò¤Ç¤­¤Ş¤¹¡£</para>
+	<application>Subversion</application>
+	¤ò»È¤Ã¤Æ¥½¡¼¥¹¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Ş¤¹¡£</para>
 
     <para>¥½¡¼¥¹¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢<filename>/usr/src/sys</filename> ¤ò³Îǧ¤·¤Æ²¼¤µ¤¤¡£
       ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï¡¢¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¤¤¯¤Ä¤â¤¢¤ê¤Ş¤¹¡£
@@ -374,7 +369,7 @@ options         IPDIVERT
       <para>ÍøÍѲÄǽ¤Ê¤¹¤Ù¤Æ¤Î¥ª¥×¥·¥ç¥ó¤ò´Ş¤à¥Õ¥¡¥¤¥ë¤ò¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢
 	°Ê²¼¤Î¥³¥Ş¥ó¥É¤ò <systemitem class="username">root</systemitem> ¸¢¸Â¤Ç¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/src/sys/i386/conf &amp;&amp; make LINT</userinput></screen>
+      <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>arch</replaceable>/conf &amp;&amp; make LINT</userinput></screen>
     </note>
 
     <indexterm>
@@ -552,12 +547,13 @@ options          NFS_ROOT          # NFS
 
     <programlisting>options          SCSI_DELAY=5000  # Delay (in ms) before probing SCSI</programlisting>
 
-    <para>¤³¤Î¹Ô¤Ï¡¢¥«¡¼¥Í¥ë¤¬¤½¤ì¤¾¤ì¤Î SCSI µ¡´ï¤ò¸¡½Ğ¤¹¤ëÁ°¤Ë
-      5 ÉôÖÂԤĤ褦¤Ë¤·¤Ş¤¹¡£
-      ¥·¥¹¥Æ¥à¤¬ IDE ¥É¥é¥¤¥Ö¤·¤«»ı¤¿¤Ê¤¤¤Ê¤é̵»ë¤¹¤ë¤«¡¢
-      µ¯Æ°»ş´Ö¤òû¤¯¤¹¤ë¤¿¤á¤Ë¡¢¤³¤Î¿ô»ú¤ò¾®¤µ¤¯Êѹ¹¤Ç¤­¤Ş¤¹¡£
-      ¤â¤·¡¢&os; ¤¬ SCSI
-      µ¡´ï¤òǧ¼±¤·¤Ê¤¯¤Ê¤Ã¤Æ¤·¤Ş¤Ã¤¿¤é¡¢¤â¤¦°ìÅÙ¿ô»ú¤òÁı¤ä¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+    <para>¤³¤Î¹Ô¤Ï¡¢¥«¡¼¥Í¥ë¤¬¤½¤ì¤¾¤ì¤Î <acronym>SCSI</acronym>
+      µ¡´ï¤ò¸¡½Ğ¤¹¤ëÁ°¤Ë 5 ÉôÖÂԤĤ褦¤Ë¤·¤Ş¤¹¡£
+      ¤â¤·¡¢<acronym>SCSI</acronym> µ¡´ï¤¬Ç§¼±¤µ¤ì¤Ê¤±¤ì¤Ğ¡¢
+      ¤³¤Î¿ô»ú¤òÁı¤ä¤·¤Æ¤¯¤À¤µ¤¤¡£
+      ¥·¥¹¥Æ¥à¤¬ <acronym>SCSI</acronym> ¥É¥é¥¤¥Ö¤ò»ı¤Ã¤Æ¤¤¤Ê¤±¤ì¤Ğ¡¢
+      ̵»ë¤¹¤ë¤«¡¢¤³¤Î¿ô»ú¤ò¾®¤µ¤¯Êѹ¹¤·¤Æµ¯Æ°»ş´Ö¤òû¤¯¤Ç¤­¤Ş¤¹¡£
+</para>
 
     <programlisting>options          KTRACE            # ktrace(1) support</programlisting>
 
@@ -612,7 +608,7 @@ options          NFS_ROOT          # NFS
       <literal>options SMP</literal> ¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
     <note>
-      <para>¤³¤Î¥Ç¥Ğ¥¤¥¹¤Ï i386 ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë¤Î¤ß¸ºß¤·¤Ş¤¹¡£
+      <para>¤³¤Î¥Ç¥Ğ¥¤¥¹¤Ï &i386; ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë¤Î¤ß¸ºß¤·¤Ş¤¹¡£
 	¾¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç¤Ï¡¢¤³¤Î¹Ô¤ò´Ş¤Ş¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</para>
     </note>
 
@@ -779,8 +775,7 @@ device          atkbdc     # AT keyboard
 
     <para>&man.vga.4; ¥Ó¥Ç¥ª¥«¡¼¥É¥É¥é¥¤¥Ğ¤Ç¤¹¡£</para>
 
-    <programlisting>
-device          splash     # Splash screen and screen saver support</programlisting>
+    <programlisting>device          splash     # Splash screen and screen saver support</programlisting>
 
     <para>µ¯Æ°»ş¤Î¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó¤ª¤è¤Ó¥¹¥¯¥ê¡¼¥ó¥»¡¼¥Ğ¤¬É¬ÍפȤ·¤Ş¤¹¡£</para>
 
@@ -962,7 +957,8 @@ device          xe         # Xircom pcca
 
     <para>ISA ¥¤¡¼¥µ¥Í¥Ã¥È¥É¥é¥¤¥Ğ¤Ç¤¹¡£
       ¤É¤Î¥«¡¼¥É¤¬¤É¤Î¥É¥é¥¤¥Ğ¤Ë¤è¤ê¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤ë¤«¤Î¾ÜºÙ¤Ï¡¢
-      <filename>/usr/src/sys/i386/conf/NOTES</filename> ¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£</para>
+      <filename>/usr/src/sys/<replaceable>arch</replaceable>/conf/NOTES</filename>
+      ¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£</para>
 
     <programlisting># Wireless NIC cards
 device          wlan            # 802.11 support</programlisting>
@@ -1100,7 +1096,7 @@ device          fwe           # Ethernet
     <para>Firewire ¥Ç¥Ğ¥¤¥¹¤Î¥µ¥İ¡¼¥È¤Ç¤¹¡£</para>
 
     <para>¤è¤ê¾ÜºÙ¤Ê¾ğÊó¤È¡¢&os; ¤Ë¤è¤ê¥µ¥İ¡¼¥È¤µ¤ì¤ë¾¤Î¥Ç¥Ğ¥¤¥¹¤Ë¤Ä¤¤¤Æ¤Ï
-      <filename>/usr/src/sys/i386/conf/NOTES</filename>
+      <filename>/usr/src/sys/<replaceable>arch</replaceable>/conf/NOTES</filename>
       ¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£</para>
 
       <sect2>

From owner-svn-doc-all@FreeBSD.ORG  Fri Feb  7 12:48:41 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DD6F8A58;
 Fri,  7 Feb 2014 12:48:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id BA75317EE;
 Fri,  7 Feb 2014 12:48:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s17CmeF1011555;
 Fri, 7 Feb 2014 12:48:40 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s17CmeM0011554;
 Fri, 7 Feb 2014 12:48:40 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201402071248.s17CmeM0011554@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 7 Feb 2014 12:48:40 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43822 - head/ja_JP.eucJP/books/handbook/kernelconfig
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.17
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, 07 Feb 2014 12:48:41 -0000

Author: ryusuke
Date: Fri Feb  7 12:48:40 2014
New Revision: 43822
URL: http://svnweb.freebsd.org/changeset/doc/43822

Log:
  - Merge the following from the English version:
  
  	r43800 -> r43817	head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml	Fri Feb  7 12:41:09 2014	(r43821)
+++ head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml	Fri Feb  7 12:48:40 2014	(r43822)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r43800
+     Original revision: r43817
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="kernelconfig">
@@ -219,7 +219,7 @@ psm0: model Generic PS/2 mouse, device I
       ¤è¤ê¾éĹ¤Ê½ĞÎϤò¹Ô¤¦ &man.pciconf.8; ¤Ç¤¹¡£
       ¤¿¤È¤¨¤Ğ¡¢°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Ş¤¹¡£</para>
 
-    <screen>&prompt.user; pciconf -lv
+    <screen>&prompt.user; <userinput>pciconf -lv</userinput>
 ath0@pci0:3:0:0:        class=0x020000 card=0x058a1014 chip=0x1014168c rev=0x01 hdr=0x00
     vendor     = 'Atheros Communications Inc.'
     device     = 'AR5212 Atheros AR5212 802.11abg wireless'
@@ -234,7 +234,7 @@ ath0@pci0:3:0:0:        class=0x020000 c
       ¤¢¤ëÆÃÄê¤Îñ¸ì¤ò´Ş¤à¥Ş¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Î°ìÍ÷¤òɽ¼¨¤¹¤ë¤Ë¤Ï¡¢
       °Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Ş¤¹¡£</para>
 
-    <screen>&prompt.root; man -k <replaceable>Atheros</replaceable></screen>
+    <screen>&prompt.root; <userinput>man -k <replaceable>Atheros</replaceable></userinput></screen>
 
     <programlisting>ath(4)                   - Atheros IEEE 802.11 wireless network driver
 ath_hal(4)               - Atheros Hardware Access Layer (HAL)</programlisting>
@@ -263,14 +263,15 @@ ath_hal(4)               - Atheros Hardw
       ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤¹¤ë¤Î¤Ç¤¢¤ì¤Ğ¡¢
       &os; ¤ÎÁ´¥½¡¼¥¹¥Ä¥ê¡¼¤¬¤Ş¤º¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Ş¤¹¡£</para>
 
-      <para>¤â¤·¡¢<filename>/usr/src/</filename>
-	¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤«¤Ã¤¿¤ê¡¢¶õ¤Ç¤¢¤ì¤Ğ¡¢
-	¥«¡¼¥Í¥ë¤Î¥½¡¼¥¹¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤»¤ó¡£
-	<xref linkend="svn"/> ¤ÇÀâÌÀ¤·¤¿
-	<application>Subversion</application>
-	¤ò»È¤Ã¤Æ¥½¡¼¥¹¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Ş¤¹¡£</para>
+    <para>¤â¤·¡¢<filename>/usr/src/</filename>
+      ¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤«¤Ã¤¿¤ê¡¢¶õ¤Ç¤¢¤ì¤Ğ¡¢
+      ¥«¡¼¥Í¥ë¤Î¥½¡¼¥¹¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤»¤ó¡£
+      <xref linkend="svn"/> ¤ÇÀâÌÀ¤·¤¿
+      <application>Subversion</application>
+      ¤ò»È¤Ã¤Æ¥½¡¼¥¹¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Ş¤¹¡£</para>
 
-    <para>¥½¡¼¥¹¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢<filename>/usr/src/sys</filename> ¤ò³Îǧ¤·¤Æ²¼¤µ¤¤¡£
+    <para>¥½¡¼¥¹¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢
+      <filename>/usr/src/sys</filename> ¤ò³Îǧ¤·¤Æ²¼¤µ¤¤¡£
       ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï¡¢¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¤¤¯¤Ä¤â¤¢¤ê¤Ş¤¹¡£
       ¤½¤ÎÃæ¤Ë¤Ï¡¢¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤ë³Æ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç¤¢¤ë¡¢<filename>amd64</filename>, <filename>i386</filename>, <filename>ia64</filename>, <filename>pc98</filename>, <filename>powerpc</filename> ¤ª¤è¤Ó  <filename>sparc64</filename> ¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¢¤ê¤Ş¤¹¡£
       ³Æ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î¥Ç¥£¥ì¥¯¥È¥êÆâÉô¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¤Ï¤¹¤Ù¤Æ¤½¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç¤Î¤ß»ÈÍѤµ¤ì¤Ş¤¹¡£

From owner-svn-doc-all@FreeBSD.ORG  Fri Feb  7 19:28:00 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 04DE4622;
 Fri,  7 Feb 2014 19:28:00 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E339B10EB;
 Fri,  7 Feb 2014 19:27:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s17JRxYt073467;
 Fri, 7 Feb 2014 19:27:59 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s17JRxBh073466;
 Fri, 7 Feb 2014 19:27:59 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201402071927.s17JRxBh073466@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 7 Feb 2014 19:27:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43823 - head/en_US.ISO8859-1/htdocs/cgi
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.17
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, 07 Feb 2014 19:28:00 -0000

Author: gjb
Date: Fri Feb  7 19:27:59 2014
New Revision: 43823
URL: http://svnweb.freebsd.org/changeset/doc/43823

Log:
  open2.pl is deprecated, so use IPC::Open2 instead.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/en_US.ISO8859-1/htdocs/cgi/search.cgi

Modified: head/en_US.ISO8859-1/htdocs/cgi/search.cgi
==============================================================================
--- head/en_US.ISO8859-1/htdocs/cgi/search.cgi	Fri Feb  7 12:48:40 2014	(r43822)
+++ head/en_US.ISO8859-1/htdocs/cgi/search.cgi	Fri Feb  7 19:27:59 2014	(r43823)
@@ -26,7 +26,7 @@ $searchpage = '/search/search.html';   
 $myurl = $ENV{'SCRIPT_NAME'};
 $ENV{PATH} = "/bin:/usr/bin:/usr/local/bin";
 
-require "open2.pl";
+use IPC::Open2 'open2';
 require "./cgi-lib.pl";
 require "./cgi-style.pl";
 

From owner-svn-doc-all@FreeBSD.ORG  Fri Feb  7 19:41:05 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 318D890C;
 Fri,  7 Feb 2014 19:41:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1D24C121F;
 Fri,  7 Feb 2014 19:41:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s17Jf457079896;
 Fri, 7 Feb 2014 19:41:04 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s17Jf4io079895;
 Fri, 7 Feb 2014 19:41:04 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201402071941.s17Jf4io079895@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 7 Feb 2014 19:41:04 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43824 - head/en_US.ISO8859-1/htdocs/cgi/GnatsPR
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.17
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, 07 Feb 2014 19:41:05 -0000

Author: gjb
Date: Fri Feb  7 19:41:04 2014
New Revision: 43824
URL: http://svnweb.freebsd.org/changeset/doc/43824

Log:
  Include SectionIterator.pm.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/en_US.ISO8859-1/htdocs/cgi/GnatsPR/Makefile

Modified: head/en_US.ISO8859-1/htdocs/cgi/GnatsPR/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/cgi/GnatsPR/Makefile	Fri Feb  7 19:27:59 2014	(r43823)
+++ head/en_US.ISO8859-1/htdocs/cgi/GnatsPR/Makefile	Fri Feb  7 19:41:04 2014	(r43824)
@@ -9,6 +9,6 @@
 
 SUBDIR=	Section
 
-DATA=	MIMEIterator.pm Section.pm
+DATA=	MIMEIterator.pm Section.pm SectionIterator.pm
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"

From owner-svn-doc-all@FreeBSD.ORG  Fri Feb  7 23:02:17 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3B9769DB;
 Fri,  7 Feb 2014 23:02:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 256661328;
 Fri,  7 Feb 2014 23:02:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s17N2H6Q058943;
 Fri, 7 Feb 2014 23:02:17 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s17N2Gnn058942;
 Fri, 7 Feb 2014 23:02:16 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201402072302.s17N2Gnn058942@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Fri, 7 Feb 2014 23:02:16 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43825 - head/en_US.ISO8859-1/books/handbook/desktop
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.17
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, 07 Feb 2014 23:02:17 -0000

Author: jgh
Date: Fri Feb  7 23:02:16 2014
New Revision: 43825
URL: http://svnweb.freebsd.org/changeset/doc/43825

Log:
  - correct error in handbook in respect to browser configuration
  
  Submitted by:	frank@tervoorde.net (doc@ mailing list)
  Approved by:	wblock (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml	Fri Feb  7 19:41:04 2014	(r43824)
+++ head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml	Fri Feb  7 23:02:16 2014	(r43825)
@@ -578,8 +578,8 @@
 	<title>Chromium and &adobe;&nbsp;&flash; Plugin</title>
 
 	<para>Configuring <application>Chromium</application> and
-	  &adobe;&nbsp;&flash; is similar to the the instructions in
-	  <xref linkend="moz-java-plugin"/>.  No additional
+	  &adobe;&nbsp;&flash; is similar to the instructions in
+	  <xref linkend="moz-flash-plugin"/>.  No additional
 	  configuration should be necessary, since
 	  <application>Chromium</application> is able to use some
 	  plugins from other browsers.</para>

From owner-svn-doc-all@FreeBSD.ORG  Fri Feb  7 23:45:41 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 93E161F7;
 Fri,  7 Feb 2014 23:45:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7DC18166C;
 Fri,  7 Feb 2014 23:45:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s17Njf7Y074612;
 Fri, 7 Feb 2014 23:45:41 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s17Njf26074611;
 Fri, 7 Feb 2014 23:45:41 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201402072345.s17Njf26074611@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 7 Feb 2014 23:45:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43826 - head/ja_JP.eucJP/books/handbook/desktop
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.17
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, 07 Feb 2014 23:45:41 -0000

Author: ryusuke
Date: Fri Feb  7 23:45:41 2014
New Revision: 43826
URL: http://svnweb.freebsd.org/changeset/doc/43826

Log:
  - Merge the following from the English version:
  
  	r43756 -> r43825	head/ja_JP.eucJP/books/handbook/desktop/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/desktop/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/desktop/chapter.xml	Fri Feb  7 23:02:16 2014	(r43825)
+++ head/ja_JP.eucJP/books/handbook/desktop/chapter.xml	Fri Feb  7 23:45:41 2014	(r43826)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r43756
+     Original revision: r43825
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="desktop">

From owner-svn-doc-all@FreeBSD.ORG  Sat Feb  8 01:05:29 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5F890C84;
 Sat,  8 Feb 2014 01:05:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 48AFB1BCF;
 Sat,  8 Feb 2014 01:05:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1815Twc006390;
 Sat, 8 Feb 2014 01:05:29 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1815Ttt006388;
 Sat, 8 Feb 2014 01:05:29 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201402080105.s1815Ttt006388@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Sat, 8 Feb 2014 01:05:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43827 - 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.17
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, 08 Feb 2014 01:05:29 -0000

Author: jgh
Date: Sat Feb  8 01:05:28 2014
New Revision: 43827
URL: http://svnweb.freebsd.org/changeset/doc/43827

Log:
  - include example on how to strip multiple files
  
  PR:		186466
  Submitted by:	nemysis@
  Approved by:	wblock (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	Fri Feb  7 23:45:41 2014	(r43826)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Sat Feb  8 01:05:28 2014	(r43827)
@@ -5122,11 +5122,19 @@ PORTVERSION=	1.0</programlisting>
 	<programlisting>post-install:
 	  ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xdl</programlisting>
 
-	<para>Use the &man.file.1; command on the installed executable
-	  to check whether the binary is stripped or not.  If it does
-	  not say <literal>not stripped</literal>, it is stripped.
-	  Additionally, &man.strip.1; will not strip a previously
-	  stripped program; it will instead exit cleanly.</para>
+	<para>When multiple files need to be stripped:</para>
+
+	<programlisting>post-install:
+	  .for l in geometry media body track world
+	  ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}-${l}.so.0
+	  .endfor</programlisting>
+
+	<para>Use &man.file.1; on a file to determine if it has been
+	  stripped.  Binaries are reported by &man.file.1; as
+	  <literal>stripped</literal>, or
+	  <literal>not stripped</literal>.  Additionally, &man.strip.1;
+	  will detect programs that have already been stripped and
+	  exit cleanly.</para>
       </sect2>
 
       <sect2 xml:id="install-copytree">

From owner-svn-doc-all@FreeBSD.ORG  Sat Feb  8 01:24:30 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8CBB33DB;
 Sat,  8 Feb 2014 01:24:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 73B221D12;
 Sat,  8 Feb 2014 01:24:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s181OUX5014117;
 Sat, 8 Feb 2014 01:24:30 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s181OUi8014116;
 Sat, 8 Feb 2014 01:24:30 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201402080124.s181OUi8014116@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 8 Feb 2014 01:24:30 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43828 - 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.17
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, 08 Feb 2014 01:24:30 -0000

Author: gjb
Date: Sat Feb  8 01:24:29 2014
New Revision: 43828
URL: http://svnweb.freebsd.org/changeset/doc/43828

Log:
  Direct the 'wantlist' link to the wiki, in preparation of
  deorbiting wantlist.html from the doc/ tree.
  
  Sponsored by:	The FreeBSD Foundation

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	Sat Feb  8 01:05:28 2014	(r43827)
+++ head/en_US.ISO8859-1/htdocs/donations/index.xml	Sat Feb  8 01:24:29 2014	(r43828)
@@ -40,7 +40,7 @@
 
     <h2>Other Donations Links</h2>
     <ul>
-      <li><a href="wantlist.html">FreeBSD Project Want List</a></li>
+      <li><a href="https://wiki.freebsd.org/Donations/WantList">FreeBSD Project Want List</a></li>
       <li><a href="donors.html">List of FreeBSD Donations</a></li>
     </ul>
 

From owner-svn-doc-all@FreeBSD.ORG  Sat Feb  8 01:29:39 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ACDDE499;
 Sat,  8 Feb 2014 01:29:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 981681D24;
 Sat,  8 Feb 2014 01:29:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s181TdJQ014662;
 Sat, 8 Feb 2014 01:29:39 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s181Tdrf014661;
 Sat, 8 Feb 2014 01:29:39 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201402080129.s181Tdrf014661@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 8 Feb 2014 01:29:39 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43829 - 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.17
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, 08 Feb 2014 01:29:39 -0000

Author: gjb
Date: Sat Feb  8 01:29:39 2014
New Revision: 43829
URL: http://svnweb.freebsd.org/changeset/doc/43829

Log:
  Trim wantlist.xml entries older than 2012-01-01.
  These entries were not transferred to the new wiki page.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: head/en_US.ISO8859-1/htdocs/donations/wantlist.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/donations/wantlist.xml	Sat Feb  8 01:24:29 2014	(r43828)
+++ head/en_US.ISO8859-1/htdocs/donations/wantlist.xml	Sat Feb  8 01:29:39 2014	(r43829)
@@ -66,104 +66,6 @@
       </tr>
 
       <tr>
-	<td>jcamou</td>
-	<td>AZ, USA.</td>
-	<td>Gigabit switch</td>
-	<td>Development/build cluster.  Any kind of switch could
-	  work.</td>
-	<td>2005/08/11</td>
-      </tr>
-
-      <tr>
-	<td>jkoshy</td>
-	<td>Rishi Valley, India.</td>
-	<td>4-port USB KVM switch &amp; USB&lt;-&gt;PS/2 adapters</td>
-	<td>Facilitate working with multiple machines.</td>
-	<td>2008/09/02</td>
-      </tr>
-
-      <tr>
-	<td>jkoshy</td>
-	<td>Rishi Valley, India.</td>
-	<td>Solar backed UPS (500W x 4-6 hrs)</td>
-	<td>Permit work on FreeBSD in the absence of grid power.</td>
-	<td>2008/09/02</td>
-      </tr>
-
-      <tr>
-	<td>jmg</td>
-	<td>California, USA</td>
-	<td>Fast multiprocessor AMD64 capable machine (dual core CPU ok).</td>
-	<td>General build box to support FreeBSD work including ARM and
-	  multi-arch testing of patches.</td>
-	<td>2006/07/17</td>
-      </tr>
-
-      <tr>
-	<td>kientzle</td>
-	<td>California, USA</td>
-	<td>Tape drive, preferably SCSI DDS-3 or later</td>
-	<td>bsdtar testing and development.</td>
-	<td>2010/01/24</td>
-      </tr>
-
-      <tr>
-	<td>marcel</td>
-	<td>CA, USA</td>
-	<td>1GB of low-profile PC133 SDRAM (168pin DIMM). Memory can be
-	  buffered or unbuffered, preferably one 1GB DIMM or two 512MB
-	  DIMMs. Low-profile is a must. ECC is optional.</td>
-	<td>More memory allows for better workloads when testing code in
-	  SMP setups.</td>
-	<td>2007/05/26</td>
-      </tr>
-
-      <tr>
-	<td>marks</td>
-	<td>The Netherlands</td>
-	<td>ACPI laptops (also for lend)</td>
-	<td>(1) ACPI laptops that work, to test new code on.<br/>
-         (2) ACPI laptops that don't work, (to try) to fix.</td>
-	<td>2004/12/19</td>
-      </tr>
-
-      <tr>
-	<td>markus</td>
-	<td>Germany</td>
-	<td>IBM ThinkPad Dock II</td>
-	<td>(1) Enhance the acpi_ibm(4) driver.<br/>
-	 (2) Enhance docking support.</td>
-	<td>2005/06/13</td>
-      </tr>
-
-      <tr>
-	<td>matusita</td>
-	<td>Japan</td>
-	<td>2-3 build machines:Pentium4 2GHz+,20GB+ ATA66+
-	  HDD,256MB+RAM, 100base-TX NIC,serial, etc.</td>
-	<td>Rebuild dying snapshots.jp.FreeBSD.org.</td>
-	<td>2002/08/05</td>
-      </tr>
-
-      <tr>
-	<td>matusita</td>
-	<td>Japan</td>
-	<td>FTP server:Pentium3/Celeron 1GHz+,10GB+ ATA66+ HDD,100GB+
-	  storage (RAID0+1 desirable),256MB+RAM, 100base-TX
-	  NIC,serial, etc.</td>
-	<td>Rebuild dying snapshots.jp.FreeBSD.org.</td>
-	<td>2002/08/05</td>
-      </tr>
-
-      <tr>
-	<td>nwhitehorn</td>
-	<td>Madison, WI, USA</td>
-	<td>IBM PPC desktop or rackmount hardware with a POWER4/5/6/7 or Cell CPU</td>
-	<td>Add support for these machines.</td>
-	<td>2010/08/17</td>
-      </tr>
-
-      <tr>
 	<td>obrien</td>
 	<td>Silicon Valley, USA</td>
 	<td>SunBlade 2500 with 2x 1.6 ghz processors (or 1.28ghz). </td>
@@ -207,18 +109,6 @@
 
       <tr>
 	<td>portmgr</td>
-	<td>Silion Valley, California</td>
-	<td>
-	    36GB or greater 1" high SCSI hotplug hard drives
-	</td>
-	<td>
-	    Replace old drives in package building cluster machines.
-	</td>
-	<td>2009/07/23</td>
-      </tr>
-
-      <tr>
-	<td>portmgr</td>
 	<td>worldwide</td>
 	<td>
 	    powerpc gear
@@ -229,20 +119,6 @@
 	</td>
 	<td>2012/01/27</td>
       </tr>
-
-      <tr>
-	<td>portmgr</td>
-	<td>worldwide</td>
-	<td>
-	    sparc64 gear
-	</td>
-	<td>
-	  We could specifically use rack-mounted Sparcs (such as
-	  SunFire V120, V210, or V240) for our package building
-	  cluster in the US.
-	</td>
-	<td>2009/07/23</td>
-      </tr>
     </table>
 
   </body>

From owner-svn-doc-all@FreeBSD.ORG  Sat Feb  8 01:34:53 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1FF12590;
 Sat,  8 Feb 2014 01:34:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F331D1DB1;
 Sat,  8 Feb 2014 01:34:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s181Yqx2017944;
 Sat, 8 Feb 2014 01:34:52 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s181YqDM017942;
 Sat, 8 Feb 2014 01:34:52 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201402080134.s181YqDM017942@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 8 Feb 2014 01:34:52 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43830 - 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.17
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, 08 Feb 2014 01:34:53 -0000

Author: gjb
Date: Sat Feb  8 01:34:52 2014
New Revision: 43830
URL: http://svnweb.freebsd.org/changeset/doc/43830

Log:
  Stop building wantlist.html.
  A followup commit will add a static wantlist.html page for
  redirection purpose, intended to be removed after a few days.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/en_US.ISO8859-1/htdocs/donations/Makefile

Modified: head/en_US.ISO8859-1/htdocs/donations/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/donations/Makefile	Sat Feb  8 01:29:39 2014	(r43829)
+++ head/en_US.ISO8859-1/htdocs/donations/Makefile	Sat Feb  8 01:34:52 2014	(r43830)
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   index.xml wantlist.xml donors.xml
+DOCS=   index.xml donors.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"

From owner-svn-doc-all@FreeBSD.ORG  Sat Feb  8 01:47:57 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1FD5B6E3;
 Sat,  8 Feb 2014 01:47:57 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 07E481E46;
 Sat,  8 Feb 2014 01:47:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s181luxG021990;
 Sat, 8 Feb 2014 01:47:56 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s181luGZ021989;
 Sat, 8 Feb 2014 01:47:56 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201402080147.s181luGZ021989@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 8 Feb 2014 01:47:56 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43831 - 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.17
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, 08 Feb 2014 01:47:57 -0000

Author: gjb
Date: Sat Feb  8 01:47:56 2014
New Revision: 43831
URL: http://svnweb.freebsd.org/changeset/doc/43831

Log:
  Add a static wantlist.html page, which will serve as a temporary
  redirector.
  
  The redirection changes will happen after the next website rebuild.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  head/en_US.ISO8859-1/htdocs/donations/wantlist.html   (contents, props changed)

Added: head/en_US.ISO8859-1/htdocs/donations/wantlist.html
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/en_US.ISO8859-1/htdocs/donations/wantlist.html	Sat Feb  8 01:47:56 2014	(r43831)
@@ -0,0 +1,381 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook">
+  <head>
+    <title>FreeBSD Developers Want List</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
+    <link rel="stylesheet" media="screen" href="../layout/css/fixed.css?20130112" type="text/css" />
+    <script type="text/javascript" src="../layout/js/google.js"></script>
+  </head>
+  <body>
+    <div id="containerwrap">
+      <div id="container">
+        <span class="txtoffscreen"><a href="#content" title="Skip site navigation" accesskey="1">Skip site navigation</a> (1)
+  <a href="#contentwrap" title="Skip section navigation" accesskey="2">Skip section navigation</a> (2)
+</span>
+        <div id="headercontainer">
+          <div id="header">
+            <h2 class="blockhide">Header And Logo</h2>
+            <div id="headerlogoleft">
+              <a href=".." title="FreeBSD">
+                <img src="../layout/images/logo-red.png" width="457" height="75" alt="FreeBSD" />
+              </a>
+            </div>
+            <div id="headerlogoright">
+              <div 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>
+              <h2 class="blockhide">Peripheral Links</h2>
+              <div id="searchnav">
+                <ul id="searchnavlist"></ul>
+              </div>
+              <div id="search">
+                <form action="http://www.FreeBSD.org/cgi/search.cgi" method="get">
+                  <div>
+                    <h2 class="blockhide">
+                      <label for="words">Search</label>
+                    </h2>
+                    <div>
+                      <input type="hidden" name="max" value="25" />
+                      <input type="hidden" name="source" value="www" />
+                      <input id="words" name="words" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value='';" value="Search" />
+                      <span> </span>
+                      <input id="submit" name="submit" type="submit" value="Search" />
+                    </div>
+                  </div>
+                </form>
+              </div>
+            </div>
+          </div>
+          <h2 class="blockhide">Site Navigation</h2>
+          <div id="menu">
+            <ul class="first">
+              <li>
+                <a href="../">Home</a>
+              </li>
+            </ul>
+            <ul>
+              <li>
+                <a href="../about.html">About</a>
+                <ul>
+                  <li>
+                    <a href="../projects/newbies.html">Introduction</a>
+                  </li>
+                  <li>
+                    <a href="../features.html">Features</a>
+                  </li>
+                  <li>
+                    <a href="../advocacy/">Advocacy</a>
+                  </li>
+                  <li>
+                    <a href="../marketing/">Marketing</a>
+                  </li>
+                  <li>
+                    <a href="../privacy.html">Privacy Policy</a>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+            <ul>
+              <li>
+                <a href="../where.html">Get FreeBSD</a>
+                <ul>
+                  <li>
+                    <a href="../releases/">Release Information</a>
+                  </li>
+                  <li>
+                    <a href="../releng/">Release Engineering</a>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+            <ul>
+              <li>
+                <a href="../docs.html">Documentation</a>
+                <ul>
+                  <li>
+                    <a href="../doc/en_US.ISO8859-1/books/faq/">FAQ</a>
+                  </li>
+                  <li>
+                    <a href="../doc/en_US.ISO8859-1/books/handbook/">Handbook</a>
+                  </li>
+                  <li>
+                    <a href="../doc/en_US.ISO8859-1/books/porters-handbook">Porter's Handbook</a>
+                  </li>
+                  <li>
+                    <a href="../doc/en_US.ISO8859-1/books/developers-handbook">Developer's Handbook</a>
+                  </li>
+                  <li>
+                    <a href="http://www.FreeBSD.org/cgi/man.cgi">Manual Pages</a>
+                  </li>
+                  <li>
+                    <a href="../doc/en_US.ISO8859-1/books/fdp-primer">Documentation Project Primer</a>
+                  </li>
+                  <li>
+                    <a href="../docs/books.html">All Books and Articles</a>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+            <ul>
+              <li>
+                <a href="../community.html">Community</a>
+                <ul>
+                  <li>
+                    <a href="../community/mailinglists.html">Mailing Lists</a>
+                  </li>
+                  <li>
+                    <a href="http://forums.freebsd.org">Forums</a>
+                  </li>
+                  <li>
+                    <a href="../usergroups.html">User Groups</a>
+                  </li>
+                  <li>
+                    <a href="../events/events.html">Events</a>
+                  </li>
+                  <li>
+                    <a href="http://serverfault.com/questions/tagged/freebsd">Q&amp;A (external)</a>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+            <ul>
+              <li>
+                <a href="../projects/index.html">Developers</a>
+                <ul>
+                  <li>
+                    <a href="http://wiki.FreeBSD.org/IdeasPage">Project Ideas</a>
+                  </li>
+                  <li>
+                    <a href="http://svnweb.FreeBSD.org">SVN Repository</a>
+                  </li>
+                  <li>
+                    <a href="http://p4web.FreeBSD.org">Perforce Repository</a>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+            <ul>
+              <li>
+                <a href="../support.html">Support</a>
+                <ul>
+                  <li>
+                    <a href="../commercial/commercial.html">Vendors</a>
+                  </li>
+                  <li>
+                    <a href="http://security.FreeBSD.org/">Security Information</a>
+                  </li>
+                  <li>
+                    <a href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">Bug Reports</a>
+                  </li>
+                  <li>
+                    <a href="../send-pr.html">Submit Bug-report</a>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+            <ul>
+              <li>
+                <a href="http://www.freebsdfoundation.org/">Foundation</a>
+                <ul>
+                  <li>
+                    <a href="http://www.freebsdfoundation.org/donate/">Monetary Donations</a>
+                  </li>
+                  <li>
+                    <a href="../donations/">Hardware Donations</a>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+        </div>
+        <div id="content">
+          <div id="sidewrap">
+            <div id="sidenav">
+              <h2 class="blockhide">Section Navigation</h2>
+              <ul>
+                <li>
+                  <a href="../about.html">About</a>
+                </li>
+                <li>
+                  <a href="../features.html">Features</a>
+                </li>
+                <li>
+                  <a href="../applications.html">Applications</a>
+                </li>
+                <li>
+                  <a href="../internet.html">Internetworking</a>
+                </li>
+                <li>
+                  <a href="../advocacy/">Advocacy</a>
+                </li>
+                <li>
+                  <a href="../marketing/">Marketing</a>
+                </li>
+                <li>
+                  <a href="../administration.html">Administration</a>
+                </li>
+                <li>
+                  <a href="../news/newsflash.html">News</a>
+                </li>
+                <li>
+                  <a href="../events/events.html">Events</a>
+                </li>
+                <li>
+                  <a href="../news/press.html">Press</a>
+                </li>
+                <li>
+                  <a href="../multimedia/multimedia.html">Multimedia</a>
+                </li>
+                <li>
+                  <a href="../art.html">Artwork</a>
+                </li>
+                <li>
+                  <a href="../logo.html">Logo</a>
+                </li>
+                <li>
+                  <a href="../donations/">Donations</a>
+                </li>
+                <li>
+                  <a href="../copyright/">Legal Notices</a>
+                </li>
+                <li>
+                  <a href="../privacy.html">Privacy Policy</a>
+                </li>
+              </ul>
+            </div>
+          </div>
+          <div id="contentwrap"><h1>FreeBSD Developers Want List</h1>
+
+    <p>This page lists various developer hardware needs.  If you are
+      interested in supporting the FreeBSD Project, you might consider
+      donating some piece of hardware on this list to the Project.</p>
+
+    <p>We provide the FreeBSD username of the developer who needs a
+      resource, the country they are in (for shipping purposes), the
+      equipment they desire, and the use to which that equipment will
+      be put.</p>
+
+    <p>For information on tax deductions and process, please see the
+      information on the main <a href="index.html#donating" shape="rect">FreeBSD
+      Donation Liaison office</a> page.</p>
+
+    <p>If you would like to donate something on this list, please
+      contact donations@FreeBSD.org.</p>
+
+    <p>On a general note, we need a variety of Sparc64 machines for
+      testing and improving our Sparc port.  Even small, old (or
+      new!) Sparc64 machines are perfectly usable.  No matter which
+      country you're in, we almost certainly have someone local who
+      could use it.</p>
+
+    <table class="tblbasic">
+      <tr>
+	<th rowspan="1" colspan="1">Developer ID</th>
+	<th rowspan="1" colspan="1">Developer Country</th>
+	<th rowspan="1" colspan="1">Equipment Desired</th>
+	<th rowspan="1" colspan="1">Equipment Use</th>
+	<th rowspan="1" colspan="1">Date Added</th>
+      </tr>
+
+      <tr>
+	<td rowspan="1" colspan="1">des</td>
+	<td rowspan="1" colspan="1">Oslo, Norway</td>
+	<td rowspan="1" colspan="1">Hosting for up to a full rack of 1U servers</td>
+	<td rowspan="1" colspan="1">New source tinderbox / continuous integration system.  I
+	  have the hardware (including spares), but nowhere to host it.
+          External bandwidth requirements are very modest, but a separate
+          gigabit switch is needed for internal communication.</td>
+	<td rowspan="1" colspan="1">2013-02-15</td>
+      </tr>
+
+      <tr>
+	<td rowspan="1" colspan="1">des</td>
+	<td rowspan="1" colspan="1">Oslo, Norway</td>
+	<td rowspan="1" colspan="1">ATX motherboard with Intel H77 chipset, Intel Core
+	  i7-3770S, 32 GB (4x8) PC3-12800 memory with heatsink.</td>
+	<td rowspan="1" colspan="1">Upgrade main development box, which is six years old.  No
+	  chassis, PSU or disks required.</td>
+	<td rowspan="1" colspan="1">2013-02-15</td>
+      </tr>
+
+      <tr>
+	<td rowspan="1" colspan="1">obrien</td>
+	<td rowspan="1" colspan="1">Silicon Valley, USA</td>
+	<td rowspan="1" colspan="1">SunBlade 2500 with 2x 1.6 ghz processors (or 1.28ghz). </td>
+	<td rowspan="1" colspan="1">Continued FreeBSD/sparc64 development and testing.</td>
+	<td rowspan="1" colspan="1">2012/05/30</td>
+      </tr>
+
+      <tr>
+	<td rowspan="1" colspan="1">obrien</td>
+	<td rowspan="1" colspan="1">Silicon Valley, USA</td>
+	<td rowspan="1" colspan="1">Apple G5 dual-processor tower. </td>
+	<td rowspan="1" colspan="1">Continued FreeBSD/PowerPC development and testing.</td>
+	<td rowspan="1" colspan="1">2012/05/30</td>
+      </tr>
+
+      <tr>
+	<td rowspan="1" colspan="1">portmgr</td>
+	<td rowspan="1" colspan="1">New Jersey, USA</td>
+	<td rowspan="1" colspan="1">
+	    1GB or 2GB 72-bit fully buffered ECC DDR2 SDRAM 1.8V,
+	      800/667/533MHz
+	</td>
+	<td rowspan="1" colspan="1">
+	  Upgrade package building cluster machines at NYI to 16GB or preferably 32GB.
+	</td>
+	<td rowspan="1" colspan="1">2012/01/25</td>
+      </tr>
+
+      <tr>
+	<td rowspan="1" colspan="1">portmgr</td>
+	<td rowspan="1" colspan="1">Silicon Valley, USA</td>
+	<td rowspan="1" colspan="1">
+	    1GB or 2GB 184-pin registered ECC DDR SDRAM 2.5V,
+	      400MHz (PC3200)
+	</td>
+	<td rowspan="1" colspan="1">
+	  Upgrade package building cluster machines at ISC to 8GB or preferably 16GB.
+	</td>
+	<td rowspan="1" colspan="1">2012/01/25</td>
+      </tr>
+
+      <tr>
+	<td rowspan="1" colspan="1">portmgr</td>
+	<td rowspan="1" colspan="1">worldwide</td>
+	<td rowspan="1" colspan="1">
+	    powerpc gear
+	</td>
+	<td rowspan="1" colspan="1">
+	  We could specifically use rack-mounted powerpcs (such as
+	  Xserve G5s) for our package building cluster in the US.
+	</td>
+	<td rowspan="1" colspan="1">2012/01/27</td>
+      </tr>
+    </table>
+
+  </div>
+          <br class="clearboth" />
+        </div>
+        <div id="footer"><span><a href="../search/index-site.html">Site Map</a> |
+  <a href="../copyright/">Legal Notices</a> | © 1995&#8211;2014 The FreeBSD Project.
+  All rights reserved.</span><br />
+      Last modified:  2014-02-08</div>
+      </div>
+    </div>
+  </body>
+</html>

From owner-svn-doc-all@FreeBSD.ORG  Sat Feb  8 01:51:06 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3B7D7808;
 Sat,  8 Feb 2014 01:51:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0BC9E1FC3;
 Sat,  8 Feb 2014 01:51:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s181p5f2024709;
 Sat, 8 Feb 2014 01:51:05 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s181p5Io024708;
 Sat, 8 Feb 2014 01:51:05 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201402080151.s181p5Io024708@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 8 Feb 2014 01:51:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43832 - 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.17
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, 08 Feb 2014 01:51:06 -0000

Author: gjb
Date: Sat Feb  8 01:51:05 2014
New Revision: 43832
URL: http://svnweb.freebsd.org/changeset/doc/43832

Log:
  Remove wantlist.xml.
  
  Sponsored by:	The FreeBSD Foundation

Deleted:
  head/en_US.ISO8859-1/htdocs/donations/wantlist.xml

From owner-svn-doc-all@FreeBSD.ORG  Sat Feb  8 01:51:47 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2534D866;
 Sat,  8 Feb 2014 01:51:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0F12C1FC5;
 Sat,  8 Feb 2014 01:51:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s181pkGv025075;
 Sat, 8 Feb 2014 01:51:46 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s181pkba025074;
 Sat, 8 Feb 2014 01:51:46 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201402080151.s181pkba025074@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 8 Feb 2014 01:51:46 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43833 - 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.17
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, 08 Feb 2014 01:51:47 -0000

Author: gjb
Date: Sat Feb  8 01:51:46 2014
New Revision: 43833
URL: http://svnweb.freebsd.org/changeset/doc/43833

Log:
  Hook the static wantlist.html to the build.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/en_US.ISO8859-1/htdocs/donations/Makefile

Modified: head/en_US.ISO8859-1/htdocs/donations/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/donations/Makefile	Sat Feb  8 01:51:05 2014	(r43832)
+++ head/en_US.ISO8859-1/htdocs/donations/Makefile	Sat Feb  8 01:51:46 2014	(r43833)
@@ -8,5 +8,6 @@
 .endif
 
 DOCS=   index.xml donors.xml
+DATA=	wantlist.html
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"

From owner-svn-doc-all@FreeBSD.ORG  Sat Feb  8 01:53:34 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5FC6F8CE;
 Sat,  8 Feb 2014 01:53:34 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 498811FCB;
 Sat,  8 Feb 2014 01:53:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s181rYRi025283;
 Sat, 8 Feb 2014 01:53:34 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s181rYpY025282;
 Sat, 8 Feb 2014 01:53:34 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201402080153.s181rYpY025282@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 8 Feb 2014 01:53:34 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43834 - 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.17
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, 08 Feb 2014 01:53:34 -0000

Author: gjb
Date: Sat Feb  8 01:53:33 2014
New Revision: 43834
URL: http://svnweb.freebsd.org/changeset/doc/43834

Log:
  Add a header in BIG BOLD LETTERS that the page has moved to the
  wiki.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/en_US.ISO8859-1/htdocs/donations/wantlist.html

Modified: head/en_US.ISO8859-1/htdocs/donations/wantlist.html
==============================================================================
--- head/en_US.ISO8859-1/htdocs/donations/wantlist.html	Sat Feb  8 01:51:46 2014	(r43833)
+++ head/en_US.ISO8859-1/htdocs/donations/wantlist.html	Sat Feb  8 01:53:33 2014	(r43834)
@@ -260,6 +260,10 @@
           </div>
           <div id="contentwrap"><h1>FreeBSD Developers Want List</h1>
 
+    <p><strong>This page has moved.</strong></p>
+
+    <p>Please see: <a href="https://wiki.freebsd.org/Donations/WantList">https://wiki.freebsd.org/Donations/WantList</a></p>
+
     <p>This page lists various developer hardware needs.  If you are
       interested in supporting the FreeBSD Project, you might consider
       donating some piece of hardware on this list to the Project.</p>

From owner-svn-doc-all@FreeBSD.ORG  Sat Feb  8 02:10:49 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4B5CBBB0;
 Sat,  8 Feb 2014 02:10:49 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 337FA1123;
 Sat,  8 Feb 2014 02:10:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s182Anjx032492;
 Sat, 8 Feb 2014 02:10:49 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s182An2q032491;
 Sat, 8 Feb 2014 02:10:49 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201402080210.s182An2q032491@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 8 Feb 2014 02:10:49 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43835 - 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.17
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, 08 Feb 2014 02:10:49 -0000

Author: gjb
Date: Sat Feb  8 02:10:48 2014
New Revision: 43835
URL: http://svnweb.freebsd.org/changeset/doc/43835

Log:
  Add a redirect to the new wantlist page in the wiki.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/en_US.ISO8859-1/htdocs/donations/wantlist.html

Modified: head/en_US.ISO8859-1/htdocs/donations/wantlist.html
==============================================================================
--- head/en_US.ISO8859-1/htdocs/donations/wantlist.html	Sat Feb  8 01:53:33 2014	(r43834)
+++ head/en_US.ISO8859-1/htdocs/donations/wantlist.html	Sat Feb  8 02:10:48 2014	(r43835)
@@ -7,6 +7,7 @@
     <link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
     <link rel="stylesheet" media="screen" href="../layout/css/fixed.css?20130112" type="text/css" />
     <script type="text/javascript" src="../layout/js/google.js"></script>
+    <meta http-equiv="refresh" content="5;url=https://wiki.freebsd.org/Donations/WantList"/>
   </head>
   <body>
     <div id="containerwrap">
@@ -262,7 +263,9 @@
 
     <p><strong>This page has moved.</strong></p>
 
-    <p>Please see: <a href="https://wiki.freebsd.org/Donations/WantList">https://wiki.freebsd.org/Donations/WantList</a></p>
+    <p>Click <a
+	href="https://wiki.freebsd.org/Donations/WantList">here</a> if
+      not automatically redirected in 5 seconds.</p>
 
     <p>This page lists various developer hardware needs.  If you are
       interested in supporting the FreeBSD Project, you might consider

From owner-svn-doc-all@FreeBSD.ORG  Sat Feb  8 02:14:11 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 06972C2A;
 Sat,  8 Feb 2014 02:14:11 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D793C1136;
 Sat,  8 Feb 2014 02:14:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s182EAPl033651;
 Sat, 8 Feb 2014 02:14:10 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s182EAx1033650;
 Sat, 8 Feb 2014 02:14:10 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201402080214.s182EAx1033650@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 8 Feb 2014 02:14:10 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43836 - 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.17
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, 08 Feb 2014 02:14:11 -0000

Author: gjb
Date: Sat Feb  8 02:14:10 2014
New Revision: 43836
URL: http://svnweb.freebsd.org/changeset/doc/43836

Log:
  Purge the old content from wantlist.html.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/en_US.ISO8859-1/htdocs/donations/wantlist.html

Modified: head/en_US.ISO8859-1/htdocs/donations/wantlist.html
==============================================================================
--- head/en_US.ISO8859-1/htdocs/donations/wantlist.html	Sat Feb  8 02:10:48 2014	(r43835)
+++ head/en_US.ISO8859-1/htdocs/donations/wantlist.html	Sat Feb  8 02:14:10 2014	(r43836)
@@ -263,118 +263,6 @@
 
     <p><strong>This page has moved.</strong></p>
 
-    <p>Click <a
-	href="https://wiki.freebsd.org/Donations/WantList">here</a> if
-      not automatically redirected in 5 seconds.</p>
-
-    <p>This page lists various developer hardware needs.  If you are
-      interested in supporting the FreeBSD Project, you might consider
-      donating some piece of hardware on this list to the Project.</p>
-
-    <p>We provide the FreeBSD username of the developer who needs a
-      resource, the country they are in (for shipping purposes), the
-      equipment they desire, and the use to which that equipment will
-      be put.</p>
-
-    <p>For information on tax deductions and process, please see the
-      information on the main <a href="index.html#donating" shape="rect">FreeBSD
-      Donation Liaison office</a> page.</p>
-
-    <p>If you would like to donate something on this list, please
-      contact donations@FreeBSD.org.</p>
-
-    <p>On a general note, we need a variety of Sparc64 machines for
-      testing and improving our Sparc port.  Even small, old (or
-      new!) Sparc64 machines are perfectly usable.  No matter which
-      country you're in, we almost certainly have someone local who
-      could use it.</p>
-
-    <table class="tblbasic">
-      <tr>
-	<th rowspan="1" colspan="1">Developer ID</th>
-	<th rowspan="1" colspan="1">Developer Country</th>
-	<th rowspan="1" colspan="1">Equipment Desired</th>
-	<th rowspan="1" colspan="1">Equipment Use</th>
-	<th rowspan="1" colspan="1">Date Added</th>
-      </tr>
-
-      <tr>
-	<td rowspan="1" colspan="1">des</td>
-	<td rowspan="1" colspan="1">Oslo, Norway</td>
-	<td rowspan="1" colspan="1">Hosting for up to a full rack of 1U servers</td>
-	<td rowspan="1" colspan="1">New source tinderbox / continuous integration system.  I
-	  have the hardware (including spares), but nowhere to host it.
-          External bandwidth requirements are very modest, but a separate
-          gigabit switch is needed for internal communication.</td>
-	<td rowspan="1" colspan="1">2013-02-15</td>
-      </tr>
-
-      <tr>
-	<td rowspan="1" colspan="1">des</td>
-	<td rowspan="1" colspan="1">Oslo, Norway</td>
-	<td rowspan="1" colspan="1">ATX motherboard with Intel H77 chipset, Intel Core
-	  i7-3770S, 32 GB (4x8) PC3-12800 memory with heatsink.</td>
-	<td rowspan="1" colspan="1">Upgrade main development box, which is six years old.  No
-	  chassis, PSU or disks required.</td>
-	<td rowspan="1" colspan="1">2013-02-15</td>
-      </tr>
-
-      <tr>
-	<td rowspan="1" colspan="1">obrien</td>
-	<td rowspan="1" colspan="1">Silicon Valley, USA</td>
-	<td rowspan="1" colspan="1">SunBlade 2500 with 2x 1.6 ghz processors (or 1.28ghz). </td>
-	<td rowspan="1" colspan="1">Continued FreeBSD/sparc64 development and testing.</td>
-	<td rowspan="1" colspan="1">2012/05/30</td>
-      </tr>
-
-      <tr>
-	<td rowspan="1" colspan="1">obrien</td>
-	<td rowspan="1" colspan="1">Silicon Valley, USA</td>
-	<td rowspan="1" colspan="1">Apple G5 dual-processor tower. </td>
-	<td rowspan="1" colspan="1">Continued FreeBSD/PowerPC development and testing.</td>
-	<td rowspan="1" colspan="1">2012/05/30</td>
-      </tr>
-
-      <tr>
-	<td rowspan="1" colspan="1">portmgr</td>
-	<td rowspan="1" colspan="1">New Jersey, USA</td>
-	<td rowspan="1" colspan="1">
-	    1GB or 2GB 72-bit fully buffered ECC DDR2 SDRAM 1.8V,
-	      800/667/533MHz
-	</td>
-	<td rowspan="1" colspan="1">
-	  Upgrade package building cluster machines at NYI to 16GB or preferably 32GB.
-	</td>
-	<td rowspan="1" colspan="1">2012/01/25</td>
-      </tr>
-
-      <tr>
-	<td rowspan="1" colspan="1">portmgr</td>
-	<td rowspan="1" colspan="1">Silicon Valley, USA</td>
-	<td rowspan="1" colspan="1">
-	    1GB or 2GB 184-pin registered ECC DDR SDRAM 2.5V,
-	      400MHz (PC3200)
-	</td>
-	<td rowspan="1" colspan="1">
-	  Upgrade package building cluster machines at ISC to 8GB or preferably 16GB.
-	</td>
-	<td rowspan="1" colspan="1">2012/01/25</td>
-      </tr>
-
-      <tr>
-	<td rowspan="1" colspan="1">portmgr</td>
-	<td rowspan="1" colspan="1">worldwide</td>
-	<td rowspan="1" colspan="1">
-	    powerpc gear
-	</td>
-	<td rowspan="1" colspan="1">
-	  We could specifically use rack-mounted powerpcs (such as
-	  Xserve G5s) for our package building cluster in the US.
-	</td>
-	<td rowspan="1" colspan="1">2012/01/27</td>
-      </tr>
-    </table>
-
   </div>
           <br class="clearboth" />
         </div>

From owner-svn-doc-all@FreeBSD.ORG  Sat Feb  8 02:24:04 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E2804D6C;
 Sat,  8 Feb 2014 02:24:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CE39311C3;
 Sat,  8 Feb 2014 02:24:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s182O45X037548;
 Sat, 8 Feb 2014 02:24:04 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s182O4hU037547;
 Sat, 8 Feb 2014 02:24:04 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201402080224.s182O4hU037547@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 8 Feb 2014 02:24:04 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43837 - 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.17
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, 08 Feb 2014 02:24:05 -0000

Author: gjb
Date: Sat Feb  8 02:24:04 2014
New Revision: 43837
URL: http://svnweb.freebsd.org/changeset/doc/43837

Log:
  Whoops.  Went a bit too delete-crazy.  Add the 'Click here if not
  redirected' link back.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/en_US.ISO8859-1/htdocs/donations/wantlist.html

Modified: head/en_US.ISO8859-1/htdocs/donations/wantlist.html
==============================================================================
--- head/en_US.ISO8859-1/htdocs/donations/wantlist.html	Sat Feb  8 02:14:10 2014	(r43836)
+++ head/en_US.ISO8859-1/htdocs/donations/wantlist.html	Sat Feb  8 02:24:04 2014	(r43837)
@@ -263,6 +263,10 @@
 
     <p><strong>This page has moved.</strong></p>
 
+    <p>Click <a
+	href="https://wiki.freebsd.org/Donations/WantList">here</a> if
+      not automatically redirected in 5 seconds.</p>
+
   </div>
           <br class="clearboth" />
         </div>

From owner-svn-doc-all@FreeBSD.ORG  Sat Feb  8 07:51:14 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 37E204FE;
 Sat,  8 Feb 2014 07:51:14 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0890D13CD;
 Sat,  8 Feb 2014 07:51:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s187pDbI065772;
 Sat, 8 Feb 2014 07:51:13 GMT (envelope-from jkois@svn.freebsd.org)
Received: (from jkois@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s187pD3b065771;
 Sat, 8 Feb 2014 07:51:13 GMT (envelope-from jkois@svn.freebsd.org)
Message-Id: <201402080751.s187pD3b065771@svn.freebsd.org>
From: Johann Kois <jkois@FreeBSD.org>
Date: Sat, 8 Feb 2014 07:51:13 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43838 - head/de_DE.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.17
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, 08 Feb 2014 07:51:14 -0000

Author: jkois
Date: Sat Feb  8 07:51:13 2014
New Revision: 43838
URL: http://svnweb.freebsd.org/changeset/doc/43838

Log:
  r43575 -> r43819
  
  MFde:   Sync the German translation of this page.
  
  Obtained from:  The FreeBSD German Documentation Project

Modified:
  head/de_DE.ISO8859-1/htdocs/where.xml

Modified: head/de_DE.ISO8859-1/htdocs/where.xml
==============================================================================
--- head/de_DE.ISO8859-1/htdocs/where.xml	Sat Feb  8 02:24:04 2014	(r43837)
+++ head/de_DE.ISO8859-1/htdocs/where.xml	Sat Feb  8 07:51:13 2014	(r43838)
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
 <!ENTITY dedate "$FreeBSDde$">
-<!ENTITY reference "basiert auf: r43575">
+<!ENTITY reference "basiert auf: r43819">
 <!ENTITY title "FreeBSD Bezugsquellen">
 <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
 ]>
@@ -26,13 +26,17 @@
 
     <a name="install"></a>
 
-    <h2><a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/install.html">FreeBSD installieren</a></h2>
+    <h2>FreeBSD installieren</h2>
 
     <p>FreeBSD kann von mehreren Medien installiert werden,
       beispielsweise von CD-ROM, DVD, USB-Stick oder sogar direkt über das
-      Netzwerk mittels anonymen FTP, HTTP oder NFS.  Bevor Sie FreeBSD
-      herunterladen, lesen Sie bitte die <a
-      href="&enbase;/doc/en_US.ISO8859-1/books/handbook/install.html">Installationsanleitung</a>.</p>
+      Netzwerk mittels anonymen FTP, HTTP oder NFS.  Je nachdem, welche
+      &os;-Version Sie installieren wollen, lesen Sie bitte entweder die <a
+      href="&enbase;/doc/en_US.ISO8859-1/books/handbook/bsdinstall.html">&os;&nbsp;9.X/10.X
+      Installationsanleitung</a> oder die <a
+      href="&enbase;/doc/en_US.ISO8859-1/books/handbook/install.html">&os;&nbsp;8.X
+      Installationsanleitung</a>, bevor Sie mit dem Herunterladen
+      beginnen.</p>
 
     <a name="distribution"></a>
 

From owner-svn-doc-all@FreeBSD.ORG  Sat Feb  8 22:08:52 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 42DB8CEC;
 Sat,  8 Feb 2014 22:08:52 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 105141343;
 Sat,  8 Feb 2014 22:08:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s18M8pmF010582;
 Sat, 8 Feb 2014 22:08:51 GMT (envelope-from bcr@svn.freebsd.org)
Received: (from bcr@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s18M8phI010581;
 Sat, 8 Feb 2014 22:08:51 GMT (envelope-from bcr@svn.freebsd.org)
Message-Id: <201402082208.s18M8phI010581@svn.freebsd.org>
From: Benedict Reuschling <bcr@FreeBSD.org>
Date: Sat, 8 Feb 2014 22:08:51 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43839 - in head/de_DE.ISO8859-1/books/handbook: backups
 sound updating
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.17
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, 08 Feb 2014 22:08:52 -0000

Author: bcr
Date: Sat Feb  8 22:08:51 2014
New Revision: 43839
URL: http://svnweb.freebsd.org/changeset/doc/43839

Log:
  Remove directories no longer present in the current handbook.
  The directories were empty anyway, so delete them completely to avoid
  further confusion.
  
  Obtained from:	    The FreeBSD German Documentation Project

Deleted:
  head/de_DE.ISO8859-1/books/handbook/backups/
  head/de_DE.ISO8859-1/books/handbook/sound/
  head/de_DE.ISO8859-1/books/handbook/updating/