From owner-svn-doc-head@FreeBSD.ORG  Sun Aug 25 11:02:31 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 47FD8442;
 Sun, 25 Aug 2013 11:02:31 +0000 (UTC)
 (envelope-from andre@FreeBSD.org)
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 3478E2771;
 Sun, 25 Aug 2013 11:02:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7PB2Vgs022894;
 Sun, 25 Aug 2013 11:02:31 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7PB2VUn022893;
 Sun, 25 Aug 2013 11:02:31 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201308251102.r7PB2VUn022893@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Sun, 25 Aug 2013 11:02:31 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42585 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Aug 2013 11:02:31 -0000

Author: andre (src committer)
Date: Sun Aug 25 11:02:30 2013
New Revision: 42585
URL: http://svnweb.freebsd.org/changeset/doc/42585

Log:
  Document FreeBSD_version 1000050 after the struct mbuf changes in
  r254780, r254799, r254804, r254807, and r254842.
  
  Sponsored by:	The FreeBSD Foundation

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 Aug 24 22:02:23 2013	(r42584)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Sun Aug 25 11:02:30 2013	(r42585)
@@ -16303,7 +16303,7 @@ Reference: &lt;http://www.freebsd.org/po
 	      <entry>August 19, 2013</entry>
 	      <entry>10-CURRENT after addition of
 		<literal>M_PROTO[9-12]</literal> and removal of
-		<literal>M_NOFREE|M_FRAG|M_FIRSTFRAG|M_LASTFRAG</literal>
+		<literal>M_FRAG|M_FIRSTFRAG|M_LASTFRAG</literal>
 		mbuf flags (rev <svnref>254524</svnref>,
 		<svnref>254526</svnref>.</entry>
 	    </row>
@@ -16316,6 +16316,16 @@ Reference: &lt;http://www.freebsd.org/po
 		(rev <svnref>254672</svnref>).</entry>
 	    </row>
 
+	    <row>
+	      <entry>1000050</entry>
+	      <entry>August 24, 2013</entry>
+	      <entry>10-CURRENT after modifications of structure
+		<literal>mbuf</literal>
+		(rev <svnref>254780</svnref>, <svnref>254799</svnref>,
+		<svnref>254804</svnref>, <svnref>254807</svnref>
+		<svnref>254842</svnref>).</entry>
+	    </row>
+
 	  </tbody>
 	</tgroup>
       </table>

From owner-svn-doc-head@FreeBSD.ORG  Sun Aug 25 20:14:16 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 57964EA2;
 Sun, 25 Aug 2013 20:14:16 +0000 (UTC)
 (envelope-from zeising@FreeBSD.org)
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 442B2201D;
 Sun, 25 Aug 2013 20:14:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7PKEG47020691;
 Sun, 25 Aug 2013 20:14:16 GMT (envelope-from zeising@svn.freebsd.org)
Received: (from zeising@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7PKEGtn020690;
 Sun, 25 Aug 2013 20:14:16 GMT (envelope-from zeising@svn.freebsd.org)
Message-Id: <201308252014.r7PKEGtn020690@svn.freebsd.org>
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Sun, 25 Aug 2013 20:14:16 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42586 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Aug 2013 20:14:16 -0000

Author: zeising
Date: Sun Aug 25 20:14:15 2013
New Revision: 42586
URL: http://svnweb.freebsd.org/changeset/doc/42586

Log:
  Document FreeBSD version 1000051:
  
  Import of Radeon KMS driver into head.

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	Sun Aug 25 11:02:30 2013	(r42585)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Sun Aug 25 20:14:15 2013	(r42586)
@@ -16326,6 +16326,13 @@ Reference: &lt;http://www.freebsd.org/po
 		<svnref>254842</svnref>).</entry>
 	    </row>
 
+	    <row>
+	      <entry>1000051</entry>
+	      <entry>August 25, 2013</entry>
+	      <entry>10-CURRENT after Radeon KMS driver import
+		(rev <svnref>254885</svnref>, <svnref>254887</svnref>).</entry>
+	    </row>
+
 	  </tbody>
 	</tgroup>
       </table>

From owner-svn-doc-head@FreeBSD.ORG  Mon Aug 26 04:00:08 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 8D341C68;
 Mon, 26 Aug 2013 04:00:08 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
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 7B93725F0;
 Mon, 26 Aug 2013 04:00:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7Q408xQ067009;
 Mon, 26 Aug 2013 04:00:08 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7Q408tN067008;
 Mon, 26 Aug 2013 04:00:08 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201308260400.r7Q408tN067008@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 26 Aug 2013 04:00:08 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42587 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Aug 2013 04:00:08 -0000

Author: gjb
Date: Mon Aug 26 04:00:08 2013
New Revision: 42587
URL: http://svnweb.freebsd.org/changeset/doc/42587

Log:
  Mirrors have already begun to pick up the 9.2-RC3 images, so switch
  the download links accordingly.

Modified:
  head/share/xml/release.ent

Modified: head/share/xml/release.ent
==============================================================================
--- head/share/xml/release.ent	Sun Aug 25 20:14:15 2013	(r42586)
+++ head/share/xml/release.ent	Mon Aug 26 04:00:08 2013	(r42587)
@@ -32,7 +32,7 @@
 <!ENTITY beta.testing "INCLUDE">
 <!ENTITY % beta.testing "INCLUDE">
 <!ENTITY betarel.current '9.2'>
-<!ENTITY betarel.vers 'RC2'>
+<!ENTITY betarel.vers 'RC3'>
 <!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'>
 
 <!-- If we have a second release in the release cycle (e.g. 5.x and 6.y

From owner-svn-doc-head@FreeBSD.ORG  Mon Aug 26 13:15:34 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 33115D1B;
 Mon, 26 Aug 2013 13:15:34 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
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 1C89D2376;
 Mon, 26 Aug 2013 13:15:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7QDFXp9068978;
 Mon, 26 Aug 2013 13:15:33 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7QDFXwL068975;
 Mon, 26 Aug 2013 13:15:33 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201308261315.r7QDFXwL068975@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 26 Aug 2013 13:15:33 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42588 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Aug 2013 13:15:34 -0000

Author: gjb
Date: Mon Aug 26 13:15:33 2013
New Revision: 42588
URL: http://svnweb.freebsd.org/changeset/doc/42588

Log:
  Announce 9.2-RC3.

Modified:
  head/share/xml/news.xml

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Mon Aug 26 04:00:08 2013	(r42587)
+++ head/share/xml/news.xml	Mon Aug 26 13:15:33 2013	(r42588)
@@ -34,6 +34,22 @@
       <name>8</name>
 
       <day>
+	<name>26</name>
+
+	<event>
+	  <title>&os;&nbsp;9.2-RC3 Available</title>
+
+	  <p>The third RC build for the &os;-9.2 release cycle is
+	    now available.  ISO images for the amd64, i386, ia64,
+	    powerpc, powerpc64 and sparc64 architectures are <a
+	      href="&lists.stable;/2013-August/074920.html">available</a>
+	    on most of our <a
+	      href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+	    mirror sites</a>.</p>
+	</event>
+      </day>
+
+      <day>
 	<name>16</name>
 
 	<event>

From owner-svn-doc-head@FreeBSD.ORG  Mon Aug 26 13:23:20 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 6853225C;
 Mon, 26 Aug 2013 13:23:20 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
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 54F37240C;
 Mon, 26 Aug 2013 13:23:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7QDNKN8073608;
 Mon, 26 Aug 2013 13:23:20 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7QDNKuJ073607;
 Mon, 26 Aug 2013 13:23:20 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201308261323.r7QDNKuJ073607@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 26 Aug 2013 13:23:20 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42589 - head/en_US.ISO8859-1/articles/contributors
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Aug 2013 13:23:20 -0000

Author: gjb
Date: Mon Aug 26 13:23:19 2013
New Revision: 42589
URL: http://svnweb.freebsd.org/changeset/doc/42589

Log:
  Add Johannes Meixner for science/py-coards and devel/py-xmltodict
  
  Submitted by:	Johannes Meixner

Modified:
  head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml

Modified: head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Mon Aug 26 13:15:33 2013	(r42588)
+++ head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Mon Aug 26 13:23:19 2013	(r42589)
@@ -4856,6 +4856,11 @@
     </listitem>
 
     <listitem>
+      <para>Johannes Meixner
+	<email>xmj@chaot.net</email></para>
+    </listitem>
+
+    <listitem>
       <para>Johannes Stille</para>
     </listitem>
 

From owner-svn-doc-head@FreeBSD.ORG  Tue Aug 27 09:33:06 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 885727D3;
 Tue, 27 Aug 2013 09:33:06 +0000 (UTC) (envelope-from brd@FreeBSD.org)
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 75AEF2A3C;
 Tue, 27 Aug 2013 09:33:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7R9X6s0050979;
 Tue, 27 Aug 2013 09:33:06 GMT (envelope-from brd@svn.freebsd.org)
Received: (from brd@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7R9X6ND050978;
 Tue, 27 Aug 2013 09:33:06 GMT (envelope-from brd@svn.freebsd.org)
Message-Id: <201308270933.r7R9X6ND050978@svn.freebsd.org>
From: Brad Davis <brd@FreeBSD.org>
Date: Tue, 27 Aug 2013 09:33:06 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42590 -
 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Aug 2013 09:33:06 -0000

Author: brd
Date: Tue Aug 27 09:33:05 2013
New Revision: 42590
URL: http://svnweb.freebsd.org/changeset/doc/42590

Log:
  - Fix IPv6 Setup instructions for the handbook [1]
  - Break the auto/static configure sections apart to make it easier to tell the difference
  - Add some replaceable tags
  - Switch to using the IPv6 doc prefix
  - Fix a few small typos
  
  PR:		170223 [1]
  Reviewed by:	bz@, gavin@

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 Aug 26 13:23:19 2013	(r42589)
+++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Tue Aug 27 09:33:05 2013	(r42590)
@@ -5319,29 +5319,38 @@ redirect_port tcp 192.168.0.3:80 80</pro
 	<filename>/etc/rc.conf</filename></title>
 
       <sect3>
-	<title><acronym>IPv6</acronym> Client Settings</title>
+	<title><acronym>IPv6</acronym> Client Auto-Configuration</title>
 
-	<para>These settings configure a machine on a
+	<para>To automatically configure a machine on a
 	  <acronym>LAN</acronym> which acts as a client, not a
-	  router.  To instruct &man.rtsol.8; to autoconfigure the
-	  interface on boot on
-	  &os;&nbsp;9.<replaceable>x</replaceable> and later, add
-	  this line to <filename>rc.conf</filename>:</para>
-
-	<programlisting>ipv6_prefer="YES"</programlisting>
+	  router, two items are required.  First to enable the
+	  <devicename>em0</devicename> to receive the router solicitation
+	  messages, add this line to <filename>rc.conf</filename>:</para>
+	
+	<programlisting>ifconfig_<replaceable>em0</replaceable>_ipv6="inet6 accept_rtadv"</programlisting>
+	
+	<para>Secondly, the router solicitation daemon, &man.rtsol.8;,
+	  should be enabled by adding the following to
+	  <filename>rc.conf</filename>:</para>
+	
+	<programlisting>rtsold_enable="YES"</programlisting>
 
 	<para>For &os;&nbsp;8.<replaceable>x</replaceable>,
 	  add:</para>
 
 	<programlisting>ipv6_enable="YES"</programlisting>
+	  </sect3>
+	  <sect3>
+	    <title><acronym>IPv6</acronym> Client Static
+	      Configuration</title>
 
 	<para>To statically assign the <acronym>IPv6</acronym>
 	  address, <hostid
-	    role="ip6addr">2001:471:1f11:251:290:27ff:fee0:2093</hostid>,
+	    role="ip6addr">2001:db8:4672:6565:2026:5043:2d42:5344</hostid>,
 	  to <devicename>fxp0</devicename>, add the following for
 	  &os;&nbsp;9.<replaceable>x</replaceable>:</para>
 
-	<programlisting>ifconfig_fxp0_ipv6="inet6 2001:471:1f11:251:290:27ff:fee0:2093 prefixlen <replaceable>64</replaceable>"</programlisting>
+	<programlisting>ifconfig_<replaceable>fxp0</replaceable>_ipv6="inet6 2001:db8:4672:6565:2026:5043:2d42:5344 prefixlen 64"</programlisting>
 
 	<note>
 	  <para>Be sure to change <replaceable>prefixlen
@@ -5349,16 +5358,16 @@ redirect_port tcp 192.168.0.3:80 80</pro
 	    subnet.</para>
 	</note>
 
-	<para>For &os;&nbsp;8<replaceable>x</replaceable>,
+	<para>For &os;&nbsp;8.<replaceable>x</replaceable>,
 	  add:</para>
 
-	<programlisting>ipv6_ifconfig_fxp0="2001:471:1f11:251:290:27ff:fee0:2093"</programlisting>
+	<programlisting>ipv6_ifconfig_<replaceable>fxp0</replaceable>="2001:db8:4672:6565:2026:5043:2d42:5344"</programlisting>
 
 	<para>To assign a default router of <hostid
-	    role="ip6addr">2001:471:1f11:251::1</hostid>, add the
+	    role="ip6addr">2001:db8:4672:6565::1</hostid>, add the
 	  following to <filename>/etc/rc.conf</filename>:</para>
 
-	<programlisting>ipv6_defaultrouter="2001:471:1f11:251::1"</programlisting>
+	<programlisting>ipv6_defaultrouter="2001:db8:4672:6565::1"</programlisting>
       </sect3>
 
       <sect3>
@@ -5372,9 +5381,9 @@ redirect_port tcp 192.168.0.3:80 80</pro
 
 	<para>The first entry lists the generic tunneling interfaces
 	  to be configured.  This example configures one interface,
-	  <devicename>gif0</devicename>:</para>
+	  <devicename>gif<replaceable>0</replaceable></devicename>:</para>
 
-	<programlisting>gif_interfaces="gif0"</programlisting>
+	<programlisting>gif_interfaces="gif<replaceable>0</replaceable>"</programlisting>
 
 	<para>To configure that interface with a local endpoint of
 	  <replaceable>MY_IPv4_ADDR</replaceable> to a remote endpoint

From owner-svn-doc-head@FreeBSD.ORG  Tue Aug 27 14:01:43 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id E315999F;
 Tue, 27 Aug 2013 14:01:43 +0000 (UTC)
 (envelope-from jkois@FreeBSD.org)
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 D09CB29A3;
 Tue, 27 Aug 2013 14:01:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7RE1hTh004611;
 Tue, 27 Aug 2013 14:01:43 GMT (envelope-from jkois@svn.freebsd.org)
Received: (from jkois@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7RE1hW5004610;
 Tue, 27 Aug 2013 14:01:43 GMT (envelope-from jkois@svn.freebsd.org)
Message-Id: <201308271401.r7RE1hW5004610@svn.freebsd.org>
From: Johann Kois <jkois@FreeBSD.org>
Date: Tue, 27 Aug 2013 14:01:43 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42591 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Aug 2013 14:01:44 -0000

Author: jkois
Date: Tue Aug 27 14:01:43 2013
New Revision: 42591
URL: http://svnweb.freebsd.org/changeset/doc/42591

Log:
  r42555 -> r42588
  
  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	Tue Aug 27 09:33:05 2013	(r42590)
+++ head/de_DE.ISO8859-1/share/xml/news.xml	Tue Aug 27 14:01:43 2013	(r42591)
@@ -4,7 +4,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r42555
+     basiert auf: r42588
 -->
 
 <!-- Simple schema for FreeBSD Project news.
@@ -42,6 +42,21 @@
       <name>8</name>
 
       <day>
+	<name>26</name>
+
+	<event>
+	  <title>&os;&nbsp;9.2-RC3 verfügbar</title>
+
+	  <p>Der dritte Release Candidate aus dem &os;-9.2 Releasezyklus ist
+	    <a href="&lists.stable;/2013-August/074920.html">verfügbar</a>.
+	    ISO-Images für die Architekturen amd64, i386, ia64, powerpc,
+	    powerpc64 sowie sparc64 sind inzwischen auf den meisten <a
+            href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/mirrors-ftp.html">&os;
+	    Spiegelservern</a> vorhanden.</p>
+	</event>
+      </day>
+
+      <day>
 	<name>16</name>
 
 	<event>

From owner-svn-doc-head@FreeBSD.ORG  Tue Aug 27 14:55:39 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 9EF9C15E;
 Tue, 27 Aug 2013 14:55:39 +0000 (UTC) (envelope-from brd@FreeBSD.org)
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 724822D62;
 Tue, 27 Aug 2013 14:55:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7REtdAe034781;
 Tue, 27 Aug 2013 14:55:39 GMT (envelope-from brd@svn.freebsd.org)
Received: (from brd@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7REtdHc034780;
 Tue, 27 Aug 2013 14:55:39 GMT (envelope-from brd@svn.freebsd.org)
Message-Id: <201308271455.r7REtdHc034780@svn.freebsd.org>
From: Brad Davis <brd@FreeBSD.org>
Date: Tue, 27 Aug 2013 14:55:39 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42592 -
 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Aug 2013 14:55:39 -0000

Author: brd
Date: Tue Aug 27 14:55:38 2013
New Revision: 42592
URL: http://svnweb.freebsd.org/changeset/doc/42592

Log:
  - More IPv6 cleanup
    - Place more emphasis on running out of IPv4 addresses and cite IANA running out of IPv4 addresses.
  
  Reviewed by:	gavin@

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	Tue Aug 27 14:01:43 2013	(r42591)
+++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Tue Aug 27 14:55:38 2013	(r42592)
@@ -5021,17 +5021,25 @@ redirect_port tcp 192.168.0.3:80 80</pro
 
     <itemizedlist>
       <listitem>
-	<para>Running out of addresses.  Today this is not so much of
-	  a concern, since RFC1918 private address space (<hostid
-	    role="ipaddr">10.0.0.0/8</hostid>, <hostid
-	    role="ipaddr">172.16.0.0/12</hostid>, and <hostid
-	    role="ipaddr">192.168.0.0/16</hostid>) and
-	  <acronym>NAT</acronym> are being employed.</para>
+	    <para>Running out of addresses.  For years the use of RFC1918
+		  private address space
+		  (<hostid role="ipaddr">10.0.0.0/8</hostid>,
+		  <hostid role="ipaddr">172.16.0.0/12</hostid>, and
+		  <hostid role="ipaddr">192.168.0.0/16</hostid>) and NAT has
+		  slowed down the exhaustion.  Even though, there are very few
+		  remaining IPv4 addresses.  The Internet Assigned Numbers
+		  Authority (<acronym>IANA</acronym>) has issued the last of
+		  the available major blocks to the Regional Registries.
+		  Once each Region Registry runs out, there will be no more
+		  available and switching to <acronym>IPv6</acronym> will be
+		  critical.</para>
       </listitem>
 
       <listitem>
-	<para>Router table entries were getting too large.  This is
-	  still a concern today.</para>
+	    <para>Every block of IPv4 addresses allocated required routing
+		  information to be exchanged between many routers on the
+		  Internet, and these routing tables were getting too large to
+		  allow efficient routing.</para>
       </listitem>
     </itemizedlist>
 
@@ -5054,7 +5062,7 @@ redirect_port tcp 192.168.0.3:80 80</pro
       </listitem>
     </itemizedlist>
 
-    <para>There are other useful features of
+    <para>There are many other useful features of
       <acronym>IPv6</acronym>:</para>
 
     <itemizedlist>

From owner-svn-doc-head@FreeBSD.ORG  Tue Aug 27 17:17:48 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id F02F6815;
 Tue, 27 Aug 2013 17:17:47 +0000 (UTC) (envelope-from brd@FreeBSD.org)
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 C380E25F3;
 Tue, 27 Aug 2013 17:17:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7RHHl6w020433;
 Tue, 27 Aug 2013 17:17:47 GMT (envelope-from brd@svn.freebsd.org)
Received: (from brd@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7RHHltP020432;
 Tue, 27 Aug 2013 17:17:47 GMT (envelope-from brd@svn.freebsd.org)
Message-Id: <201308271717.r7RHHltP020432@svn.freebsd.org>
From: Brad Davis <brd@FreeBSD.org>
Date: Tue, 27 Aug 2013 17:17:47 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42593 -
 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Aug 2013 17:17:48 -0000

Author: brd
Date: Tue Aug 27 17:17:47 2013
New Revision: 42593
URL: http://svnweb.freebsd.org/changeset/doc/42593

Log:
  - Fix bad whitespace that I introduced in the last commit.
  
  Translators:	please ignore

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	Tue Aug 27 14:55:38 2013	(r42592)
+++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Tue Aug 27 17:17:47 2013	(r42593)
@@ -5022,24 +5022,24 @@ redirect_port tcp 192.168.0.3:80 80</pro
     <itemizedlist>
       <listitem>
 	    <para>Running out of addresses.  For years the use of RFC1918
-		  private address space
-		  (<hostid role="ipaddr">10.0.0.0/8</hostid>,
-		  <hostid role="ipaddr">172.16.0.0/12</hostid>, and
-		  <hostid role="ipaddr">192.168.0.0/16</hostid>) and NAT has
-		  slowed down the exhaustion.  Even though, there are very few
-		  remaining IPv4 addresses.  The Internet Assigned Numbers
-		  Authority (<acronym>IANA</acronym>) has issued the last of
-		  the available major blocks to the Regional Registries.
-		  Once each Region Registry runs out, there will be no more
-		  available and switching to <acronym>IPv6</acronym> will be
-		  critical.</para>
+	      private address space
+	      (<hostid role="ipaddr">10.0.0.0/8</hostid>,
+	      <hostid role="ipaddr">172.16.0.0/12</hostid>, and
+	      <hostid role="ipaddr">192.168.0.0/16</hostid>) and NAT has
+	      slowed down the exhaustion.  Even though, there are very few
+	      remaining IPv4 addresses.  The Internet Assigned Numbers
+	      Authority (<acronym>IANA</acronym>) has issued the last of
+	      the available major blocks to the Regional Registries.
+	      Once each Region Registry runs out, there will be no more
+	      available and switching to <acronym>IPv6</acronym> will be
+	      critical.</para>
       </listitem>
 
       <listitem>
 	    <para>Every block of IPv4 addresses allocated required routing
-		  information to be exchanged between many routers on the
-		  Internet, and these routing tables were getting too large to
-		  allow efficient routing.</para>
+	      information to be exchanged between many routers on the
+	      Internet, and these routing tables were getting too large to
+	      allow efficient routing.</para>
       </listitem>
     </itemizedlist>
 

From owner-svn-doc-head@FreeBSD.ORG  Wed Aug 28 08:14:34 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id A9265758;
 Wed, 28 Aug 2013 08:14:34 +0000 (UTC)
 (envelope-from maxim@FreeBSD.org)
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 966172430;
 Wed, 28 Aug 2013 08:14:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7S8EYjS047289;
 Wed, 28 Aug 2013 08:14:34 GMT (envelope-from maxim@svn.freebsd.org)
Received: (from maxim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7S8EYAV047287;
 Wed, 28 Aug 2013 08:14:34 GMT (envelope-from maxim@svn.freebsd.org)
Message-Id: <201308280814.r7S8EYAV047287@svn.freebsd.org>
From: Maxim Konovalov <maxim@FreeBSD.org>
Date: Wed, 28 Aug 2013 08:14:34 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42594 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Aug 2013 08:14:34 -0000

Author: maxim
Date: Wed Aug 28 08:14:34 2013
New Revision: 42594
URL: http://svnweb.freebsd.org/changeset/doc/42594

Log:
  "then then" -> "then".
  
  PR:		misc/181583
  Submitted by:	Ivan Aleman

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	Tue Aug 27 17:17:47 2013	(r42593)
+++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Wed Aug 28 08:14:34 2013	(r42594)
@@ -1381,7 +1381,7 @@ root     5211  0.0  0.2  3620  1724   2 
 
     <para>Disks in &os; are divided into slices, referred to in
       &windows; as partitions, which are numbered from 1 to 4.  These
-      are then then divided into partitions, which contain file
+      are then divided into partitions, which contain file
       systems, and are labeled using letters.</para>
 
     <indexterm><primary>slices</primary></indexterm>

From owner-svn-doc-head@FreeBSD.ORG  Wed Aug 28 10:32:20 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id CDEC84EC;
 Wed, 28 Aug 2013 10:32:20 +0000 (UTC) (envelope-from brd@FreeBSD.org)
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 BAE3D2C09;
 Wed, 28 Aug 2013 10:32:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7SAWKdA026260;
 Wed, 28 Aug 2013 10:32:20 GMT (envelope-from brd@svn.freebsd.org)
Received: (from brd@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7SAWKDe026259;
 Wed, 28 Aug 2013 10:32:20 GMT (envelope-from brd@svn.freebsd.org)
Message-Id: <201308281032.r7SAWKDe026259@svn.freebsd.org>
From: Brad Davis <brd@FreeBSD.org>
Date: Wed, 28 Aug 2013 10:32:20 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42595 -
 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Aug 2013 10:32:21 -0000

Author: brd
Date: Wed Aug 28 10:32:20 2013
New Revision: 42595
URL: http://svnweb.freebsd.org/changeset/doc/42595

Log:
  - Fix bad whitespace that I introduced in the last two commits. Sorry for the noise.
  
  Translators:    please ignore

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	Wed Aug 28 08:14:34 2013	(r42594)
+++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Wed Aug 28 10:32:20 2013	(r42595)
@@ -5021,25 +5021,25 @@ redirect_port tcp 192.168.0.3:80 80</pro
 
     <itemizedlist>
       <listitem>
-	    <para>Running out of addresses.  For years the use of RFC1918
-	      private address space
+	    <para>Running out of addresses.  For years the use of
+	      RFC1918 private address space
 	      (<hostid role="ipaddr">10.0.0.0/8</hostid>,
 	      <hostid role="ipaddr">172.16.0.0/12</hostid>, and
-	      <hostid role="ipaddr">192.168.0.0/16</hostid>) and NAT has
-	      slowed down the exhaustion.  Even though, there are very few
-	      remaining IPv4 addresses.  The Internet Assigned Numbers
-	      Authority (<acronym>IANA</acronym>) has issued the last of
-	      the available major blocks to the Regional Registries.
-	      Once each Region Registry runs out, there will be no more
-	      available and switching to <acronym>IPv6</acronym> will be
-	      critical.</para>
+	      <hostid role="ipaddr">192.168.0.0/16</hostid>) and NAT
+	      has slowed down the exhaustion.  Even though, there are
+	      very few remaining IPv4 addresses.  The Internet
+	      Assigned Numbers Authority (<acronym>IANA</acronym>) has
+	      issued the last of the available major blocks to the
+	      Regional Registries.  Once each Regional Registry runs
+	      out, there will be no more available and switching to 
+	      <acronym>IPv6</acronym> will be critical.</para>
       </listitem>
 
       <listitem>
-	    <para>Every block of IPv4 addresses allocated required routing
-	      information to be exchanged between many routers on the
-	      Internet, and these routing tables were getting too large to
-	      allow efficient routing.</para>
+	    <para>Every block of IPv4 addresses allocated required
+	      routing information to be exchanged between many routers
+	      on the Internet, and these routing tables were getting
+	      too large to allow efficient routing.</para>
       </listitem>
     </itemizedlist>
 
@@ -5327,13 +5327,15 @@ redirect_port tcp 192.168.0.3:80 80</pro
 	<filename>/etc/rc.conf</filename></title>
 
       <sect3>
-	<title><acronym>IPv6</acronym> Client Auto-Configuration</title>
+	<title><acronym>IPv6</acronym> Client
+	  Auto-Configuration</title>
 
 	<para>To automatically configure a machine on a
 	  <acronym>LAN</acronym> which acts as a client, not a
 	  router, two items are required.  First to enable the
-	  <devicename>em0</devicename> to receive the router solicitation
-	  messages, add this line to <filename>rc.conf</filename>:</para>
+	  <devicename>em0</devicename> to receive the router
+	  solicitation messages, add this line to
+	  <filename>rc.conf</filename>:</para>
 	
 	<programlisting>ifconfig_<replaceable>em0</replaceable>_ipv6="inet6 accept_rtadv"</programlisting>
 	

From owner-svn-doc-head@FreeBSD.ORG  Wed Aug 28 11:05:53 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id A1075300;
 Wed, 28 Aug 2013 11:05:53 +0000 (UTC) (envelope-from brd@FreeBSD.org)
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 7E2DA2E21;
 Wed, 28 Aug 2013 11:05: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 r7SB5rNs044881;
 Wed, 28 Aug 2013 11:05:53 GMT (envelope-from brd@svn.freebsd.org)
Received: (from brd@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7SB5rl8044880;
 Wed, 28 Aug 2013 11:05:53 GMT (envelope-from brd@svn.freebsd.org)
Message-Id: <201308281105.r7SB5rl8044880@svn.freebsd.org>
From: Brad Davis <brd@FreeBSD.org>
Date: Wed, 28 Aug 2013 11:05:53 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42596 -
 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Aug 2013 11:05:53 -0000

Author: brd
Date: Wed Aug 28 11:05:53 2013
New Revision: 42596
URL: http://svnweb.freebsd.org/changeset/doc/42596

Log:
  - Make the section about using applications with IPv6 a little more generic and move it to the end where it fits better.
  - Add Hurricane Electric as a Tunnel Broker.
  
  Reviewed by:	gavin@, Ken Reed <kreed002@gmail.com>

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	Wed Aug 28 10:32:20 2013	(r42595)
+++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Wed Aug 28 11:05:53 2013	(r42596)
@@ -5288,6 +5288,12 @@ redirect_port tcp 192.168.0.3:80 80</pro
 	  <para><ulink url="http://www.sixxs.net">SixXS</ulink> offers
 	    tunnels with end-points all around the globe.</para>
 	</listitem>
+	
+	<listitem>
+	  <para><ulink url="http://www.tunnelbroker.net">Hurricane
+	    Electric</ulink> offers tunnels with end-points all around
+	    the globe.</para>
+	</listitem>
 
 	<listitem>
 	  <para>Tunnel via 6-to-4 as described in <ulink
@@ -5303,26 +5309,6 @@ redirect_port tcp 192.168.0.3:80 80</pro
     </sect2>
 
     <sect2>
-      <title><acronym>DNS</acronym> in the <acronym>IPv6</acronym>
-	World</title>
-
-      <para>There used to be two types of <acronym>DNS</acronym>
-	records for <acronym>IPv6</acronym>.  The
-	<acronym>IETF</acronym> has declared <acronym>AAAA</acronym>
-	records as the current standard.</para>
-
-      <para>Using <acronym>AAAA</acronym> records is straightforward.
-	Assign the hostname to the <acronym>IPv6</acronym> address
-	in the primary zone <acronym>DNS</acronym> file:</para>
-
-      <programlisting>MYHOSTNAME           AAAA    MYIPv6ADDR</programlisting>
-
-      <para>Current versions of &man.named.8; and <filename
-	  role="package">dns/djbdns</filename> support
-	<acronym>AAAA</acronym> records.</para>
-    </sect2>
-
-    <sect2>
       <title>Applying the Needed Changes to
 	<filename>/etc/rc.conf</filename></title>
 
@@ -5495,6 +5481,23 @@ redirect_port tcp 192.168.0.3:80 80</pro
 	section 3.6 and 3.7 as well as <acronym>RFC</acronym> 4038
 	section 4.2 may be useful to some adminstrators.</para>
     </sect2>
+
+	<sect2>
+	  <title>Application Use of <acronym>IPv6</acronym></title>
+
+	    <para>Currently <acronym>IPv6</acronym> support for many
+	      applications and services is very good, though for some
+	      software it still needs work.  For authoritative
+	      information about the support of
+	      <acronym>IPv6</acronym>, please consult the Official
+	      Documentation for the software in question.</para>
+
+	    <para>Web, <acronym>DNS</acronym> and Mail applications
+	      and servers have the best support for
+	      <acronym>IPv6</acronym> because they are the most common
+	      use case.  Other applications may have varying degrees
+	      of <acronym>IPv6</acronym> support.</para>
+	</sect2>
   </sect1>
 
   <sect1 id="network-atm">

From owner-svn-doc-head@FreeBSD.ORG  Wed Aug 28 14:44:03 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 00A81DE6;
 Wed, 28 Aug 2013 14:44:02 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
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 E1C622C68;
 Wed, 28 Aug 2013 14:44:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7SEi2Jp071894;
 Wed, 28 Aug 2013 14:44:02 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7SEi29T071893;
 Wed, 28 Aug 2013 14:44:02 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201308281444.r7SEi29T071893@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 28 Aug 2013 14:44:02 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42597 - head/en_US.ISO8859-1/htdocs/releases/9.2R
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Aug 2013 14:44:03 -0000

Author: gjb
Date: Wed Aug 28 14:44:02 2013
New Revision: 42597
URL: http://svnweb.freebsd.org/changeset/doc/42597

Log:
  The 9.2-RELEASE cycle will include a -RC4 build.
  
  Adjust the -RELEASE and announcement dates appropriately.
  
  Approved by:	re (implicit)

Modified:
  head/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml

Modified: head/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml	Wed Aug 28 11:05:53 2013	(r42596)
+++ head/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml	Wed Aug 28 14:44:02 2013	(r42597)
@@ -120,15 +120,24 @@
     </tr>
 
     <tr>
+      <td>RC4 builds begin</td>
+      <td>31&nbsp;August&nbsp;2013</td>
+      <td>-</td>
+      <td>Fourth release candidate.</td>
+    </tr>
+
+    <tr>
       <td>RELEASE builds begin</td>
-      <td>23&nbsp;August&nbsp;2013</td>
+      <td><s>23&nbsp;August&nbsp;2013</s><br/>
+	6&nbsp;September&nbsp;2013</td>
       <td>-</td>
       <td>9.2-RELEASE built.</td>
     </tr>
 
     <tr>
       <td>RELEASE announcement</td>
-      <td>31&nbsp;August&nbsp;2013</td>
+      <td><s>31&nbsp;August&nbsp;2013</s><br/>
+	14&nbsp;September&nbsp;2013</td>
       <td>-</td>
       <td>9.2-RELEASE press release.</td>
     </tr>

From owner-svn-doc-head@FreeBSD.ORG  Wed Aug 28 15:03:53 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id BEE596C0;
 Wed, 28 Aug 2013 15:03:53 +0000 (UTC) (envelope-from brd@FreeBSD.org)
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 AA8332E86;
 Wed, 28 Aug 2013 15:03: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 r7SF3rkB082771;
 Wed, 28 Aug 2013 15:03:53 GMT (envelope-from brd@svn.freebsd.org)
Received: (from brd@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7SF3rGL082766;
 Wed, 28 Aug 2013 15:03:53 GMT (envelope-from brd@svn.freebsd.org)
Message-Id: <201308281503.r7SF3rGL082766@svn.freebsd.org>
From: Brad Davis <brd@FreeBSD.org>
Date: Wed, 28 Aug 2013 15:03:53 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42598 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Aug 2013 15:03:53 -0000

Author: brd
Date: Wed Aug 28 15:03:52 2013
New Revision: 42598
URL: http://svnweb.freebsd.org/changeset/doc/42598

Log:
  - Add the following from bapt@
    - Document new libdepends way
    - Add motif to the uses list
    - USE_DISPLAY is now USES=display

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	Wed Aug 28 14:44:02 2013	(r42597)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Wed Aug 28 15:03:52 2013	(r42598)
@@ -3565,35 +3565,19 @@ ALWAYS_KEEP_DISTFILES=	yes
 
 	<para>This variable specifies the shared libraries this port
 	  depends on.  It is a list of
-	  <replaceable>lib</replaceable>:<replaceable>dir</replaceable><optional><replaceable>:target</replaceable></optional>
+	  <replaceable>lib</replaceable>:<replaceable>dir</replaceable>
 	  tuples where <replaceable>lib</replaceable> is the name of
 	  the shared library, <replaceable>dir</replaceable> is the
-	  directory in which to find it in case it is not available,
-	  and <replaceable>target</replaceable> is the target to call
-	  in that directory.  For example,</para>
+	  directory in which to find it in case it is not available.
+	  For example,</para>
 
-	<programlisting>LIB_DEPENDS=   jpeg:${PORTSDIR}/graphics/jpeg</programlisting>
+	<programlisting>LIB_DEPENDS=   libjpeg.so:${PORTSDIR}/graphics/jpeg</programlisting>
 
 	<para>will check for a shared jpeg library with any version,
 	  and descend into the
 	  <filename>graphics/jpeg</filename> subdirectory of your
-	  ports tree to build and install it if it is not found.  The
-	  <replaceable>target</replaceable> part can be omitted if it
-	  is equal to <makevar>DEPENDS_TARGET</makevar> (which
-	  defaults to <literal>install</literal>).</para>
-
-	<note>
-	  <para>The <replaceable>lib</replaceable> part is a regular
-	    expression which is being looked up in the
-	    <command>ldconfig -r</command> output.  Values such as
-	    <literal>intl.9</literal> and
-	    <literal>intl.[5-7]</literal> are allowed.  The first
-	    pattern, <literal>intl.9</literal>, will match only
-	    version 9 of intl, while <literal>intl.[5-7]</literal>,
-	    will match any of: <literal>intl.5</literal>,
-	    <literal>intl.6</literal> or
-	    <literal>intl.7</literal>.</para>
-	</note>
+	  ports tree to build and install it if it is not found.
+	</para>
 
 	<para>The dependency is checked twice, once from within the
 	  <maketarget>extract</maketarget> target and then from within
@@ -6373,7 +6357,7 @@ USE_XORG=	x11 xpm</programlisting>
 	  X server.  The working <envar>DISPLAY</envar> is then passed
 	  to the build.</para>
 
-	<programlisting>USE_DISPLAY=	yes</programlisting>
+	<programlisting>USES=	display</programlisting>
       </sect2>
 
       <sect2 id="desktop-entries">

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses.xml	Wed Aug 28 14:44:02 2013	(r42597)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses.xml	Wed Aug 28 15:03:52 2013	(r42598)
@@ -121,6 +121,17 @@
 </row>
 
 <row>
+  <entry><literal>motif</literal></entry>
+  <entry>(none)</entry>
+  <entry>Implies that the ports uses <filename
+    role="package">devel/open-motif</filename> as a library
+    dependency. End users can set <makevar>WANT_LESSTIF</makevar>
+    for the dependency to be on <filename
+    role="package">devel/lesstif</filename> instead of <filename
+    role="package">devel/open-motif</filename>.</entry>
+</row>
+
+<row>
   <entry><literal>ncurses</literal></entry>
   <entry>(none), <literal>base</literal>,
     <literal>port</literal></entry>

From owner-svn-doc-head@FreeBSD.ORG  Wed Aug 28 15:05:07 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 69D9D780;
 Wed, 28 Aug 2013 15:05:07 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
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 5690F2EB7;
 Wed, 28 Aug 2013 15:05:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7SF576p083370;
 Wed, 28 Aug 2013 15:05:07 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7SF57U4083369;
 Wed, 28 Aug 2013 15:05:07 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201308281505.r7SF57U4083369@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 28 Aug 2013 15:05:07 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42599 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Aug 2013 15:05:07 -0000

Author: gjb
Date: Wed Aug 28 15:05:06 2013
New Revision: 42599
URL: http://svnweb.freebsd.org/changeset/doc/42599

Log:
  Update the anticipated release date for 9.2-RELEASE
  
  Prodded by:	pluknet

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

Modified: head/en_US.ISO8859-1/htdocs/releng/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releng/index.xml	Wed Aug 28 15:03:52 2013	(r42598)
+++ head/en_US.ISO8859-1/htdocs/releng/index.xml	Wed Aug 28 15:05:06 2013	(r42599)
@@ -50,7 +50,7 @@
     </tr>
 
     <tr>
-      <td>August 2013</td>
+      <td>September 2013</td>
       <td>&os; 9.2</td>
       <td><a href="&base;/releases/9.2R/schedule.html">Target Schedule</a></td>
     </tr>

From owner-svn-doc-head@FreeBSD.ORG  Wed Aug 28 15:19:38 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 6DDFE111;
 Wed, 28 Aug 2013 15:19:38 +0000 (UTC) (envelope-from brd@FreeBSD.org)
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 5B5A92098;
 Wed, 28 Aug 2013 15:19:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7SFJc6r090641;
 Wed, 28 Aug 2013 15:19:38 GMT (envelope-from brd@svn.freebsd.org)
Received: (from brd@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7SFJcqZ090640;
 Wed, 28 Aug 2013 15:19:38 GMT (envelope-from brd@svn.freebsd.org)
Message-Id: <201308281519.r7SFJcqZ090640@svn.freebsd.org>
From: Brad Davis <brd@FreeBSD.org>
Date: Wed, 28 Aug 2013 15:19:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42600 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Aug 2013 15:19:38 -0000

Author: brd
Date: Wed Aug 28 15:19:37 2013
New Revision: 42600
URL: http://svnweb.freebsd.org/changeset/doc/42600

Log:
  - Remove an extra 'a'
  - Running MIT Kerberos on FreeBSD does not need any flags passed to it
  
  Reviewed by:	Ken Reed <kreed002@gmail.com>

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	Wed Aug 28 15:05:06 2013	(r42599)
+++ head/en_US.ISO8859-1/books/handbook/security/chapter.xml	Wed Aug 28 15:19:37 2013	(r42600)
@@ -1579,7 +1579,7 @@ Aug 27 15:37:58  Aug 28 01:37:58  krbtgt
       <para>First, copy
 	<filename>/etc/krb5.conf</filename> from the
 	<acronym>KDC</acronym> to the client computer in a secure
-	fashion, such as &man.scp.1;, or physically via a removable
+	fashion, such as &man.scp.1;, or physically via removable
 	media.</para>
 
       <para>Next, create <filename>/etc/krb5.keytab</filename>.
@@ -1915,6 +1915,7 @@ jdoe@example.org</screen>
 
       <programlisting>kerberos5_server="/usr/local/sbin/krb5kdc"
 kadmind5_server="/usr/local/sbin/kadmind"
+kerberos5_server_flags=""
 kerberos5_server_enable="YES"
 kadmind5_server_enable="YES"</programlisting>
 

From owner-svn-doc-head@FreeBSD.ORG  Thu Aug 29 00:52:21 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 7C28FECE;
 Thu, 29 Aug 2013 00:52:21 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
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 67956250F;
 Thu, 29 Aug 2013 00:52: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 r7T0qLoX013894;
 Thu, 29 Aug 2013 00:52:21 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7T0qLa0013893;
 Thu, 29 Aug 2013 00:52:21 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201308290052.r7T0qLa0013893@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 29 Aug 2013 00:52:21 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42601 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Aug 2013 00:52:21 -0000

Author: wblock
Date: Thu Aug 29 00:52:20 2013
New Revision: 42601
URL: http://svnweb.freebsd.org/changeset/doc/42601

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	Wed Aug 28 15:19:37 2013	(r42600)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Thu Aug 29 00:52:20 2013	(r42601)
@@ -88,8 +88,9 @@
 	tab setting: <application>Emacs</application> and
 	<application>Vim</application> should recognize the setting on
 	loading the file.  Both &man.vi.1; and &man.ex.1; can be set
-	to use the correct value by typing <command>:set
-	  tabstop=4</command> once the file has been loaded.</para>
+	to use the correct value by typing
+	<command>:set tabstop=4</command> once the file has been
+	loaded.</para>
     </note>
 
     <para>
@@ -151,8 +152,8 @@ MANCOMPRESSED=	yes
 	contents of the <literal>&dollar;FreeBSD&dollar;</literal>
 	line, it will be filled in automatically by SVN when the port
 	is imported to our main ports tree.  You can find a more
-	detailed example in the <link
-	  linkend="porting-samplem">sample Makefile</link>
+	detailed example in the
+	<link linkend="porting-samplem">sample Makefile</link>
 	section.</para>
     </sect1>
 
@@ -163,8 +164,8 @@ MANCOMPRESSED=	yes
 	any port, whether they actually package or not.  They are
 	<filename>pkg-descr</filename> and
 	<filename>pkg-plist</filename>.  Their
-	<filename>pkg-</filename> prefix distinguishes them from
-	other files.</para>
+	<filename>pkg-</filename> prefix distinguishes them from other
+	files.</para>
 
       <sect2>
 	<title><filename>pkg-descr</filename></title>
@@ -193,13 +194,12 @@ MANCOMPRESSED=	yes
 	  runtime environment, or implementation languages help users
 	  decide whether this port will work for them.</para>
 
-	<para>Include a URL to the official WWW homepage.
-	  Prepend <emphasis>one</emphasis> of
-	  the websites (pick the most common one) with
-	  <literal>WWW:</literal> (followed by single space) so that
-	  automated tools will work correctly.  If the URI is the root
-	  of the website or directory, it should be terminated with a
-	  slash.</para>
+	<para>Include a URL to the official WWW homepage.  Prepend
+	  <emphasis>one</emphasis> of the websites (pick the most
+	  common one) with <literal>WWW:</literal> (followed by single
+	  space) so that automated tools will work correctly.  If the
+	  URI is the root of the website or directory, it should be
+	  terminated with a slash.</para>
 
 	<note>
 	  <para>If the listed webpage for a port is not available, try
@@ -397,12 +397,13 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 	<command>portlint</command></title>
 
       <para>Please use <command>portlint</command> to see if your port
-	conforms to our guidelines.  The <filename
-	  role="package">ports-mgmt/portlint</filename> program is
-	part of the ports collection.  In particular, you may want to
-	check if the <link linkend="porting-samplem">Makefile</link>
-	is in the right shape and the <link
-	  linkend="porting-pkgname">package</link> is named
+	conforms to our guidelines.  The
+	<filename role="package">ports-mgmt/portlint</filename>
+	program is part of the ports collection.  In particular, you
+	may want to check if the
+	<link linkend="porting-samplem">Makefile</link> is in the
+	right shape and the
+	<link linkend="porting-pkgname">package</link> is named
 	appropriately.</para>
     </sect1>
 
@@ -410,8 +411,8 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
       <title>Submitting the New Port</title>
 
       <para>Before you submit the new port, make sure you have read
-	the <link
-	  linkend="porting-dads">DOs and DON'Ts</link> section.</para>
+	the <link linkend="porting-dads">DOs and DON'Ts</link>
+	section.</para>
 
       <para>Now that you are happy with your port, the only thing
 	remaining is to put it in the main &os; ports tree and make
@@ -421,8 +422,8 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 	Next, assuming your port is called oneko,
 	<command>cd</command> to the directory above where the
 	<literal>oneko</literal> directory is located, and then type
-	the following: <command>shar `find oneko` &gt;
-	  oneko.shar</command></para>
+	the following:
+	<command>shar `find oneko` &gt; oneko.shar</command></para>
 
       <para>Include your <literal>oneko.shar</literal> file in a bug
 	report and send it with the &man.send-pr.1; program (see
@@ -450,9 +451,9 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 
       <para>One more time, <emphasis>do not include the original
 	  source distfile, the <filename>work</filename> directory, or
-	  the package you built with <command>make
-	  package</command></emphasis>; and, do use &man.shar.1; for
-	new ports, not &man.diff.1;.</para>
+	  the package you built with
+	  <command>make package</command></emphasis>; and, do use
+	&man.shar.1; for new ports, not &man.diff.1;.</para>
 
       <para>After you have submitted your port, please be patient.
 	Sometimes it can take a few months before a port is included
@@ -655,19 +656,19 @@ PLIST_DIRS=	lib/X11/oneko</programlistin
 	<makevar>MASTER_SITES</makevar>.  If you can, try to talk the
 	port author out of doing this; it really does help to
 	establish some kind of source code control.  Hosting your own
-	version will prevent users from getting <errorname>checksum
-	  mismatch</errorname> errors, and also reduce the workload of
-	maintainers of our FTP site.  Also, if there is only one
-	master site for the port, it is recommended that you house a
-	backup at your site and list it as the second
+	version will prevent users from getting
+	<errorname>checksum mismatch</errorname> errors, and also
+	reduce the workload of maintainers of our FTP site.  Also, if
+	there is only one master site for the port, it is recommended
+	that you house a backup at your site and list it as the second
 	<makevar>MASTER_SITES</makevar>.</para>
 
       <para>If your port requires some additional `patches' that are
 	available on the Internet, fetch them too and put them in
 	<makevar>DISTDIR</makevar>.  Do not worry if they come from a
 	site other than where you got the main source tarball, we have
-	a way to handle these situations (see the description of <link
-	  linkend="porting-patchfiles">PATCHFILES</link>
+	a way to handle these situations (see the description of
+	<link linkend="porting-patchfiles">PATCHFILES</link>
 	below).</para>
     </sect1>
 
@@ -853,8 +854,8 @@ DOS2UNIX_REGEX=	.*\.(c|cpp|h)</programli
 
     <para>Configuring the <filename>Makefile</filename> is pretty
       simple, and again we suggest that you look at existing examples
-      before starting.  Also, there is a <link
-	linkend="porting-samplem">sample Makefile</link> in this
+      before starting.  Also, there is a
+      <link linkend="porting-samplem">sample Makefile</link> in this
       handbook, so take a look and please follow the ordering of
       variables and sections in that template to make your port easier
       for others to read.</para>
@@ -1109,16 +1110,16 @@ PORTREVISION=	1</programlisting>
 	  <para>A new version is released by the vendor, numbered
 	    <literal>0.2</literal> (it turns out the author actually
 	    intended <literal>0.10</literal> to actually mean
-	    <literal>0.1.0</literal>, not <quote>what comes after
-	      0.9</quote> - oops, too late now).  Since the new minor
-	    version <literal>2</literal> is numerically less than the
-	    previous version <literal>10</literal>, the
-	    <makevar>PORTEPOCH</makevar> must be bumped to manually
-	    force the new package to be detected as
-	    <quote>newer</quote>.  Since it is a new vendor release of
-	    the code, <makevar>PORTREVISION</makevar> is reset to 0
-	    (or removed from the
-	    <filename>Makefile</filename>).</para>
+	    <literal>0.1.0</literal>, not
+	    <quote>what comes after 0.9</quote> - oops, too late now).
+	    Since the new minor version <literal>2</literal> is
+	    numerically less than the previous version
+	    <literal>10</literal>, the <makevar>PORTEPOCH</makevar>
+	    must be bumped to manually force the new package to be
+	    detected as <quote>newer</quote>.  Since it is a new
+	    vendor release of the code,
+	    <makevar>PORTREVISION</makevar> is reset to 0 (or removed
+	    from the <filename>Makefile</filename>).</para>
 
 	  <programlisting>PORTNAME=	gtkmumble
 PORTVERSION=	0.2
@@ -1162,9 +1163,9 @@ PORTEPOCH=	1</programlisting>
 	  <makevar>PORTVERSION</makevar> to form
 	  <makevar>PKGNAME</makevar> as
 	  <literal>${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}</literal>.
-	  Make sure this conforms to our <link
-	    linkend="porting-pkgname">guidelines for a good package
-	    name</link>.  In particular, you are
+	  Make sure this conforms to our
+	  <link linkend="porting-pkgname">guidelines for a good
+	    package name</link>.  In particular, you are
 	  <emphasis>not</emphasis> allowed to use a hyphen
 	  (<literal>-</literal>) in <makevar>PORTVERSION</makevar>.
 	  Also, if the package name has the
@@ -1202,8 +1203,8 @@ PORTEPOCH=	1</programlisting>
 	  use.  By setting <makevar>NO_LATEST_LINK</makevar>, 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>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
@@ -1499,8 +1500,8 @@ PORTEPOCH=	1</programlisting>
 	<para>This list also determines where in the ports tree the
 	  port is imported.  If you put more than one category here,
 	  it is assumed that the port files will be put in the
-	  subdirectory with the name in the first category.  See <link
-	    linkend="choosing-categories">below</link> for more
+	  subdirectory with the name in the first category.  See
+	  <link linkend="choosing-categories">below</link> for more
 	  discussion about how to pick the right categories.</para>
       </sect2>
 
@@ -1706,8 +1707,8 @@ PORTEPOCH=	1</programlisting>
 
 	      <row>
 		<entry><filename>gnome*</filename></entry>
-		<entry>Ports from the <ulink
-		    url="http://www.gnome.org">GNOME</ulink>
+		<entry>Ports from the
+		  <ulink url="http://www.gnome.org">GNOME</ulink>
 		  Project.</entry>
 		<entry></entry>
 	      </row>
@@ -1781,8 +1782,8 @@ PORTEPOCH=	1</programlisting>
 
 	      <row>
 		<entry><filename>kde*</filename></entry>
-		<entry>Ports from the <ulink
-		    url="http://www.kde.org">KDE</ulink>
+		<entry>Ports from the
+		  <ulink url="http://www.kde.org">KDE</ulink>
 		  Project.</entry>
 		<entry></entry>
 	      </row>
@@ -2119,9 +2120,9 @@ PORTEPOCH=	1</programlisting>
 
 	      <row>
 		<entry><filename>xfce*</filename></entry>
-		<entry>Ports related to the <ulink
-		    url="http://www.xfce.org/">Xfce</ulink> desktop
-		  environment.</entry>
+		<entry>Ports related to the
+		  <ulink url="http://www.xfce.org/">Xfce</ulink>
+		  desktop environment.</entry>
 		<entry></entry>
 	      </row>
 
@@ -2485,6 +2486,7 @@ MASTER_SITE_SUBDIR=	make</programlisting
 	<programlisting>MASTER_SITES=	SF/stardict/WyabdcRealPeopleTTS/${PORTVERSION}</programlisting>
 
 	<para>This can be also written as</para>
+
 	<programlisting>MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	stardict/WyabdcRealPeopleTTS/${PORTVERSION}</programlisting>
 
@@ -2691,9 +2693,9 @@ EXTRACT_ONLY=	source.tar.gz</programlist
 	  Sites and Subdirectories
 	  (<literal>MASTER_SITES:n</literal>)</title>
 
-	<para>(Consider this to be a somewhat <quote>advanced
-	    topic</quote>; those new to this document may wish to skip
-	  this section at first).</para>
+	<para>(Consider this to be a somewhat
+	  <quote>advanced topic</quote>; those new to this document
+	  may wish to skip this section at first).</para>
 
 	<para>This section has information on the fetching mechanism
 	  known as both <literal>MASTER_SITES:n</literal> and
@@ -3522,8 +3524,8 @@ ALWAYS_KEEP_DISTFILES=	yes
 	    checks because it is known to be broken, add:</para>
 
 	  <programlisting>PORTSCOUT=	ignore:8.2</programlisting>
-
 	</listitem>
+
 	<listitem>
 	  <para>When specific versions or specific major and minor
 	    revisions of a distfile should be checked.  For
@@ -3533,8 +3535,8 @@ ALWAYS_KEEP_DISTFILES=	yes
 	    &os;, add:</para>
 
 	  <programlisting>PORTSCOUT=	limit:^0\.6\.4</programlisting>
-
 	</listitem>
+
 	<listitem>
 	  <para>When URLs listing the available versions differ
 	    from the download URLs.  For example, to limit
@@ -3574,10 +3576,9 @@ ALWAYS_KEEP_DISTFILES=	yes
 	<programlisting>LIB_DEPENDS=   libjpeg.so:${PORTSDIR}/graphics/jpeg</programlisting>
 
 	<para>will check for a shared jpeg library with any version,
-	  and descend into the
-	  <filename>graphics/jpeg</filename> subdirectory of your
-	  ports tree to build and install it if it is not found.
-	</para>
+	  and descend into the <filename>graphics/jpeg</filename>
+	  subdirectory of your ports tree to build and install it if
+	  it is not found.</para>
 
 	<para>The dependency is checked twice, once from within the
 	  <maketarget>extract</maketarget> target and then from within
@@ -3661,8 +3662,8 @@ ALWAYS_KEEP_DISTFILES=	yes
 	  variables, which are processed by
 	  <filename>ports/Mk/bsd.*.mk</filename> to augment initial
 	  build dependencies.  For example,
-	  <literal>USES= gmake</literal> adds <filename
-	    role="package">devel/gmake</filename> to
+	  <literal>USES= gmake</literal> adds
+	  <filename role="package">devel/gmake</filename> to
 	  <makevar>BUILD_DEPENDS</makevar>.  To prevent such
 	  additional dependencies from polluting
 	  <makevar>RUN_DEPENDS</makevar>, take care to assign with
@@ -4111,9 +4112,9 @@ MASTERDIR=	${.CURDIR}/../xdvi300
 	automatically add any manpages to
 	<filename>pkg-plist</filename> (this means you must
 	<emphasis>not</emphasis> list manpages in the
-	<filename>pkg-plist</filename>&mdash;see <link
-	  linkend="plist-sub">generating PLIST</link> for more).  It
-	also makes the install stage automatically compress or
+	<filename>pkg-plist</filename>&mdash;see
+	<link linkend="plist-sub">generating PLIST</link> for more).
+	It also makes the install stage automatically compress or
 	uncompress manpages depending on the setting of
 	<makevar>NO_MANCOMPRESS</makevar> in
 	<filename>/etc/make.conf</filename>.</para>
@@ -4518,7 +4519,6 @@ CONFIGURE_ARGS+=	--without-examples
 
 .include &lt;bsd.port.mk&gt;</programlisting>
 	  </example>
-
 	</sect3>
 
 	<sect3>
@@ -4604,15 +4604,17 @@ CONFIGURE_ARGS+=	--disable-foo
 
 	<note>
 	  <para>Under some circumstances, the shorthand conditional
-	    syntax can cause problems with complex constructs.
-	    If you receive errors such as <literal>Malformed
-	      conditional</literal>, an alternative syntax can be
-	    used.</para>
+	    syntax can cause problems with complex constructs.  If you
+	    receive errors such as
+	    <literal>Malformed conditional</literal>, an alternative
+	    syntax can be used.</para>
+
 	  <programlisting>.if !empty(VARIABLE:MVALUE)
 # as an alternative to
 .if ${VARIABLE:MVALUE}</programlisting>
 	</note>
       </sect2>
+
       <sect2>
 	<title>Options Helpers</title>
 
@@ -4620,8 +4622,8 @@ CONFIGURE_ARGS+=	--disable-foo
 	  values which differ based on the options set.</para>
 
 	<para>If <makevar>OPTIONS_SUB</makevar> is set to
-	  <literal>yes</literal> then each of the options added 
-	  to <makevar>OPTIONS_DEFINE</makevar> will be added to 
+	  <literal>yes</literal> then each of the options added
+	  to <makevar>OPTIONS_DEFINE</makevar> will be added to
 	  <makevar>PLIST_SUB</makevar>, for example:</para>
 
 	<programlisting>OPTIONS_DEFINE=	OPT1
@@ -4640,10 +4642,10 @@ PLIST_SUB+=	OPT1="@comment "
 .endif</programlisting>
 
 	<para>If <makevar>X_CONFIGURE_ENABLE</makevar> is set then
-	  <literal>--enable-${X_CONFIGURE_ENABLE}</literal>
-	  or <literal>--disable-${X_CONFIGURE_ENABLE}</literal> will
-	  be added to <makevar>CONFIGURE_ARGS</makevar> depending on
-	  the value of the option<makevar>X</makevar>, for example:</para>
+	  <literal>--enable-${X_CONFIGURE_ENABLE}</literal> or
+	  <literal>--disable-${X_CONFIGURE_ENABLE}</literal> will be
+	  added to <makevar>CONFIGURE_ARGS</makevar> depending on the
+	  value of the option<makevar>X</makevar>, for example:</para>
 
 	<programlisting>OPTIONS_DEFINE=	OPT1
 OPT1_CONFIGURE_ENABLE=	test</programlisting>
@@ -4663,7 +4665,7 @@ CONFIGURE_ARGS+=	--disable-test
 	<para>If <makevar>X_CONFIGURE_WITH</makevar> is set then
 	  <literal>--with-${X_CONFIGURE_WITH}</literal>
 	  or <literal>--without-${X_CONFIGURE_WITH}</literal> will
-	  be added to <makevar>CONFIGURE_ARGS</makevar> depending 
+	  be added to <makevar>CONFIGURE_ARGS</makevar> depending
 	  on the status of the option <makevar>X</makevar>,
 	  for example:</para>
 
@@ -4682,10 +4684,10 @@ CONFIGURE_ARGS+=	--with-test
 CONFIGURE_ARGS+=	--without-test
 .endif</programlisting>
 
-	<para>If <makevar>X_CONFIGURE_ON</makevar> is set then its value
-	  will be appended to <makevar>CONFIGURE_ARGS</makevar> depending
-	  on the status of the option <makevar>X</makevar>, for example:
-	</para>
+	<para>If <makevar>X_CONFIGURE_ON</makevar> is set then its
+	  value will be appended to <makevar>CONFIGURE_ARGS</makevar>
+	  depending on the status of the option <makevar>X</makevar>,
+	  for example:</para>
 
 	<programlisting>OPTIONS_DEFINE=	OPT1
 OPT1_CONFIGURE_ON=	--add-test</programlisting>
@@ -4700,10 +4702,10 @@ OPT1_CONFIGURE_ON=	--add-test</programli
 CONFIGURE_ARGS+=	--add-test
 .endif</programlisting>
 
-	<para>If <makevar>X_CONFIGURE_OFF</makevar> is set then its value
-	  will be appended to <makevar>CONFIGURE_ARGS</makevar> depending
-	  on the status of the option <makevar>X</makevar>, for example:
-	</para>
+	<para>If <makevar>X_CONFIGURE_OFF</makevar> is set then its
+	  value will be appended to <makevar>CONFIGURE_ARGS</makevar>
+	  depending on the status of the option <makevar>X</makevar>,
+	  for example:</para>
 
 	<programlisting>OPTIONS_DEFINE=	OPT1
 OPT1_CONFIGURE_OFF=	--no-test</programlisting>
@@ -4718,8 +4720,8 @@ CONFIGURE_ARGS+=	--no-test
 
 	<para>If <makevar>X_CMAKE_ON</makevar> is set then its value
 	  will be appended to <makevar>CMAKE_ARGS</makevar> depending
-	  on the status of the option <makevar>X</makevar>, for example:
-	</para>
+	  on the status of the option <makevar>X</makevar>, for
+	  example:</para>
 
 	<programlisting>OPTIONS_DEFINE=	OPT1
 OPT1_CMAKE_ON=	-DTEST:BOOL=true</programlisting>
@@ -4736,8 +4738,8 @@ CMAKE_ARGS+=	-DTEST:BOOL=true
 
 	<para>If <makevar>X_CMAKE_OFF</makevar> is set then its value
 	  will be appended to <makevar>CMAKE_ARGS</makevar> depending
-	  on the status of the option <makevar>X</makevar>, for example:
-	</para>
+	  on the status of the option <makevar>X</makevar>, for
+	  example:</para>
 
 	<programlisting>OPTIONS_DEFINE=	OPT1
 OPT1_CMAKE_OFF=	-DTEST:BOOL=false</programlisting>
@@ -4755,33 +4757,33 @@ CMAKE_ARGS+=	-DTEST:BOOL=false
 	<para>For any of the following variables:</para>
 
 	<itemizedlist>
-	    <listitem>
-	      <para><makevar>CFLAGS</makevar></para>
-	    </listitem>
+	  <listitem>
+	    <para><makevar>CFLAGS</makevar></para>
+	  </listitem>
 
-	    <listitem>
-	      <para><makevar>CXXFLAGS</makevar></para>
-	    </listitem>
+	  <listitem>
+	    <para><makevar>CXXFLAGS</makevar></para>
+	  </listitem>
 
-	    <listitem>
-	      <para><makevar>LDLAGS</makevar></para>
-	    </listitem>
+	  <listitem>
+	    <para><makevar>LDLAGS</makevar></para>
+	  </listitem>
 
-	    <listitem>
-	      <para><makevar>CONFIGURE_ENV</makevar></para>
-	    </listitem>
+	  <listitem>
+	    <para><makevar>CONFIGURE_ENV</makevar></para>
+	  </listitem>
 
-	    <listitem>
-	      <para><makevar>MAKE_ENV</makevar></para>
-	    </listitem>
+	  <listitem>
+	    <para><makevar>MAKE_ENV</makevar></para>
+	  </listitem>
 
-	    <listitem>
-	      <para><makevar>USES</makevar></para>
-	    </listitem>
+	  <listitem>
+	    <para><makevar>USES</makevar></para>
+	  </listitem>
 
-	    <listitem>
-	      <para><makevar>DISTFILES</makevar></para>
-	    </listitem>
+	  <listitem>
+	    <para><makevar>DISTFILES</makevar></para>
+	  </listitem>
 	</itemizedlist>
 
 	<para>If <makevar>X_ABOVEVARIABLE</makevar> is defined then
@@ -4807,33 +4809,33 @@ CFLAGS+=	-DTEST
 	<para>For any of the following dependency type:</para>
 
 	<itemizedlist>
-	    <listitem>
-	      <para><makevar>PKG_DEPENDS</makevar></para>
-	    </listitem>
+	  <listitem>
+	    <para><makevar>PKG_DEPENDS</makevar></para>
+	  </listitem>
 
-	    <listitem>
-	      <para><makevar>EXTRACT_DEPENDS</makevar></para>
-	    </listitem>
+	  <listitem>
+	    <para><makevar>EXTRACT_DEPENDS</makevar></para>
+	  </listitem>
 
-	    <listitem>
-	      <para><makevar>PATCH_DEPENDS</makevar></para>
-	    </listitem>
+	  <listitem>
+	    <para><makevar>PATCH_DEPENDS</makevar></para>
+	  </listitem>
 
-	    <listitem>
-	      <para><makevar>FETCH_DEPENDS</makevar></para>
-	    </listitem>
+	  <listitem>
+	    <para><makevar>FETCH_DEPENDS</makevar></para>
+	  </listitem>
 
-	    <listitem>
-	      <para><makevar>BUILD_DEPENDS</makevar></para>
-	    </listitem>
+	  <listitem>
+	    <para><makevar>BUILD_DEPENDS</makevar></para>
+	  </listitem>
 
-	    <listitem>
-	      <para><makevar>LIB_DEPENDS</makevar></para>
-	    </listitem>
+	  <listitem>
+	    <para><makevar>LIB_DEPENDS</makevar></para>
+	  </listitem>
 
-	    <listitem>
-	      <para><makevar>RUN_DEPENDS</makevar></para>
-	    </listitem>
+	  <listitem>
+	    <para><makevar>RUN_DEPENDS</makevar></para>
+	  </listitem>
 	</itemizedlist>
 
 	<para>If <makevar>X_ABOVEVARIABLE</makevar> is defined then
@@ -5188,8 +5190,8 @@ PORTVERSION=	1.0</programlisting>
 	  <filename>share/doc/<makevar>PORTNAME</makevar></filename>
 	  will be substituted for <literal>%%DOCSDIR%%</literal> in
 	  the packing list by default, and so on.  (See more on
-	  <filename>pkg-plist</filename> substitution <link
-	    linkend="plist-sub">here</link>.)</para>
+	  <filename>pkg-plist</filename> substitution
+	  <link linkend="plist-sub">here</link>.)</para>
 
 	<para>All conditionally installed documentation files and
 	  directories should be included in
@@ -5229,8 +5231,8 @@ PORTVERSION=	1.0</programlisting>
 	    <makevar>PORTEXAMPLES</makevar>, respectively.</para>
 
 	  <para>You can also use the <filename>pkg-message</filename>
-	    file to display messages upon installation.  See <link
-	      linkend="porting-message">the section on using
+	    file to display messages upon installation.  See
+	    <link linkend="porting-message">the section on using
 	    <filename>pkg-message</filename></link> for details.  The
 	    <filename>pkg-message</filename> file does not need to be
 	    added to <filename>pkg-plist</filename>.</para>
@@ -5304,9 +5306,9 @@ PORTVERSION=	1.0</programlisting>
 
       <para>Please double-check, often this is not necessary at all or
 	can be avoided through <literal>-rpath</literal> or setting
-	<envar>LD_RUN_PATH</envar> during linking (see <filename
-	  role="package">lang/moscow_ml</filename> for an example), or
-	through a shell-wrapper which sets
+	<envar>LD_RUN_PATH</envar> during linking (see
+	<filename role="package">lang/moscow_ml</filename> for an
+	example), or through a shell-wrapper which sets
 	<makevar>LD_LIBRARY_PATH</makevar> before invoking the binary,
 	like <filename role="package">www/seamonkey</filename>
 	does.</para>
@@ -5530,12 +5532,13 @@ IGNORE=	may not be redistributed because
 	  <filename>Imakefile</filename> files using
 	  <application>imake</application>, then set
 	  <literal>USES= imake</literal>.  This will cause the
-	  configure stage to automatically do an <command>xmkmf
-	    -a</command>.  If the <option>-a</option> flag is a
-	  problem for your port, set <literal>XMKMF=xmkmf</literal>.
-	  If the port uses <application>imake</application> but does
-	  not understand the <maketarget>install.man</maketarget>
-	  target, <literal>NO_INSTALL_MANPAGES=yes</literal> should be
+	  configure stage to automatically do an
+	  <command>xmkmf -a</command>.  If the <option>-a</option>
+	  flag is a problem for your port, set
+	  <literal>XMKMF=xmkmf</literal>.  If the port uses
+	  <application>imake</application> but does not understand the
+	  <maketarget>install.man</maketarget> target,
+	  <literal>NO_INSTALL_MANPAGES=yes</literal> should be
 	  set.</para>
 
 	<para>If your port's source <filename>Makefile</filename> has
@@ -5676,8 +5679,8 @@ IGNORE=	may not be redistributed because
 	  lower-cased value of <makevar>CMAKE_BUILD_TYPE</makevar> is
 	  exported to the <makevar>PLIST_SUB</makevar> and should be
 	  used if port installs <literal>*.cmake</literal> files
-	  depending on the build type (see <filename
-	    role="package">deskutils/strigi</filename> for an
+	  depending on the build type (see
+	  <filename role="package">deskutils/strigi</filename> for an
 	  example).  Please note that some projects may define their
 	  own build profiles and/or force particular build type by
 	  setting <literal>CMAKE_BUILD_TYPE</literal> in
@@ -5999,9 +6002,9 @@ GNU_CONFIGURE=	yes</programlisting>
 	  through passing <option>--disable-nls</option> to
 	  <command>configure</command>.  In that case, your port
 	  should use <literal>gettext</literal> conditionally,
-	  depending on the status of the <makevar>NLS</makevar> option.
-	  For ports of low to medium complexity, you can rely on the
-	  following idiom:</para>
+	  depending on the status of the <makevar>NLS</makevar>
+	  option.  For ports of low to medium complexity, you can rely
+	  on the following idiom:</para>
 
 	<programlisting>GNU_CONFIGURE=		yes
 
@@ -6052,7 +6055,6 @@ PLIST_SUB+=		NLS="@comment "
 	  reside under
 	  <filename><makevar>LOCALBASE</makevar>/share/locale</filename>,
 	  should rarely be created and removed by a port.  The most
-
 	  popular languages have their respective directories listed
 	  in
 	  <filename><makevar>PORTSDIR</makevar>/Templates/BSD.local.dist</filename>.
@@ -6253,9 +6255,10 @@ PLIST_SUB+=		NLS="@comment "
 	<para>The Mesa Project is an effort to provide free OpenGL
 	  implementation.  You can specify a dependency on various
 	  components of this project with <makevar>USE_GL</makevar>
-	  variable.  Valid options are: <literal>glut, glu, glw, glew,
-	    gl</literal> and <literal>linux</literal>.  For backwards
-	  compatibility, the value of <literal>yes</literal> maps to
+	  variable.  Valid options are:
+	  <literal>glut, glu, glw, glew, gl</literal> and
+	  <literal>linux</literal>.  For backwards compatibility, the
+	  value of <literal>yes</literal> maps to
 	  <literal>glu</literal>.</para>
 
 	<example id="use-xorg-example">
@@ -6299,11 +6302,12 @@ USE_XORG=	x11 xpm</programlisting>
 	<para>If your port requires a Motif library, define
 	  <makevar>USES= motif</makevar> in the
 	  <filename>Makefile</filename>.  Default Motif implementation
-	  is <filename
-	    role="package">x11-toolkits/open-motif</filename>.  Users
-	  can choose <filename
-	    role="package">x11-toolkits/lesstif</filename> instead by
-	  setting <makevar>WANT_LESSTIF</makevar> variable.</para>
+	  is
+	  <filename role="package">x11-toolkits/open-motif</filename>.
+	  Users can choose
+	  <filename role="package">x11-toolkits/lesstif</filename>
+	  instead by setting <makevar>WANT_LESSTIF</makevar>
+	  variable.</para>
 
 	<para>The <makevar>MOTIFLIB</makevar> variable will be set by
 	  <filename>bsd.port.mk</filename> to reference the
@@ -6399,9 +6403,10 @@ USE_XORG=	x11 xpm</programlisting>
 
 	  <para>If a port has a MimeType entry in its
 	    <filename><replaceable>portname</replaceable>.desktop</filename>,
-	    the desktop database must
-	    be updated after install and deinstall.  To do this,
-	    define <makevar>USES</makevar>= desktop-file-utils.</para>
+	    the desktop database must be updated after install and
+	    deinstall.  To do this, define <makevar>USES</makevar>=
+	    desktop-file-utils.</para>
+
 	</sect3>
 
 	<sect3 id="desktop-entries-macro">
@@ -6480,8 +6485,8 @@ USE_XORG=	x11 xpm</programlisting>
 	      <row>
 		<entry><makevar>USE_QT4</makevar></entry>
 		<entry>Specify tool and library dependencies for ports
-		  that use Qt 4.  See <link
-		    linkend="qt4-components">Qt 4 component
+		  that use Qt 4.  See
+		    <link linkend="qt4-components">Qt 4 component
 		    selection</link> for more details.</entry>
 	      </row>
 
@@ -6609,20 +6614,20 @@ PLIST_SUB+=	QT_INCDIR_REL=${QT_INCDIR_RE
       <sect2 id="qt4-components">
 	<title>Component Selection (Qt 4.x Only)</title>
 
-	<para>Individual Qt 4 tool and library dependencies
-	  must be specified in the <makevar>USE_QT4</makevar>
-	  variable.  Every component
-	  can be suffixed by either <literal>_build</literal> or
-	  <literal>_run</literal>, the suffix indicating whether the
-	  component should be depended on at buildtime or runtime,
-	  respectively.  If unsuffixed, the component will be depended
-	  on at both build- and runtime.  Usually, library components
-	  should be specified unsuffixed, tool components should be
-	  specified with the <literal>_build</literal> suffix and
-	  plugin components should be specified with the
-	  <literal>_run</literal> suffix.  The most commonly used
-	  components are listed below (all available components are
-	  listed in <makevar>_USE_QT4_ALL</makevar> in
+	<para>Individual Qt 4 tool and library dependencies must be
+	  specified in the <makevar>USE_QT4</makevar> variable.  Every
+	  component can be suffixed by either
+	  <literal>_build</literal> or <literal>_run</literal>, the
+	  suffix indicating whether the component should be depended
+	  on at buildtime or runtime, respectively.  If unsuffixed,
+	  the component will be depended on at both build- and
+	  runtime.  Usually, library components should be specified
+	  unsuffixed, tool components should be specified with the
+	  <literal>_build</literal> suffix and plugin components
+	  should be specified with the <literal>_run</literal> suffix.
+	  The most commonly used components are listed below (all
+	  available components are listed in
+	  <makevar>_USE_QT4_ALL</makevar> in
 	  <filename>/usr/ports/Mk/bsd.qt.mk</filename>):</para>
 
 	<table frame="none">
@@ -6682,7 +6687,6 @@ PLIST_SUB+=	QT_INCDIR_REL=${QT_INCDIR_RE
 		<entry><literal>xml</literal></entry>
 		<entry>XML library</entry>
 	      </row>
-
 	    </tbody>
 	  </tgroup>
 	</table>
@@ -6755,7 +6759,6 @@ PLIST_SUB+=	QT_INCDIR_REL=${QT_INCDIR_RE
 		<entry>imageformat plugins for GIF, JPEG, MNG and
 		  SVG (if the application ships image files)</entry>
 	      </row>
-
 	    </tbody>
 	  </tgroup>
 	</table>
@@ -6825,9 +6828,9 @@ do-configure:
 	    <para><emphasis>Bogus installation paths.</emphasis>
 	      Sometimes data such as icons or .desktop files are by
 	      default installed into directories which are not scanned
-	      by XDG-compatible applications.  <filename
-		role="package">editors/texmaker</filename> is an
-	      example for this - look at
+	      by XDG-compatible applications.
+	      <filename role="package">editors/texmaker</filename> is
+	      an example for this - look at
 	      <filename>patch-texmaker.pro</filename> in the
 	      <filename>files</filename> directory of that port for a
 	      template on how to remedy this directly in the
@@ -7003,13 +7006,13 @@ do-configure:
 
 	<para>KDE 4.x ports are installed into
 	  <makevar>KDE4_PREFIX</makevar>, which is
-	  <filename>/usr/local/kde4</filename> currently.
-	  This is achieved by
-	  specifying the <literal>kdeprefix</literal> component, which
-	  overrides the default <makevar>PREFIX</makevar>.  The ports
-	  however respect any <makevar>PREFIX</makevar> set via
-	  <envar>MAKEFLAGS</envar> environment variable and/or
-	  <command>make</command> arguments.</para>
+	  <filename>/usr/local/kde4</filename> currently.  This is
+	  achieved by specifying the <literal>kdeprefix</literal>
+	  component, which overrides the default
+	  <makevar>PREFIX</makevar>.  The ports however respect any
+	  <makevar>PREFIX</makevar> set via <envar>MAKEFLAGS</envar>
+	  environment variable and/or <command>make</command>
+	  arguments.</para>
 
 	<example id="kde4-components-example">
 	  <title><makevar>USE_KDE4</makevar> Example</title>
@@ -7050,8 +7053,8 @@ USE_QT4=	moc_build qmake_build rcc_build
 	<para>There are several JDKs in the ports collection, from
 	  various vendors, and in several versions.  If your port must
 	  use one of these versions, you can define which one.  The
-	  most current version, and &os; default is <filename
-	    role="package">java/openjdk6</filename>.</para>
+	  most current version, and &os; default is
+	  <filename role="package">java/openjdk6</filename>.</para>
 
 	<table frame="none">
 	  <title>Variables Which May be Set by Ports That Use
@@ -7064,6 +7067,7 @@ USE_QT4=	moc_build qmake_build rcc_build
 		<entry>Means</entry>
 	      </row>
 	    </thead>
+
 	    <tbody>
 	      <row>
 		<entry><makevar>USE_JAVA</makevar></entry>
@@ -7132,6 +7136,7 @@ USE_QT4=	moc_build qmake_build rcc_build
 		<entry>Value</entry>
 	      </row>
 	    </thead>
+
 	    <tbody>
 	      <row>
 		<entry><makevar>JAVA_PORT</makevar></entry>
@@ -7149,7 +7154,6 @@ USE_QT4=	moc_build qmake_build rcc_build
 
 	      <row>
 		<entry><makevar>JAVA_PORT_OS</makevar></entry>
-
 		<entry>The operating system used by the JDK port
 		  (e.g., <literal>'native'</literal>).</entry>
 	      </row>
@@ -7297,6 +7301,7 @@ USE_QT4=	moc_build qmake_build rcc_build
 		<entry>Value</entry>
 	      </row>
 	    </thead>
+
 	    <tbody>
 	      <row>
 		<entry><makevar>JAVASHAREDIR</makevar></entry>
@@ -7338,8 +7343,8 @@ USE_QT4=	moc_build qmake_build rcc_build
 	  default one will be set that simply runs Ant according to
 	  <makevar>MAKE_ENV</makevar>, <makevar>MAKE_ARGS</makevar>
 	  and <makevar>ALL_TARGET</makevar>.  This is similar to the
-	  <makevar>USES= gmake</makevar> mechanism, which is documented
-	  in <xref linkend="building"/>.</para>
+	  <makevar>USES= gmake</makevar> mechanism, which is
+	  documented in <xref linkend="building"/>.</para>
       </sect2>
 
       <sect2 id="java-best-practices">
@@ -7370,14 +7375,14 @@ USE_QT4=	moc_build qmake_build rcc_build
 
 	<para>Regardless of the type of your port (library or
 	  application), the additional documentation should be
-	  installed in the <link linkend="install-documentation">same
-	  location</link> as for any other port.  The JavaDoc tool is
-	  known to produce a different set of files depending on the
-	  version of the JDK that is used.  For ports that do not
-	  enforce the use of a particular JDK, it is therefore a
-	  complex task to specify the packing list
-	  (<filename>pkg-plist</filename>).  This is one reason why
-	  porters are strongly encouraged to use the
+	  installed in the
+	  <link linkend="install-documentation">same location</link>
+	  as for any other port.  The JavaDoc tool is known to produce
+	  a different set of files depending on the version of the JDK
+	  that is used.  For ports that do not enforce the use of a
+	  particular JDK, it is therefore a complex task to specify
+	  the packing list (<filename>pkg-plist</filename>).  This is
+	  one reason why porters are strongly encouraged to use the
 	  <makevar>PORTDOCS</makevar> macro.  Moreover, even if you
 	  can predict the set of files that will be generated by
 	  <command>javadoc</command>, the size of the resulting
@@ -7389,18 +7394,18 @@ USE_QT4=	moc_build qmake_build rcc_build
 	  good idea to override <makevar>DATADIR</makevar> to
 	  <filename>${JAVASHAREDIR}/${PORTNAME}</filename> for Java
 	  ports.  Indeed, <makevar>DATADIR</makevar> is automatically
-	  added to <makevar>PLIST_SUB</makevar> (documented in <xref
-	    linkend="plist-sub"/>) so you may use
+	  added to <makevar>PLIST_SUB</makevar> (documented in
+	  <xref linkend="plist-sub"/>) so you may use
 	  <literal>%%DATADIR%%</literal> directly in
 	  <filename>pkg-plist</filename>.</para>
 
 	<para>As for the choice of building Java ports from source or
 	  directly installing them from a binary distribution, there
 	  is no defined policy at the time of writing.  However,
-	  people from the <ulink
-	    url="http://www.freebsd.org/java/">&os; Java
-	  Project</ulink> encourage porters to have their ports built
-	  from source whenever it is a trivial task.</para>
+	  people from the
+	  <ulink url="http://www.freebsd.org/java/">&os; Java
+	    Project</ulink> encourage porters to have their ports
+	  built from source whenever it is a trivial task.</para>
 
 	<para>All the features that have been presented in this
 	  section are implemented in <filename>bsd.java.mk</filename>.
@@ -7568,9 +7573,9 @@ USE_QT4=	moc_build qmake_build rcc_build
 	  as <makevar>WWWOWN</makevar> and <makevar>WWWGRP</makevar>,
 	  in case you need to change the ownership of some files.  The
 	  default values of both are <literal>www</literal>.  If you
-	  want different values for your port, use <literal>WWWOWN?=
-	    myuser</literal> notation, to allow user to override it
-	  easily.</para>
+	  want different values for your port, use
+	  <literal>WWWOWN?= myuser</literal> notation, to allow user
+	  to override it easily.</para>
 
 	<para>Do not depend on Apache unless the web app explicitly
 	  needs Apache.  Respect that users may wish to run your web
@@ -7590,8 +7595,8 @@ USE_QT4=	moc_build qmake_build rcc_build
 		<entry>The port requires PHP.  The value
 		  <literal>yes</literal> adds a dependency on PHP.
 		  The list of required PHP extensions can be specified
-		  instead.  Example: <literal>pcre xml
-		    gettext</literal></entry>
+		  instead.  Example:
+		  <literal>pcre xml gettext</literal></entry>
 	      </row>
 
 	      <row>
@@ -7808,8 +7813,8 @@ _DOCSDIR=	.
 	      <entry><makevar>USE_TWISTED</makevar></entry>
 	      <entry>Add dependency on twistedCore.  The list of
 		required components can be specified as a value of
-		this variable.  Example: <literal>web lore pair
-		  flow</literal></entry>
+		this variable.  Example:
+		<literal>web lore pair flow</literal></entry>
 	    </row>
 
 	    <row>
@@ -7968,7 +7973,6 @@ _DOCSDIR=	.
 		<filename>setup.rb</filename>.  Common value is
 		<filename>install.rb</filename>.</entry>
 	    </row>
-
 	  </tbody>
 	</tgroup>
       </table>
@@ -8034,7 +8038,6 @@ _DOCSDIR=	.
 	      <entry>Module examples installation path.</entry>
 	      <entry><literal>/usr/local/share/examples/ruby18/patsy</literal></entry>
 	    </row>
-
 	  </tbody>
 	</tgroup>
       </table>
@@ -8049,8 +8052,8 @@ _DOCSDIR=	.
 
       <para>The <makevar>USE_SDL</makevar> variable is used to
 	autoconfigure the dependencies for ports which use an SDL
-	based library like <filename
-	  role="package">devel/sdl12</filename> and <filename
+	based library like
+	<filename role="package">devel/sdl12</filename> and <filename
 	  role="package">x11-toolkits/sdl_gui</filename>.</para>
 
       <para>The following SDL libraries are recognized at the
@@ -8115,11 +8118,11 @@ _DOCSDIR=	.
 
       <programlisting>USE_SDL=	net mixer</programlisting>
 
-      <para>The dependency <filename
-	  role="package">devel/sdl12</filename>, which is required by
-	<filename role="package">net/sdl_net</filename> and <filename
-	  role="package">audio/sdl_mixer</filename>, is automatically
-	added as well.</para>
+      <para>The dependency
+	<filename role="package">devel/sdl12</filename>, which is
+	required by <filename role="package">net/sdl_net</filename>
+	and <filename role="package">audio/sdl_mixer</filename>, is
+	automatically added as well.</para>
 
       <para>If you use <makevar>USE_SDL</makevar>, it will
 	automatically:</para>
@@ -8400,9 +8403,9 @@ USE_SDL+=	mixer
 
 	<para>The dependency type can be selected for each component
 	  by adding a suffix separated by a semicolon.  If not present
-	  then a default type will be used (see <xref
-	    linkend="wx-def-dep-types"/>).  The following types are
-	  available:</para>
+	  then a default type will be used (see
+	  <xref linkend="wx-def-dep-types"/>).  The following types
+	  are available:</para>
 
 	<table frame="none">
 	  <title>Available <application>wxWidgets</application>
@@ -8979,9 +8982,9 @@ WANT_LUA_VER=	5.0</programlisting>
 
 	<para>The dependency type can be selected for each component
 	  by adding a suffix separated by a semicolon.  If not present
-	  then a default type will be used (see <xref
-	    linkend="lua-def-dep-types"/>).  The following types are
-	  available:</para>
+	  then a default type will be used (see
+	  <xref linkend="lua-def-dep-types"/>).  The following types
+	  are available:</para>
 
 	<table frame="none">
 	  <title>Available <application>Lua</application> Dependency
@@ -9117,8 +9120,8 @@ CONFIGURE_ARGS+=	--enable-tolua
 	<title>Defined Variables</title>
 
 	<para>The following variables are available in the port (after
-	  defining one from <xref
-	    linkend="lua-ver-sel-table"/>).</para>
+	  defining one from
+	  <xref linkend="lua-ver-sel-table"/>).</para>
 
 	<table frame="none">
 	  <title>Variables Defined for Ports That Use
@@ -9293,9 +9296,10 @@ CFLAGS+=	-DLUA_VERSION_STRING="${VER_STR

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

From owner-svn-doc-head@FreeBSD.ORG  Thu Aug 29 01:46:15 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 49F30EF0;
 Thu, 29 Aug 2013 01:46:15 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
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 3623427E8;
 Thu, 29 Aug 2013 01:46: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 r7T1kFds043106;
 Thu, 29 Aug 2013 01:46:15 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7T1kFFk043105;
 Thu, 29 Aug 2013 01:46:15 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201308290146.r7T1kFFk043105@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 29 Aug 2013 01:46:15 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42602 -
 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Aug 2013 01:46:15 -0000

Author: wblock
Date: Thu Aug 29 01:46:14 2013
New Revision: 42602
URL: http://svnweb.freebsd.org/changeset/doc/42602

Log:
  Patch from Ken Reed to update and improve the NFS section.  Modified
  version of the patch included with PR.
  
  PR:		docs/181269
  Submitted by:	Ken Reed <kreed002@gmail.com>

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	Thu Aug 29 00:52:20 2013	(r42601)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Thu Aug 29 01:46:14 2013	(r42602)
@@ -557,37 +557,40 @@ server-program-arguments</programlisting
     <title>Network File System (NFS)</title>
 
     <indexterm><primary>NFS</primary></indexterm>
-    <para>Among the many different file systems that FreeBSD supports
-      is the Network File System, also known as <acronym role="Network
-      File System">NFS</acronym>.  <acronym role="Network File
-      System">NFS</acronym> allows a system to share directories and
-      files with others over a network.  By using <acronym
-      role="Network File System">NFS</acronym>, users and programs can
-      access files on remote systems almost as if they were local
-      files.</para>
+    <para>&os; supports the Network File System
+      (<acronym>NFS</acronym>), which allows a server to share
+      directories and files with clients over a network.  With
+      <acronym>NFS</acronym>, users and programs can access files
+      on remote systems as if they were stored locally.</para>
 
-    <para>Some of the most notable benefits that
-      <acronym>NFS</acronym> can provide are:</para>
+    <para>The most notable benefits that
+      <acronym>NFS</acronym> provides are:</para>
 
     <itemizedlist>
       <listitem>
-	<para>Local workstations use less disk space because commonly
-	  used data can be stored on a single machine and still remain
-	  accessible to others over the network.</para>
+	<para>Data that would otherwise be duplicated on each client
+	  can be kept in a single location and accessed by clients
+	  on the network.</para>
       </listitem>
 
       <listitem>
-	<para>There is no need for users to have separate home
-	  directories on every network machine.  Home directories
-	  could be set up on the <acronym>NFS</acronym> server and
-	  made available throughout the network.</para>
+	<para>User home directories can be stored in one location
+	  and accessed by their owners over the network.</para>
       </listitem>
 
       <listitem>
-	<para>Storage devices such as floppy disks, CDROM drives, and
-	  &iomegazip; drives can be used by other machines on the
-	  network.  This may reduce the number of removable media
-	  drives throughout the network.</para>
+	<para>Administration of <acronym>NFS</acronym> exports is
+	  also simplified.  For example, there is only one file
+	  system where security or backup policies must be
+	  set.</para>
+      </listitem>
+
+      <listitem>
+	<para>Removable media storage devices, such as floppy disks
+	  or <acronym>CD-ROM</acronym> drives, can be used by other
+	  machines on the network.  This reduces the number of devices
+	  throughout the network and provides a centralized location
+	  to manage their security.</para>
       </listitem>
     </itemizedlist>
 
@@ -600,7 +603,7 @@ server-program-arguments</programlisting
 	order for this to function properly a few processes have to be
 	configured and running.</para>
 
-      <para>The server has to be running the following daemons:</para>
+      <para>These daemons must be running on the server:</para>
       <indexterm>
 	<primary>NFS</primary>
 	<secondary>server</secondary>
@@ -657,13 +660,8 @@ server-program-arguments</programlisting
 	</tgroup>
       </informaltable>
 
-      <para>The client can also run a daemon, known as
-	<application>nfsiod</application>.  The
-	<application>nfsiod</application> daemon services the requests
-	from the <acronym>NFS</acronym> server.  This is optional, and
-	improves performance, but is not required for normal and
-	correct operation.  See the &man.nfsiod.8; manual page for
-	more information.</para>
+      <para>Running &man.nfsiod.8; can improve performance on the
+	client, but is not required.</para>
     </sect2>
 
     <sect2 id="network-configuring-nfs">
@@ -674,14 +672,11 @@ server-program-arguments</programlisting
 	<secondary>configuration</secondary>
       </indexterm>
 
-      <para><acronym>NFS</acronym> configuration is a relatively
-	straightforward process.  The processes that need to be
-	running can all start at boot time with a few modifications
-	to <filename>/etc/rc.conf</filename>.</para>
-
-      <para>On the <acronym>NFS</acronym> server, make sure that the
-	following options are configured in the
-	<filename>/etc/rc.conf</filename> file:</para>
+      <para>Enabling the <acronym>NFS</acronym> server
+	is straightforward.  The required processes
+	can be set to start at boot time by adding
+	these options to
+	<filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>rpcbind_enable="YES"
 nfs_server_enable="YES"
@@ -690,99 +685,101 @@ mountd_flags="-r"</programlisting>
       <para><application>mountd</application> runs automatically
 	whenever the <acronym>NFS</acronym> server is enabled.</para>
 
-      <para>On the client, make sure this option is present in
+      <para>To enable the client, set this option in
 	<filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>nfs_client_enable="YES"</programlisting>
 
-      <para>The <filename>/etc/exports</filename> file specifies which
-	file systems <acronym>NFS</acronym> should export (sometimes
-	referred to as <quote>share</quote>).  Each line in
+      <para><filename>/etc/exports</filename> specifies which
+	file systems the <acronym>NFS</acronym> server will
+	export.  Each line in
 	<filename>/etc/exports</filename> specifies a file system to
-	be exported and which machines have access to that file
-	system.  Along with what machines have access to that file
-	system, access options may also be specified.  There are many
-	such options that can be used in this file but only a few will
-	be mentioned here.  Other options are discussed in
-	the &man.exports.5; manual page.</para>
-
-      <para>Here are a few example <filename>/etc/exports</filename>
-	entries:</para>
+	be exported and which clients have access to that file system,
+	as well as any access options.  There are many
+	such options that can be used in this file, but only a few will
+	be mentioned here.  See &man.exports.5; for the full list of
+	options.</para>
 
       <indexterm>
 	<primary>NFS</primary>
 	<secondary>export examples</secondary>
       </indexterm>
 
-      <para>The following examples give an idea of how to export file
-	systems, although the settings may be different depending on
-	the environment and network configuration.  For instance, to
-	export the <filename>/cdrom</filename> directory to three
-	example machines that have the same domain name as the server
-	(hence the lack of a domain name for each) or have entries in
-	the <filename>/etc/hosts</filename> file.  The
-	<option>-ro</option> flag makes the exported file system
-	read-only.  With this flag, the remote system will not be able
-	to write any changes to the exported file system.</para>
-
-      <programlisting>/cdrom -ro host1 host2 host3</programlisting>
-
-      <para>The following line exports <filename>/home</filename> to
-	three hosts by IP address.  This is a useful setup on
-	a private network without a <acronym>DNS</acronym> server
-	configured.  Optionally the <filename>/etc/hosts</filename>
-	file could be configured for internal hostnames; please review
-	&man.hosts.5; for more information.  The
-	<option>-alldirs</option> flag allows the subdirectories to be
-	mount points.  In other words, it will not mount the
-	subdirectories but permit the client to mount only the
-	directories that are required or needed.</para>
+      <para>These examples give an idea of how to export file systems.
+	Minor modifications may be required for the examples to work
+	on the reader's network.</para>
+
+      <para>This example shows how to export the
+	<filename class="directory">/cdrom</filename> directory to
+	three clients called <replaceable>alpha</replaceable>,
+	<replaceable>bravo</replaceable>, and
+	<replaceable>charlie</replaceable>:</para>
+
+      <programlisting>/cdrom -ro <replaceable>alpha</replaceable> <replaceable>bravo</replaceable> <replaceable>charlie</replaceable></programlisting>
+
+      <para>The <literal>-ro</literal> flag makes the file systems
+	read-only, preventing clients from making any changes to
+	those exported file systems.</para>
+
+      <para>The next example exports
+	<filename class="directory">/home</filename> to three clients
+	by IP address.  This can be useful for networks without
+	<acronym>DNS</acronym>.  Optionally,
+	<filename>/etc/hosts</filename> could be configured for
+	internal hostnames; please review &man.hosts.5; for more
+	information.  The <literal>-alldirs</literal> flag allows
+	subdirectories to be mount points.  In other words, it will
+	not mount the subdirectories but permit the client to mount
+	only the directories that are required or needed.</para>
 
       <programlisting>/home  -alldirs  10.0.0.2 10.0.0.3 10.0.0.4</programlisting>
 
-      <para>The following line exports <filename>/a</filename> so that
-	two clients from different domains may access the file system.
+      <para>This next line exports
+	<filename class="directory">/a</filename> so that two clients
+	from different domains may access the file system.
 	The <option>-maproot=root</option> flag allows the
 	<username>root</username> user on the remote system to write
 	data on the exported file system as <username>root</username>.
 	If the <literal>-maproot=root</literal> flag is not specified,
-	then even if a user has <username>root</username> access on
-	the remote system, he will not be able to modify files on
-	the exported file system.</para>
+	the client's <username>root</username> user will be mapped
+	to the server's <username>nobody</username> account and will
+	be subject to the access limitations defined for user,
+	<username>nobody</username>.</para>
 
       <programlisting>/a  -maproot=root  host.example.com box.example.org</programlisting>
 
-      <para>In order for a client to access an exported file system,
-	the client must have permission to do so.  Make sure the
-	client is listed in <filename>/etc/exports</filename>.</para>
-
-      <para>In <filename>/etc/exports</filename>, each line represents
-	the export information for one file system to one host.  A
-	remote host can only be specified once per file system, and
-	may only have one default entry.  For example, assume that
-	<filename>/usr</filename> is a single file system.  The
-	following <filename>/etc/exports</filename> would be
-	invalid:</para>
+      <para>For a client to have access to an exported file system,
+	the client must be listed in
+	<filename>/etc/exports</filename>.</para>
+
+      <para>In <filename>/etc/exports</filename>, each line defines
+	the export information for one file system to one or more
+	clients.  A remote host can only be specified once per file
+	system.  For example, assume that
+	<filename class="directory">/usr</filename> is a single file
+	system.  This entry, in <filename>/etc/exports</filename>,
+	would be invalid:</para>
 
       <programlisting># Invalid when /usr is one file system
 /usr/src   client
 /usr/ports client</programlisting>
 
-      <para>One file system, <filename>/usr</filename>, has two lines
+      <para>The <filename class="directory">/usr</filename> file
+	system has two lines
 	specifying exports to the same host, <hostid>client</hostid>.
 	The correct format for this situation is:</para>
 
       <programlisting>/usr/src /usr/ports  client</programlisting>
 
-      <para>The properties of one file system exported to a given host
-	must all occur on one line.  Lines without a client specified
-	are treated as a single host.  This limits how file systems
-	may be exported; however, for most environments, this is not
-	an issue.</para>
+      <para>The exported file system, its properties, and allowed
+	hosts must occur on a single line.  If no clients are listed,
+	then any client on the network may mount the exported file
+	system.</para>
 
       <para>The following is an example of a valid export list, where
-	<filename>/usr</filename> and <filename>/exports</filename>
-	are local file systems:</para>
+	<filename class="directory">/usr</filename> and
+	<filename class="directory">/exports</filename> are local
+	file systems:</para>
 
       <programlisting># Export src and ports to client01 and client02, but only
 # client01 has root privileges on it
@@ -793,24 +790,20 @@ mountd_flags="-r"</programlisting>
 /exports -alldirs -maproot=root      client01 client02
 /exports/obj -ro</programlisting>
 
-      <para>The <application>mountd</application> daemon must be
-	forced to recheck the <filename>/etc/exports</filename> file
-	whenever it has been modified, so the changes can take effect.
-	This can be accomplished either by sending a HUP signal to the
-	running daemon:</para>
-
-      <screen>&prompt.root; <userinput>kill -HUP `cat /var/run/mountd.pid`</userinput></screen>
-
-      <para>or by invoking the <command>mountd</command> &man.rc.8;
-	script with the appropriate parameter:</para>
+      <para>The <application>mountd</application> daemon reads
+	<filename>/etc/exports</filename> when started.  To make
+	<acronym>NFS</acronym> server changes take effect immediately,
+	force <application>mountd</application> to reread
+	<filename>/etc/exports</filename>:</para>
 
-      <screen>&prompt.root; <userinput>service mountd onereload</userinput></screen>
+      <screen>&prompt.root; <userinput>service mountd reload</userinput></screen>
 
       <para>Please refer to <xref linkend="configtuning-rcd"/> for
 	more information about using rc scripts.</para>
 
-      <para>NFS services can now be started by running the following
-	command, on the <acronym>NFS</acronym> server, as
+      <para>On a new server being configured with
+	<acronym>NFS</acronym> services, the server can be
+	started by running this command as
 	<username>root</username>:</para>
 
       <screen>&prompt.root; <userinput>service nfsd start</userinput></screen>
@@ -819,12 +812,13 @@ mountd_flags="-r"</programlisting>
 
       <screen>&prompt.root; <userinput>service nfsclient restart</userinput></screen>
 
-      <para>Now everything should be ready to actually mount a remote
-	file system.  In these examples the server's name will be
-	<hostid>server</hostid> and the client's name will be
+      <para>The client now has everything it needs to mount a remote
+	file system.  In these examples, the server's name is
+	<hostid>server</hostid> and the client's name is
 	<hostid>client</hostid>.  For testing or to temporarily mount
-	a remote file system execute a command like this as
-	<username>root</username> on the client:</para>
+	a remote file system, execute
+	<application>mount</application> as
+	<username>root</username> on <hostid>client</hostid>:</para>
 
       <indexterm>
 	<primary>NFS</primary>
@@ -832,16 +826,20 @@ mountd_flags="-r"</programlisting>
       </indexterm>
       <screen>&prompt.root; <userinput>mount server:/home /mnt</userinput></screen>
 
-      <para>This will mount the <filename>/home</filename> directory
-	on the server at <filename>/mnt</filename> on the client.  If
-	everything is set up correctly, the server's files should be
-	visible and available in the <filename>/mnt</filename>
-	directory.</para>
-
-      <para>To permanently mount a remote file system each time the
-	computer boots, add the file system to the
-	<filename>/etc/fstab</filename> file.  Here is an
-	example:</para>
+      <para>This mounts the
+	<hostid>server</hostid>:
+	<filename class="directory">/home</filename>
+	file system to the
+	<hostid>client</hostid>:
+	<filename class="directory">/mnt</filename> mount
+	point.  The files and directories in the
+	<hostid>server</hostid>
+	<filename class="directory">/home</filename> file system will
+	now be available on <hostid>client</hostid>, in the
+	<filename class="directory">/mnt</filename> directory.</para>
+
+      <para>To mount a remote file system each time the client
+	boots, add it to <filename>/etc/fstab</filename>:</para>
 
       <programlisting>server:/home	/mnt	nfs	rw	0	0</programlisting>
 
@@ -855,32 +853,35 @@ mountd_flags="-r"</programlisting>
       <para>Some applications (e.g., <application>mutt</application>)
 	require file locking to operate correctly.  In the case of
 	<acronym>NFS</acronym>, <application>rpc.lockd</application>
-	can be used for file locking.  To enable it, add the following
-	to the <filename>/etc/rc.conf</filename> file on both client
-	and server (it is assumed that the <acronym>NFS</acronym>
-	client and server are configured already):</para>
+	can be used for file locking.  To enable it, add this line to
+	<filename>/etc/rc.conf</filename> on both client
+	and server:</para>
 
       <programlisting>rpc_lockd_enable="YES"
 rpc_statd_enable="YES"</programlisting>
 
-      <para>Start the application by using:</para>
+      <para>Please note that this assumes that both
+	<acronym>NFS</acronym> client and server are already
+	configured.</para>
+
+      <para>Start the application, as
+	<username>root</username>, with:</para>
 
       <screen>&prompt.root; <userinput>service lockd start</userinput>
 &prompt.root; <userinput>service statd start</userinput></screen>
 
-      <para>If real locking between the <acronym>NFS</acronym> clients
-	and <acronym>NFS</acronym> server is not required, it is
-	possible to let the <acronym>NFS</acronym> client do locking
-	locally by passing <option>-L</option> to &man.mount.nfs.8;.
-	Refer to the &man.mount.nfs.8; manual page for further
-	details.</para>
+      <para>If locking is not required on the server, the
+	<acronym>NFS</acronym> client can be configured to
+	lock locally by passing <option>-L</option> to
+	&man.mount.nfs.8;.  Refer to the &man.mount.nfs.8;
+	manual page for further details.</para>
     </sect2>
 
     <sect2>
       <title>Practical Uses</title>
 
       <para><acronym>NFS</acronym> has many practical uses.  Some of
-	the more common ones are listed below:</para>
+	the more common uses:</para>
 
       <indexterm>
 	<primary>NFS</primary>
@@ -888,25 +889,26 @@ rpc_statd_enable="YES"</programlisting>
       </indexterm>
       <itemizedlist>
 	<listitem>
-	  <para>Set several machines to share a CDROM or other media
-	    among them.  This is cheaper and often a more convenient
-	    method to install software on multiple machines.</para>
+	  <para>Share a <acronym>CD-ROM</acronym> or other media
+	    with any number of clients.  It is often more
+	    convenient to install software on multiple
+	    machines from a single location.</para>
 	</listitem>
 
 	<listitem>
-	  <para>On large networks, it might be more convenient to
-	    configure a central <acronym>NFS</acronym> server in which
-	    to store all the user home directories.  These home
-	    directories can then be exported to the network so that
-	    users would always have the same home directory,
-	    regardless of which workstation they log in to.</para>
+	  <para>On large networks, it is often more convenient to
+	    configure a central <acronym>NFS</acronym> server on which
+	    all user home directories are stored.  Users can log into
+	    a client anywhere on the network and have access to their
+	    home directories.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Several machines could have a common
-	    <filename>/usr/ports/distfiles</filename> directory.  This
-	    allows for quick access to the source files without
-	    downloading them on each machine.</para>
+	  <para>Several clients may need access to the
+	    <filename class="directory">/usr/ports/distfiles</filename>
+	    directory.  Sharing that directory allows for quick access
+	    to the source files without having to download them to
+	    each client.</para>
 	</listitem>
       </itemizedlist>
     </sect2>
@@ -940,34 +942,37 @@ rpc_statd_enable="YES"</programlisting>
 	mounts a remote file system whenever a file or directory
 	within that file system is accessed.  Filesystems that are
 	inactive for a period of time will also be automatically
-	unmounted by <application>amd</application>.  Using
-	<application>amd</application> provides a simple alternative
-	to permanent mounts, as permanent mounts are usually listed in
-	<filename>/etc/fstab</filename>.</para>
+	unmounted by <application>amd</application>.
+	<application>amd</application> provides an alternative to
+	modifying <filename>/etc/fstab</filename> to list every
+	client.</para>
 
       <para><application>amd</application> operates by attaching
-	itself as an NFS server to the <filename>/host</filename> and
-	<filename>/net</filename> directories.  When a file is
+	itself as an NFS server to the
+	<filename class="directory">/host</filename>
+	and <filename class="directory">/net</filename> directories.  When a file is
 	accessed within one of these directories,
 	<application>amd</application> looks up the corresponding
 	remote mount and automatically mounts it.
-	<filename>/net</filename> is used to mount an exported file
-	system from an IP address, while <filename>/host</filename> is
+	<filename class="directory">/net</filename> is used to mount an exported file
+	system from an IP address, while
+	<filename class="directory">/host</filename> is
 	used to mount an export from a remote hostname.</para>
 
-      <para>An access to a file within
-	<filename>/host/foobar/usr</filename> would tell
-	<application>amd</application> to attempt to mount the
-	<filename>/usr</filename> export on the host
+      <para>For instance, an attempt to access a file within
+	<filename class="directory">/host/foobar/usr</filename> would tell
+	<application>amd</application> to mount the
+	<filename class="directory">/usr</filename> export on the host
 	<hostid>foobar</hostid>.</para>
 
       <example>
 	<title>Mounting an Export with
 	  <application>amd</application></title>
 
-	<para>The <command>showmount</command> command shows the
-	  available mounts on a remote host.  For example, to view the
-	  mounts of a host named <hostid>foobar</hostid>:</para>
+	<para><command>showmount -e</command> shows the
+	  exported file systems that can be mounted from
+	  the <acronym>NFS</acronym> server,
+	  <hostid>foobar</hostid>:</para>
 
 	<screen>&prompt.user; <userinput>showmount -e foobar</userinput>
 Exports list on foobar:
@@ -976,155 +981,39 @@ Exports list on foobar:
 &prompt.user; <userinput>cd /host/foobar/usr</userinput></screen>
       </example>
 
-      <para>As seen in the example, the <command>showmount</command>
-	shows <filename>/usr</filename> as an export.  When changing
-	directories to <filename>/host/foobar/usr</filename>,
-	<application>amd</application> attempts to resolve the
-	hostname <hostid>foobar</hostid> and automatically mount the
-	desired export.</para>
+      <para>The output from <command>showmount</command>
+	shows <filename class="directory">/usr</filename> as an
+	export.  When changing directories to
+	<filename class="directory">/host/foobar/usr</filename>,
+	<application>amd</application> intercepts the request and
+	attempts to resolve the hostname <hostid>foobar</hostid>.
+	If successful, <application>amd</application> automatically
+	mounts the desired export.</para>
 
-      <para><application>amd</application> can be started by the
-	startup scripts by placing the following lines in
-	<filename>/etc/rc.conf</filename>:</para>
+      <para><application>amd</application> is enabled by placing
+	this line in <filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>amd_enable="YES"</programlisting>
 
-      <para>Additionally, custom flags can be passed to
+      <para>It can then be started using the &os; &man.rc.8; scripts
+	or by using the &man.service.8; command.</para>
+
+      <para>Custom flags can be passed to
 	<application>amd</application> from the
-	<varname>amd_flags</varname> option.  By default,
-	<varname>amd_flags</varname> is set to:</para>
+	<varname>amd_flags</varname> environment variable.  By
+	default, <varname>amd_flags</varname> is set to:</para>
 
       <programlisting>amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map"</programlisting>
 
-      <para>The <filename>/etc/amd.map</filename> file defines the
-	default options that exports are mounted with.  The
-	<filename>/etc/amd.conf</filename> file defines some of the
+      <para><filename>/etc/amd.map</filename> defines the
+	default options with which exports are mounted.
+	<filename>/etc/amd.conf</filename> defines some of the
 	more advanced features of
 	<application>amd</application>.</para>
 
       <para>Consult the &man.amd.8; and &man.amd.conf.5; manual pages
 	for more information.</para>
     </sect2>
-
-    <sect2 id="network-nfs-integration">
-      <sect2info>
-	<authorgroup>
-	  <author>
-	    <firstname>John</firstname>
-	    <surname>Lind</surname>
-	    <contrib>Contributed by </contrib>
-	  </author>
-	</authorgroup>
-      </sect2info>
-      <title>Problems Integrating with Other Systems</title>
-
-      <para>Certain Ethernet adapters for ISA PC systems have
-	limitations which can lead to serious network problems,
-	particularly with NFS.  This difficulty is not specific to
-	FreeBSD, but FreeBSD systems are affected by it.</para>
-
-      <para>The problem nearly always occurs when (FreeBSD) PC systems
-	are networked with high-performance workstations, such as
-	those made by Silicon Graphics, Inc., and Sun Microsystems,
-	Inc.  The NFS mount will work fine, and some operations may
-	succeed, but suddenly the server will seem to become
-	unresponsive to the client, even though requests to and from
-	other systems continue to be processed.  This happens to the
-	client system, whether the client is the FreeBSD system or the
-	workstation.  On many systems, there is no way to shut down
-	the client gracefully once this problem has manifested itself.
-	The only solution is often to reset the client, because the
-	NFS situation cannot be resolved.</para>
-
-      <para>Though the <quote>correct</quote> solution is to get a
-	higher performance and capacity Ethernet adapter for the
-	FreeBSD system, there is a simple workaround that will allow
-	satisfactory operation.  If the FreeBSD system is the
-	<emphasis>server</emphasis>, include the option
-	<option>-w=1024</option> on the mount from the client.  If the
-	FreeBSD system is the <emphasis>client</emphasis>, then mount
-	the NFS file system with the option <option>-r=1024</option>.
-	These options may be specified using the fourth field of the
-	<filename>fstab</filename> entry on the client for automatic
-	mounts, or by using the <option>-o</option> parameter of the
-	&man.mount.8; command for manual mounts.</para>
-
-      <para>It should be noted that there is a different problem,
-	sometimes mistaken for this one, when the NFS servers and
-	clients are on different networks.  If that is the case, make
-	<emphasis>certain</emphasis> that the routers are routing the
-	necessary <acronym>UDP</acronym> information.</para>
-
-      <para>In the following examples, <hostid>fastws</hostid> is the
-	host (interface) name of a high-performance workstation, and
-	<hostid>freebox</hostid> is the host (interface) name of a
-	FreeBSD system with a lower-performance Ethernet adapter.
-	Also, <filename>/sharedfs</filename> will be the exported NFS
-	file system (see &man.exports.5;), and
-	<filename>/project</filename> will be the mount point on the
-	client for the exported file system.  In all cases, note that
-	additional options, such as <option>hard</option> or
-	<option>soft</option> and <option>bg</option> may be desirable
-	in the application.</para>
-
-      <para>Examples for the FreeBSD system (<hostid>freebox</hostid>)
-	as the client in <filename>/etc/fstab</filename> on
-	<hostid>freebox</hostid>:</para>
-
-      <programlisting>fastws:/sharedfs /project nfs rw,-r=1024 0 0</programlisting>
-
-      <para>As a manual mount command on
-	<hostid>freebox</hostid>:</para>
-
-      <screen>&prompt.root; <userinput>mount -t nfs -o -r=1024 fastws:/sharedfs /project</userinput></screen>
-
-      <para>Examples for the FreeBSD system as the server in
-	<filename>/etc/fstab</filename> on
-	<hostid>fastws</hostid>:</para>
-
-      <programlisting>freebox:/sharedfs /project nfs rw,-w=1024 0 0</programlisting>
-
-      <para>As a manual mount command on
-	<hostid>fastws</hostid>:</para>
-
-      <screen>&prompt.root; <userinput>mount -t nfs -o -w=1024 freebox:/sharedfs /project</userinput></screen>
-
-      <para>Nearly any 16-bit Ethernet adapter will allow operation
-	without the above restrictions on the read or write
-	size.</para>
-
-      <para>For anyone who cares, here is what happens when the
-	failure occurs, which also explains why it is unrecoverable.
-	NFS typically works with a <quote>block</quote> size of
-	8&nbsp;K (though it may do fragments of smaller sizes).  Since
-	the maximum Ethernet packet is around 1500&nbsp;bytes, the NFS
-	<quote>block</quote> gets split into multiple Ethernet
-	packets, even though it is still a single unit to the
-	upper-level code, and must be received, assembled, and
-	<emphasis>acknowledged</emphasis> as a unit.  The
-	high-performance workstations can pump out the packets which
-	comprise the NFS unit one right after the other, just as close
-	together as the standard allows.  On the smaller, lower
-	capacity cards, the later packets overrun the earlier packets
-	of the same unit before they can be transferred to the host
-	and the unit as a whole cannot be reconstructed or
-	acknowledged.  As a result, the workstation will time out and
-	try again, but it will try again with the entire 8&nbsp;K
-	unit, and the process will be repeated, ad infinitum.</para>
-
-      <para>By keeping the unit size below the Ethernet packet size
-	limitation, we ensure that any complete Ethernet packet
-	received can be acknowledged individually, avoiding the
-	deadlock situation.</para>
-
-      <para>Overruns may still occur when a high-performance
-	workstations is slamming data out to a PC system, but with the
-	better cards, such overruns are not guaranteed on NFS
-	<quote>units</quote>.  When an overrun occurs, the units
-	affected will be retransmitted, and there will be a fair
-	chance that they will be received, assembled, and
-	acknowledged.</para>
-    </sect2>
   </sect1>
 
   <sect1 id="network-nis">

From owner-svn-doc-head@FreeBSD.ORG  Thu Aug 29 03:56:18 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 59B2FF6A;
 Thu, 29 Aug 2013 03:56:18 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
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 459EA2F58;
 Thu, 29 Aug 2013 03:56:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7T3uIn9016978;
 Thu, 29 Aug 2013 03:56:18 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7T3uIDK016977;
 Thu, 29 Aug 2013 03:56:18 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201308290356.r7T3uIDK016977@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 29 Aug 2013 03:56:18 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42603 -
 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Aug 2013 03:56:18 -0000

Author: wblock
Date: Thu Aug 29 03:56:17 2013
New Revision: 42603
URL: http://svnweb.freebsd.org/changeset/doc/42603

Log:
  Whitespace-only fixes.  Translators, please ignore.

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	Thu Aug 29 01:46:14 2013	(r42602)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Thu Aug 29 03:56:17 2013	(r42603)
@@ -22,12 +22,11 @@
   <sect1 id="network-servers-synopsis">
     <title>Synopsis</title>
 
-    <para>This chapter covers some of the more frequently used
-      network services on &unix; systems.  This includes
-      installing, configuring, testing, and maintaining
-      many different types of network services.  Example
-      configuration files are included throughout this
-      chapter for reference.</para>
+    <para>This chapter covers some of the more frequently used network
+      services on &unix; systems.  This includes installing,
+      configuring, testing, and maintaining many different types of
+      network services.  Example configuration files are included
+      throughout this chapter for reference.</para>
 
     <para>By the end of this chapter, readers will know:</para>
 
@@ -134,16 +133,15 @@
 
       <para>The &man.inetd.8; daemon is sometimes referred to as the
 	<quote>Internet Super-Server</quote> because it manages
-	connections for many services.  When a connection is
-	received by <application>inetd</application>, it determines
-	which program the connection is destined for, spawns the
-	particular process and delegates the socket to it (the program
-	is invoked with the service socket as its standard input,
-	output and error descriptors).  Running
-	<application>inetd</application> for servers that are not
-	heavily used can reduce the overall system load, when compared
-	to running each daemon individually in stand-alone
-	mode.</para>
+	connections for many services.  When a connection is received
+	by <application>inetd</application>, it determines which
+	program the connection is destined for, spawns the particular
+	process and delegates the socket to it (the program is invoked
+	with the service socket as its standard input, output and
+	error descriptors).  Running <application>inetd</application>
+	for servers that are not heavily used can reduce the overall
+	system load, when compared to running each daemon individually
+	in stand-alone mode.</para>
 
       <para>Primarily, <application>inetd</application> is used to
 	spawn other daemons, but several trivial protocols are handled
@@ -413,8 +411,7 @@ server-program-arguments</programlisting
 	      <option>nowait</option> is mandatory.
 	      <option>max-child</option>,
 	      <option>max-connections-per-ip-per-minute</option> and
-	      <option>max-child-per-ip</option> are
-	      optional.</para>
+	      <option>max-child-per-ip</option> are optional.</para>
 
 	    <para>A stream-type multi-threaded daemon without any
 	      <option>max-child</option>,
@@ -560,8 +557,8 @@ server-program-arguments</programlisting
     <para>&os; supports the Network File System
       (<acronym>NFS</acronym>), which allows a server to share
       directories and files with clients over a network.  With
-      <acronym>NFS</acronym>, users and programs can access files
-      on remote systems as if they were stored locally.</para>
+      <acronym>NFS</acronym>, users and programs can access files on
+      remote systems as if they were stored locally.</para>
 
     <para>The most notable benefits that
       <acronym>NFS</acronym> provides are:</para>
@@ -690,15 +687,14 @@ mountd_flags="-r"</programlisting>
 
       <programlisting>nfs_client_enable="YES"</programlisting>
 
-      <para><filename>/etc/exports</filename> specifies which
-	file systems the <acronym>NFS</acronym> server will
-	export.  Each line in
-	<filename>/etc/exports</filename> specifies a file system to
-	be exported and which clients have access to that file system,
-	as well as any access options.  There are many
-	such options that can be used in this file, but only a few will
-	be mentioned here.  See &man.exports.5; for the full list of
-	options.</para>
+      <para><filename>/etc/exports</filename> specifies which file
+	systems the <acronym>NFS</acronym> server will export.  Each
+	line in <filename>/etc/exports</filename> specifies a file
+	system to be exported and which clients have access to that
+	file system, as well as any access options.  There are many
+	such options that can be used in this file, but only a few
+	will be mentioned here.  See &man.exports.5; for the full list
+	of options.</para>
 
       <indexterm>
 	<primary>NFS</primary>
@@ -736,14 +732,14 @@ mountd_flags="-r"</programlisting>
 
       <para>This next line exports
 	<filename class="directory">/a</filename> so that two clients
-	from different domains may access the file system.
-	The <option>-maproot=root</option> flag allows the
+	from different domains may access the file system.  The
+	<option>-maproot=root</option> flag allows the
 	<username>root</username> user on the remote system to write
 	data on the exported file system as <username>root</username>.
 	If the <literal>-maproot=root</literal> flag is not specified,
-	the client's <username>root</username> user will be mapped
-	to the server's <username>nobody</username> account and will
-	be subject to the access limitations defined for user,
+	the client's <username>root</username> user will be mapped to
+	the server's <username>nobody</username> account and will be
+	subject to the access limitations defined for user,
 	<username>nobody</username>.</para>
 
       <programlisting>/a  -maproot=root  host.example.com box.example.org</programlisting>
@@ -765,9 +761,9 @@ mountd_flags="-r"</programlisting>
 /usr/ports client</programlisting>
 
       <para>The <filename class="directory">/usr</filename> file
-	system has two lines
-	specifying exports to the same host, <hostid>client</hostid>.
-	The correct format for this situation is:</para>
+	system has two lines specifying exports to the same host,
+	<hostid>client</hostid>.  The correct format for this
+	situation is:</para>
 
       <programlisting>/usr/src /usr/ports  client</programlisting>
 
@@ -802,9 +798,8 @@ mountd_flags="-r"</programlisting>
 	more information about using rc scripts.</para>
 
       <para>On a new server being configured with
-	<acronym>NFS</acronym> services, the server can be
-	started by running this command as
-	<username>root</username>:</para>
+	<acronym>NFS</acronym> services, the server can be started by
+	running this command as <username>root</username>:</para>
 
       <screen>&prompt.root; <userinput>service nfsd start</userinput></screen>
 
@@ -816,9 +811,9 @@ mountd_flags="-r"</programlisting>
 	file system.  In these examples, the server's name is
 	<hostid>server</hostid> and the client's name is
 	<hostid>client</hostid>.  For testing or to temporarily mount
-	a remote file system, execute
-	<application>mount</application> as
-	<username>root</username> on <hostid>client</hostid>:</para>
+	a remote file system, execute <application>mount</application>
+	as <username>root</username> on
+	<hostid>client</hostid>:</para>
 
       <indexterm>
 	<primary>NFS</primary>
@@ -826,14 +821,11 @@ mountd_flags="-r"</programlisting>
       </indexterm>
       <screen>&prompt.root; <userinput>mount server:/home /mnt</userinput></screen>
 
-      <para>This mounts the
-	<hostid>server</hostid>:
-	<filename class="directory">/home</filename>
-	file system to the
-	<hostid>client</hostid>:
-	<filename class="directory">/mnt</filename> mount
-	point.  The files and directories in the
-	<hostid>server</hostid>
+      <para>This mounts the <hostid>server</hostid>:
+	<filename class="directory">/home</filename> file system to
+	the <hostid>client</hostid>:
+	<filename class="directory">/mnt</filename> mount point.  The
+	files and directories in the <hostid>server</hostid>
 	<filename class="directory">/home</filename> file system will
 	now be available on <hostid>client</hostid>, in the
 	<filename class="directory">/mnt</filename> directory.</para>
@@ -864,17 +856,17 @@ rpc_statd_enable="YES"</programlisting>
 	<acronym>NFS</acronym> client and server are already
 	configured.</para>
 
-      <para>Start the application, as
-	<username>root</username>, with:</para>
+      <para>Start the application, as <username>root</username>,
+	with:</para>
 
       <screen>&prompt.root; <userinput>service lockd start</userinput>
 &prompt.root; <userinput>service statd start</userinput></screen>
 
       <para>If locking is not required on the server, the
-	<acronym>NFS</acronym> client can be configured to
-	lock locally by passing <option>-L</option> to
-	&man.mount.nfs.8;.  Refer to the &man.mount.nfs.8;
-	manual page for further details.</para>
+	<acronym>NFS</acronym> client can be configured to lock
+	locally by passing <option>-L</option> to &man.mount.nfs.8;.
+	Refer to the &man.mount.nfs.8; manual page for further
+	details.</para>
     </sect2>
 
     <sect2>
@@ -889,10 +881,10 @@ rpc_statd_enable="YES"</programlisting>
       </indexterm>
       <itemizedlist>
 	<listitem>
-	  <para>Share a <acronym>CD-ROM</acronym> or other media
-	    with any number of clients.  It is often more
-	    convenient to install software on multiple
-	    machines from a single location.</para>
+	  <para>Share a <acronym>CD-ROM</acronym> or other media with
+	    any number of clients.  It is often more convenient to
+	    install software on multiple machines from a single
+	    location.</para>
 	</listitem>
 
 	<listitem>
@@ -904,8 +896,8 @@ rpc_statd_enable="YES"</programlisting>
 	</listitem>
 
 	<listitem>
-	  <para>Several clients may need access to the
-	    <filename class="directory">/usr/ports/distfiles</filename>
+	  <para>Several clients may need access to the <filename
+	      class="directory">/usr/ports/distfiles</filename>
 	    directory.  Sharing that directory allows for quick access
 	    to the source files without having to download them to
 	    each client.</para>
@@ -949,19 +941,19 @@ rpc_statd_enable="YES"</programlisting>
 
       <para><application>amd</application> operates by attaching
 	itself as an NFS server to the
-	<filename class="directory">/host</filename>
-	and <filename class="directory">/net</filename> directories.  When a file is
-	accessed within one of these directories,
+	<filename class="directory">/host</filename> and
+	<filename class="directory">/net</filename> directories.  When
+	a file is accessed within one of these directories,
 	<application>amd</application> looks up the corresponding
 	remote mount and automatically mounts it.
-	<filename class="directory">/net</filename> is used to mount an exported file
-	system from an IP address, while
-	<filename class="directory">/host</filename> is
-	used to mount an export from a remote hostname.</para>
+	<filename class="directory">/net</filename> is used to mount
+	an exported file system from an IP address, while
+	<filename class="directory">/host</filename> is used to mount
+	an export from a remote hostname.</para>
 
       <para>For instance, an attempt to access a file within
-	<filename class="directory">/host/foobar/usr</filename> would tell
-	<application>amd</application> to mount the
+	<filename class="directory">/host/foobar/usr</filename> would
+	tell <application>amd</application> to mount the
 	<filename class="directory">/usr</filename> export on the host
 	<hostid>foobar</hostid>.</para>
 
@@ -981,13 +973,13 @@ Exports list on foobar:
 &prompt.user; <userinput>cd /host/foobar/usr</userinput></screen>
       </example>
 
-      <para>The output from <command>showmount</command>
-	shows <filename class="directory">/usr</filename> as an
-	export.  When changing directories to
+      <para>The output from <command>showmount</command> shows
+	<filename class="directory">/usr</filename> as an export.
+	When changing directories to
 	<filename class="directory">/host/foobar/usr</filename>,
 	<application>amd</application> intercepts the request and
-	attempts to resolve the hostname <hostid>foobar</hostid>.
-	If successful, <application>amd</application> automatically
+	attempts to resolve the hostname <hostid>foobar</hostid>.  If
+	successful, <application>amd</application> automatically
 	mounts the desired export.</para>
 
       <para><application>amd</application> is enabled by placing
@@ -1005,11 +997,10 @@ Exports list on foobar:
 
       <programlisting>amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map"</programlisting>
 
-      <para><filename>/etc/amd.map</filename> defines the
-	default options with which exports are mounted.
-	<filename>/etc/amd.conf</filename> defines some of the
-	more advanced features of
-	<application>amd</application>.</para>
+      <para><filename>/etc/amd.map</filename> defines the default
+	options with which exports are mounted.
+	<filename>/etc/amd.conf</filename> defines some of the more
+	advanced features of <application>amd</application>.</para>
 
       <para>Consult the &man.amd.8; and &man.amd.conf.5; manual pages
 	for more information.</para>
@@ -1139,7 +1130,6 @@ Exports list on foobar:
 
 	    <row>
 	      <entry><application>ypbind</application></entry>
-
 	      <entry><quote>Binds</quote> an NIS client to its NIS
 		server.  It will take the NIS domainname from the
 		system, and using <acronym>RPC</acronym>, connect to
@@ -1449,10 +1439,10 @@ Exports list on foobar:
 
 	  <note>
 	    <para>Depending on the NIS setup, additional entries may
-	      be required.  See the <link
-		linkend="network-nis-server-is-client">section about
-	      NIS servers that are also NIS clients</link>, below, for
-	      details.</para>
+	      be required.  See the
+	      <link linkend="network-nis-server-is-client">section
+		about NIS servers that are also NIS clients</link>,
+	      below, for details.</para>
 	  </note>
 
 	  <para>After setting up the above entries, run the command
@@ -1481,8 +1471,8 @@ Exports list on foobar:
 	    good reason, never propagate passwords for
 	    <username>root</username> and other administrative
 	    accounts to all the servers in the NIS domain.  Therefore,
-	    before the NIS maps are initialized, configure the
-	    primary password files:</para>
+	    before the NIS maps are initialized, configure the primary
+	    password files:</para>
 
 	  <screen>&prompt.root; <userinput>cp /etc/master.passwd /var/yp/master.passwd</userinput>
 &prompt.root; <userinput>cd /var/yp</userinput>
@@ -1541,12 +1531,11 @@ ellington has been setup as an YP master
 
 	  <para>At this point, <command>ypinit</command> should have
 	    created <filename>/var/yp/Makefile</filename> from
-	    <filename>/var/yp/Makefile.dist</filename>.
-	    When created, this file assumes that the operating
-	    environment is a single server NIS system with only &os;
-	    machines.  Since <literal>test-domain</literal> has
-	    a slave server as well, edit
-	    <filename>/var/yp/Makefile</filename> as well:</para>
+	    <filename>/var/yp/Makefile.dist</filename>.  When created,
+	    this file assumes that the operating environment is a
+	    single server NIS system with only &os; machines.  Since
+	    <literal>test-domain</literal> has a slave server as well,
+	    edit <filename>/var/yp/Makefile</filename> as well:</para>
 
 	  <screen>ellington&prompt.root; <userinput>vi /var/yp/Makefile</userinput></screen>
 
@@ -2440,9 +2429,8 @@ nis_client_flags="-S <replaceable>NIS do
 	Blowfish and MD5 encrypted passwords, respectively).</para>
 
       <para>If any changes were made to
-	<filename>/etc/login.conf</filename>, the
-	login capability database must be rebuilt by
-	running the following command as
+	<filename>/etc/login.conf</filename>, the login capability
+	database must be rebuilt by running the following command as
 	<username>root</username>:</para>
 
       <screen>&prompt.root; <userinput>cap_mkdb /etc/login.conf</userinput></screen>
@@ -2603,12 +2591,12 @@ result: 0 Success
 	during the certificate creation process below.</para>
 
       <para>The following commands must be executed in the
-	<filename class="directory">
-	  /usr/local/etc/openldap/private</filename> directory.  This
-	is important as the file permissions will need to be
-	restrictive and users should not have access to these files
-	directly.  To create the certificates, issues the following
-	commands.</para>
+	<filename
+	  class="directory">/usr/local/etc/openldap/private</filename>
+	directory.  This is important as the file permissions will
+	need to be restrictive and users should not have access to
+	these files directly.  To create the certificates, issues the
+	following commands.</para>
 
       <screen>&prompt.root; <userinput>openssl req -days 365 -nodes -new -x509 -keyout ca.key -out ../ca.crt</userinput></screen>
 
@@ -2915,237 +2903,236 @@ result: 0 Success
 
       <para>DHCP is supported by
 	<application>sysinstall</application>.  When configuring a
-	  network interface within
-	  <application>sysinstall</application>, the second question
-	  asked is: <quote>Do you want to try DHCP configuration of
-	  the interface?</quote>.  Answering affirmatively will
-	  execute <command>dhclient</command>, and if successful, will
-	  fill in the network configuration information
-	  automatically.</para>
+	network interface within
+	<application>sysinstall</application>, the second question
+	asked is: <quote>Do you want to try DHCP configuration of the
+	interface?</quote>.  Answering affirmatively will execute
+	<command>dhclient</command>, and if successful, will fill in
+	the network configuration information automatically.</para>
 
-	<para>There are two things required to have the system use
-	  DHCP upon startup:</para>
-	<indexterm>
-	  <primary>DHCP</primary>
-	  <secondary>requirements</secondary>
-	</indexterm>
-	<itemizedlist>
-	  <listitem>
-	    <para>Make sure that the <devicename>bpf</devicename>
-	      device is compiled into the kernel.  To do this, add
-	      <literal>device bpf</literal> to the kernel
-	      configuration file, and rebuild the kernel.  For more
-	      information about building kernels, see
-	      <xref linkend="kernelconfig"/>.</para>
-
-	    <para>The <devicename>bpf</devicename> device is already
-	      part of the <filename>GENERIC</filename> kernel that is
-	      supplied with &os;, thus there is no need to build a
-	      custom kernel for <acronym>DHCP</acronym>.  In the case
-	      of a custom kernel configuration file, this device must
-	      be present for <acronym>DHCP</acronym> to function
-	      properly.</para>
+      <para>There are two things required to have the system use
+	DHCP upon startup:</para>
+      <indexterm>
+	<primary>DHCP</primary>
+	<secondary>requirements</secondary>
+      </indexterm>
+      <itemizedlist>
+	<listitem>
+	  <para>Make sure that the <devicename>bpf</devicename> device
+	    is compiled into the kernel.  To do this, add
+	    <literal>device bpf</literal> to the kernel configuration
+	    file, and rebuild the kernel.  For more information about
+	    building kernels, see
+	    <xref linkend="kernelconfig"/>.</para>
 
-	    <note>
-	      <para>For those who are particularly security conscious,
-		take note that <devicename>bpf</devicename>
-		is also the device that allows packet sniffers to work
-		correctly (although they still have to be run as
-		<username>root</username>).
-		<devicename>bpf</devicename> <emphasis>is</emphasis>
-		required to use DHCP; however, the security sensitive
-		types should probably not add
-		<devicename>bpf</devicename> to the
-		kernel in the expectation that at some point in the
-		future the system will be using DHCP.</para>
-	    </note>
-	  </listitem>
+	  <para>The <devicename>bpf</devicename> device is already
+	    part of the <filename>GENERIC</filename> kernel that is
+	    supplied with &os;, thus there is no need to build a
+	    custom kernel for <acronym>DHCP</acronym>.  In the case of
+	    a custom kernel configuration file, this device must be
+	    present for <acronym>DHCP</acronym> to function
+	    properly.</para>
 
-	  <listitem>
-	    <para>By default, DHCP configuration on &os; runs in the
-	      background, or <firstterm>asynchronously</firstterm>.
-	      Other startup scripts continue to run while DHCP
-	      completes, speeding up system startup.</para>
-
-	    <para>Background DHCP works well when the DHCP server
-	      responds quickly to requests and the DHCP configuration
-	      process goes quickly.  However, DHCP may take a long
-	      time to complete on some systems.  If network services
-	      attempt to run before DHCP has completed, they will
-	      fail.  Using DHCP in <firstterm>synchronous</firstterm>
-	      mode prevents the problem, pausing startup until DHCP
-	      configuration has completed.</para>
-
-	    <para>To connect to a DHCP server in the background while
-	      other startup continues (asynchronous mode), use the
-	      <quote><literal>DHCP</literal></quote> value in
-	      <filename>/etc/rc.conf</filename>:</para>
-
-	    <programlisting>ifconfig_<replaceable>fxp0</replaceable>="DHCP"</programlisting>
-
-	    <para>To pause startup while DHCP completes, use
-	      synchronous mode with the
-	      <quote><literal>SYNCDHCP</literal></quote> value:</para>
+	  <note>
+	    <para>For those who are particularly security conscious,
+	      take note that <devicename>bpf</devicename> is also the
+	      device that allows packet sniffers to work correctly
+	      (although they still have to be run as
+	      <username>root</username>).
+	      <devicename>bpf</devicename> <emphasis>is</emphasis>
+	      required to use DHCP; however, the security sensitive
+	      types should probably not add
+	      <devicename>bpf</devicename> to the kernel in the
+	      expectation that at some point in the future the system
+	      will be using DHCP.</para>
+	  </note>
+	</listitem>
 
-	    <programlisting>ifconfig_<replaceable>fxp0</replaceable>="SYNCDHCP"</programlisting>
+	<listitem>
+	  <para>By default, DHCP configuration on &os; runs in the
+	    background, or <firstterm>asynchronously</firstterm>.
+	    Other startup scripts continue to run while DHCP
+	    completes, speeding up system startup.</para>
+
+	  <para>Background DHCP works well when the DHCP server
+	    responds quickly to requests and the DHCP configuration
+	    process goes quickly.  However, DHCP may take a long time
+	    to complete on some systems.  If network services attempt
+	    to run before DHCP has completed, they will fail.  Using
+	    DHCP in <firstterm>synchronous</firstterm> mode prevents
+	    the problem, pausing startup until DHCP configuration has
+	    completed.</para>
+
+	  <para>To connect to a DHCP server in the background while
+	    other startup continues (asynchronous mode), use the
+	    <quote><literal>DHCP</literal></quote> value in
+	    <filename>/etc/rc.conf</filename>:</para>
 
-	    <note>
-	      <para>Replace the <replaceable>fxp0</replaceable> shown
-		in these examples with the name of the interface to be
-		dynamically configured, as described in
-		<xref linkend="config-network-setup"/>.</para>
-	    </note>
+	  <programlisting>ifconfig_<replaceable>fxp0</replaceable>="DHCP"</programlisting>
+
+	  <para>To pause startup while DHCP completes, use
+	    synchronous mode with the
+	    <quote><literal>SYNCDHCP</literal></quote> value:</para>
 
-	    <para>When using a different file system location for
-	      <command>dhclient</command>, or if
-	      additional flags must be passed to
-	      <command>dhclient</command>,
-	      include (editing as necessary):</para>
+	  <programlisting>ifconfig_<replaceable>fxp0</replaceable>="SYNCDHCP"</programlisting>
 
-	    <programlisting>dhclient_program="/sbin/dhclient"
+	  <note>
+	    <para>Replace the <replaceable>fxp0</replaceable> shown
+	      in these examples with the name of the interface to be
+	      dynamically configured, as described in
+	      <xref linkend="config-network-setup"/>.</para>
+	  </note>
+
+	  <para>When using a different file system location for
+	    <command>dhclient</command>, or if additional flags must
+	    be passed to <command>dhclient</command>, include (editing
+	    as necessary):</para>
+
+	  <programlisting>dhclient_program="/sbin/dhclient"
 dhclient_flags=""</programlisting>
-	  </listitem>
-	</itemizedlist>
+	</listitem>
+      </itemizedlist>
 
-	<indexterm>
-	  <primary>DHCP</primary>
-	  <secondary>server</secondary>
-	</indexterm>
-	<para>The DHCP server, <application>dhcpd</application>, is
-	  included as part of the
-	  <filename role="package">net/isc-dhcp42-server</filename>
-	  port in the ports collection.  This port contains the ISC
-	  DHCP server and documentation.</para>
-      </sect2>
+      <indexterm>
+	<primary>DHCP</primary>
+	<secondary>server</secondary>
+      </indexterm>
+      <para>The DHCP server, <application>dhcpd</application>, is
+	included as part of the
+	<filename role="package">net/isc-dhcp42-server</filename> port
+	in the ports collection.  This port contains the ISC DHCP
+	server and documentation.</para>
+    </sect2>
 
-      <sect2>
-	<title>Files</title>
+    <sect2>
+      <title>Files</title>
 
-	<indexterm>
-	  <primary>DHCP</primary>
-	  <secondary>configuration files</secondary>
-	</indexterm>
-	<itemizedlist>
-	  <listitem>
-	    <para><filename>/etc/dhclient.conf</filename></para>
-	    <para><command>dhclient</command> requires a configuration
-	      file, <filename>/etc/dhclient.conf</filename>.
-	      Typically the file contains only comments, the defaults
-	      being reasonably sane.  This configuration file is
-	      described by the &man.dhclient.conf.5; manual
-	      page.</para>
-	  </listitem>
+      <indexterm>
+	<primary>DHCP</primary>
+	<secondary>configuration files</secondary>
+      </indexterm>
+      <itemizedlist>
+	<listitem>
+	  <para><filename>/etc/dhclient.conf</filename></para>
 
-	  <listitem>
-	    <para><filename>/sbin/dhclient</filename></para>
-	    <para><command>dhclient</command> is statically linked and
-	      resides in <filename>/sbin</filename>.  The
-	      &man.dhclient.8; manual page gives more information
-	      about <command>dhclient</command>.</para>
-	  </listitem>
+	  <para><command>dhclient</command> requires a configuration
+	    file, <filename>/etc/dhclient.conf</filename>.  Typically
+	    the file contains only comments, the defaults being
+	    reasonably sane.  This configuration file is described by
+	    the &man.dhclient.conf.5; manual page.</para>
+	</listitem>
 
-	  <listitem>
-	    <para><filename>/sbin/dhclient-script</filename></para>
-	    <para><command>dhclient-script</command> is the
-	      FreeBSD-specific DHCP client configuration script.  It
-	      is described in &man.dhclient-script.8;, but should not
-	      need any user modification to function properly.</para>
-	  </listitem>
+	<listitem>
+	  <para><filename>/sbin/dhclient</filename></para>
 
-	  <listitem>
-	    <para><filename>/var/db/dhclient.leases.<replaceable>interface</replaceable></filename></para>
-	    <para>The DHCP client keeps a database of valid leases
-	      in this file, which is written as a log.
-	      &man.dhclient.leases.5; gives a slightly longer
-	      description.</para>
-	  </listitem>
-	</itemizedlist>
-      </sect2>
+	  <para><command>dhclient</command> is statically linked and
+	    resides in <filename>/sbin</filename>.  The
+	    &man.dhclient.8; manual page gives more information about
+	    <command>dhclient</command>.</para>
+	</listitem>
 
-      <sect2>
-	<title>Further Reading</title>
+	<listitem>
+	  <para><filename>/sbin/dhclient-script</filename></para>
 
-	<para>The DHCP protocol is fully described in <ulink
-	    url="http://www.freesoft.org/CIE/RFC/2131/">RFC
-	    2131</ulink>.  An informational resource has also been set
-	  up at <ulink url="http://www.dhcp.org/"></ulink>.</para>
-      </sect2>
-
-      <sect2 id="network-dhcp-server">
-	<title>Installing and Configuring a DHCP Server</title>
-
-	<sect3>
-	  <title>What This Section Covers</title>
-
-	  <para>This section provides information on how to configure
-	    a FreeBSD system to act as a DHCP server using the ISC
-	    (Internet Systems Consortium) implementation of the DHCP
-	    server.</para>
+	  <para><command>dhclient-script</command> is the
+	    FreeBSD-specific DHCP client configuration script.  It
+	    is described in &man.dhclient-script.8;, but should not
+	    need any user modification to function properly.</para>
+	</listitem>
 
-	  <para>The server is not provided as part of &os;, and so the
-	    <filename role="package">net/isc-dhcp42-server</filename>
-	    port must be installed to provide this service.  See
-	    <xref linkend="ports"/> for more information on using the
-	    Ports Collection.</para>
-	</sect3>
+	<listitem>
+	  <para><filename>/var/db/dhclient.leases.<replaceable>interface</replaceable></filename></para>
 
-	<sect3>
-	  <title>DHCP Server Installation</title>
+	  <para>The DHCP client keeps a database of valid leases in
+	    this file, which is written as a log.
+	    &man.dhclient.leases.5; gives a slightly longer
+	    description.</para>
+	</listitem>
+      </itemizedlist>
+    </sect2>
 
-	  <indexterm>
-	    <primary>DHCP</primary>
-	    <secondary>installation</secondary>
-	  </indexterm>
-	  <para>In order to configure the &os; system as a DHCP
-	    server, first ensure that the &man.bpf.4; device is
-	    compiled into the kernel.  To do this, add
-	    <literal>device bpf</literal> to the kernel configuration
-	    file, and rebuild the kernel.  For more information about
-	    building kernels, see
-	    <xref linkend="kernelconfig"/>.</para>
+    <sect2>
+      <title>Further Reading</title>
 
-	  <para>The <devicename>bpf</devicename> device is already
-	    part of the <filename>GENERIC</filename> kernel that is
-	    supplied with &os;, so there is no need to create a
-	    custom kernel in order to get <acronym>DHCP</acronym>
-	    working.</para>
+      <para>The DHCP protocol is fully described in
+	<ulink url="http://www.freesoft.org/CIE/RFC/2131/">RFC
+	  2131</ulink>.  An informational resource has also been set
+	up at <ulink url="http://www.dhcp.org/"></ulink>.</para>
+    </sect2>
 
-	  <note>
-	    <para>Those who are particularly security conscious
-	      should note that <devicename>bpf</devicename> is also
-	      the device that allows packet sniffers to function
-	      correctly (although such programs still need
-	      privileged access).  The <devicename>bpf</devicename>
-	      device <emphasis>is</emphasis> required to use DHCP, but
-	      if the sensitivity of the system's security is high,
-	      this device should not be included in the kernel purely
-	      because the use of <acronym>DHCP</acronym> may, at some
-	      point in the future, be desired.</para>
-	  </note>
+    <sect2 id="network-dhcp-server">
+      <title>Installing and Configuring a DHCP Server</title>
 
-	  <para>The next thing that is needed is to edit the
-	    sample <filename>dhcpd.conf</filename> which was installed
-	    by the <filename
-	      role="package">net/isc-dhcp42-server</filename> port.
-	    By default, this will be
-	    <filename>/usr/local/etc/dhcpd.conf.sample</filename>, and
-	    you should copy this to
-	    <filename>/usr/local/etc/dhcpd.conf</filename> before
-	    proceeding to make changes.</para>
-	</sect3>
+      <sect3>
+	<title>What This Section Covers</title>
 
-	<sect3>
-	  <title>Configuring the DHCP Server</title>
+	<para>This section provides information on how to configure a
+	  FreeBSD system to act as a DHCP server using the ISC
+	  (Internet Systems Consortium) implementation of the DHCP
+	  server.</para>
 
-	  <indexterm>
-	    <primary>DHCP</primary>
-	    <secondary>dhcpd.conf</secondary>
-	  </indexterm>
-	  <para><filename>dhcpd.conf</filename> is comprised of
-	    declarations regarding subnets and hosts, and is perhaps
-	    most easily explained using an example :</para>
+	<para>The server is not provided as part of &os;, and so the
+	  <filename role="package">net/isc-dhcp42-server</filename>
+	  port must be installed to provide this service.  See
+	  <xref linkend="ports"/> for more information on using the
+	  Ports Collection.</para>
+      </sect3>
+
+      <sect3>
+	<title>DHCP Server Installation</title>
+
+	<indexterm>
+	  <primary>DHCP</primary>
+	  <secondary>installation</secondary>
+	</indexterm>
+
+	<para>In order to configure the &os; system as a DHCP server,
+	  first ensure that the &man.bpf.4; device is compiled into
+	  the kernel.  To do this, add <literal>device bpf</literal>
+	  to the kernel configuration file, and rebuild the kernel.
+	  For more information about building kernels, see
+	  <xref linkend="kernelconfig"/>.</para>
+
+	<para>The <devicename>bpf</devicename> device is already part
+	  of the <filename>GENERIC</filename> kernel that is supplied
+	  with &os;, so there is no need to create a custom kernel in
+	  order to get <acronym>DHCP</acronym> working.</para>
+
+	<note>
+	  <para>Those who are particularly security conscious should
+	    note that <devicename>bpf</devicename> is also the device
+	    that allows packet sniffers to function correctly
+	    (although such programs still need privileged access).
+	    The <devicename>bpf</devicename> device
+	    <emphasis>is</emphasis> required to use DHCP, but if the
+	    sensitivity of the system's security is high, this device
+	    should not be included in the kernel purely because the
+	    use of <acronym>DHCP</acronym> may, at some point in the
+	    future, be desired.</para>
+	</note>
 
-	  <programlisting>option domain-name "example.com";<co id="domain-name"/>
+	<para>The next thing that is needed is to edit the sample
+	  <filename>dhcpd.conf</filename> which was installed by the
+	  <filename role="package">net/isc-dhcp42-server</filename>
+	  port.  By default, this will be
+	  <filename>/usr/local/etc/dhcpd.conf.sample</filename>, and
+	  you should copy this to
+	  <filename>/usr/local/etc/dhcpd.conf</filename> before
+	  proceeding to make changes.</para>
+      </sect3>
+
+      <sect3>
+	<title>Configuring the DHCP Server</title>
+
+	<indexterm>
+	  <primary>DHCP</primary>
+	  <secondary>dhcpd.conf</secondary>
+	</indexterm>
+	<para><filename>dhcpd.conf</filename> is comprised of
+	  declarations regarding subnets and hosts, and is perhaps
+	  most easily explained using an example :</para>
+
+	<programlisting>option domain-name "example.com";<co id="domain-name"/>
 option domain-name-servers 192.168.4.100;<co id="domain-name-servers"/>
 option subnet-mask 255.255.255.0;<co id="subnet-mask"/>
 
@@ -3248,13 +3235,12 @@ dhcpd_ifaces="dc0"</programlisting>
 
 	<screen>&prompt.root; <userinput>service isc-dhcpd start</userinput></screen>
 
-	<para>Any future changes to the configuration
-	  of the server will require the sending of a
-	  <literal>SIGTERM</literal> signal to
-	  <application>dhcpd</application> rather than a
-	  <literal>SIGHUP</literal>.  It is definitely more
-	  simple to use &man.service.8; to completely restart
-	  the service.</para>
+	<para>Any future changes to the configuration of the server
+	  will require the sending of a <literal>SIGTERM</literal>
+	  signal to <application>dhcpd</application> rather than a
+	  <literal>SIGHUP</literal>.  It is definitely more simple to
+	  use &man.service.8; to completely restart the
+	  service.</para>
       </sect3>
 
       <sect3>
@@ -3267,30 +3253,33 @@ dhcpd_ifaces="dc0"</programlisting>
 	<itemizedlist>
 	  <listitem>
 	    <para><filename>/usr/local/sbin/dhcpd</filename></para>
+
 	    <para><application>dhcpd</application> is statically
 	      linked and resides in
-	      <filename>/usr/local/sbin</filename>.  The
-	      &man.dhcpd.8; manual page installed with the port
-	      gives more information about
+	      <filename>/usr/local/sbin</filename>.  The &man.dhcpd.8;
+	      manual page installed with the port gives more
+	      information about
 	      <application>dhcpd</application>.</para>
 	  </listitem>
 
 	  <listitem>
 	    <para><filename>/usr/local/etc/dhcpd.conf</filename></para>
+
 	    <para><application>dhcpd</application> requires a
 	      configuration file,
-	      <filename>/usr/local/etc/dhcpd.conf</filename> before
-	      it will start providing service to clients.  This file
+	      <filename>/usr/local/etc/dhcpd.conf</filename> before it
+	      will start providing service to clients.  This file
 	      needs to contain all the information that should be
-	      provided to clients that are being serviced, along
-	      with information regarding the operation of the
-	      server.  This configuration file is described
-	      by the &man.dhcpd.conf.5; manual page installed
-	      by the port.</para>
+	      provided to clients that are being serviced, along with
+	      information regarding the operation of the server.  This
+	      configuration file is described by the
+	      &man.dhcpd.conf.5; manual page installed by the
+	      port.</para>
 	  </listitem>
 
 	  <listitem>
 	    <para><filename>/var/db/dhcpd.leases</filename></para>
+
 	    <para>The DHCP server keeps a database of leases it has
 	      issued in this file, which is written as a log.  The
 	      manual page &man.dhcpd.leases.5;, installed by the
@@ -3299,14 +3288,15 @@ dhcpd_ifaces="dc0"</programlisting>
 
 	  <listitem>
 	    <para><filename>/usr/local/sbin/dhcrelay</filename></para>
+
 	    <para><application>dhcrelay</application> is used in
 	      advanced environments where one DHCP server forwards a
 	      request from a client to another DHCP server on a
 	      separate network.  If this functionality is required,
-	      then install the <filename
-		role="package">net/isc-dhcp42-relay</filename> port.
-	      The &man.dhcrelay.8; manual page provided with the
-	      port contains more detail.</para>
+	      then install the
+	      <filename role="package">net/isc-dhcp42-relay</filename>
+	      port.  The &man.dhcrelay.8; manual page provided with
+	      the port contains more detail.</para>
 	  </listitem>
 	</itemizedlist>
       </sect3>
@@ -3345,11 +3335,11 @@ dhcpd_ifaces="dc0"</programlisting>
 	of the <acronym>DNS</acronym> protocol.
 	<acronym>DNS</acronym> is the protocol through which names are
 	mapped to <acronym>IP</acronym> addresses, and vice versa.
-	For example, a query for <hostid
-	  role="fqdn">www.FreeBSD.org</hostid> will receive a reply
-	with the <acronym>IP</acronym> address of The &os; Project's
-	web server, whereas, a query for <hostid
-	  role="fqdn">ftp.FreeBSD.org</hostid> will return the
+	For example, a query for
+	<hostid role="fqdn">www.FreeBSD.org</hostid> will receive a
+	reply with the <acronym>IP</acronym> address of The &os;
+	Project's web server, whereas, a query for
+	<hostid role="fqdn">ftp.FreeBSD.org</hostid> will return the
 	<acronym>IP</acronym> address of the corresponding
 	<acronym>FTP</acronym> machine.  Likewise, the opposite can
 	happen.  A query for an <acronym>IP</acronym> address can
@@ -3479,12 +3469,11 @@ dhcpd_ifaces="dc0"</programlisting>
       </itemizedlist>
 
       <para>As one can see, the more specific part of a hostname
-	appears to its left.  For example, <hostid
-	  role="domainname">example.org.</hostid> is more specific
-	than <hostid>org.</hostid>, as <hostid>org.</hostid> is more
-	specific than the root zone.  The layout of each part of a
-	hostname is
-	much like a file system: the
+	appears to its left.  For example,
+	<hostid role="domainname">example.org.</hostid> is more
+	specific than <hostid>org.</hostid>, as <hostid>org.</hostid>
+	is more specific than the root zone.  The layout of each part
+	of a hostname is much like a file system: the
 	<filename class="directory">/dev</filename> directory falls
 	within the root, and so on.</para>
     </sect2>
@@ -3493,8 +3482,8 @@ dhcpd_ifaces="dc0"</programlisting>
       <title>Reasons to Run a Name Server</title>
 
       <para>Name servers generally come in two forms: authoritative
-	name servers, and caching (also known as resolving)
-	name servers.</para>
+	name servers, and caching (also known as resolving) name
+	servers.</para>
 
       <para>An authoritative name server is needed when:</para>
 
@@ -3505,10 +3494,10 @@ dhcpd_ifaces="dc0"</programlisting>
 	</listitem>
 
 	<listitem>
-	  <para>A domain, such as <hostid
-	      role="domainname">example.org</hostid>, is registered
-	    and <acronym>IP</acronym> addresses need to be assigned
-	    to hostnames under it.</para>
+	  <para>A domain, such as
+	    <hostid role="domainname">example.org</hostid>, is
+	    registered and <acronym>IP</acronym> addresses need to be
+	    assigned to hostnames under it.</para>
 	</listitem>
 
 	<listitem>
@@ -4109,7 +4098,7 @@ www             IN      CNAME   example.
 	<variablelist>
 	  <varlistentry>
 	    <term><hostid
-	      role="domainname">example.org.</hostid></term>
+		role="domainname">example.org.</hostid></term>
 
 	    <listitem>
 	      <para>the domain name, also the origin for this
@@ -4141,16 +4130,16 @@ www             IN      CNAME   example.
 	    <term><literal>2006051501</literal></term>
 
 	    <listitem>
-	      <para>the serial number of the file.  This
-		must be incremented each time the zone file is
-		modified.  Nowadays, many admins prefer a
+	      <para>the serial number of the file.  This must be
+		incremented each time the zone file is modified.
+		Nowadays, many admins prefer a
 		<literal>yyyymmddrr</literal> format for the serial
-		number.  <literal>2006051501</literal> would mean
-		last modified 05/15/2006, the latter
-		<literal>01</literal> being the first time the zone
-		file has been modified this day.  The serial number
-		is important as it alerts slave name servers for a
-		zone when it is updated.</para>
+		number.  <literal>2006051501</literal> would mean last
+		modified 05/15/2006, the latter <literal>01</literal>
+		being the first time the zone file has been modified
+		this day.  The serial number is important as it alerts
+		slave name servers for a zone when it is
+		updated.</para>
 	    </listitem>
 	  </varlistentry>
 	</variablelist>
@@ -4263,12 +4252,12 @@ mail            IN      A       192.168.
       </indexterm>
 
       <para>Domain Name System Security Extensions, or <acronym
-	  role="Domain Name Security Extensions">DNSSEC</acronym>
-	for short, is a suite of specifications to protect resolving
-	name servers from forged <acronym>DNS</acronym> data, such
-	as spoofed <acronym>DNS</acronym> records.  By using digital
-	signatures, a resolver can verify the integrity of the
-	record.  Note that <acronym role="Domain Name Security
+	  role="Domain Name Security Extensions">DNSSEC</acronym> for

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

From owner-svn-doc-head@FreeBSD.ORG  Thu Aug 29 19:07:00 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id E5AC6C12;
 Thu, 29 Aug 2013 19:06:59 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
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 C360F2192;
 Thu, 29 Aug 2013 19:06: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 r7TJ6xWN029251;
 Thu, 29 Aug 2013 19:06:59 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7TJ6xIk029250;
 Thu, 29 Aug 2013 19:06:59 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201308291906.r7TJ6xIk029250@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 29 Aug 2013 19:06:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42604 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Aug 2013 19:07:00 -0000

Author: wblock
Date: Thu Aug 29 19:06:59 2013
New Revision: 42604
URL: http://svnweb.freebsd.org/changeset/doc/42604

Log:
  Remove the no-longer-relevant section on binary formats, as discussed in
  http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/binary-formats.html
  
  Submitted by:	Hugh O'Brien <obrien.hugh@gmail.com>

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	Thu Aug 29 03:56:17 2013	(r42603)
+++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Thu Aug 29 19:06:59 2013	(r42604)
@@ -70,10 +70,6 @@
       </listitem>
 
       <listitem>
-	<para>What binary format is used under &os;.</para>
-      </listitem>
-
-      <listitem>
 	<para>How to read manual pages for more information.</para>
       </listitem>
     </itemizedlist>
@@ -2385,152 +2381,6 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <filename class="directory">/dev</filename>.</para>
   </sect1>
 
-  <sect1 id="binary-formats">
-    <title>Binary Formats</title>
-
-    <para>Typically when a command is passed to the shell, the shell
-      will arrange for an executable file to be loaded into memory and
-      a new process is created.  Executable files can either be a binary
-      file (usually created by the linker as part of compiling a program)
-      or a shell script (text file to be interpreted by a binary file,
-      like &man.sh.1; or &man.perl.1;).  The &man.file.1; command can
-      usually determine what is inside a file.</para>
-
-    <para>Binary files need to have a well defined format for the system
-      to be able to use them properly.  Part of the file will be the
-      executable machine code (the instructions that tell the CPU what
-      to do), part of it will be data space with pre-defined values,
-      part will be data space with no pre-defined values, etc.  Through
-      time, different binary file formats have evolved.</para>
-
-    <para>To understand why &os; uses the &man.elf.5; format, the three
-      currently <quote>dominant</quote>, executable formats for &unix;
-      must be described:</para>
-
-    <itemizedlist>
-      <listitem>
-	<para>&man.a.out.5;</para>
-
-	<para>The oldest and <quote>classic</quote> &unix; object
-	  format.  It uses a short and compact header with a
-	  &man.magic.5; number at the beginning that is often used to
-	  characterize the format.  It contains three loaded segments:
-	  .text, .data, and .bss, plus a symbol table and a string
-	  table.</para>
-      </listitem>
-
-      <listitem>
-	<para><acronym>COFF</acronym></para>
-
-	<para>The SVR3 object format.  The header comprises a section
-	  table which can contain more than just .text, .data, and
-	  .bss sections.</para>
-      </listitem>
-
-      <listitem>
-	<para>&man.elf.5;</para>
-
-	<para>The successor to <acronym>COFF</acronym>, featuring
-	  multiple sections and 32-bit or 64-bit possible values.  One
-	  major drawback is that <acronym>ELF</acronym> was designed
-	  with the assumption that there would be only one ABI per
-	  system architecture.  That assumption is actually incorrect,
-	  and not even in the commercial SYSV world (which has at
-	  least three ABIs: SVR4, Solaris, SCO) does it hold
-	  true.</para>
-
-	<para>&os; tries to work around this problem somewhat by
-	  providing a utility for <emphasis>branding</emphasis> a
-	  known <acronym>ELF</acronym> executable with information
-	  about its compliant ABI.  Refer to &man.brandelf.1; for more
-	  information.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>&os; comes from the <quote>classic</quote> camp and used
-      the &man.a.out.5; format, a technology tried and proven through
-      many generations of BSD releases, until the beginning of the 3.X
-      branch.  Though it was possible to build and run native
-      <acronym>ELF</acronym> binaries and kernels on a &os; system
-      for some time before that, &os; initially resisted the
-      <quote>push</quote> to switch to <acronym>ELF</acronym> as the
-      default format.  Why?  When Linux made its painful transition to
-      <acronym>ELF</acronym>, it was due to their inflexible
-      jump-table based shared library mechanism, which made the
-      construction of shared libraries difficult for vendors and
-      developers.  Since <acronym>ELF</acronym> tools offered a
-      solution to the shared library problem and were generally seen
-      as <quote>the way forward</quote>, the migration cost was
-      accepted as necessary and the transition made.  &os;'s shared
-      library mechanism is based more closely on the &sunos; style
-      shared library mechanism and is easy to use.</para>
-
-    <para>So, why are there so many different formats?  Back in the
-      PDP-11 days when simple hardware supported a simple, small
-      system, <filename>a.out</filename> was adequate for the job of
-      representing binaries.  As &unix; was ported, the
-      <filename>a.out</filename> format was retained because it was
-      sufficient for the early ports of &unix; to architectures like
-      the Motorola 68k or VAXen.</para>
-
-    <para>Then some hardware engineer decided that if he could force
-      software to do some sleazy tricks, a few gates could be shaved
-      off the design and the CPU core could run faster.
-      <filename>a.out</filename> was ill-suited for this new kind of
-      hardware, known as <acronym>RISC</acronym>.  Many formats were
-      developed to get better performance from this hardware than the
-      limited, simple <filename>a.out</filename> format could offer.
-      <acronym>COFF</acronym>, <acronym>ECOFF</acronym>, and a few
-      others were invented and their limitations explored before
-      settling on <acronym>ELF</acronym>.</para>
-
-    <para>In addition, program sizes were getting huge while disks
-      and physical memory were still relatively small, so the concept
-      of a shared library was born.  The virtual memory system became
-      more sophisticated. While each advancement was done using the
-      <filename>a.out</filename> format, its usefulness was stretched
-      with each new feature.  In addition, people wanted to
-      dynamically load things at run time, or to junk parts of their
-      program after the init code had run to save in core memory and
-      swap space.  Languages became more sophisticated and people
-      wanted code called before the main() function automatically.
-      Lots of hacks were done to the <filename>a.out</filename> format
-      to allow all of these things to happen, and they basically
-      worked for a time.  In time, <filename>a.out</filename> was not
-      up to handling all these problems without an ever increasing
-      overhead in code and complexity.  While <acronym>ELF</acronym>
-      solved many of these problems, it would be painful to switch
-      from the system that basically worked.  So
-      <acronym>ELF</acronym> had to wait until it was more painful to
-      remain with <filename>a.out</filename> than it was to migrate to
-      <acronym>ELF</acronym>.</para>
-
-    <para>As time passed, the build tools that &os; derived their
-      build tools from, especially the assembler and loader, evolved
-      in two parallel trees.  The &os; tree added shared libraries and
-      fixed some bugs.  The GNU folks that originally wrote these
-      programs rewrote them and added simpler support for building
-      cross compilers and plugging in different formats.  Those who
-      wanted to build cross compilers targeting &os; were out of luck
-      since the older sources that &os; had for &man.as.1; and
-      &man.ld.1; were not up to the task.  The new GNU tools chain
-      (<application>binutils</application>) supports cross
-      compiling, <acronym>ELF</acronym>, shared libraries, and C++
-      extensions.  In addition, many vendors release
-      <acronym>ELF</acronym> binaries, and &os; should be able to run
-      them.</para>
-
-    <para><acronym>ELF</acronym> is more expressive than
-      <filename>a.out</filename> and allows more extensibility in the
-      base system.  The <acronym>ELF</acronym> tools are better
-      maintained and offer cross compilation support.
-      <acronym>ELF</acronym> may be a little slower than
-      <filename>a.out</filename>, but trying to measure it can be
-      difficult.  There are also numerous details that are different
-      between the two such as how they map pages and handle init
-      code.</para>
-  </sect1>
-
   <sect1 id="basics-more-information">
     <title>For More Information</title>
 

From owner-svn-doc-head@FreeBSD.ORG  Thu Aug 29 20:01:38 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 8272CFDD;
 Thu, 29 Aug 2013 20:01:38 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
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 5FCF5254F;
 Thu, 29 Aug 2013 20:01:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7TK1cXp060288;
 Thu, 29 Aug 2013 20:01:38 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7TK1c5K060287;
 Thu, 29 Aug 2013 20:01:38 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201308292001.r7TK1c5K060287@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 29 Aug 2013 20:01:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42605 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Aug 2013 20:01:38 -0000

Author: wblock
Date: Thu Aug 29 20:01:37 2013
New Revision: 42605
URL: http://svnweb.freebsd.org/changeset/doc/42605

Log:
  Whitespace-only fixes, translators please ignore.

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	Thu Aug 29 19:06:59 2013	(r42604)
+++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Thu Aug 29 20:01:37 2013	(r42605)
@@ -93,8 +93,8 @@
 
       <indexterm><primary>console</primary></indexterm>
 
-      <para>Unless &os; has been configured to automatically start
-	a graphical environment during startup, the system will boot
+      <para>Unless &os; has been configured to automatically start a
+	graphical environment during startup, the system will boot
 	into a command line login prompt, as seen in this
 	example:</para>
 
@@ -102,10 +102,10 @@
 
 login:</screen>
 
-      <para>The first line contains some information about the
-	system.  The <literal>amd64</literal> indicates that the
-	system in this example is running a 64-bit version of &os;.
-	The hostname is <hostid>pc3.example.org</hostid>, and
+      <para>The first line contains some information about the system.
+	The <literal>amd64</literal> indicates that the system in this
+	example is running a 64-bit version of &os;.  The hostname is
+	<hostid>pc3.example.org</hostid>, and
 	<devicename>ttyv0</devicename> indicates that this is the
 	system console.</para>
 
@@ -116,10 +116,10 @@ login:</screen>
     <sect2 id="consoles-login">
       <title>Logging into &os;</title>
 
-      <para>&os; is a multiuser, multiprocessing system.  This is
-	the formal description that is usually given to a system that
-	can be used by many different people, who simultaneously run a
-	lot of programs on a single machine.</para>
+      <para>&os; is a multiuser, multiprocessing system.  This is the
+	formal description that is usually given to a system that can
+	be used by many different people, who simultaneously run a lot
+	of programs on a single machine.</para>
 
       <para>Every multiuser system needs some way to distinguish one
 	<quote>user</quote> from the rest.  In &os; (and all the
@@ -127,9 +127,8 @@ login:</screen>
 	requiring that every user must <quote>log into</quote> the
 	system before being able to run programs.  Every user has a
 	unique name (the <quote>username</quote>) and a personal,
-	secret key (the <quote>password</quote>).  &os; will ask
-	for these two before allowing a user to run any
-	programs.</para>
+	secret key (the <quote>password</quote>).  &os; will ask for
+	these two before allowing a user to run any programs.</para>
 
       <indexterm><primary>startup scripts</primary></indexterm>
       <para>When a &os; system boots, startup scripts are
@@ -141,8 +140,8 @@ login:</screen>
       <screen>login:</screen>
 
       <para>Type the username that was configured during system
-	installation, as described in <xref
-	  linkend="bsdinstall-addusers"/>, and press
+	installation, as described in
+	<xref linkend="bsdinstall-addusers"/>, and press
 	<keycap>Enter</keycap>.  Then enter the password associated
 	with the username and press <keycap>Enter</keycap>.  The
 	password is <emphasis>not echoed</emphasis> for security
@@ -270,8 +269,8 @@ console none                            
 
       <screen>&prompt.root; <userinput>vidcontrol -i mode</userinput></screen>
 
-      <para>The output of this command lists the video modes that
-	are supported by the hardware.  To select a new video mode,
+      <para>The output of this command lists the video modes that are
+	supported by the hardware.  To select a new video mode,
 	specify the mode using &man.vidcontrol.1; as the
 	<username>root</username> user:</para>
 
@@ -290,9 +289,9 @@ console none                            
 
     <indexterm><primary>UNIX</primary></indexterm>
 
-    <para>&os;, being a direct descendant of BSD &unix;, is based
-      on several key &unix; concepts.  The first and most pronounced
-      is that &os; is a multi-user operating system that can handle
+    <para>&os;, being a direct descendant of BSD &unix;, is based on
+      several key &unix; concepts.  The first and most pronounced is
+      that &os; is a multi-user operating system that can handle
       several users working simultaneously on completely unrelated
       tasks.  The system is responsible for properly sharing and
       managing requests for hardware devices, peripherals, memory, and
@@ -300,12 +299,12 @@ console none                            
 
     <para>Much more information about user accounts is in the chapter
       about <link linkend="users">accounts</link>.  It is important to
-      understand that each person (user) who uses the computer should be
-      given their own username and password.  The system keeps track
-      of the people using the computer based on this username.  Since
-      it is often the case that several people are working on the same
-      project &unix; also provides groups.  Several users can be placed
-      in the same group.</para>
+      understand that each person (user) who uses the computer should
+      be given their own username and password.  The system keeps
+      track of the people using the computer based on this username.
+      Since it is often the case that several people are working on
+      the same project &unix; also provides groups.  Several users can
+      be placed in the same group.</para>
 
     <para>Because the system is capable of supporting multiple users,
       everything the system manages has a set of permissions governing
@@ -317,9 +316,10 @@ console none                            
 
     <note>
       <para>This section will discuss the traditional &unix;
-	permissions.  For finer grained file system access
-	control, see the <link linkend="fs-acl">File System
-	Access Control Lists</link> section.</para>
+	permissions.  For finer grained file system access control,
+	see the
+	<link linkend="fs-acl">File System Access Control Lists</link>
+	section.</para>
     </note>
 
     <indexterm><primary>permissions</primary></indexterm>
@@ -387,6 +387,7 @@ console none                            
 	</tbody>
       </tgroup>
     </informaltable>
+
     <indexterm>
       <primary>&man.ls.1;</primary>
     </indexterm>
@@ -1022,9 +1023,9 @@ root     5211  0.0  0.2  3620  1724   2 
 		  class="directory">/var/</filename></entry>
 	      <entry>Multi-purpose log, temporary, transient, and
 		spool files.  A memory-based file system is sometimes
-		mounted at <filename
-		  class="directory">/var</filename>. This can be
-		automated using the varmfs-related variables in
+		mounted at
+		<filename class="directory">/var</filename>.  This can
+		be automated using the varmfs-related variables in
 		&man.rc.conf.5; or with an entry in
 		<filename>/etc/fstab</filename>; refer to
 		&man.mdmfs.8; for details.</entry>
@@ -1053,8 +1054,8 @@ root     5211  0.0  0.2  3620  1724   2 
 	      <entry><filename
 		  class="directory">/var/tmp/</filename></entry>
 	      <entry>Temporary files which are usually preserved
-		across a system reboot, unless <filename
-		  class="directory">/var</filename> is a
+		across a system reboot, unless
+		<filename class="directory">/var</filename> is a
 		memory-based file system.</entry>
 	    </row>
 
@@ -1087,8 +1088,8 @@ root     5211  0.0  0.2  3620  1724   2 
     <para>Files and directories are referenced by giving the file or
       directory name, followed by a forward slash,
       <literal>/</literal>, followed by any other directory names that
-      are necessary.  For example, if the directory <filename
-	class="directory">foo</filename> contains a directory
+      are necessary.  For example, if the directory
+      <filename class="directory">foo</filename> contains a directory
       <filename class="directory">bar</filename> which contains the
       file <filename>readme.txt</filename>, the full name, or
       <firstterm>path</firstterm>, to the file is
@@ -1103,11 +1104,12 @@ root     5211  0.0  0.2  3620  1724   2 
       file system contains exactly one directory at the very top
       level, called the <firstterm>root directory</firstterm> for that
       file system.  This root directory can contain other directories.
-      One file system is designated the <firstterm>root file
-	system</firstterm> or <literal>/</literal>.  Every other file
-      system is <firstterm>mounted</firstterm> under the root file
-      system.  No matter how many disks are on the &os; system, every
-      directory appears to be part of the same disk.</para>
+      One file system is designated the
+      <firstterm>root file system</firstterm> or <literal>/</literal>.
+      Every other file system is <firstterm>mounted</firstterm> under
+      the root file system.  No matter how many disks are on the &os;
+      system, every directory appears to be part of the same
+      disk.</para>
 
     <para>Consider three file systems, called <literal>A</literal>,
       <literal>B</literal>, and <literal>C</literal>.  Each file
@@ -1163,10 +1165,10 @@ root     5211  0.0  0.2  3620  1724   2 
 
     <para>Any files that are in the <literal>B1</literal> or
       <literal>B2</literal> directories can be reached with the path
-      <filename class="directory">/A1/B1</filename> or <filename
-	class="directory">/A1/B2</filename> as necessary.  Any files
-      that were in <filename class="directory">/A1</filename> have
-      been temporarily hidden.  They will reappear if
+      <filename class="directory">/A1/B1</filename> or
+      <filename class="directory">/A1/B2</filename> as necessary.  Any
+      files that were in <filename class="directory">/A1</filename>
+      have been temporarily hidden.  They will reappear if
       <literal>B</literal> is <firstterm>unmounted</firstterm> from
       <literal>A</literal>.</para>
 
@@ -1193,8 +1195,9 @@ root     5211  0.0  0.2  3620  1724   2 
     </mediaobject>
 
     <para>and the paths would be
-      <filename class="directory">/A2/B1</filename> and <filename
-	class="directory">/A2/B2</filename> respectively.</para>
+      <filename class="directory">/A2/B1</filename> and
+      <filename class="directory">/A2/B2</filename>
+      respectively.</para>
 
     <para>File systems can be mounted on top of one another.
       Continuing the last example, the <literal>C</literal> file
@@ -1262,9 +1265,9 @@ root     5211  0.0  0.2  3620  1724   2 
 	  <firstterm>mount options</firstterm>.  For example, the root
 	  file system can be mounted read-only, making it impossible
 	  for users to inadvertently delete or edit a critical file.
-	  Separating user-writable file systems, such as <filename
-	    class="directory">/home</filename>, from other file
-	  systems allows them to be mounted
+	  Separating user-writable file systems, such as
+	  <filename class="directory">/home</filename>, from other
+	  file systems allows them to be mounted
 	  <firstterm>nosuid</firstterm>.  This option prevents the
 	  <firstterm>suid</firstterm>/<firstterm>guid</firstterm> bits
 	  on executables stored on the file system from taking effect,
@@ -1282,11 +1285,11 @@ root     5211  0.0  0.2  3620  1724   2 
 
       <listitem>
 	<para>&os;'s file systems are robust if power is lost.
-	  However, a power loss at a critical point could still
-	  damage the structure of the file system.  By splitting
-	  data over multiple file systems it is more likely that the
-	  system will still come up, making it easier to restore from
-	  backup as necessary.</para>
+	  However, a power loss at a critical point could still damage
+	  the structure of the file system.  By splitting data over
+	  multiple file systems it is more likely that the system will
+	  still come up, making it easier to restore from backup as
+	  necessary.</para>
       </listitem>
     </itemizedlist>
 
@@ -1302,9 +1305,9 @@ root     5211  0.0  0.2  3620  1724   2 
 	  restoring the backed up data.</para>
 
 	<important>
-	  <para>&os; features the &man.growfs.8; command, which
-	    makes it possible to increase the size of file system on
-	    the fly, removing this limitation.</para>
+	  <para>&os; features the &man.growfs.8; command, which makes
+	    it possible to increase the size of file system on the
+	    fly, removing this limitation.</para>
 	</important>
       </listitem>
     </itemizedlist>
@@ -1319,8 +1322,8 @@ root     5211  0.0  0.2  3620  1724   2 
       point in the file system hierarchy, or the letter of the
       partition they are contained in.</para>
 
-    <para>&os; also uses disk space for <firstterm>swap
-	space</firstterm> to provide
+    <para>&os; also uses disk space for
+      <firstterm>swap space</firstterm> to provide
       <firstterm>virtual memory</firstterm>.  This allows your
       computer to behave as though it has much more memory than it
       actually does.  When &os; runs out of memory, it moves some of
@@ -1360,8 +1363,7 @@ root     5211  0.0  0.2  3620  1724   2 
 	      This allows utilities that need to work on the entire
 	      slice, such as a bad block scanner, to work on the
 	      <literal>c</literal> partition.  A file system would not
-	      normally be
-	      created on this partition.</entry>
+	      normally be created on this partition.</entry>
 	  </row>
 
 	  <row>
@@ -1377,8 +1379,8 @@ root     5211  0.0  0.2  3620  1724   2 
 
     <para>Disks in &os; are divided into slices, referred to in
       &windows; as partitions, which are numbered from 1 to 4.  These
-      are then divided into partitions, which contain file
-      systems, and are labeled using letters.</para>
+      are then divided into partitions, which contain file systems,
+      and are labeled using letters.</para>
 
     <indexterm><primary>slices</primary></indexterm>
     <indexterm><primary>partitions</primary></indexterm>
@@ -1401,21 +1403,22 @@ root     5211  0.0  0.2  3620  1724   2 
       letter is appended to the device name, so
       <quote>da0<emphasis>a</emphasis></quote> is the
       <literal>a</literal> partition on the first
-      <literal>da</literal> drive, which is <quote>dangerously
-	dedicated</quote>.  <quote>ad1s3<emphasis>e</emphasis></quote>
-      is the fifth partition in the third slice of the second IDE
-      disk drive.</para>
+      <literal>da</literal> drive, which is
+      <quote>dangerously dedicated</quote>.
+      <quote>ad1s3<emphasis>e</emphasis></quote> is the fifth
+      partition in the third slice of the second IDE disk
+      drive.</para>
 
     <para>Finally, each disk on the system is identified.  A disk name
       starts with a code that indicates the type of disk, and then a
       number, indicating which disk it is.  Unlike slices, disk
-      numbering starts at 0.  Common codes are listed in <xref
-	linkend="basics-dev-codes"/>.</para>
+      numbering starts at 0.  Common codes are listed in
+      <xref linkend="basics-dev-codes"/>.</para>
 
     <para>When referring to a partition, include the disk name,
       <literal>s</literal>, the slice number, and then the partition
-      letter.  Examples are shown in <xref
-	linkend="basics-disk-slice-part"/>.</para>
+      letter.  Examples are shown in
+      <xref linkend="basics-disk-slice-part"/>.</para>
 
     <para><xref linkend="basics-concept-disk-model"/> shows a
       conceptual model of a disk layout.</para>
@@ -1493,7 +1496,6 @@ root     5211  0.0  0.2  3620  1724   2 
 
 	    <row>
 	      <entry><literal>da1s2e</literal></entry>
-
 	      <entry>The fifth partition (<literal>e</literal>) on the
 		second slice (<literal>s2</literal>) on the second
 		SCSI disk (<literal>da1</literal>).</entry>
@@ -1511,15 +1513,15 @@ root     5211  0.0  0.2  3620  1724   2 
 	size, and contains two 2&nbsp;GB slices (&ms-dos; partitions).
 	The first slice contains a &ms-dos; disk,
 	<devicename>C:</devicename>, and the second slice contains a
-	&os; installation.  This example &os; installation has
-	three data partitions, and a swap partition.</para>
+	&os; installation.  This example &os; installation has three
+	data partitions, and a swap partition.</para>
 
       <para>The three partitions will each hold a file system.
 	Partition <literal>a</literal> will be used for the root file
-	system, <literal>e</literal> for the <filename
-	  class="directory">/var/</filename> directory hierarchy, and
-	<literal>f</literal> for the <filename
-	  class="directory">/usr/</filename> directory
+	system, <literal>e</literal> for the
+	<filename class="directory">/var/</filename> directory
+	hierarchy, and <literal>f</literal> for the
+	<filename class="directory">/usr/</filename> directory
 	hierarchy.</para>
 
       <mediaobject>
@@ -1562,29 +1564,31 @@ root     5211  0.0  0.2  3620  1724   2 
   <sect1 id="mount-unmount">
     <title>Mounting and Unmounting File Systems</title>
 
-    <para>The file system is best visualized as a tree,
-      rooted, as it were, at <filename class="directory">/</filename>.
-      <filename class="directory">/dev</filename>, <filename
-	class="directory">/usr</filename>, and the other directories
-      in the root directory are branches, which may have their own
-      branches, such as <filename
-	class="directory">/usr/local</filename>, and so on.</para>
+    <para>The file system is best visualized as a tree, rooted, as it
+      were, at <filename class="directory">/</filename>.
+      <filename class="directory">/dev</filename>,
+      <filename class="directory">/usr</filename>, and the other
+      directories in the root directory are branches, which may have
+      their own branches, such as
+      <filename class="directory">/usr/local</filename>, and so
+      on.</para>
 
     <indexterm><primary>root file system</primary></indexterm>
     <para>There are various reasons to house some of these
-      directories on separate file systems.  <filename
-	class="directory">/var</filename> contains the directories
-      <filename class="directory">log/</filename>,
+      directories on separate file systems.
+      <filename class="directory">/var</filename> contains the
+      directories <filename class="directory">log/</filename>,
       <filename class="directory">spool/</filename>, and various types
       of temporary files, and as such, may get filled up.  Filling up
-      the root file system is not a good idea, so splitting <filename
-	class="directory">/var</filename> from <filename
-	class="directory">/</filename> is often favorable.</para>
+      the root file system is not a good idea, so splitting
+      <filename class="directory">/var</filename> from
+      <filename class="directory">/</filename> is often
+      favorable.</para>
 
     <para>Another common reason to contain certain directory trees on
       other file systems is if they are to be housed on separate
       physical disks, or are separate virtual disks, such as Network
-      File System  mounts, described in <xref linkend="network-nfs"/>,
+      File System mounts, described in <xref linkend="network-nfs"/>,
       or CDROM drives.</para>
 
     <sect2 id="disks-fstab">
@@ -1595,8 +1599,8 @@ root     5211  0.0  0.2  3620  1724   2 
 	<secondary>mounted with fstab</secondary>
       </indexterm>
 
-      <para>During the boot process (<xref linkend="boot"/>),
-	file systems listed in <filename>/etc/fstab</filename> are
+      <para>During the boot process (<xref linkend="boot"/>), file
+	systems listed in <filename>/etc/fstab</filename> are
 	automatically mounted except for the entries containing
 	<option>noauto</option>.  This file contains entries in the
 	following format:</para>
@@ -2128,8 +2132,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <filename>foo.bar</filename>, type <command>rm
 	fo[<keycap>Tab</keycap>].[<keycap>Tab</keycap>]</command>.</para>
 
-    <para>The shell should print out <command>rm
-	foo[BEEP].bar</command>.</para>
+    <para>The shell should print out
+      <command>rm foo[BEEP].bar</command>.</para>
 
     <para>The [BEEP] is the console bell, which the shell used to
       indicate it was unable to complete the filename because there
@@ -2252,10 +2256,10 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       as special representations of data.  The most common
       meta-character is <literal>*</literal>, which represents any
       number of characters in a filename.  Meta-characters can be
-      used to perform filename globbing.  For example, <command>echo
-	*</command> is equivalent to &man.ls.1; because the shell
-      takes all the files that match <literal>*</literal> and
-      &man.echo.1; lists them on the command line.</para>
+      used to perform filename globbing.  For example,
+      <command>echo *</command> is equivalent to &man.ls.1; because
+      the shell takes all the files that match <literal>*</literal>
+      and &man.echo.1; lists them on the command line.</para>
 
     <para>To prevent the shell from interpreting a special character,
       escape it from the shell by starting it with a backslash
@@ -2325,9 +2329,9 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <keycap>Ctrl</keycap>, so <literal>^e</literal> expands to
       <keycombo
 	action="simul"><keycap>Ctrl</keycap><keycap>e</keycap></keycombo>.
-      To leave &man.ee.1;, press <keycap>Esc</keycap>, then choose
-      the <quote>leave editor</quote> option from the main menu.
-      The editor will prompt to save any changes if the file has been
+      To leave &man.ee.1;, press <keycap>Esc</keycap>, then choose the
+      <quote>leave editor</quote> option from the main menu.  The
+      editor will prompt to save any changes if the file has been
       modified.</para>
 
     <indexterm>
@@ -2468,8 +2472,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 	keyword <quote>mail</quote> in their descriptions.  This is
 	equivalent to using &man.apropos.1;.</para>
 
-      <para>To determine what the commands in <filename
-	  class="directory">/usr/bin</filename> do,
+      <para>To determine what the commands in
+	<filename class="directory">/usr/bin</filename> do,
 	type:</para>
 
       <screen>&prompt.user; <userinput>cd /usr/bin</userinput>
@@ -2493,9 +2497,10 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 	by the Free Software Foundation (FSF).  In addition to manual
 	pages, these programs may include hypertext documents called
 	<literal>info</literal> files.  These can be viewed using
-	&man.info.1; or, if <filename
-	  role="package">editors/emacs</filename> is installed, the
-	info mode of <application>emacs</application>.</para>
+	&man.info.1; or, if
+	<filename role="package">editors/emacs</filename> is
+	installed, the info mode of
+	<application>emacs</application>.</para>
 
       <para>To use &man.info.1;, type:</para>
 

From owner-svn-doc-head@FreeBSD.ORG  Sat Aug 31 04:56:01 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id D8DE848A;
 Sat, 31 Aug 2013 04:56:01 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
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 C6E05284A;
 Sat, 31 Aug 2013 04:56:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7V4u14u087769;
 Sat, 31 Aug 2013 04:56:01 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7V4u1Ui087768;
 Sat, 31 Aug 2013 04:56:01 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201308310456.r7V4u1Ui087768@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 31 Aug 2013 04:56:01 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42606 - head/ja_JP.eucJP/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Aug 2013 04:56:01 -0000

Author: ryusuke
Date: Sat Aug 31 04:56:01 2013
New Revision: 42606
URL: http://svnweb.freebsd.org/changeset/doc/42606

Log:
  - Merge the following from the English version:
  
  	r42555 -> r42588	head/ja_JP.eucJP/share/xml/news.xml

Modified:
  head/ja_JP.eucJP/share/xml/news.xml

Modified: head/ja_JP.eucJP/share/xml/news.xml
==============================================================================
--- head/ja_JP.eucJP/share/xml/news.xml	Thu Aug 29 20:01:37 2013	(r42605)
+++ head/ja_JP.eucJP/share/xml/news.xml	Sat Aug 31 04:56:01 2013	(r42606)
@@ -20,7 +20,7 @@
      the contents of <title> will be preferred over <p>.
 
      $FreeBSD$
-     Original revision: r42555
+     Original revision: r42588
 -->
 <news>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -34,6 +34,22 @@
       <name>8</name>
 
       <day>
+	<name>26</name>
+
+	<event>
+	  <title>&os;&nbsp;9.2-RC3 ¸ø³«</title>
+
+	  <p>&os;-9.2 ¥ê¥ê¡¼¥¹¥µ¥¤¥¯¥ë¤«¤é 3 ²óÌܤΥê¥ê¡¼¥¹¸õÊ䤬¸ø³«¤µ¤ì¤Þ¤·¤¿¡£
+	    amd64, i386, ia64, powerpc, powerpc64 ¤ª¤è¤Ó
+	    sparc64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î ISO ¥¤¥á¡¼¥¸¤¬¡¢<a
+	      href="&url.doc.base;/books/handbook/mirrors-ftp.html">&os;
+	    ¥ß¥é¡¼¥µ¥¤¥È</a> ¤Ç <a
+	      href="&lists.stable;/2013-August/074920.html">¸ø³«</a>
+	    ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
+	</event>
+      </day>
+
+      <day>
 	<name>16</name>
 
 	<event>