From owner-svn-doc-head@FreeBSD.ORG  Sun Jan 27 01:15:51 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])
 by hub.freebsd.org (Postfix) with ESMTP id 8DFB0950;
 Sun, 27 Jan 2013 01:15:51 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 67B998CC;
 Sun, 27 Jan 2013 01:15:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0R1FpP5026334;
 Sun, 27 Jan 2013 01:15:51 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0R1FpSe026333;
 Sun, 27 Jan 2013 01:15:51 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301270115.r0R1FpSe026333@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 27 Jan 2013 01:15:51 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40757 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 27 Jan 2013 01:15:51 -0000

Author: eadler
Date: Sun Jan 27 01:15:50 2013
New Revision: 40757
URL: http://svnweb.freebsd.org/changeset/doc/40757

Log:
  According to wikipedia the last stable release of NextSTEP was in 1995.
  As such remove ppp-nextstep
  
  Discussed with:	nwhitehorn
  Approved by:	bcr (mentor, implicit)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sat Jan 26 20:06:40 2013	(r40756)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 01:15:50 2013	(r40757)
@@ -5980,26 +5980,6 @@ Key F15        A        A        Menu Wo
       </qandaentry>
 
       <qandaentry>
-	<question id="ppp-nextstep">
-	  <para>Why am I having problems talking PPP to NeXTStep
-	    machines?</para>
-	</question>
-
-	<answer>
-	  <para>Try disabling the TCP extensions in
-	    <filename>/etc/rc.conf</filename> (see &man.rc.conf.5;) by
-	    changing the following variable to
-	    <literal>NO</literal>:</para>
-
-	  <programlisting>tcp_extensions=NO</programlisting>
-
-	  <para>Xylogic's Annex boxes are also broken in this regard and
-	    you must use the above change to connect through
-	    them.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="ip-multicast">
 	  <para>How do I enable IP multicast support?</para>
 	</question>

From owner-svn-doc-head@FreeBSD.ORG  Sun Jan 27 01:45: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])
 by hub.freebsd.org (Postfix) with ESMTP id 0E338D38;
 Sun, 27 Jan 2013 01:45:16 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E1EE8974;
 Sun, 27 Jan 2013 01:45:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0R1jFd0034729;
 Sun, 27 Jan 2013 01:45:15 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0R1jFCj034728;
 Sun, 27 Jan 2013 01:45:15 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301270145.r0R1jFCj034728@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 27 Jan 2013 01:45:15 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40758 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 27 Jan 2013 01:45:16 -0000

Author: eadler
Date: Sun Jan 27 01:45:15 2013
New Revision: 40758
URL: http://svnweb.freebsd.org/changeset/doc/40758

Log:
  Remove generic question with mostly useless answer.
  
  Approved by:	bcr (mentor, implicit)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 01:15:50 2013	(r40757)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 01:45:15 2013	(r40758)
@@ -5932,22 +5932,6 @@ Key F15        A        A        Menu Wo
       </qandaentry>
 
       <qandaentry>
-	<question id="nfs">
-	  <para>Why am I having trouble with NFS and &os;?</para>
-	</question>
-
-	<answer>
-	  <para>Certain PC network cards are better than others (to put
-	    it mildly) and can sometimes cause problems with network
-	    intensive applications like NFS.</para>
-
-	  <para>See <ulink
-	      url="&url.books.handbook;/network-nfs.html">the Handbook entry on NFS</ulink>
-	    for more information on this topic.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="nfs-linux">
 	  <para>Why can I not NFS-mount from a &linux; box?</para>
 	</question>

From owner-svn-doc-head@FreeBSD.ORG  Sun Jan 27 12:51: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])
 by hub.freebsd.org (Postfix) with ESMTP id D26A27D1;
 Sun, 27 Jan 2013 12:51:03 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C3881EC9;
 Sun, 27 Jan 2013 12:51:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RCp30m036413;
 Sun, 27 Jan 2013 12:51:03 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RCp3N3036412;
 Sun, 27 Jan 2013 12:51:03 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301271251.r0RCp3N3036412@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 27 Jan 2013 12:51:03 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40759 - head/en_US.ISO8859-1/htdocs/snapshots
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 27 Jan 2013 12:51:03 -0000

Author: eadler
Date: Sun Jan 27 12:51:03 2013
New Revision: 40759
URL: http://svnweb.freebsd.org/changeset/doc/40759

Log:
  Minor word niggles on the snapshot page:
  
  - if something is obvious, don't say it
  - use &os;
  - people don't really use netnews
  - don't discourage bug submissions about documentation
  
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/htdocs/snapshots/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/snapshots/index.xml	Sun Jan 27 01:45:15 2013	(r40758)
+++ head/en_US.ISO8859-1/htdocs/snapshots/index.xml	Sun Jan 27 12:51:03 2013	(r40759)
@@ -69,7 +69,7 @@
 	These are <em>not</em> releases, these are <em>snapshots</em>,
 	and it is important that this distinction be preserved.
 	Although people can and will, of course, refer to snapshots
-	by date in mail or netnews, do not confuse them.</li>
+	by date in email, do not confuse them.</li>
 
       <li>Snapshots might not include package sets, but will generally
 	include a ports tree.</li>
@@ -78,12 +78,12 @@
 	For example, <tt>README</tt> may still refer
 	to a previous release.  This is because that is much less important
 	than getting the real bug fixes and new features out for testing.
-	Please do not send a bug report about the documentation.</li>
+	Please do not send a bug report about version numbers.</li>
     </ul>
 
-    <p>Your feedback on these snapshots is, of course, greatly welcome.
+    <p>Your feedback on these snapshots is greatly welcome.
       They are not just for our benefit - those who are coming to rely
-      on FreeBSD for mission critical applications should welcome
+      on &os; for mission critical applications should welcome
       a chance to get at more updated bits in a structured fashion.
       You can also use these snapshots as tangible evidence that your
       feedback is getting incorporated and that you (hopefully) will not have

From owner-svn-doc-head@FreeBSD.ORG  Sun Jan 27 12:51: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])
 by hub.freebsd.org (Postfix) with ESMTP id 12BD37D2;
 Sun, 27 Jan 2013 12:51:06 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 01721ECA;
 Sun, 27 Jan 2013 12:51:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RCp5Cj036448;
 Sun, 27 Jan 2013 12:51:05 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RCp5YZ036446;
 Sun, 27 Jan 2013 12:51:05 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301271251.r0RCp5YZ036446@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 27 Jan 2013 12:51:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40760 - head/en_US.ISO8859-1/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 27 Jan 2013 12:51:06 -0000

Author: eadler
Date: Sun Jan 27 12:51:05 2013
New Revision: 40760
URL: http://svnweb.freebsd.org/changeset/doc/40760

Log:
  Bump the number of ports.
  
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/htdocs/about.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/about.xml	Sun Jan 27 12:51:03 2013	(r40759)
+++ head/en_US.ISO8859-1/htdocs/about.xml	Sun Jan 27 12:51:05 2013	(r40760)
@@ -61,7 +61,7 @@
 		      <h2>Run a huge number of
 			  applications</h2>
 
-		      <p>With over 20,000 ported libraries and <a
+		      <p>With over 24,000 ported libraries and <a
 			href="&base;/applications.html">applications</a>,
 			FreeBSD supports applications for desktop, server,
 			appliance, and embedded environments.</p>

From owner-svn-doc-head@FreeBSD.ORG  Sun Jan 27 12:51: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 [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id DC1BF7D3;
 Sun, 27 Jan 2013 12:51:08 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id AB1A7ECB;
 Sun, 27 Jan 2013 12:51:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RCp8sQ036491;
 Sun, 27 Jan 2013 12:51:08 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RCp8JO036488;
 Sun, 27 Jan 2013 12:51:08 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301271251.r0RCp8JO036488@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 27 Jan 2013 12:51:08 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40761 - in head/en_US.ISO8859-1/htdocs: advocacy projects
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, 27 Jan 2013 12:51:08 -0000

Author: eadler
Date: Sun Jan 27 12:51:07 2013
New Revision: 40761
URL: http://svnweb.freebsd.org/changeset/doc/40761

Log:
  FreeSBIE appears to be inactive.
  
  Discussed with:	nox, pgj
  Approved by:	bcr (mentor)

Modified:
  head/en_US.ISO8859-1/htdocs/advocacy/myths.xml
  head/en_US.ISO8859-1/htdocs/projects/newbies.xml
  head/en_US.ISO8859-1/htdocs/projects/projects.xml

Modified: head/en_US.ISO8859-1/htdocs/advocacy/myths.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/advocacy/myths.xml	Sun Jan 27 12:51:05 2013	(r40760)
+++ head/en_US.ISO8859-1/htdocs/advocacy/myths.xml	Sun Jan 27 12:51:07 2013	(r40761)
@@ -334,11 +334,6 @@
 	  Brooks Davis's paper about the implementation of a FreeBSD
 	  cluster with more than 300 CPU's</li>
 
-	<li><a href="http://www.onlamp.com/pub/a/bsd/2004/07/01/freesbie.html">
-	  http://www.onlamp.com/pub/a/bsd/2004/07/01/freesbie.html</a>
-	  Building a Web Cluster with FreeSBIE (a FreeBSD derivative
-	  live-CD system)</li>
-
 	<li><a href="http://www.openbsd.org/faq/pf/carp.html">
 	  http://www.openbsd.org/faq/pf/carp.html</a>
 	  OpenBSD's Common Address Redundancy Protocol (CARP) to

Modified: head/en_US.ISO8859-1/htdocs/projects/newbies.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/projects/newbies.xml	Sun Jan 27 12:51:05 2013	(r40760)
+++ head/en_US.ISO8859-1/htdocs/projects/newbies.xml	Sun Jan 27 12:51:07 2013	(r40761)
@@ -128,12 +128,6 @@
         tools aimed at ease of use for the casual computer
         user.</p></li>
 
-      <li><p><a href="http://www.freesbie.org/">FreeSBIE</a> is a
-        LiveCD based on &os;.  It works directly from a CD, without
-        touching your hard drive.  It also includes a simple and easily
-        extendable toolkit used for the creation of embedded
-        images.</p></li>
-
       <li><p>Apple's <a href="http://www.apple.com/macosx">Mac OS
         X</a>
         is <a href="http://www.apple.com/server/macosx/technology/unix.html">based

Modified: head/en_US.ISO8859-1/htdocs/projects/projects.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/projects/projects.xml	Sun Jan 27 12:51:05 2013	(r40760)
+++ head/en_US.ISO8859-1/htdocs/projects/projects.xml	Sun Jan 27 12:51:07 2013	(r40761)
@@ -320,12 +320,6 @@ microkernel.</li>
 <a name="misc"></a>
 <h3>Misc</h3>
     <ul>
-      <li><a name="freesbie" href="http://www.freesbie.org/">FreeSBIE</a>:
-	A live CD based on the FreeBSD operating system.  It
-	includes a broad range of useful applications, and can either run
-	purely from CD, or can act as an installer to install FreeBSD on
-	your hard disk.</li>
-
       <li><a name="nanobsd" href="&url.articles;/nanobsd/index.html">NanoBSD</a>:
 	NanoBSD is a tool designed to create a possibly reduced FreeBSD
 	system image, which is suited to fit on a Compact Flash card

From owner-svn-doc-head@FreeBSD.ORG  Sun Jan 27 12:51:11 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])
 by hub.freebsd.org (Postfix) with ESMTP id 1497981F;
 Sun, 27 Jan 2013 12:51:11 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EAE3BECC;
 Sun, 27 Jan 2013 12:51:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RCpA5i036527;
 Sun, 27 Jan 2013 12:51:10 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RCpA6l036526;
 Sun, 27 Jan 2013 12:51:10 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301271251.r0RCpA6l036526@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 27 Jan 2013 12:51:10 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40762 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 27 Jan 2013 12:51:11 -0000

Author: eadler
Date: Sun Jan 27 12:51:10 2013
New Revision: 40762
URL: http://svnweb.freebsd.org/changeset/doc/40762

Log:
  Simplify some language.
  
  Translators may ignore.
  
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 12:51:07 2013	(r40761)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 12:51:10 2013	(r40762)
@@ -524,7 +524,7 @@
 	    on average.  Release dates are announced well in advance, so
 	    that the people working on the system know when their
 	    projects need to be finished and tested.  A testing period
-	    precedes each release, in order to ensure that the addition
+	    precedes each release, to ensure that the addition
 	    of new features does not compromise the stability of the
 	    release.  Many users regard this caution as one of the best
 	    things about &os;, even though waiting for all the latest
@@ -1099,7 +1099,7 @@
 	      url="http://www.BSDCertification.org">their site</ulink>.</para>
 
 	  <para>Any other organizations providing training and support
-	    should contact the Project in order to be listed here.</para>
+	    should contact the Project to be listed here.</para>
 	</answer>
       </qandaentry>
     </qandaset>
@@ -1272,7 +1272,7 @@
 
       <qandaentry>
 	<question id="need-to-run">
-	  <para>What do I need in order to run &os;?</para>
+	  <para>What do I need to run &os;?</para>
 	</question>
 
 	<answer>
@@ -2546,7 +2546,7 @@ bindkey ^[[3~ delete-char # for xterm</p
 	    address into a hostname.  Many servers, including the
 	    <application>Telnet</application> and
 	    <application>SSH</application> servers that come with &os;,
-	    do this in order to, among other things, store the hostname
+	    do this to store the hostname
 	    in a log file for future reference by the
 	    administrator.</para>
 
@@ -3018,7 +3018,7 @@ kern.timecounter.hardware: TSC -&gt; i82
 
 	  <para>The existing implementation is our best effort at
 	    meeting as many of these requirements simultaneously as we
-	    can.  In order to keep <command>/bin/sh</command> small,
+	    can.  To keep <command>/bin/sh</command> small,
 	    we have not provided many of the convenience features that
 	    other shells have.  That is why other more
 	    featureful shells like
@@ -4225,8 +4225,8 @@ C:\="DOS"</programlisting>
 
 	  <answer>
 	    <para>This could happen because the pool is 100% full.
-	      ZFS requires space on the disk in order to write
-	      transaction metadata.  In order to restore the pool
+	      ZFS requires space on the disk to write
+	      transaction metadata.  To restore the pool
 	      to a usable state, truncate a file you want to
 	      delete.</para>
 
@@ -4377,7 +4377,7 @@ C:\="DOS"</programlisting>
 	</question>
 
 	<answer>
-	  <para>This is a security feature.  In order to
+	  <para>This is a security feature.  To
 	    <command>su</command> to <username>root</username> (or any
 	    other account with superuser privileges), you must be in the
 	    <groupname>wheel</groupname> group.  If this feature were
@@ -5189,7 +5189,7 @@ options    SYSVMSG          # enable for
 	<answer>
 	  <para>If you are using &man.syscons.4; (the default console
 	    driver), you can configure &os; to support a mouse pointer on
-	    each virtual screen.  In order to avoid conflicting with X,
+	    each virtual screen.  To avoid conflicting with X,
 	    &man.syscons.4; supports a virtual device called
 	    <devicename>/dev/sysmouse</devicename>.  All mouse events
 	    received from the real mouse device are written to the
@@ -7076,7 +7076,7 @@ CCP: Received Terminate Ack (1) state = 
 	</question>
 
 	<answer>
-	  <para>In order to log all lines of your modem
+	  <para>To log all lines of your modem
 	    <quote>conversation</quote>, you must enable the
 	    following:</para>
 
@@ -7113,12 +7113,12 @@ CCP: Received Terminate Ack (1) state = 
 	    line in your config files so that it can interpret strings
 	    such as <literal>set phone "123 456 789"</literal> correctly
 	    and realize that the number is actually only
-	    <emphasis>one</emphasis> argument.  In order to specify a
+	    <emphasis>one</emphasis> argument.  To specify a
 	    <literal>&quot;</literal> character, you must escape it
 	    using a backslash (<literal>\</literal>).</para>
 
 	  <para>When the chat interpreter parses each argument, it
-	    re-interprets the argument in order to find any special
+	    re-interprets the argument to find any special
 	    escape sequences such as <literal>\P</literal> or
 	    <literal>\T</literal> (see the manual page).  As a result of
 	    this double-parsing, you must remember to use the correct
@@ -8560,10 +8560,10 @@ panic: page fault</programlisting>
 	    capture all of them.  Using the unstripped kernel image with
 	    all the debug symbols should show the exact line of kernel
 	    source code where the panic occurred.  Usually you have to
-	    read the stack trace from the bottom up in order to trace
+	    read the stack trace from the bottom up to trace
 	    the exact sequence of events that lead to the crash.  You
 	    can also use &man.kgdb.1; to print out the contents of
-	    various variables or structures in order to examine the
+	    various variables or structures to examine the
 	    system state at the time of the crash.</para>
 
 	  <tip>

From owner-svn-doc-head@FreeBSD.ORG  Sun Jan 27 12:51:13 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])
 by hub.freebsd.org (Postfix) with ESMTP id 4D2B1829;
 Sun, 27 Jan 2013 12:51:13 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 403D0ECD;
 Sun, 27 Jan 2013 12:51:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RCpD5i036569;
 Sun, 27 Jan 2013 12:51:13 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RCpDgI036568;
 Sun, 27 Jan 2013 12:51:13 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301271251.r0RCpDgI036568@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 27 Jan 2013 12:51:13 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40763 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 27 Jan 2013 12:51:13 -0000

Author: eadler
Date: Sun Jan 27 12:51:12 2013
New Revision: 40763
URL: http://svnweb.freebsd.org/changeset/doc/40763

Log:
  Simplify some language
  
  Translators may ignore.
  
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 12:51:10 2013	(r40762)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 12:51:12 2013	(r40763)
@@ -2799,8 +2799,8 @@ kern.timecounter.hardware: TSC -&gt; i82
 	    can be installed and uninstalled again easily without having
 	    to know the gory details of which files it includes.</para>
 
-	  <para>Invoke
-	    the &man.pkg.add.1; command on the specific package files
+	  <para>Use
+	    &man.pkg.add.1; on the specific package files
 	    you are interested in installing.  Package files can usually
 	    be identified by their <filename>.tbz</filename> suffix and
 	    CD-ROM distribution people will have a
@@ -7041,7 +7041,7 @@ set dfilter 3 permit 0/0 0/0</programlis
 
 	  <para>This will make <application>sendmail</application> queue
 	    everything until the queue is run (usually, sendmail is
-	    invoked with <option>-bd -q30m</option>, telling it to run
+	    run with <option>-bd -q30m</option>, telling it to run
 	    the queue every 30 minutes) or until a <command>sendmail
 	    <option>-q</option></command> is done (perhaps from your
 	    <filename>ppp.linkup</filename>).</para>

From owner-svn-doc-head@FreeBSD.ORG  Sun Jan 27 12:51: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])
 by hub.freebsd.org (Postfix) with ESMTP id 8454B82A;
 Sun, 27 Jan 2013 12:51:15 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 772A8ECE;
 Sun, 27 Jan 2013 12:51:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RCpF8b036603;
 Sun, 27 Jan 2013 12:51:15 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RCpFOE036602;
 Sun, 27 Jan 2013 12:51:15 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301271251.r0RCpFOE036602@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 27 Jan 2013 12:51:15 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40764 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 27 Jan 2013 12:51:15 -0000

Author: eadler
Date: Sun Jan 27 12:51:14 2013
New Revision: 40764
URL: http://svnweb.freebsd.org/changeset/doc/40764

Log:
  Remove fluff words.
  
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 12:51:12 2013	(r40763)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 12:51:14 2013	(r40764)
@@ -5761,18 +5761,17 @@ Key F15        A        A        Menu Wo
 	    </listitem>
 	  </itemizedlist>
 
-	  <para>In fact, nVidia provides detailed information on which
-	    card is supported by which driver.  This information is
-	    available directly on their web site: <ulink
+	  <para>nVidia provides detailed information on which
+	    card is supported by which driver
+	    on their web site: <ulink
 	      url="http://www.nvidia.com/object/IO_32667.html"></ulink>.</para>
 
-	  <para>For Matrox&nbsp;G200/G400, you should check the
+	  <para>For Matrox&nbsp;G200/G400, check the
 	    <filename role="package">x11-servers/mga_hal</filename>
 	    port.</para>
 
-	  <para>For ATI&nbsp;Rage&nbsp;128 and Radeon, see the
-	    &man.ati.4x;, &man.r128.4x; and &man.radeon.4x; manual
-	    pages.</para>
+	  <para>For ATI&nbsp;Rage&nbsp;128 and Radeon see
+	    &man.ati.4x;, &man.r128.4x; and &man.radeon.4x;.</para>
 	</answer>
       </qandaentry>
     </qandaset>

From owner-svn-doc-head@FreeBSD.ORG  Sun Jan 27 12:51:17 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])
 by hub.freebsd.org (Postfix) with ESMTP id C6771864;
 Sun, 27 Jan 2013 12:51:17 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B9C2CECF;
 Sun, 27 Jan 2013 12:51:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RCpHS9036642;
 Sun, 27 Jan 2013 12:51:17 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RCpHaH036641;
 Sun, 27 Jan 2013 12:51:17 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301271251.r0RCpHaH036641@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 27 Jan 2013 12:51:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40765 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 27 Jan 2013 12:51:17 -0000

Author: eadler
Date: Sun Jan 27 12:51:17 2013
New Revision: 40765
URL: http://svnweb.freebsd.org/changeset/doc/40765

Log:
  A window manager restart has not been required for xmodmap to work in
  ages (if ever).
  
  Approved by: 	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 12:51:14 2013	(r40764)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 12:51:17 2013	(r40765)
@@ -5676,9 +5676,6 @@ UserConfig&gt; <userinput>quit</userinpu
 
 	  <screen>&prompt.root; <userinput>xmodmap -e "keycode 115 = comma"</userinput></screen>
 
-	  <para>You will probably have to re-start your window manager
-	    to see the result.</para>
-
 	  <para>To have the <keycap>Windows</keycap> key-mappings
 	    enabled automatically every time you start X either put the
 	    <command>xmodmap</command> commands in your

From owner-svn-doc-head@FreeBSD.ORG  Sun Jan 27 12:51: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])
 by hub.freebsd.org (Postfix) with ESMTP id 0B2A7866;
 Sun, 27 Jan 2013 12:51:20 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F2769ED1;
 Sun, 27 Jan 2013 12:51:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RCpJhj036682;
 Sun, 27 Jan 2013 12:51:19 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RCpJ5B036681;
 Sun, 27 Jan 2013 12:51:19 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301271251.r0RCpJ5B036681@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 27 Jan 2013 12:51:19 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40766 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 27 Jan 2013 12:51:20 -0000

Author: eadler
Date: Sun Jan 27 12:51:19 2013
New Revision: 40766
URL: http://svnweb.freebsd.org/changeset/doc/40766

Log:
  Fix minor grammar issue
  
  Submitted by:	Perry Hutchison <perryh@pluto.rain.com>
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 12:51:17 2013	(r40765)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 12:51:19 2013	(r40766)
@@ -5851,7 +5851,7 @@ Key F15        A        A        Menu Wo
 	  <para>Yes.  &man.ppp.8; provides support for both
 	    incoming and outgoing connections.</para>
 
-	  <para>For more information on how to use these, please see the
+	  <para>For more information on how to use this, please see the
 	    <ulink
 	      url="&url.books.handbook;/ppp-and-slip.html">Handbook chapter on PPP</ulink>.</para>
 	</answer>

From owner-svn-doc-head@FreeBSD.ORG  Sun Jan 27 12:51:22 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])
 by hub.freebsd.org (Postfix) with ESMTP id 40F2D8A1;
 Sun, 27 Jan 2013 12:51:22 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 346B4ED3;
 Sun, 27 Jan 2013 12:51:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RCpMoZ036718;
 Sun, 27 Jan 2013 12:51:22 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RCpMdd036717;
 Sun, 27 Jan 2013 12:51:22 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301271251.r0RCpMdd036717@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 27 Jan 2013 12:51:22 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40767 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 27 Jan 2013 12:51:22 -0000

Author: eadler
Date: Sun Jan 27 12:51:21 2013
New Revision: 40767
URL: http://svnweb.freebsd.org/changeset/doc/40767

Log:
  The "F" renders much more distinctly as a literal than a "C" or a "S"
  leading to an odd looking set of words.  Instead of <literal> use a
  capital letter.
  
  Submitted by:	Perry Hutchison <perryh@pluto.rain.com>
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 12:51:19 2013	(r40766)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 12:51:21 2013	(r40767)
@@ -7362,8 +7362,7 @@ ATDT1234567</programlisting>
 	</question>
 
 	<answer>
-	  <para>FCS stands for <literal>F</literal>rame
-	    <literal>C</literal>heck <literal>S</literal>equence.  Each
+	  <para>FCS stands for Frame Check Sequence.  Each
 	    PPP packet has a checksum attached to ensure that the data
 	    being received is the data being sent.  If the FCS of an
 	    incoming packet is incorrect, the packet is dropped and the

From owner-svn-doc-head@FreeBSD.ORG  Sun Jan 27 13:34:11 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])
 by hub.freebsd.org (Postfix) with ESMTP id DC01C5C9;
 Sun, 27 Jan 2013 13:34:11 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BA25E73;
 Sun, 27 Jan 2013 13:34:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RDYABn049814;
 Sun, 27 Jan 2013 13:34:10 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RDY9Ax049804;
 Sun, 27 Jan 2013 13:34:09 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201301271334.r0RDY9Ax049804@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sun, 27 Jan 2013 13:34:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40768 - in head/ja_JP.eucJP/htdocs: . projects security
 snapshots
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 27 Jan 2013 13:34:11 -0000

Author: ryusuke
Date: Sun Jan 27 13:34:09 2013
New Revision: 40768
URL: http://svnweb.freebsd.org/changeset/doc/40768

Log:
  - Merge the following from the English version:
  
  	r39632 -> r40760	head/ja_JP.eucJP/htdocs/about.xml
  	r40551 -> r40715	head/ja_JP.eucJP/htdocs/security/security.xml
  	r40386 -> r40759	head/ja_JP.eucJP/htdocs/snapshots/index.xml
  	r38730 -> r40761	head/ja_JP.eucJP/htdocs/projects/newbies.xml
  	r39000 -> r40761	head/ja_JP.eucJP/htdocs/projects/projects.xml

Modified:
  head/ja_JP.eucJP/htdocs/about.xml
  head/ja_JP.eucJP/htdocs/projects/newbies.xml
  head/ja_JP.eucJP/htdocs/projects/projects.xml
  head/ja_JP.eucJP/htdocs/security/security.xml
  head/ja_JP.eucJP/htdocs/snapshots/index.xml

Modified: head/ja_JP.eucJP/htdocs/about.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/about.xml	Sun Jan 27 12:51:21 2013	(r40767)
+++ head/ja_JP.eucJP/htdocs/about.xml	Sun Jan 27 13:34:09 2013	(r40768)
@@ -4,7 +4,7 @@
 <!ENTITY title "FreeBSD ¤Ë¤Ä¤¤¤Æ">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r39632 -->
+<!-- Original revision: r40760 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -57,7 +57,7 @@
 
 	    <h2>¿ô¿¤¯¤ÎÂбþ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</h2>
 
-	    <p>FreeBSD ¤Ë¤Ï¡¢20,000 ¤ò±Û¤¨¤ë°Ü¿¢¤µ¤ì¤¿¥é¥¤¥Ö¥é¥ê¤ä
+	    <p>FreeBSD ¤Ë¤Ï¡¢24,000 ¤ò±Û¤¨¤ë°Ü¿¢¤µ¤ì¤¿¥é¥¤¥Ö¥é¥ê¤ä
 	      <a href="&base;/applications.html">¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</a>
 	      ¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	      ¥Ç¥¹¥¯¥È¥Ã¥×¡¢¥µ¡¼¥Ð¡¢¥¢¥×¥é¥¤¥¢¥ó¥¹¤äÁȤ߹þ¤ß´Ä¶­¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</p>

Modified: head/ja_JP.eucJP/htdocs/projects/newbies.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/projects/newbies.xml	Sun Jan 27 12:51:21 2013	(r40767)
+++ head/ja_JP.eucJP/htdocs/projects/newbies.xml	Sun Jan 27 13:34:09 2013	(r40768)
@@ -6,7 +6,7 @@
 <!ENTITY url.books "&enbase;/doc/ja_JP.eucJP/books">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.65 -->
+<!-- Original revision: r40761 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
@@ -152,12 +152,6 @@
 	  ¤ò¥Ù¡¼¥¹¤È¤·¤Æ¡¢¥°¥é¥Õ¥£¥«¥ë¤Ê¥¤¥ó¥¹¥È¡¼¥é¤ÈÈþ¤·¤¤¥Ç¥£¥¹¥¯¥È¥Ã¥×¥Ä¡¼¥ë¤ò²Ã¤¨¡¢
 	  ¥«¥¸¥å¥¢¥ë¤Ê¥³¥ó¥Ô¥å¡¼¥¿¥æ¡¼¥¶¤Ç¤â´Êñ¤Ë»È¤¨¤ë¤³¤È¤òÌܻؤ·¤Æ¤¤¤Þ¤¹¡£</p></li>
 
-      <li><p><a href="http://www.freesbie.org/">FreeSBIE</a> ¤Ï¡¢
-	  &os; ¤ò¥Ù¡¼¥¹¤È¤·¤¿ LiveCD ¤Ç¤¹¡£
-	  ¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤³¤È¤Ê¤¯¡¢CD ¤«¤éľÀܵ¯Æ°¤·¤Þ¤¹¡£
-	  ÁȤ߹þ¤ß¥¤¥á¡¼¥¸¤òºîÀ®¤¹¤ë¤¿¤á¤Î¡¢
-	  ¥·¥ó¥×¥ë¤Ç´Êñ¤Ë³ÈÄ¥²Äǽ¤Ê¥Ä¡¼¥ë¥­¥Ã¥È¤âÄ󶡤·¤Æ¤¤¤Þ¤¹¡£</p></li>
-
       <li><p>Apple ¼Ò¤Î <a href="http://www.apple.com/jp/macosx">Mac OS
             X</a> ¤Ï¡¢
 	  <a href="http://www.apple.com/jp/server/macosx/technology/unix.html">¥Ù¡¼¥¹¤Î°ìÉô</a>

Modified: head/ja_JP.eucJP/htdocs/projects/projects.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/projects/projects.xml	Sun Jan 27 12:51:21 2013	(r40767)
+++ head/ja_JP.eucJP/htdocs/projects/projects.xml	Sun Jan 27 13:34:09 2013	(r40768)
@@ -8,7 +8,7 @@
 ]>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r39000 -->
+<!-- Original revision: r40761 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -334,11 +334,6 @@ FreeBSD ¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÎÈϰϤò¿·¤·¤¤
 <a name="misc"></a>
 <h3>¤½¤Î¾</h3>
     <ul>
-      <li><a name="freesbie" href="http://www.freesbie.org/">FreeSBIE</a>:
-	FreeBSD ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ò¥Ù¡¼¥¹¤È¤·¤¿ live CD ¤Ç¤¹¡£
-	Í­ÍѤʥ¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÉý¹­¤¯¼ýÏ¿¤·¡¢½ã¿è¤Ë CD ¤À¤±¤Çµ¯Æ°¤·¤Þ¤¹¡£
-	¤Þ¤¿¡¢FreeBSD ¤ò¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤¿¤á¤Î¥¤¥ó¥¹¥È¡¼¥é¤È¤·¤Æ¤âÍøÍѤǤ­¤Þ¤¹¡£</li>
-
       <li><a name="nanobsd" href="&url.articles;/nanobsd/index.html">NanoBSD</a>:
 	NanoBSD ¤Ï¡¢¤Ç¤­¤ë¤«¤®¤ê¾®¤µ¤Ê FreeBSD
 	¥·¥¹¥Æ¥à¤Î¥¤¥á¡¼¥¸¤òºîÀ®¤¹¤ë¤¿¤á¤Î¥Ä¡¼¥ë¤Ç¤¹¡£

Modified: head/ja_JP.eucJP/htdocs/security/security.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/security/security.xml	Sun Jan 27 12:51:21 2013	(r40767)
+++ head/ja_JP.eucJP/htdocs/security/security.xml	Sun Jan 27 13:34:09 2013	(r40768)
@@ -6,7 +6,7 @@
 ]>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r40551 -->
+<!-- Original revision: r40715 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -234,8 +234,8 @@
     ¥Ö¥é¥ó¥Á¤ÎÊݼ餬µ­ºÜ¤µ¤ì¤Æ¤¤¤ëÆüÉÕ¤è¤ê¤âÁ᤯½ªÎ»¤¹¤ë²ÄǽÀ­¤â¤¢¤ë¤È¤¤¤¦¤³¤È¤Ë¤´Ãí°Õ¤¯¤À¤µ¤¤¡£</p>
 
   <!--
-      Please also update www/en/releng/index.xml when updating this
-      list of supported branches.
+      Please also update head/en_US.ISO8859-1/htdocs/releng/index.xml
+      when updating this list of supported branches.
     -->
 
   <table class="tblbasic">

Modified: head/ja_JP.eucJP/htdocs/snapshots/index.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/snapshots/index.xml	Sun Jan 27 12:51:21 2013	(r40767)
+++ head/ja_JP.eucJP/htdocs/snapshots/index.xml	Sun Jan 27 13:34:09 2013	(r40768)
@@ -7,7 +7,7 @@
 ]>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r40386 -->
+<!-- Original revision: r40759 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -68,21 +68,21 @@
 	¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤Ï <em>¤¿¤À¤Î</em> ¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤Ç¤¹¡£
 	¤³¤Î°ã¤¤¤ò¤è¤¯µ­²±¤Ë¤È¤É¤á¤Æ¤ª¤¤¤Æ²¼¤µ¤¤¡£
 	¤â¤Á¤í¤ó¡¢¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ÎÆüÉÕ¤òÌÀµ­¤¹¤ì¤Ð¡¢
-	¥á¡¼¥ë¤ä NetNews ¾å¤Ç¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤Ë¤Ä¤¤¤Æ¸ÀµÚ¤¹¤ë¤Î¤Ë²¿¤ÎÌäÂê¤â¤¢¤ê¤Þ¤»¤ó¤¬¡¢
+	¥á¡¼¥ë¤Ç¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤Ë¤Ä¤¤¤Æ¸ÀµÚ¤¹¤ë¤Î¤Ë²¿¤ÎÌäÂê¤â¤¢¤ê¤Þ¤»¤ó¤¬¡¢
 	¤ß¤ó¤Ê¤òº®Í𤵤»¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¤Í¡£</li>
 
       <li>¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤Ë¤Ï¡¢packages ¤Ï´Þ¤Þ¤ì¤Æ¤ª¤é¤º¡¢
 	Ä̾ï ports ¥Ä¥ê¡¼¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¤Ç¤·¤ç¤¦¡£</li>
 
       <li>ºÇ¸å¤Ë¡¢Ê¸½ñ¤Î¹¹¿·¤¬¤Ê¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-	¤¿¤È¤¨¤Ð README¤¬¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¤Þ¤Þ¤Î¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
+	¤¿¤È¤¨¤Ð README ¤¬¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¤Þ¤Þ¤Î¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
 	¤½¤ì¤è¤ê¤â¥Ð¥°¥Õ¥£¥Ã¥¯¥¹¤ò¹Ô¤¤¡¢¿·¤·¤¤µ¡Ç½¤ò¥Æ¥¹¥È¤¹¤ëÊý¤¬¤â¤Ã¤È¤º¤Ã¤ÈÂç»ö¤Ê¤Î¤Ç¤¹¡£
-	ʸ½ñ¤Ë´Ø¤·¤Æ¤Î¥Ð¥°¥ì¥Ý¡¼¥È¤ÏÁ÷¤é¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¤Í¡£</li>
+	¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤Ë¤Ä¤¤¤Æ¤Î¥Ð¥°¥ì¥Ý¡¼¥È¤ÏÁ÷¤é¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¤Í¡£</li>
     </ul>
 
-    <p>¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ËÂФ¹¤ë¥Õ¥£¡¼¥É¥Ð¥Ã¥¯¤Ï¡¢¸À¤¦¤Þ¤Ç¤â¤Ê¤¯¡¢
-      Èó¾ï¤Ë´¿·Þ¤µ¤ì¤Þ¤¹¡£¤³¤ì¤Ï²æ¡¹¤Ë¤È¤Ã¤ÆÍø±×¤Ë¤Ê¤ë¤À¤±¤Ç¤Ê¤¯¡¢
-      ¤³¤ì¤«¤é FreeBSD ¤Ç¥ß¥Ã¥·¥ç¥ó¥¯¥ê¥Æ¥£¥«¥ë¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÆ°¤«¤½¤¦¤È¤¤¤¦¿Í¤¬¡¢
+    <p>¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ËÂФ¹¤ë¥Õ¥£¡¼¥É¥Ð¥Ã¥¯¤Ï¡¢Èó¾ï¤Ë´¿·Þ¤µ¤ì¤Þ¤¹¡£
+      ¤³¤ì¤Ï²æ¡¹¤Ë¤È¤Ã¤ÆÍø±×¤Ë¤Ê¤ë¤À¤±¤Ç¤Ê¤¯¡¢
+      ¤³¤ì¤«¤é &os; ¤Ç¥ß¥Ã¥·¥ç¥ó¥¯¥ê¥Æ¥£¥«¥ë¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÆ°¤«¤½¤¦¤È¤¤¤¦¿Í¤¬¡¢
       ¤â¤Ã¤È¿·¤·¤¤¡¢ÁÈ¿¥¤À¤Ã¤¿¤è¤¤¤â¤Î¤ò¼ê¤ËÆþ¤ì¤é¤ì¤ë¤È¤¤¤¦¤³¤È¤Ç¤â¤¢¤ë¤Î¤Ç¤¹¡£
       ¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤Ï¡¢¤¢¤Ê¤¿¤Î¥Õ¥£¡¼¥É¥Ð¥Ã¥¯¤¬ÁȤßÆþ¤ì¤é¤ì¡¢¼¡¤Î¥ê¥ê¡¼¥¹¤Ç¤Ï
       (˾¤à¤é¤¯¤Ï) ²¿¤Ë¤â¼ºË¾¤¹¤ë¤³¤È¤Ï̵¤¤¤À¤í¤¦¤³¤È¤Î¾Úº¸¤È¤·¤Æ¤â»È¤¨¤Þ¤¹¡£

From owner-svn-doc-head@FreeBSD.ORG  Sun Jan 27 14:53:42 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])
 by hub.freebsd.org (Postfix) with ESMTP id 181346DB;
 Sun, 27 Jan 2013 14:53:42 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E6A30344;
 Sun, 27 Jan 2013 14:53:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RErf6C073785;
 Sun, 27 Jan 2013 14:53:41 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RErfMd073784;
 Sun, 27 Jan 2013 14:53:41 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301271453.r0RErfMd073784@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 27 Jan 2013 14:53:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40769 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 27 Jan 2013 14:53:42 -0000

Author: eadler
Date: Sun Jan 27 14:53:41 2013
New Revision: 40769
URL: http://svnweb.freebsd.org/changeset/doc/40769

Log:
  The -nat option in user-mode ppp(8) does not cease to exist
  when a given installation is not using dialup
  
  Submitted by:	Perry Hutchison <perryh@pluto.rain.com>
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 13:34:09 2013	(r40768)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 14:53:41 2013	(r40769)
@@ -5822,14 +5822,12 @@ Key F15        A        A        Menu Wo
 	    case of the previous question and works perfectly
 	    well.</para>
 
-	  <para>If you are using dialup to connect to the Internet
-	    user-mode &man.ppp.8; contains a <option>-nat</option>
-	    option.  If you run &man.ppp.8; with the
-	    <option>-nat</option> option, set
+	  <para>Dialup users must use <option>-nat</option>
+	    and set
 	    <literal>gateway_enable</literal> to
 	    <emphasis>YES</emphasis> in
-	    <filename>/etc/rc.conf</filename>, and configure your
-	    &windows; machine correctly, this should work fine.  For
+	    <filename>/etc/rc.conf</filename>.
+	    For
 	    more information, please see the &man.ppp.8; manual page or
 	    the <ulink
 	      url="&url.books.handbook;/userppp.html">Handbook entry on user PPP</ulink>.</para>

From owner-svn-doc-head@FreeBSD.ORG  Sun Jan 27 15:11:49 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])
 by hub.freebsd.org (Postfix) with ESMTP id 8A956144;
 Sun, 27 Jan 2013 15:11:49 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 73226693;
 Sun, 27 Jan 2013 15:11:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RFBmZF079946;
 Sun, 27 Jan 2013 15:11:48 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RFBmtF079945;
 Sun, 27 Jan 2013 15:11:48 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301271511.r0RFBmtF079945@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 27 Jan 2013 15:11:48 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40770 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 27 Jan 2013 15:11:49 -0000

Author: eadler
Date: Sun Jan 27 15:11:48 2013
New Revision: 40770
URL: http://svnweb.freebsd.org/changeset/doc/40770

Log:
  Modernize the xdm-boot question.
  
  Submitted by:	Lowell Gilbert <lgusenet@be-well.ilk.org>
  Reviewed by:	-doc
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 14:53:41 2013	(r40769)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 15:11:48 2013	(r40770)
@@ -5157,8 +5157,8 @@ options    SYSVMSG          # enable for
       <qandaentry>
 	<question id="running-X-securelevels">
 	  <para>I <emphasis>tried</emphasis> to run X, but I get an
-	    <errorname>KDENABIO failed (Operation not
-	    permitted)</errorname> error when I type
+	    <errorname>No devices detected.</errorname> error when I
+	    type
 	    <command>startx</command>.  What do I do now?</para>
 	</question>
 
@@ -5173,6 +5173,7 @@ options    SYSVMSG          # enable for
 	    Set your
 	    <literal>securelevel</literal> back down to zero (usually
 	    in <filename>/etc/rc.conf</filename>), or run &man.xdm.1;
+	    (or an alternative display manager)
 	    at boot time (before the <literal>securelevel</literal> is
 	    raised).</para>
 

From owner-svn-doc-head@FreeBSD.ORG  Sun Jan 27 15:12: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])
 by hub.freebsd.org (Postfix) with ESMTP id 77DD01A8;
 Sun, 27 Jan 2013 15:12:38 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5EDCF69A;
 Sun, 27 Jan 2013 15:12:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RFCcKX080121;
 Sun, 27 Jan 2013 15:12:38 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RFCcBN080120;
 Sun, 27 Jan 2013 15:12:38 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301271512.r0RFCcBN080120@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 27 Jan 2013 15:12:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40771 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 27 Jan 2013 15:12:38 -0000

Author: eadler
Date: Sun Jan 27 15:12:37 2013
New Revision: 40771
URL: http://svnweb.freebsd.org/changeset/doc/40771

Log:
  Add a link to the wiki page of IRC channels.
  
  Submitted by:	Alex Weber <alexwebr@gmail.com>
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 15:11:48 2013	(r40770)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 15:12:37 2013	(r40771)
@@ -1057,6 +1057,10 @@
 	    </listitem>
 	  </itemizedlist>
 
+	  <para>The &os; wiki has a <ulink
+	      url="http://wiki.freebsd.org/IrcChannels">good list</ulink>
+	    of IRC channels.</para>
+
 	  <para>Each of these channels are distinct and are not
 	    connected to each other.  Their chat styles also differ, so
 	    you may need to try each to find one suited to your chat

From owner-svn-doc-head@FreeBSD.ORG  Sun Jan 27 21:41:12 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])
 by hub.freebsd.org (Postfix) with ESMTP id 14855287;
 Sun, 27 Jan 2013 21:41:12 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F3FC1849;
 Sun, 27 Jan 2013 21:41:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0RLfBET097462;
 Sun, 27 Jan 2013 21:41:11 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0RLfABr097455;
 Sun, 27 Jan 2013 21:41:10 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201301272141.r0RLfABr097455@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Sun, 27 Jan 2013 21:41:10 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40772 - in head/nl_NL.ISO8859-1/books/handbook:
 firewalls l10n linuxemu network-servers preface printing 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: Sun, 27 Jan 2013 21:41:12 -0000

Author: rene
Date: Sun Jan 27 21:41:09 2013
New Revision: 40772
URL: http://svnweb.freebsd.org/changeset/doc/40772

Log:
  MFen the Dutch Handbook:
  - network-servers r40649 -> r40744
  - printing r39631 -> r40750
  - linuxemu r39631 -> r40735
  - firewalls r40685 -> r40732 (replace most &ndash; with - to closer match
    the English version)
  - preface r39631 -> r40743
  - security r40625 -> r40749
  - l10n r39666 -> r40734

Modified:
  head/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/preface/preface.xml
  head/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/security/chapter.xml

Modified: head/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml	Sun Jan 27 15:12:37 2013	(r40771)
+++ head/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.xml	Sun Jan 27 21:41:09 2013	(r40772)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
-     %SRCID%	40685
+     %SRCID%	40732
 -->
 
 <chapter id="firewalls">
@@ -640,7 +640,7 @@ options IPFILTER_DEFAULT_BLOCK</programl
       <para><literal>options IPFILTER_LOG</literal> schakelt de
 	optie in waarmee IPF verkeer kan loggen door het naar het
 	<devicename>ipl</devicename> pakketloggende
-	pseudo&ndash;apparaat te schrijven voor iedere regel met het
+	pseudo-apparaat te schrijven voor iedere regel met het
 	sleutelwoord <literal>log</literal> erin.</para>
 
       <para><literal>options IPFILTER_DEFAULT_BLOCK</literal>
@@ -729,7 +729,7 @@ ipnat_rules="/etc/ipnat.rules"    # best
       <para>&man.ipfstat.8; haalt de totalen van de statistieken op
 	die horen bij de firewall sinds die is gestart en toont deze.
 	Het kan ook zijn dat de tellers in tussentijd op nul zijn
-	gesteld met <command>ipf &ndash;Z</command>.</para>
+	gesteld met <command>ipf -Z</command>.</para>
 
       <para>In &man.ipfstat.8; worden alle details behandeld.</para>
 
@@ -759,10 +759,10 @@ Packet log flags set: (0)</screen>
 	commando de juiste lijst met regels die de kernel op dat moment gebruikt
 	wordt weergeven.</para>
 
-      <para><command>ipfstat &ndash;in</command> toont de tabel met
+      <para><command>ipfstat -in</command> toont de tabel met
 	regels voor inkomend verkeer met regelnummers</para>
 
-      <para><command>ipfstat &ndash;on</command> toont de tabel met
+      <para><command>ipfstat -on</command> toont de tabel met
 	regels voor uitgaand verkeer met regelnummers</para>
 
       <para>De uitvoer ziet er ongeveer als volgt uit:</para>
@@ -771,11 +771,11 @@ Packet log flags set: (0)</screen>
 @2 block out on dc0 from any to any
 @3 pass out quick on dc0 proto tcp/udp from any to any keep state</screen>
 
-      <para><command>ipfstat &ndash;ih</command> toont de tabel met
+      <para><command>ipfstat -ih</command> toont de tabel met
 	regels voor inkomend verkeer, waarbij voor iedere regel staat
 	hoe vaak die van toepassing was.</para>
 
-      <para><command>ipfstat &ndash;oh</command> toont de tabel met
+      <para><command>ipfstat -oh</command> toont de tabel met
 	regels voor uitgaand verkeer, waarbij voor iedere regel staat
 	hoe vaak die van toepassing was.</para>
 
@@ -822,7 +822,7 @@ Packet log flags set: (0)</screen>
 	IPFILTER ingesteld om samen te werken.  &os; heeft ingebouwde
 	mogelijkheden om automatisch syslogs te roteren.  Daarom is
 	het beter om de uitvoer naar &man.syslogd.8; te schrijven
-	dan naar een gewoon bestand.  In de standaardversie van het bestand
+	dan naar een gewoon bestand.  In de standaardversie van
 	<filename>rc.conf</filename> is te zien dat de instelling
 	<literal>ipmon_flags</literal> de waarde <option>-Ds</option>
 	heeft:</para>
@@ -883,7 +883,7 @@ LOG_ERR &ndash; gelogde pakketten die ee
 
       <para>De functionaliteit van &man.syslogd.8; wordt beheerd met
 	instellingen in <filename>/etc/syslog.conf</filename>.
-	<filename>syslog.conf</filename> biedt aanzienlijke
+	Dit bestand biedt aanzienlijke
 	flexibiliteit in hoe <application>syslog</application> omgaat met
 	systeemberichten die door softwaretoepassingen als IPF worden
 	gegeven.</para>
@@ -904,7 +904,7 @@ LOG_ERR &ndash; gelogde pakketten die ee
 	wordt ingelezen met <command>/etc/rc.d/syslogd
 	  reload</command>.  Het PID (procesnummer) is te achterhalen
 	door een overzicht van taken te tonen met
-	<command>ps &ndash;ax</command>.  Het PID is het nummer in de
+	<command>ps -ax</command>.  Het PID is het nummer in de
 	linker kolom voor de regel waarop <quote>syslog</quote>
 	staat.</para>
 
@@ -1208,7 +1208,7 @@ sh /etc/ipf.rules.script</programlisting
 
       <para><replaceable>SELECTIE</replaceable> = protowaarde |
 	bron/bestemming IP | poort = nummer | flags
-	flag&ndash;value</para>
+	flag-value</para>
 
       <para><replaceable>PROTO</replaceable> = tcp/udp | udp | tcp |
 	icmp</para>
@@ -1290,7 +1290,7 @@ sh /etc/ipf.rules.script</programlisting
 
 	<para>Als een pakket wordt gelogd, dan worden de koppen van het
 	  pakket weggeschreven naar het <acronym>ipl</acronym>
-	  pakketloggende pseudo&ndash;apparaat.  Direct na het
+	  pakketloggende pseudo-apparaat.  Direct na het
 	  sleutelwoord <literal>log</literal> mogen de volgende opties
 	  gebruikt worden (in de aangegeven volgorde):</para>
 
@@ -1577,9 +1577,9 @@ sh /etc/ipf.rules.script</programlisting
 	door aanvallers gebruikt om het besturingssysteem van uw server
 	proberen te achterhalen.</para>
 
-      <para>We raden aan om telkens als er logmeldingen komen van een regel
-	met <literal>log first</literal> het commando
-	<command>ipfstat&nbsp;-hio</command> uit te voeren om te
+      <para>We raden aan om telkens als er logmeldingen van een regel
+	met de optie <literal>log first</literal> komen,
+	<command>ipfstat -hio</command> uit te voeren om te
 	bekijken hoe vaak de regel van toepassing is geweest.  Een groot aantal
 	overeenkomsten geeft gewoonlijk aan dat de firewall overspoeld wordt,
 	met andere woorden aangevallen wordt.</para>
@@ -1687,7 +1687,7 @@ pass out quick on dc0 proto tcp from any
 pass out quick on dc0 proto tcp from any to any port = 5999 flags S keep state
 
 # Sta ping toe naar het publieke Internet.
-pass out quick on dc0 proto icmp from any to any icmp&ndash;type 8 keep state
+pass out quick on dc0 proto icmp from any to any icmp-type 8 keep state
 
 # Sta whois toe vanaf het LAN naar het publieke Internet.
 pass out quick on dc0 proto tcp from any to any port = 43 flags S keep state
@@ -1702,14 +1702,14 @@ block out log first quick on dc0 all
 # met als bestemming deze gateway-server of het private netwerk.
 #################################################################
 
-# Blokkeer al het verkeer voor niet&ndash;routeerbare of gereserveerde
+# Blokkeer al het verkeer voor niet-routeerbare of gereserveerde
 # adresreeksen.
 block in quick on dc0 from 192.168.0.0/16 to any    #RFC 1918 privaat IP
 block in quick on dc0 from 172.16.0.0/12 to any     #RFC 1918 privaat IP
 block in quick on dc0 from 10.0.0.0/8 to any        #RFC 1918 privaat IP
 block in quick on dc0 from 127.0.0.0/8 to any       #loopback
 block in quick on dc0 from 0.0.0.0/8 to any         #loopback
-block in quick on dc0 from 169.254.0.0/16 to any    #DHCP auto&ndash;config
+block in quick on dc0 from 169.254.0.0/16 to any    #DHCP auto-config
 block in quick on dc0 from 192.0.2.0/24 to any      #gereserveerd voor documentatie
 block in quick on dc0 from 204.152.64.0/23 to any   #Sun cluster interconnect
 block in quick on dc0 from 224.0.0.0/3 to any       #Klasse D &amp; E multicast
@@ -1735,7 +1735,7 @@ block in log first quick on dc0 proto tc
 block in quick on dc0 all with ipopts
 
 # Blokkeer publieke pings.
-block in quick on dc0 proto icmp all icmp&ndash;type 8
+block in quick on dc0 proto icmp all icmp-type 8
 
 # Blokkeer ident.
 block in quick on dc0 proto tcp from any to any port = 113
@@ -1902,7 +1902,7 @@ block in log first quick on dc0 all
       <para>Bij het maken van wijzigingen aan de
 	<acronym>NAT</acronym>-regels nadat <acronym>NAT</acronym>
 	gestart is, wordt aangeraden de wijziging aan het bestand met
-	regels te maken en daarna het commando <command>ipnat</command>
+	regels te maken en daarna <command>ipnat</command>
 	<option>-CF</option> te gebruiken om alle actieve
 	<acronym>NAT</acronym>-regels te wissen.  Daarna kunnen de regels uit
 	het bestand weer als volgt geladen worden:</para>
@@ -1923,7 +1923,7 @@ block in log first quick on dc0 all
 	worden ingeschakeld en dan wordt informatie over het
 	verwerken van verkeer en de actieve regels getoond:</para>
 
-      <screen>&prompt.root; <userinput>ipnat &ndash;v</userinput></screen>
+      <screen>&prompt.root; <userinput>ipnat -v</userinput></screen>
     </sect2>
 
     <sect2>
@@ -2067,7 +2067,7 @@ block in log first quick on dc0 all
 	<para>Een reeks van publiekelijke IP adressen kan gespecificeerd
 	  worden met een netwerkmasker:</para>
 
-	<programlisting>map dc0 192.168.1.0/24 -&gt; 204.134.75.1&ndash;10</programlisting>
+	<programlisting>map dc0 192.168.1.0/24 -&gt; 204.134.75.1-10</programlisting>
 
 	<para>of door gebruik van de CIDR notatie:</para>
 
@@ -2146,7 +2146,7 @@ block in log first quick on dc0 all
 
 	<programlisting>map dc0 0.0.0.0/0 -&gt; 0/32 proxy port 21 ftp/tcp</programlisting>
 
-	<para>Deze laatste regel handelt al het niet&ndash;FTP
+	<para>Deze laatste regel handelt al het niet-FTP
 	  verkeer voor het LAN af:</para>
 
 	<programlisting>map dc0 10.0.10.0/29 -&gt; 0/32</programlisting>
@@ -2203,7 +2203,7 @@ pass in quick on rl0 proto tcp from any 
       verouderde techniek om te realiseren wat eenvoudige stateful
       logica zou kunnen heten.</para>
 
-    <para>De set voorbeeldregels van IPFW (die in
+    <para>De verzameling voorbeeldregels van IPFW (die in
       <filename>/etc/rc.firewall</filename> en
       <filename>/etc/rc.firewall6</filename> staan) uit de standaard
       &os;-installatie is redelijk eenvoudig en niet voorbereid om
@@ -2355,10 +2355,10 @@ net.inet.ip.fw.verbose_limit=5</programl
 
       <programlisting>firewall_enable="YES"</programlisting>
 
-      <para>Om één van de standaard firewall types te
-	selecteren die geleverd wordt door &os; lees
+      <para>Om één van de standaard firewall types die geleverd wordt
+	door &os; te selecteren, lees
 	<filename>/etc/rc.firewall</filename>, maak een selectie en
-	plaats de volgende regel:</para>
+	plaats het in de volgende regel:</para>
 
       <programlisting>firewall_type="open"</programlisting>
 
@@ -2447,7 +2447,7 @@ ipfw add deny out</programlisting>
 	    linkend="firewalls-ipfw-enable"/>).  Er is geen variabele in
 	  <filename>rc.conf</filename> om logboeklimieten in te
 	  stellen, maar dat kan ingesteld worden via een sysctl
-	  variabele, handmatig of via het bestand
+	  variabele, handmatig of via
 	  <filename>/etc/sysctl.conf</filename>:</para>
 
 	<programlisting>net.inet.ip.fw.verbose_limit=5</programlisting>
@@ -2489,7 +2489,7 @@ ipfw add deny out</programlisting>
       <para>Om alle regels te tonen met de tijd waarop deze voor het
 	laatst van toepassing was:</para>
 
-      <screen>&prompt.root; <userinput>ipfw &ndash;t list</userinput></screen>
+      <screen>&prompt.root; <userinput>ipfw -t list</userinput></screen>
 
       <para>Het volgende commando kan gebruikt worden om de
 	verantwoordingsinformatie, pakkettellers en de regel zelf te
@@ -2499,16 +2499,16 @@ ipfw add deny out</programlisting>
 	van toepassing was voor uitgaand verkeer.  Als laatste wordt
 	de regel zelf getoond:</para>
 
-      <screen>&prompt.root; <userinput>ipfw &ndash;a list</userinput></screen>
+      <screen>&prompt.root; <userinput>ipfw -a list</userinput></screen>
 
       <para>Ook kunnen onder de statische regels de dynamische regels
 	getoond worden:</para>
 
-      <screen>&prompt.root; <userinput>ipfw &ndash;d list</userinput></screen>
+      <screen>&prompt.root; <userinput>ipfw -d list</userinput></screen>
 
       <para>En de dynamische regels die verlopen zijn:</para>
 
-      <screen>&prompt.root; <userinput>ipfw &ndash;d &ndash;e list</userinput></screen>
+      <screen>&prompt.root; <userinput>ipfw -d -e list</userinput></screen>
 
       <para>De tellers op nul gesteld worden:</para>
 
@@ -2633,16 +2633,16 @@ ipfw add deny out</programlisting>
 	    regel geldt voor een pakket, laat dat pakket dan door en
 	    stop met het zoeken naar geldende regels.</para>
 
-	  <para><parameter>check&ndash;state</parameter></para>
+	  <para><parameter>check-state</parameter></para>
 
 	  <para>Vergelijkt het pakket met de tabel met dynamische
 	    regels.  Als het erin staat, dan wordt de actie van
 	    de dynamisch door deze regel gemaakte regel uitgevoerd.
 	    Anders wordt er verder gezocht door de regels.  Een regel met
-	    check&ndash;state heeft geen selectiecriteria.  Als er geen regel
-	    met check&ndash;state in de set met regels staat, dan wordt de
+	    check-state heeft geen selectiecriteria.  Als er geen regel
+	    met check-state in de set met regels staat, dan wordt de
 	    tabel met dynamische regels bij het eerste voorkomen van
-	    keep&ndash;state of limit gecontroleerd.</para>
+	    keep-state of limit gecontroleerd.</para>
 
 	  <para><parameter>deny | drop</parameter></para>
 
@@ -2669,7 +2669,7 @@ ipfw add deny out</programlisting>
 	    gevallen bestaat er in het geval de waarde nul is geen limiet.
 	    Als de limiet is bereikt, dan kan het loggen weer
 	    ingeschakeld worden door de teller voor het loggen weer
-	    op nul te zetten voor die regel met het commando
+	    op nul te zetten voor die regel met
 	    <command>ipfw reset log</command>.</para>
 
 	  <note>
@@ -2759,17 +2759,17 @@ ipfw add deny out</programlisting>
 	    verzoek tot het opstarten van een <acronym>TCP</acronym>
 	    sessie.</para>
 
-	  <para><parameter>keep&ndash;state</parameter></para>
+	  <para><parameter>keep-state</parameter></para>
 
 	  <para>Dit is een verplicht sleutelwoord.  Als er een pakket
-	    op een regel met <parameter>keep&ndash;state</parameter>
+	    op een regel met <parameter>keep-state</parameter>
 	    van toepassing is, dan wordt er door de firewall een
-	    dynamische regel gemaakt die bi&ndash;directioneel
+	    dynamische regel gemaakt die bi-directioneel
 	    verkeer zal toestaan tussen bron en bestemming en de
 	    bijbehorende poorten voor hetzelfde protocol.</para>
 
-	  <para><parameter>limit {bron&ndash;adr | bron&ndash;poort |
-	      best&ndash;adr | best&ndash;poort}</parameter></para>
+	  <para><parameter>limit {bron-adr | bron-poort |
+	      best-adr | best-poort}</parameter></para>
 
 	  <para>De firewall staat maar <replaceable>N</replaceable>
 	    verbindingen toe met dezelfde groep parameters uit een
@@ -2777,10 +2777,10 @@ ipfw add deny out</programlisting>
 	    parameters bron- of bestemmingsadres en bron- en
 	    bestemmingspoort gebruikt worden.
 	    <parameter>limit</parameter> en
-	    <parameter>keep&ndash;state</parameter> kunnen niet in
+	    <parameter>keep-state</parameter> kunnen niet in
 	    dezelfde regel gebruikt worden.  De optie
 	    <parameter>limit</parameter> geeft dezelfde mogelijkheden
-	    als <parameter>keep&ndash;state</parameter> en voegt daar
+	    als <parameter>keep-state</parameter> en voegt daar
 	    zijn eigen mogelijkheden aan toe.</para>
 	</sect4>
       </sect3>
@@ -2795,14 +2795,14 @@ ipfw add deny out</programlisting>
 	</indexterm>
 
 	<para>Bij stateful filteren wordt verkeer bekeken als
-	  bi&ndash;directioneel verkeer dat samen een sessie vormt.
+	  bi-directioneel verkeer dat samen een sessie vormt.
 	  Het heeft de mogelijkheid om te bepalen of de sessie
 	  tussen de zender en de ontvanger op de juiste wijze
 	  voortgaat.  Alle pakketten die niet precies in de
 	  verwachting van een sessie passen worden automatisch als
 	  fout geblokkeerd.</para>
 
-	<para>De optie <literal>check&ndash;state</literal> wordt gebruikt
+	<para>De optie <literal>check-state</literal> wordt gebruikt
 	  om aan te geven waar IPFW-regels tegen de mogelijkheden
 	  voor dynamische regels gehouden moeten worden.  Als er
 	  een passende regel bij een pakket wordt gevonden, dan kan
@@ -2813,7 +2813,7 @@ ipfw add deny out</programlisting>
 	  getest.</para>
 
 	<para>De mogelijkheden voor dynamische regels zijn kwetsbaar
-	  voor een aanval die SYN&ndash;flood heet, waarmee wordt
+	  voor een aanval die SYN-flood heet, waarmee wordt
 	  geprobeerd een zeer groot aantal regels aan te laten maken.
 	  Om deze aanval tegen te gaan, is de optie
 	  <literal>limit</literal> beschikbaar.  Met deze
@@ -2905,13 +2905,13 @@ ipfw add deny out</programlisting>
 
 	<programlisting>############### begin voorbeeldscript ipfw regels ##############
 #
-ipfw &ndash;q &ndash;f flush       # Verwijder alle bestaande regels.
+ipfw -q -f flush       # Verwijder alle bestaande regels.
 # Stel standaarden in.
 oif="tun0"             # uitgaande interface.
 odns="192.0.2.11"      # IP adres DNS server ISP.
-cmd="ipfw &ndash;q add "     # Voorvoegsel voor regel.
-ks="keep&ndash;state"        # Te lui om iedere keer in te typen.
-&dollar;cmd 00500 check&ndash;state
+cmd="ipfw -q add "     # Voorvoegsel voor regel.
+ks="keep-state"        # Te lui om iedere keer in te typen.
+&dollar;cmd 00500 check-state
 &dollar;cmd 00502 deny all from any to any frag
 &dollar;cmd 00501 deny tcp from any to any established
 &dollar;cmd 00600 allow tcp from any to any 80 out via &dollar;oif setup &dollar;ks
@@ -2936,13 +2936,13 @@ ks="keep&ndash;state"        # Te lui om
 	<para>Wat in het bovenstaande voorbeeld met een bestand is
 	  gerealiseerd, kan ook met de hand:</para>
 
-	<screen>&prompt.root; <userinput>ipfw &ndash;q &ndash;f flush</userinput>
-&prompt.root; <userinput>ipfw &ndash;q add 00500 check&ndash;state</userinput>
-&prompt.root; <userinput>ipfw &ndash;q add 00502 deny all from any to any frag</userinput>
-&prompt.root; <userinput>ipfw &ndash;q add 00501 deny tcp from any to any established</userinput>
-&prompt.root; <userinput>ipfw &ndash;q add 00600 allow tcp from any to any 80 out via tun0 setup keep&ndash;state</userinput>
-&prompt.root; <userinput>ipfw &ndash;q add 00610 allow tcp from any to 192.0.2.11 53 out via tun0 setup keep&ndash;state</userinput>
-&prompt.root; <userinput>ipfw &ndash;q add 00611 allow udp from any to 192.0.2.11 53 out via tun0 keep&ndash;state</userinput></screen>
+	<screen>&prompt.root; <userinput>ipfw -q -f flush</userinput>
+&prompt.root; <userinput>ipfw -q add 00500 check-state</userinput>
+&prompt.root; <userinput>ipfw -q add 00502 deny all from any to any frag</userinput>
+&prompt.root; <userinput>ipfw -q add 00501 deny tcp from any to any established</userinput>
+&prompt.root; <userinput>ipfw -q add 00600 allow tcp from any to any 80 out via tun0 setup keep-state</userinput>
+&prompt.root; <userinput>ipfw -q add 00610 allow tcp from any to 192.0.2.11 53 out via tun0 setup keep-state</userinput>
+&prompt.root; <userinput>ipfw -q add 00611 allow udp from any to 192.0.2.11 53 out via tun0 keep-state</userinput></screen>
       </sect3>
 
       <sect3>
@@ -3057,7 +3057,7 @@ ks="keep&ndash;state"        # Te lui om
 	<itemizedlist>
 	  <listitem>
 	    <para>Alle regels die een verzoek zijn voor het opzetten van een
-	      sessie gebruiken <literal>keep&ndash;state</literal>.</para>
+	      sessie gebruiken <literal>keep-state</literal>.</para>
 	  </listitem>
 
 	  <listitem>
@@ -3083,10 +3083,10 @@ ks="keep&ndash;state"        # Te lui om
 
 	<programlisting>################ Begin bestand met IPFW regels ###############################
 # Verwijder eerst de bestaande regels.
-ipfw &ndash;q &ndash;f flush
+ipfw -q -f flush
 
 # Stel commando voorvoegsel in.
-cmd="ipfw &ndash;q add"
+cmd="ipfw -q add"
 pif="dc0"     # Interfacenaam van NIC die verbinding
               # met het publieke Internet heeft.
 
@@ -3103,9 +3103,9 @@ pif="dc0"     # Interfacenaam van NIC di
 
 #################################################################
 # Sta het pakket toe als het aan de tabel met dynamische regels
-# was toegevoegd met een 'allow keep&ndash;state' commando.
+# was toegevoegd met een 'allow keep-state' commando.
 #################################################################
-&dollar;cmd 00015 check&ndash;state
+&dollar;cmd 00015 check-state
 
 #################################################################
 # Interface aan het publieke Internet (onderdeel Uitgaand).
@@ -3118,8 +3118,8 @@ pif="dc0"     # Interfacenaam van NIC di
 # x.x.x.x moet het IP adres van de DNS van de ISP zijn.
 # Dupliceer deze regels als een ISP meerdere DNS servers heeft.
 # Haal het IP adres evt. uit /etc/resolv.conf
-&dollar;cmd 00110 allow tcp from any to x.x.x.x 53 out via &dollar;pif setup keep&ndash;state
-&dollar;cmd 00111 allow udp from any to x.x.x.x 53 out via &dollar;pif keep&ndash;state
+&dollar;cmd 00110 allow tcp from any to x.x.x.x 53 out via &dollar;pif setup keep-state
+&dollar;cmd 00111 allow udp from any to x.x.x.x 53 out via &dollar;pif keep-state
 
 # Geef toegang tot de DHCP server van de ISP voor kabel- en
 # xDSL-netwerken. Deze regel is niet nodig als gebruik gemaakt worden
@@ -3127,37 +3127,37 @@ pif="dc0"     # Interfacenaam van NIC di
 # verwijderd worden. Gebruik de volgende regel en controleer het
 # logboek voor het IP adres. Wijzig dan het IP adres in de regel
 # commentaar hieronder en verwijder de eerste regel.
-&dollar;cmd 00120 allow log udp from any to any 67 out via &dollar;pif keep&ndash;state
-#&dollar;cmd 00120 allow udp from any to x.x.x.x 67 out via &dollar;pif keep&ndash;state
+&dollar;cmd 00120 allow log udp from any to any 67 out via &dollar;pif keep-state
+#&dollar;cmd 00120 allow udp from any to x.x.x.x 67 out via &dollar;pif keep-state
 
 # Sta niet beveiligd www verkeer toe.
-&dollar;cmd 00200 allow tcp from any to any 80 out via &dollar;pif setup keep&ndash;state
+&dollar;cmd 00200 allow tcp from any to any 80 out via &dollar;pif setup keep-state
 
 # Sta beveiligd www verkeer over TLS SSL toe.
-&dollar;cmd 00220 allow tcp from any to any 443 out via &dollar;pif setup keep&ndash;state
+&dollar;cmd 00220 allow tcp from any to any 443 out via &dollar;pif setup keep-state
 
 # Sta het verzenden en ontvangen van e-mail toe.
-&dollar;cmd 00230 allow tcp from any to any 25 out via &dollar;pif setup keep&ndash;state
-&dollar;cmd 00231 allow tcp from any to any 110 out via &dollar;pif setup keep&ndash;state
+&dollar;cmd 00230 allow tcp from any to any 25 out via &dollar;pif setup keep-state
+&dollar;cmd 00231 allow tcp from any to any 110 out via &dollar;pif setup keep-state
 
 # Sta de FreeBSD CVSUP functie toe voor uid root.
-&dollar;cmd 00240 allow tcp from me to any out via &dollar;pif setup keep&ndash;state uid root
+&dollar;cmd 00240 allow tcp from me to any out via &dollar;pif setup keep-state uid root
 
 # Sta ping toe.
-&dollar;cmd 00250 allow icmp from any to any out via &dollar;pif keep&ndash;state
+&dollar;cmd 00250 allow icmp from any to any out via &dollar;pif keep-state
 
 # Sta Time toe naar buiten.
-&dollar;cmd 00260 allow tcp from any to any 37 out via &dollar;pif setup keep&ndash;state
+&dollar;cmd 00260 allow tcp from any to any 37 out via &dollar;pif setup keep-state
 
 # Sta NNTP nieuws toe naar buiten.
-&dollar;cmd 00270 allow tcp from any to any 119 out via &dollar;pif setup keep&ndash;state
+&dollar;cmd 00270 allow tcp from any to any 119 out via &dollar;pif setup keep-state
 
 # Sta beveiligde FTP, Telnet en SCP toe naar buiten.
 # Deze functie maakt gebruik van SSH (secure shell).
-&dollar;cmd 00280 allow tcp from any to any 22 out via &dollar;pif setup keep&ndash;state
+&dollar;cmd 00280 allow tcp from any to any 22 out via &dollar;pif setup keep-state
 
 # Sta whois toe naar buiten.
-&dollar;cmd 00290 allow tcp from any to any 43 out via &dollar;pif setup keep&ndash;state
+&dollar;cmd 00290 allow tcp from any to any 43 out via &dollar;pif setup keep-state
 
 # Blokkeer en log al het andere dat probeert buiten te komen.
 # Deze regel dwingt de 'block all' logica af.
@@ -3176,7 +3176,7 @@ pif="dc0"     # Interfacenaam van NIC di
 &dollar;cmd 00302 deny all from 10.0.0.0/8 to any in via &dollar;pif        #RFC 1918 privaat IP
 &dollar;cmd 00303 deny all from 127.0.0.0/8 to any in via &dollar;pif       #loopback
 &dollar;cmd 00304 deny all from 0.0.0.0/8 to any in via &dollar;pif         #loopback
-&dollar;cmd 00305 deny all from 169.254.0.0/16 to any in via &dollar;pif    #DHCP auto&ndash;config
+&dollar;cmd 00305 deny all from 169.254.0.0/16 to any in via &dollar;pif    #DHCP auto-config
 &dollar;cmd 00306 deny all from 192.0.2.0/24 to any in via &dollar;pif      #gereserveerd voor documentatie
 &dollar;cmd 00307 deny all from 204.152.64.0/23 to any in via &dollar;pif   #Sun cluster interconnect
 &dollar;cmd 00308 deny all from 224.0.0.0/3 to any in via &dollar;pif       #Klasse D &amp; E multicast
@@ -3207,19 +3207,19 @@ pif="dc0"     # Interfacenaam van NIC di
 # van PPP naar het publieke Internet. In dat geval kan de hele groep
 # verwijderd worden. Hier wordt hetzelfde IP adres gebruikt als in de
 # sectie voor Uitgaand verkeer.
-#&dollar;cmd 00360 allow udp from any to x.x.x.x 67 in via &dollar;pif keep&ndash;state
+#&dollar;cmd 00360 allow udp from any to x.x.x.x 67 in via &dollar;pif keep-state
 
 # Sta inkomend webverkeer toe omdat er een Apache server draait.
-&dollar;cmd 00400 allow tcp from any to me 80 in via &dollar;pif setup limit src&ndash;addr 2
+&dollar;cmd 00400 allow tcp from any to me 80 in via &dollar;pif setup limit src-addr 2
 
 # Sta beveiligde FTP, telnet en SCP toe vanaf Internet.
-&dollar;cmd 00410 allow tcp from any to me 22 in via &dollar;pif setup limit src&ndash;addr 2
+&dollar;cmd 00410 allow tcp from any to me 22 in via &dollar;pif setup limit src-addr 2
 
 # Sta niet beveiligde telnet sessie toe vanaf het publieke Internet.
 # Dit heeft het label ``niet veilig'' omdat gebruikersnaam en
 # wachtwoord als platte tekst over Internet gaan. Als er geen telnet
 # server draait, hoeft deze regel niet actief te zijn.
-&dollar;cmd 00420 allow tcp from any to me 23 in via &dollar;pif setup limit src&ndash;addr 2
+&dollar;cmd 00420 allow tcp from any to me 23 in via &dollar;pif setup limit src-addr 2
 
 # Weiger en log alle niet toegestane inkomende verbindingen van buiten.
 &dollar;cmd 00499 deny log all from any to any in via &dollar;pif
@@ -3252,12 +3252,12 @@ pif="dc0"     # Interfacenaam van NIC di
 
 	<programlisting>natd_enable="YES"                   # Schakel NATD in
 natd_interface="rl0"                # interfacenaam voor de publieke Internet NIC
-natd_flags="&ndash;dynamic &ndash;m"            # &ndash;m = behoud poortnummers als mogelijk</programlisting>
+natd_flags="-dynamic -m"            # -m = behoud poortnummers als mogelijk</programlisting>
 
 	<para>Stateful regels samen met de regel
 	  <literal>divert natd</literal> (Network Address Translation) gebruiken
 	  maakt het schrijven van regels veel gecompliceerder.  De plaats
-	  van de regels met <literal>check&ndash;state</literal>
+	  van de regels met <literal>check-state</literal>
 	  en <literal>divert natd</literal> zijn van kritiek
 	  belang.  De logica bestaat niet langer uit het eenvoudigweg
 	  van boven naar beneden doorwerken van de regels.  Er wordt
@@ -3278,7 +3278,7 @@ natd_flags="&ndash;dynamic &ndash;m"    
 	  vrijgelaten.  In het voorbeeld zijn de regels 100, 101, 450, 500, en
 	  510 van belang.  Die regels regelen de vertaling van inkomende en
 	  uitgaande pakketten zodat er in de tabel met de
-	  dynamische <literal>keep&ndash;state</literal>-regels
+	  dynamische <literal>keep-state</literal>-regels
 	  altijd het private <acronym>IP</acronym>-adres staat.
 	  Daarnaast is het van belang op te merken dat er in alle
 	  <literal>allow</literal>- en <literal>deny</literal>-regels de
@@ -3299,8 +3299,8 @@ natd_flags="&ndash;dynamic &ndash;m"    
 	  heeft dan nog steeds het bron-<acronym>IP</acronym>-adres
 	  van het private LAN.  Als blijkt dat deze regel geldt, dan
 	  gebeuren er twee dingen: door
-	  <literal>keep&ndash;state</literal> wordt er een regel
-	  in de dynamische keep&ndash;state tabel gezet en wordt de
+	  <literal>keep-state</literal> wordt er een regel
+	  in de dynamische keep-state tabel gezet en wordt de
 	  aangegeven actie uitgevoerd.  De actie is onderdeel van de
 	  informatie uit de dynamische tabel.  In dit geval is het
 	  <literal>skipto rule 500</literal>.  In regel 500 wordt
@@ -3312,14 +3312,14 @@ natd_flags="&ndash;dynamic &ndash;m"    
 	  het aan regel 100 en dus wordt het bestemmingsadres
 	  vertaald naar het bijbehorende <acronym>IP</acronym>-adres
 	  op het LAN.  Daarna past het bij de
-	  <literal>check&ndash;state</literal>-regel en wordt een
+	  <literal>check-state</literal>-regel en wordt een
 	  vermelding in de tabel gevonden wat betekent dat er een
 	  bestaande sessie is en wordt het doorgelaten naar het LAN.
 	  Het gaat dan naar de PC op het LAN die als eerste een
 	  pakket heeft verzonden en die verstuurt een nieuw pakket
 	  met de vraag om een volgend segment met gegevens naar de
 	  server.  Nu blijkt bij controle van de
-	  <literal>check&ndash;state</literal>-regel dat die op
+	  <literal>check-state</literal>-regel dat die op
 	  het pakket van toepassing moet zijn en er staat een
 	  vermelding in de tabel voor uitgaand verkeer.  Daarom wordt
 	  de bijbehorende actie <literal>skipto rule 500</literal>
@@ -3330,10 +3330,10 @@ natd_flags="&ndash;dynamic &ndash;m"    
 	<para>Wat betreft binnenkomende pakketten wordt alles dat
 	  onderdeel is van een bestaande sessie automatisch
 	  afgehandeld door de
-	  <literal>check&ndash;state</literal>-regel en de correct
+	  <literal>check-state</literal>-regel en de correct
 	  geplaatste <literal>divert natd</literal>-regels.  Nu hoeven
 	  alleen de foute pakketten nog geweigerd te worden en moeten
-	  de inkomende diensten doorgelaten worden.  In
+	  de inkomende geauthoriseerde diensten doorgelaten worden.  In
 	  dit geval draait er een Apache server op de firewall-machine
 	  die vanaf Internet bereikbaar moet zijn.  Het nieuwe
 	  inkomende pakket past bij regel 100 en het
@@ -3343,13 +3343,13 @@ natd_flags="&ndash;dynamic &ndash;m"    
 	  eigenschappen en komt uiteindelijk aan bij regel 425 die
 	  van toepassing blijkt te zijn.  In dat geval kunnen er twee
 	  dingen gebeuren: de pakketregel wordt in de dynamische
-	  keep&ndash;state tabel gezet, maar nu wordt het aantal nieuwe
+	  keep-state tabel gezet, maar nu wordt het aantal nieuwe
 	  sessies dat van het bron <acronym>IP</acronym>-adres komt
 	  gelimiteerd tot twee.  Dit is een bescherming tegen DoS-aanvallen
 	  op de dienst die op dat poortnummer wordt aangeboden.  De actie is
 	  <literal>allow</literal>, dus het pakket wordt tot het LAN toegelaten.
 	  Voor het pakket dat als antwoord wordt verstuurd herkent de
-	  <literal>check&ndash;state</literal> regel dat het
+	  <literal>check-state</literal> regel dat het
 	  pakket bij een bestaande sessie hoort.  Het stuurt het naar regel
 	  500 voor <acronym>NAT</acronym> en stuurt het via de
 	  uitgaande interface weg.</para>
@@ -3357,19 +3357,19 @@ natd_flags="&ndash;dynamic &ndash;m"    
 	<para>Voorbeeld Set Regels #1:</para>
 
 	<programlisting>#!/bin/sh
-cmd="ipfw &ndash;q add"
+cmd="ipfw -q add"
 skip="skipto 500"
 pif=rl0
-ks="keep&ndash;state"
+ks="keep-state"
 good_tcpo="22,25,37,43,53,80,443,110,119"
 
-ipfw &ndash;q &ndash;f flush
+ipfw -q -f flush
 
 &dollar;cmd 002 allow all from any to any via xl0  # exclude LAN traffic
 &dollar;cmd 003 allow all from any to any via lo0  # exclude loopback traffic
 
 &dollar;cmd 100 divert natd ip from any to any in via &dollar;pif
-&dollar;cmd 101 check&ndash;state
+&dollar;cmd 101 check-state
 
 # Toegestaan uitgaand verkeer.
 &dollar;cmd 120 &dollar;skip udp from any to xx.168.240.2 53 out via &dollar;pif &dollar;ks
@@ -3385,14 +3385,14 @@ ipfw &ndash;q &ndash;f flush
 &dollar;cmd 302 deny all from 10.0.0.0/8      to any in via &dollar;pif  #RFC 1918 privaat IP
 &dollar;cmd 303 deny all from 127.0.0.0/8     to any in via &dollar;pif  #loopback
 &dollar;cmd 304 deny all from 0.0.0.0/8       to any in via &dollar;pif  #loopback
-&dollar;cmd 305 deny all from 169.254.0.0/16  to any in via &dollar;pif  #DHCP auto&ndash;config
+&dollar;cmd 305 deny all from 169.254.0.0/16  to any in via &dollar;pif  #DHCP auto-config
 &dollar;cmd 306 deny all from 192.0.2.0/24    to any in via &dollar;pif  #gereserveerd voor documentatie
 &dollar;cmd 307 deny all from 204.152.64.0/23 to any in via &dollar;pif  #Sun cluster
 &dollar;cmd 308 deny all from 224.0.0.0/3     to any in via &dollar;pif  #Klasse D &amp; E multicast
 
 # Toegestaan inkomend verkeer.
 &dollar;cmd 400 allow udp from xx.70.207.54 to any 68 in &dollar;ks
-&dollar;cmd 420 allow tcp from any to me 80 in via &dollar;pif setup limit src&ndash;addr 1
+&dollar;cmd 420 allow tcp from any to me 80 in via &dollar;pif setup limit src-addr 1
 
 &dollar;cmd 450 deny log ip from any to any
 
@@ -3413,10 +3413,10 @@ ipfw &ndash;q &ndash;f flush
 	<programlisting>#!/bin/sh
 ################ Begin bestand met IPFW regels ###############################
 # Verwijder eerst de bestaande regels.
-ipfw &ndash;q &ndash;f flush
+ipfw -q -f flush
 
 # Stel commando voorvoegsel in.
-cmd="ipfw &ndash;q add"
+cmd="ipfw -q add"
 skip="skipto 800"
 pif="rl0"     # Interfacenaam van NIC die verbinding
               # met het publieke Internet heeft.
@@ -3439,9 +3439,9 @@ pif="rl0"     # Interfacenaam van NIC di
 
 #################################################################
 # Sta het pakket toe als het aan de tabel met dynamische regels
-# was toegevoegd met een 'allow keep&ndash;state' commando.
+# was toegevoegd met een 'allow keep-state' commando.
 #################################################################
-&dollar;cmd 015 check&ndash;state
+&dollar;cmd 015 check-state
 
 #################################################################
 # Interface aan het publieke Internet (onderdeel Uitgaand).
@@ -3454,42 +3454,42 @@ pif="rl0"     # Interfacenaam van NIC di
 # x.x.x.x moet het IP adres van de DNS van de ISP zijn.
 # Dupliceer deze regels als een ISP meerdere DNS servers heeft.
 # Haal het IP adres evt. uit /etc/resolv.conf
-&dollar;cmd 020 &dollar;skip tcp from any to x.x.x.x 53 out via &dollar;pif setup keep&ndash;state
+&dollar;cmd 020 &dollar;skip tcp from any to x.x.x.x 53 out via &dollar;pif setup keep-state
 
 # Geef toegang tot de DHCP server van de ISP voor kabel en xDSL.
-&dollar;cmd 030 &dollar;skip udp from any to x.x.x.x 67 out via &dollar;pif keep&ndash;state
+&dollar;cmd 030 &dollar;skip udp from any to x.x.x.x 67 out via &dollar;pif keep-state
 
 # Sta niet beveiligd www verkeer toe.
-&dollar;cmd 040 &dollar;skip tcp from any to any 80 out via &dollar;pif setup keep&ndash;state
+&dollar;cmd 040 &dollar;skip tcp from any to any 80 out via &dollar;pif setup keep-state
 
 # Sta beveiligd www verkeer over TLS SSL toe.
-&dollar;cmd 050 &dollar;skip tcp from any to any 443 out via &dollar;pif setup keep&ndash;state
+&dollar;cmd 050 &dollar;skip tcp from any to any 443 out via &dollar;pif setup keep-state
 
 # Sta het verzenden en ontvangen van e-mail toe.
-&dollar;cmd 060 &dollar;skip tcp from any to any 25 out via &dollar;pif setup keep&ndash;state
-&dollar;cmd 061 &dollar;skip tcp from any to any 110 out via &dollar;pif setup keep&ndash;state
+&dollar;cmd 060 &dollar;skip tcp from any to any 25 out via &dollar;pif setup keep-state
+&dollar;cmd 061 &dollar;skip tcp from any to any 110 out via &dollar;pif setup keep-state
 
 # Sta de FreeBSD CVSUP functie toe voor uid root.
-&dollar;cmd 070 &dollar;skip tcp from me to any out via &dollar;pif setup keep&ndash;state uid root
+&dollar;cmd 070 &dollar;skip tcp from me to any out via &dollar;pif setup keep-state uid root
 
 # Sta ping toe naar het publieke Internet.
-&dollar;cmd 080 &dollar;skip icmp from any to any out via &dollar;pif keep&ndash;state
+&dollar;cmd 080 &dollar;skip icmp from any to any out via &dollar;pif keep-state
 
 # Sta Time toe.
-&dollar;cmd 090 &dollar;skip tcp from any to any 37 out via &dollar;pif setup keep&ndash;state
+&dollar;cmd 090 &dollar;skip tcp from any to any 37 out via &dollar;pif setup keep-state
 
 # Sta NNTP nieuws toe.
-&dollar;cmd 100 &dollar;skip tcp from any to any 119 out via &dollar;pif setup keep&ndash;state
+&dollar;cmd 100 &dollar;skip tcp from any to any 119 out via &dollar;pif setup keep-state
 
 # Sta beveiligde FTP, Telnet en SCP toe.
 # Deze functie maakt gebruik van SSH (secure shell).
-&dollar;cmd 110 &dollar;skip tcp from any to any 22 out via &dollar;pif setup keep&ndash;state
+&dollar;cmd 110 &dollar;skip tcp from any to any 22 out via &dollar;pif setup keep-state
 
 # Sta whois toe.
-&dollar;cmd 120 &dollar;skip tcp from any to any 43 out via &dollar;pif setup keep&ndash;state
+&dollar;cmd 120 &dollar;skip tcp from any to any 43 out via &dollar;pif setup keep-state
 
 # Sta NPT tijdserver toe.
-&dollar;cmd 130 &dollar;skip udp from any to any 123 out via &dollar;pif keep&ndash;state
+&dollar;cmd 130 &dollar;skip udp from any to any 123 out via &dollar;pif keep-state
 
 #################################################################
 # Interface aan het publieke Internet (onderdeel Inkomend).
@@ -3504,7 +3504,7 @@ pif="rl0"     # Interfacenaam van NIC di
 &dollar;cmd 302 deny all from 10.0.0.0/8      to any in via &dollar;pif  #RFC 1918 privaat IP
 &dollar;cmd 303 deny all from 127.0.0.0/8     to any in via &dollar;pif  #loopback
 &dollar;cmd 304 deny all from 0.0.0.0/8       to any in via &dollar;pif  #loopback
-&dollar;cmd 305 deny all from 169.254.0.0/16  to any in via &dollar;pif  #DHCP auto&ndash;config
+&dollar;cmd 305 deny all from 169.254.0.0/16  to any in via &dollar;pif  #DHCP auto-config
 &dollar;cmd 306 deny all from 192.0.2.0/24    to any in via &dollar;pif  #gereserveerd voor documentatie
 &dollar;cmd 307 deny all from 204.152.64.0/23 to any in via &dollar;pif  #Sun cluster
 &dollar;cmd 308 deny all from 224.0.0.0/3     to any in via &dollar;pif  #Klasse D &amp; E multicast
@@ -3532,19 +3532,19 @@ pif="rl0"     # Interfacenaam van NIC di
 # van PPP naar het publieke Internet. In dat geval kan de hele groep
 # verwijderd worden. Hier wordt hetzelfde IP adres gebruikt als in de
 # sectie voor Uitgaand verkeer.
-&dollar;cmd 360 allow udp from x.x.x.x to any 68 in via &dollar;pif keep&ndash;state
+&dollar;cmd 360 allow udp from x.x.x.x to any 68 in via &dollar;pif keep-state
 
 # Sta inkomend webverkeer toe omdat er een Apache server draait.
-&dollar;cmd 370 allow tcp from any to me 80 in via &dollar;pif setup limit src&ndash;addr 2
+&dollar;cmd 370 allow tcp from any to me 80 in via &dollar;pif setup limit src-addr 2
 
 # Sta beveiligde FTP, telnet en SCP toe vanaf Internet.
-&dollar;cmd 380 allow tcp from any to me 22 in via &dollar;pif setup limit src&ndash;addr 2
+&dollar;cmd 380 allow tcp from any to me 22 in via &dollar;pif setup limit src-addr 2
 
 # Sta niet beveiligde telnet sessie toe vanaf het publieke Internet.
 # Dit heeft het label ``niet veilig'' omdat gebruikersnaam en
 # wachtwoord als platte tekst over Internet gaan. Als er geen telnet
 # server draait, hoeft deze regel niet actief te zijn.
-#&dollar;cmd 390 allow tcp from any to me 23 in via &dollar;pif setup limit src&ndash;addr 2
+#&dollar;cmd 390 allow tcp from any to me 23 in via &dollar;pif setup limit src-addr 2
 
 # Weiger en log alle niet toegestane inkomende verbindingen vanaf het
 # publieke Internet.

Modified: head/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml	Sun Jan 27 15:12:37 2013	(r40771)
+++ head/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml	Sun Jan 27 21:41:09 2013	(r40772)
@@ -5,7 +5,7 @@
       $FreeBSD$
 
       %SOURCE%	en_US.ISO8859-1/books/handbook/l10n/chapter.xml
-      %SRCID%	39666
+      %SRCID%	40734
 -->
 
 <chapter id="l10n">
@@ -988,7 +988,7 @@ Option	"XkbOptions"  "grp:caps_toggle"</
 	<note>
 	  <para>Minimaal gelokaliseerde applicaties moeten vroeg in het
 	    programma een aanroep naar de <function>XtSetLanguageProc
-	    (NULL, NULL,);</function> functie doen.</para>
+	      (NULL, NULL,);</function> functie doen.</para>
 
 	  <para>In <ulink
 	      url="http://koi8.pp.ru/xwin.html">KOI8-R for X

Modified: head/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml	Sun Jan 27 15:12:37 2013	(r40771)
+++ head/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.xml	Sun Jan 27 21:41:09 2013	(r40772)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
-     %SRCID%	39631
+     %SRCID%	40735
 -->
 
 <chapter id="linuxemu">

Modified: head/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml	Sun Jan 27 15:12:37 2013	(r40771)
+++ head/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml	Sun Jan 27 21:41:09 2013	(r40772)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
-     %SRCID%	40649
+     %SRCID%	40744
 -->
 
 <chapter id="network-servers">
@@ -2167,7 +2167,7 @@ basie&prompt.root;</screen>
 	<tgroup cols="2">
 	  <thead>
 	    <row>
-	      <entry>Gebruikersna(a)m(en)</entry>
+	      <entry>Gebruikersnamen</entry>
 
 	      <entry>Beschrijving</entry>
 	    </row>
@@ -2210,7 +2210,7 @@ basie&prompt.root;</screen>
 	<tgroup cols="2">
 	  <thead>
 	    <row>
-	      <entry>Machinena(a)m(en)</entry>
+	      <entry>Machinenamen</entry>
 
 	      <entry>Beschrijving</entry>
 	    </row>
@@ -2314,10 +2314,10 @@ STAGS   (,able,test-domain)     (,baker,
 
       <orderedlist>
 	<listitem>
-	  <para>De na(a)m(en) van de host(s) waar de volgende onderdelen
-	    geldig zijn.  Als er geen hostnaam wordt opgegeven dan is de
-	    regel geldig voor alle hosts.  Als er wel een hostnaam wordt
-	    opgegeven, dan wordt een donker, spookachtig en verwarrend
+	  <para>De naam van de host of namen van de hosts waar de volgende
+	    onderdelen geldig zijn.  Als er geen hostnaam wordt opgegeven
+	    dan is de regel geldig voor alle hosts.  Als er wel een hostnaam
+	    wordt opgegeven, dan wordt een donker, spookachtig en verwarrend
 	    domein betreden.</para>
 	</listitem>
 

Modified: head/nl_NL.ISO8859-1/books/handbook/preface/preface.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/preface/preface.xml	Sun Jan 27 15:12:37 2013	(r40771)
+++ head/nl_NL.ISO8859-1/books/handbook/preface/preface.xml	Sun Jan 27 21:41:09 2013	(r40772)
@@ -6,7 +6,7 @@
      Vertaald door: Remko Lodder
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/preface/preface.xml
-     %SRCID%	39631
+     %SRCID%	40743
 -->
 
 <preface id="book-preface">

Modified: head/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml	Sun Jan 27 15:12:37 2013	(r40771)
+++ head/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml	Sun Jan 27 21:41:09 2013	(r40772)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/printing/chapter.xml
-     %SRCID%	39631
+     %SRCID%	40750
 -->
 
 <chapter id="printing">

Modified: head/nl_NL.ISO8859-1/books/handbook/security/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/security/chapter.xml	Sun Jan 27 15:12:37 2013	(r40771)
+++ head/nl_NL.ISO8859-1/books/handbook/security/chapter.xml	Sun Jan 27 21:41:09 2013	(r40772)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/security/chapter.xml
-     %SRCID%	40625
+     %SRCID%	40749
 -->
 
 <chapter id="security">
@@ -1373,7 +1373,7 @@ GAME GAG WELT OUT DOWN CHAT</screen>
       <para>Als OPIE eenmaal is ingesteld staat er bij het
 	aanmelden iets als het volgende:</para>
 
-<screen>&prompt.user; <userinput>telnet example.com</userinput>
+      <screen>&prompt.user; <userinput>telnet example.com</userinput>
 Trying 10.0.0.1...
 Connected to example.com
 Escape character is '^]'.

From owner-svn-doc-head@FreeBSD.ORG  Sun Jan 27 22:57:13 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])
 by hub.freebsd.org (Postfix) with ESMTP id 6177853C;
 Sun, 27 Jan 2013 22:57:13 +0000 (UTC) (envelope-from kaduk@mit.edu)
Received: from dmz-mailsec-scanner-6.mit.edu (DMZ-MAILSEC-SCANNER-6.MIT.EDU
 [18.7.68.35]) by mx1.freebsd.org (Postfix) with ESMTP id 586F8AAB;
 Sun, 27 Jan 2013 22:57:12 +0000 (UTC)
X-AuditID: 12074423-b7f5b6d000007e03-a0-5105af950948
Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])
 by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP id
 DD.ED.32259.59FA5015; Sun, 27 Jan 2013 17:52:05 -0500 (EST)
Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
 by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id r0RMq5FB031145;
 Sun, 27 Jan 2013 17:52:05 -0500
Received: from multics.mit.edu (SYSTEM-LOW-SIPB.MIT.EDU [18.187.2.37])
 (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU)
 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id r0RMq2Gc018400
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
 Sun, 27 Jan 2013 17:52:04 -0500 (EST)
Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308)
 id r0RMq16x013458; Sun, 27 Jan 2013 17:52:01 -0500 (EST)
Date: Sun, 27 Jan 2013 17:52:01 -0500 (EST)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Eitan Adler <eadler@freebsd.org>
Subject: Re: svn commit: r40770 - head/en_US.ISO8859-1/books/faq
In-Reply-To: <201301271511.r0RFBmtF079945@svn.freebsd.org>
Message-ID: <alpine.GSO.1.10.1301271751340.9389@multics.mit.edu>
References: <201301271511.r0RFBmtF079945@svn.freebsd.org>
User-Agent: Alpine 1.10 (GSO 962 2008-03-14)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrIIsWRmVeSWpSXmKPExsUixCmqrTt1PWugwZM9YhY/Ph5istj1dw6z
 xY1F+5ksdvf3MjuweMz4NJ8lgDGKyyYlNSezLLVI3y6BK+PPmheMBVs4Kx6sjGlgPM7excjB
 ISFgItFy2aWLkRPIFJO4cG89WxcjF4eQwD5GifM/25ggnA2MEjcevmCEcE4wSZxesZ4Vwmlg
 lPj09zUjSD+LgLZE36YF7CA2m4CKxMw3G9lAbBEg+/v+n0wgNrNAlMSepY2sILawgIPE0g/b
 WUBsTgErie+7l4DN4QWKT1h+HMwWErCUaPsMUSMqoCOxev8UFogaQYmTM5+wQMy0lDj35zrb
 BEbBWUhSs5CkFjAyrWKUTcmt0s1NzMwpTk3WLU5OzMtLLdI108vNLNFLTSndxAgKWXYX5R2M
 fw4qHWIU4GBU4uENyGQJFGJNLCuuzD3EKMnBpCTKa7qUNVCILyk/pTIjsTgjvqg0J7X4EKME
 B7OSCO/xVqAcb0piZVVqUT5MSpqDRUmc91rKTX8hgfTEktTs1NSC1CKYrAwHh5IEb946oEbB
 otT01Iq0zJwShDQTByfIcB6g4ZEgNbzFBYm5xZnpEPlTjIpS4ryha4ASAiCJjNI8uF5YSnnF
 KA70ijBvIkg7DzAdwXW/AhrMBDQ4u5cZZHBJIkJKqoGR8dBzt+mnnv6Zpsip1yB35aUMi3QR
 k+BeztR14TEx/LbLcgLOyGYfYH4ndMpM8xUr74Hb536WdccotV7ZcOzX6zXcWkr7I178uC8r
 1PrgW5Pmzi1LCth1je7qrO5k9dwcfIJ5HqfRjwypud4q5y/viUvpVhdmdKlgPKTycfHOzrqt
 Nn/K5ncrsRRnJBpqMRcVJwIAh1adsQQDAAA=
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
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, 27 Jan 2013 22:57:13 -0000

On Sun, 27 Jan 2013, Eitan Adler wrote:

> Author: eadler
> Date: Sun Jan 27 15:11:48 2013
> New Revision: 40770
> URL: http://svnweb.freebsd.org/changeset/doc/40770
>
> Log:
>  Modernize the xdm-boot question.
>
>  Submitted by:	Lowell Gilbert <lgusenet@be-well.ilk.org>
>  Reviewed by:	-doc
>  Approved by:	bcr (mentor)
>
> Modified:
>  head/en_US.ISO8859-1/books/faq/book.xml
>
> Modified: head/en_US.ISO8859-1/books/faq/book.xml
> ==============================================================================
> --- head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 14:53:41 2013	(r40769)
> +++ head/en_US.ISO8859-1/books/faq/book.xml	Sun Jan 27 15:11:48 2013	(r40770)
> @@ -5157,8 +5157,8 @@ options    SYSVMSG          # enable for
>       <qandaentry>
> 	<question id="running-X-securelevels">
> 	  <para>I <emphasis>tried</emphasis> to run X, but I get an

Probably should just be "I get a", now.

-Ben

> -	    <errorname>KDENABIO failed (Operation not
> -	    permitted)</errorname> error when I type
> +	    <errorname>No devices detected.</errorname> error when I
> +	    type
> 	    <command>startx</command>.  What do I do now?</para>
> 	</question>
>

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 00:06:23 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])
 by hub.freebsd.org (Postfix) with ESMTP id AEF70F4B
 for <svn-doc-head@freebsd.org>; Mon, 28 Jan 2013 00:06:23 +0000 (UTC)
 (envelope-from lists@eitanadler.com)
Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com
 [209.85.217.178]) by mx1.freebsd.org (Postfix) with ESMTP id 29DF1D98
 for <svn-doc-head@freebsd.org>; Mon, 28 Jan 2013 00:06:21 +0000 (UTC)
Received: by mail-lb0-f178.google.com with SMTP id n1so3204419lba.9
 for <svn-doc-head@freebsd.org>; Sun, 27 Jan 2013 16:06:21 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=eitanadler.com; s=0xdeadbeef;
 h=x-received:mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type;
 bh=k33Oj3PUVrQq2No9k8hqf/H/VG8+PG1ZSCxteS2jnDs=;
 b=sF0vR45tUJ83xtWbXeVHLrgzOrkR38C/eqbQSzRifmGWtCxOk/KFjgy8iWdM+ttb/U
 JwCxnUI7E/PjKIkT94kZ2LOLFttoslxv+y+ZxF+KPoZJnz3bjvmxT15z230+oN7oQ4HZ
 86bbG39RV/6mGTI01nfTcIDaUVG/lu29cfmJ4=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=x-received:mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type
 :x-gm-message-state;
 bh=k33Oj3PUVrQq2No9k8hqf/H/VG8+PG1ZSCxteS2jnDs=;
 b=aFBTNO+1A57ECAmQNBveVyaXGtxyArPW2Z/czrxhBSeQVFRCB0CmYTtLReydmhtvKk
 IXW9gJy3zO2vJdo7fZaIP8XSwXK9n1LfSQ1zjCdz3+FWo6G44FZG/D+hMJOPcYykreS+
 I4621xK8FZ5hWYbiGeIn051U0vCiUXo8OxuDjaeFFN7fRvm2RxTiou42q8E3erYx2BgQ
 k55xm7x1Tj3h448A5yHrsgebyPyNa4Rorfgc244ay2MfpIkuy3Ge2Af3RKJ/uHQYtlET
 wLYdmlQOXeePHC0feT9nQz5xN1Kn8VoEF/mpw6pEezXZNCUSd04hmiqhDn4826P4cOSp
 ZKeA==
X-Received: by 10.112.17.137 with SMTP id o9mr5027098lbd.15.1359331580772;
 Sun, 27 Jan 2013 16:06:20 -0800 (PST)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.112.100.164 with HTTP; Sun, 27 Jan 2013 16:05:50 -0800 (PST)
In-Reply-To: <alpine.GSO.1.10.1301271751340.9389@multics.mit.edu>
References: <201301271511.r0RFBmtF079945@svn.freebsd.org>
 <alpine.GSO.1.10.1301271751340.9389@multics.mit.edu>
From: Eitan Adler <eadler@freebsd.org>
Date: Sun, 27 Jan 2013 19:05:50 -0500
X-Google-Sender-Auth: LBSHdZp-DSpC9kJP4jwdR-y8MNo
Message-ID: <CAF6rxg=P+D-9MRA7z5A2M9BToVy9DNa0k0bxBfYxB5dD72BHuA@mail.gmail.com>
Subject: Re: svn commit: r40770 - head/en_US.ISO8859-1/books/faq
To: Benjamin Kaduk <kaduk@mit.edu>
Content-Type: text/plain; charset=UTF-8
X-Gm-Message-State: ALoCoQkENGg8rnRcZqulhs/aDZz61Qpupz/EEQgKPIclKBv5vuRZtwBZLDXQPlj3MUmHlSuWPZyZ
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
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, 28 Jan 2013 00:06:23 -0000

On 27 January 2013 17:52, Benjamin Kaduk <kaduk@mit.edu> wrote:
>
> Probably should just be "I get a", now.

Patch sent.

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

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 04:43:17 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])
 by hub.freebsd.org (Postfix) with ESMTP id E1C39F43;
 Mon, 28 Jan 2013 04:43:17 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D4040902;
 Mon, 28 Jan 2013 04:43:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0S4hHig024447;
 Mon, 28 Jan 2013 04:43:17 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0S4hH9x024446;
 Mon, 28 Jan 2013 04:43:17 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201301280443.r0S4hH9x024446@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 28 Jan 2013 04:43:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40773 - head/en_US.ISO8859-1/articles/contributing
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, 28 Jan 2013 04:43:18 -0000

Author: gjb
Date: Mon Jan 28 04:43:16 2013
New Revision: 40773
URL: http://svnweb.freebsd.org/changeset/doc/40773

Log:
  Correct mailing address for the Foundation.
  
  Submitted by:	ryusuke

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

Modified: head/en_US.ISO8859-1/articles/contributing/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/contributing/article.xml	Sun Jan 27 21:41:09 2013	(r40772)
+++ head/en_US.ISO8859-1/articles/contributing/article.xml	Mon Jan 28 04:43:16 2013	(r40773)
@@ -518,9 +518,9 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
 	<para>Donations may be sent in check form to:
 	  <address>
 	    The FreeBSD Foundation
-	    <street>7321 Brockway Dr.</street>
+	    <street>P.O. Box 20247</street>,
 	    <city>Boulder</city>,
-	    <state>CO</state> <postcode>80303</postcode>
+	    <state>CO</state> <postcode>80308</postcode>
 	    <country>USA</country>
 	  </address></para>
 

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 04:43:25 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])
 by hub.freebsd.org (Postfix) with ESMTP id 4E432F98;
 Mon, 28 Jan 2013 04:43:25 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 41404904;
 Mon, 28 Jan 2013 04:43:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0S4hPi1024499;
 Mon, 28 Jan 2013 04:43:25 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0S4hPnK024498;
 Mon, 28 Jan 2013 04:43:25 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201301280443.r0S4hPnK024498@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 28 Jan 2013 04:43:25 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40774 - head/en_US.ISO8859-1/books/handbook/introduction
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, 28 Jan 2013 04:43:25 -0000

Author: gjb
Date: Mon Jan 28 04:43:24 2013
New Revision: 40774
URL: http://svnweb.freebsd.org/changeset/doc/40774

Log:
  Update introduction page after 9.1-RELEASE.
  
  Submitted by:	ryusuke

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

Modified: head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml	Mon Jan 28 04:43:16 2013	(r40773)
+++ head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml	Mon Jan 28 04:43:24 2013	(r40774)
@@ -684,7 +684,8 @@
 	be additional releases from the RELENG_8 branch.</para>
 
       <para>The RELENG_9 branch was created in September 2011.  The first
-	release of this branch was &rel.current;-RELEASE, which came
+	release of this branch was 9.0-RELEASE, which came
+	out in January 2012.  The most recent &rel.current;-RELEASE came
 	out in &rel.current.date;.  There will be additional releases
 	from the RELENG_9 branch.</para>
 

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 05:09:14 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])
 by hub.freebsd.org (Postfix) with ESMTP id 155D03BC;
 Mon, 28 Jan 2013 05:09:14 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E51299AF;
 Mon, 28 Jan 2013 05:09:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0S59DSY031356;
 Mon, 28 Jan 2013 05:09:13 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0S59Dfx031355;
 Mon, 28 Jan 2013 05:09:13 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201301280509.r0S59Dfx031355@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 28 Jan 2013 05:09:13 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40775 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 28 Jan 2013 05:09:14 -0000

Author: wblock
Date: Mon Jan 28 05:09:12 2013
New Revision: 40775
URL: http://svnweb.freebsd.org/changeset/doc/40775

Log:
  Fix an innovative spelling of "necessary".

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Mon Jan 28 04:43:24 2013	(r40774)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Jan 28 05:09:12 2013	(r40775)
@@ -5141,7 +5141,7 @@ options    SYSVMSG          # enable for
 
 	  <para>Use <filename
 	      role="package">x11/xorg-minimal</filename>, which builds
-	    and installs only the neccasary &xorg; components.</para>
+	    and installs only the necessary &xorg; components.</para>
 
 	  <para>Install &xorg; from &os; packages:</para>
 

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 15:05:37 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])
 by hub.freebsd.org (Postfix) with ESMTP id 24DF48B4;
 Mon, 28 Jan 2013 15:05:37 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 10DF91C8;
 Mon, 28 Jan 2013 15:05:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SF5agC010616;
 Mon, 28 Jan 2013 15:05:36 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SF5aMM010613;
 Mon, 28 Jan 2013 15:05:36 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201301281505.r0SF5aMM010613@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Mon, 28 Jan 2013 15:05:36 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40778 - head/en_US.ISO8859-1/books/handbook/ppp-and-slip
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, 28 Jan 2013 15:05:37 -0000

Author: dru
Date: Mon Jan 28 15:05:36 2013
New Revision: 40778
URL: http://svnweb.freebsd.org/changeset/doc/40778

Log:
  Commit white fix space only patch to correct repo this time. Translators can ignore.
  
  Approved by: gjb (mentor)

Modified:
  head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml

Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Mon Jan 28 15:00:58 2013	(r40777)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Mon Jan 28 15:05:36 2013	(r40778)
@@ -21,6 +21,7 @@
 
   <sect1 id="ppp-and-slip-synopsis">
     <title>Synopsis</title>
+
     <indexterm id="ppp-ppp">
       <primary>PPP</primary>
     </indexterm>
@@ -29,10 +30,10 @@
     </indexterm>
 
     <para>FreeBSD has a number of ways to link one computer to
-      another.  To establish a network or Internet connection through a
-      dial-up modem, or to allow others to do so through you, requires
-      the use of PPP or SLIP.  This chapter describes setting up
-      these modem-based communication services in detail.</para>
+      another.  To establish a network or Internet connection through
+      a dial-up modem, or to allow others to do so through you,
+      requires the use of PPP or SLIP.  This chapter describes setting
+      up these modem-based communication services in detail.</para>
 
     <para>After reading this chapter, you will know:</para>
 
@@ -50,7 +51,7 @@
       <listitem>
 	<para>How to set up <acronym>PPPoA</acronym> (PPP over
 	  ATM).</para>
-	</listitem>
+      </listitem>
       <listitem>
 	<para>How to configure and set up a SLIP client and
 	  server (&os;&nbsp;7.X only).</para>
@@ -82,21 +83,23 @@
       </listitem>
     </itemizedlist>
 
-    <para>You may be wondering what the main difference is between user
-      PPP and kernel PPP.  The answer is simple: user PPP processes the
-      inbound and outbound data in userland rather than in the kernel.
-      This is expensive in terms of copying the data between the kernel
-      and userland, but allows a far more feature-rich PPP implementation.
-      User PPP uses the <devicename>tun</devicename> device to communicate
-      with the outside world whereas kernel PPP uses the
+    <para>You may be wondering what the main difference is between
+      user PPP and kernel PPP.  The answer is simple: user PPP
+      processes the inbound and outbound data in userland rather than
+      in the kernel.  This is expensive in terms of copying the data
+      between the kernel and userland, but allows a far more
+      feature-rich PPP implementation.  User PPP uses the
+      <devicename>tun</devicename> device to communicate with the
+      outside world whereas kernel PPP uses the
       <devicename>ppp</devicename> device.</para>
 
     <note>
       <para>Throughout in this chapter, user PPP will simply be
-	referred to as <application>ppp</application> unless a distinction
-	needs to be made between it and any other PPP software such as
-	<application>pppd</application> (&os;&nbsp;7.X only).  Unless otherwise stated, all of
-	the commands explained in this chapter should be executed as
+	referred to as <application>ppp</application> unless a
+	distinction needs to be made between it and any other PPP
+	software such as <application>pppd</application>
+	(&os;&nbsp;7.X only).  Unless otherwise stated, all of the
+	commands explained in this chapter should be executed as
 	<username>root</username>.</para>
     </note>
   </sect1>
@@ -104,33 +107,33 @@
   <sect1 id="userppp">
     <sect1info>
       <authorgroup>
-        <author>
-          <firstname>Tom</firstname>
-          <surname>Rhodes</surname>
-          <contrib>Updated and enhanced by </contrib>
-        </author>
+	<author>
+	  <firstname>Tom</firstname>
+	  <surname>Rhodes</surname>
+	  <contrib>Updated and enhanced by </contrib>
+	</author>
       </authorgroup>
       <authorgroup>
-        <author>
-          <firstname>Brian</firstname>
-          <surname>Somers</surname>
+	<author>
+	  <firstname>Brian</firstname>
+	  <surname>Somers</surname>
 	  <contrib>Originally contributed by </contrib>
-        </author>
+	</author>
       </authorgroup>
       <authorgroup>
 	<author>
 	  <firstname>Nik</firstname>
 	  <surname>Clayton</surname>
 	  <contrib>With input from </contrib>
-        </author>
-        <author>
+	</author>
+	<author>
 	  <firstname>Dirk</firstname>
-          <surname>Fr&ouml;mberg</surname>
-        </author>
-        <author>
-          <firstname>Peter</firstname>
-          <surname>Childs</surname>
-        </author>
+	  <surname>Fr&ouml;mberg</surname>
+	</author>
+	<author>
+	  <firstname>Peter</firstname>
+	  <surname>Childs</surname>
+	</author>
       </authorgroup>
     </sect1info>
 
@@ -164,14 +167,14 @@
 	    <primary>PPP</primary>
 	  </indexterm>
 	  <listitem>
-	    <para>An account with an Internet Service Provider (ISP) which
-	      you connect to using PPP.</para>
+	    <para>An account with an Internet Service Provider (ISP)
+	      which you connect to using PPP.</para>
 	  </listitem>
 
 	  <listitem>
 	    <para>A modem or
-	      other device connected to your system and properly configured
-	      to allow you to connect to your ISP.</para>
+	      other device connected to your system and properly
+	      configured to allow you to connect to your ISP.</para>
 	  </listitem>
 
 	  <listitem>
@@ -194,9 +197,9 @@
 	    <indexterm id="ppp-password">
 	      <primary>password</primary>
 	    </indexterm>
-	    <para>Your login name and password. (Either a
-	      regular &unix; style login and password pair, or a PAP or CHAP
-	      login and password pair).</para>
+	    <para>Your login name and password.  (Either a
+	      regular &unix; style login and password pair, or a PAP
+	      or CHAP login and password pair).</para>
 	  </listitem>
 
 	  <listitem>
@@ -205,26 +208,27 @@
 	    </indexterm>
 
 	    <para>The IP address of one or more name servers.
-	      Normally, you will be given two IP addresses by your ISP to
-	      use for this.  If they have not given you at least one, then
-	      you can use the <command>enable dns</command> command in
-	      <filename>ppp.conf</filename> and
-	      <application>ppp</application> will set the name servers for
-	      you.  This feature depends on your ISPs PPP implementation
-              supporting DNS negotiation.</para>
+	      Normally, you will be given two IP addresses by your
+	      ISP to use for this.  If they have not given you at
+	      least one, then you can use the <command>enable
+		dns</command> command in <filename>ppp.conf</filename>
+	      and <application>ppp</application> will set the name
+	      servers for you.  This feature depends on your ISPs
+	      PPP implementation supporting DNS negotiation.</para>
 	  </listitem>
 	</itemizedlist>
 
-	<para>The following information may be supplied by your ISP, but
-	  is not completely necessary:</para>
+	<para>The following information may be supplied by your ISP,
+	  but is not completely necessary:</para>
 
 	<itemizedlist>
 	  <listitem>
-	    <para>The IP address of your ISP's gateway.  The gateway is
-	      the machine to which you will connect and will be set up as
-	      your <emphasis>default route</emphasis>.  If you do not have
-	      this information, we can make one up and your ISP's PPP
-	      server will tell us the correct value when we connect.</para>
+	    <para>The IP address of your ISP's gateway.  The gateway
+	      is the machine to which you will connect and will be
+	      set up as your <emphasis>default route</emphasis>.  If
+	      you do not have this information, we can make one up
+	      and your ISP's PPP server will tell us the correct value
+	      when we connect.</para>
 
 	    <para>This IP number is referred to as
 	      <literal>HISADDR</literal> by
@@ -234,7 +238,7 @@
 	  <listitem>
 	    <para>The netmask you should use.  If your ISP has not
 	      provided you with one, you can safely use <hostid
-	      role="netmask">255.255.255.255</hostid>.</para>
+		role="netmask">255.255.255.255</hostid>.</para>
 	  </listitem>
 
 	  <listitem>
@@ -242,28 +246,30 @@
 	      <primary>static IP address</primary>
 	    </indexterm>
 
-	    <para>If your ISP provides you with a static IP address and
-	      hostname, you can enter it.  Otherwise, we simply let the
-	      peer assign whatever IP address it sees fit.</para>
+	    <para>If your ISP provides you with a static IP address
+	      and hostname, you can enter it.  Otherwise, we simply
+	      let the peer assign whatever IP address it sees
+	      fit.</para>
 	  </listitem>
 	</itemizedlist>
 
-	<para>If you do not have any of the required information, contact
-	  your ISP.</para>
+	<para>If you do not have any of the required information,
+	  contact your ISP.</para>
 
 	<note>
 	  <para>Throughout this section, many of the examples showing
 	    the contents of configuration files are numbered by line.
 	    These numbers serve to aid in the presentation and
-	    discussion only and are not meant to be placed in the actual
-	    file.  Proper indentation with tab and space characters is
-	    also important.</para>
+	    discussion only and are not meant to be placed in the
+	    actual file.  Proper indentation with tab and space
+	    characters is also important.</para>
 	</note>
 
       </sect3>
 
       <sect3>
-        <title>Automatic <application>PPP</application> Configuration</title>
+	<title>Automatic <application>PPP</application>
+	  Configuration</title>
 
 	<indexterm>
 	  <primary>PPP</primary>
@@ -271,17 +277,19 @@
 	</indexterm>
 
 	<para>Both <command>ppp</command> and <command>pppd</command>
-	  (the kernel level implementation of PPP, &os;&nbsp;7.X only) use the configuration
-	  files located in the <filename class="directory">/etc/ppp</filename> directory.
-          Examples for user ppp can be found in
-          <filename class="directory">/usr/share/examples/ppp/</filename>.</para>
-
-	<para>Configuring <command>ppp</command> requires that you edit a
-	  number of files, depending on your requirements.  What you put
-	  in them depends to some extent on whether your ISP allocates IP
-	  addresses statically (i.e., you get given one IP address, and
-	  always use that one) or dynamically (i.e., your IP address
-	  changes each time you connect to your ISP).</para>
+	  (the kernel level implementation of PPP, &os;&nbsp;7.X only)
+	  use the configuration files located in the <filename
+	    class="directory">/etc/ppp</filename> directory.
+	  Examples for user ppp can be found in <filename
+	    class="directory">/usr/share/examples/ppp/</filename>.</para>
+
+	<para>Configuring <command>ppp</command> requires that you
+	  edit a number of files, depending on your requirements.
+	  What you put in them depends to some extent on whether your
+	  ISP allocates IP addresses statically (i.e., you get given
+	  one IP address, and always use that one) or dynamically
+	  (i.e., your IP address changes each time you connect to
+	  your ISP).</para>
 
 	<sect4 id="userppp-staticIP">
 	  <title>PPP and Static IP Addresses</title>
@@ -292,14 +300,14 @@
 	  </indexterm>
 
 	  <para>You will need to edit the
-	    <filename>/etc/ppp/ppp.conf</filename> configuration file.  It
-            should look similar to the example below.</para>
+	    <filename>/etc/ppp/ppp.conf</filename> configuration file.
+	    It should look similar to the example below.</para>
 
 	  <note>
 	    <para>Lines that end in a <literal>:</literal> start in
-	      the first column (beginning of the line)&mdash; all other
-	      lines should be indented as shown using spaces or
-	      tabs.</para>
+	      the first column (beginning of the line)&mdash; all
+	      other lines should be indented as shown using spaces
+	      or tabs.</para>
 	  </note>
 
 	  <programlisting>1     default:
@@ -327,7 +335,8 @@
 
 	      <listitem>
 		<para>Identifies the default entry.  Commands in this
-		  entry are executed automatically when ppp is run.</para>
+		  entry are executed automatically when ppp is
+		  run.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -335,13 +344,14 @@
 	      <term>Line 2:</term>
 
 	      <listitem>
-		<para>Enables logging parameters.  When the configuration
-		  is working satisfactorily, this line should be reduced
-                  to saying:</para>
+		<para>Enables logging parameters.  When the
+		  configuration is working satisfactorily, this line
+		  should be reduced to saying:</para>
 
-	        <programlisting>set log phase tun</programlisting>
+		  <programlisting>set log phase tun</programlisting>
 
-                <para>in order to avoid excessive log file sizes.</para>
+		<para>in order to avoid excessive log file
+		  sizes.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -350,10 +360,11 @@
 
 	      <listitem>
 		<para>Tells PPP how to identify itself to the peer.
-                  PPP identifies itself to the peer if it has any trouble
-                  negotiating and setting up the link, providing information
-                  that the peers administrator may find useful when
-                  investigating such problems.</para>
+		  PPP identifies itself to the peer if it has any
+		  trouble negotiating and setting up the link,
+		  providing information that the peers administrator
+		  may find useful when investigating such
+		  problems.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -366,7 +377,8 @@
 		  <filename class="devicefile">/dev/cuau0</filename>
 		  and
 		  <devicename>COM2</devicename> is
-		  <filename class="devicefile">/dev/cuau1</filename>.</para>
+		  <filename
+		    class="devicefile">/dev/cuau1</filename>.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -374,9 +386,9 @@
 	      <term>Line 5:</term>
 
 	      <listitem>
-		<para>Sets the speed you want to connect at.  If 115200
-		  does not work (it should with any reasonably new modem),
-		  try 38400 instead.</para>
+		<para>Sets the speed you want to connect at.  If
+		  115200 does not work (it should with any reasonably
+		  new modem), try 38400 instead.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -390,14 +402,15 @@
 		</indexterm>
 
 		<para>The dial string.  User PPP uses an expect-send
-		  syntax similar to the &man.chat.8; program.  Refer to
-		  the manual page for information on the features of this
-		  language.</para>
-
-		<para>Note that this command continues onto the next line
-                   for readability.  Any command in
-                   <filename>ppp.conf</filename> may do this if the last
-                  character on the line is a <literal>\</literal> character.</para>
+		  syntax similar to the &man.chat.8; program.  Refer
+		  to the manual page for information on the features
+		  of this language.</para>
+
+		<para>Note that this command continues onto the next
+		  line for readability.  Any command in
+		  <filename>ppp.conf</filename> may do this if the
+		  last character on the line is a <literal>\</literal>
+		  character.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -406,7 +419,8 @@
 
 	      <listitem>
 		<para>Sets the idle timeout for the link.  180 seconds
-		  is the default, so this line is purely cosmetic.</para>
+		  is the default, so this line is purely
+		  cosmetic.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -415,8 +429,8 @@
 
 	      <listitem>
 		<para>Tells PPP to ask the peer to confirm the local
-		  resolver settings.  If you run a local name server, this
-                  line should be commented out or removed.</para>
+		  resolver settings.  If you run a local name server,
+		  this line should be commented out or removed.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -424,8 +438,8 @@
 	      <term>Line 10:</term>
 
 	      <listitem>
-		<para>A blank line for readability.  Blank lines are ignored
-		by PPP.</para>
+		<para>A blank line for readability.  Blank lines are
+		  ignored by PPP.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -435,9 +449,10 @@
 	      <listitem>
 		<para>Identifies an entry for a provider called
 		  <quote>provider</quote>.  This could be changed
-                    to the name of your <acronym>ISP</acronym> so
-                    that later you can use the <option>load <replaceable>ISP</replaceable></option>
-                    to start the connection.</para>
+		  to the name of your <acronym>ISP</acronym> so
+		  that later you can use the <option>load
+		    <replaceable>ISP</replaceable></option> to start
+		  the connection.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -445,21 +460,22 @@
 	      <term>Line 12:</term>
 
 	      <listitem>
-		<para>Sets the phone number for this provider.  Multiple
-		  phone numbers may be specified using the colon
-		  (<literal>:</literal>) or pipe character
-		  (<literal>|</literal>) as a separator.  The difference
-		  between the two separators is described in &man.ppp.8;.
-		  To summarize, if you want to rotate through the numbers,
-		  use a colon.  If you want to always attempt to dial the
-		  first number first and only use the other numbers if the
-		  first number fails, use the pipe character.  Always
-		  quote the entire set of phone numbers as shown.</para>
-
-	      <para>You must enclose the phone number in quotation marks
-		(<literal>"</literal>) if there is any intention on using
-		spaces in the phone number.  This can cause a simple, yet
-		subtle error.</para>
+		<para>Sets the phone number for this provider.
+		  Multiple phone numbers may be specified using the
+		  colon (<literal>:</literal>) or pipe character
+		  (<literal>|</literal>) as a separator.  The
+		  difference between the two separators is described
+		  in &man.ppp.8;.  To summarize, if you want to rotate
+		  through the numbers, use a colon.  If you want to
+		  always attempt to dial the first number first and
+		  only use the other numbers if the first number
+		  fails, use the pipe character.  Always quote the
+		  entire set of phone numbers as shown.</para>
+
+		<para>You must enclose the phone number in quotation
+		  marks (<literal>"</literal>) if there is any
+		  intention on using spaces in the phone number.
+		  This can cause a simple, yet subtle error.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -468,11 +484,11 @@
 
 	      <listitem>
 		<para>Identifies the user name and password.  When
-                  connecting using a &unix; style login prompt, these
-                  values are referred to by the <command>set
-                  login</command> command using the \U and \P
-                  variables.  When connecting using PAP or CHAP, these
-                  values are used at authentication time.</para>
+		  connecting using a &unix; style login prompt, these
+		  values are referred to by the <command>set
+		    login</command> command using the \U and \P
+		  variables.  When connecting using PAP or CHAP, these
+		  values are used at authentication time.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -482,14 +498,16 @@
 	      <listitem>
 		<indexterm><primary>PAP</primary></indexterm>
 		<indexterm><primary>CHAP</primary></indexterm>
-		<para>If you are using PAP or CHAP, there will be no login
-		  at this point, and this line should be commented out or
-		  removed.  See <link linkend="userppp-PAPnCHAP">PAP and CHAP
-		  authentication</link> for further details.</para>
-
-                <para>The login string is of the same chat-like syntax as
-		  the dial string.  In this example, the string works for
-		  a service whose login session looks like this:</para>
+		<para>If you are using PAP or CHAP, there will be no
+		  login at this point, and this line should be
+		  commented out or removed.  See <link
+		    linkend="userppp-PAPnCHAP">PAP and CHAP
+		    authentication</link> for further details.</para>
+
+		<para>The login string is of the same chat-like
+		  syntax as the dial string.  In this example, the
+		  string works for a service whose login session looks
+		  like this:</para>
 
 		<screen>J. Random Provider
 login: <replaceable>foo</replaceable>
@@ -510,11 +528,12 @@ protocol: ppp</screen>
 	      <listitem>
 		<indexterm><primary>timeout</primary></indexterm>
 
-		<para>Sets the default idle timeout (in seconds) for the
-		  connection.  Here, the connection will be closed
-		  automatically after 300 seconds of inactivity.  If you
-		  never want to timeout, set this value to zero or use
-                  the <option>-ddial</option> command line switch.</para>
+		<para>Sets the default idle timeout (in seconds) for
+		  the connection.  Here, the connection will be closed
+		  automatically after 300 seconds of inactivity.  If
+		  you never want to timeout, set this value to zero
+		  or use the <option>-ddial</option> command line
+		  switch.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -549,29 +568,31 @@ protocol: ppp</screen>
 
 	      <listitem>
 		<para>Adds a default route to your ISP's gateway.  The
-		  special word <literal>HISADDR</literal> is replaced with
-		  the gateway address specified on line 17.  It is
-		  important that this line appears after line 17,
-		  otherwise <literal>HISADDR</literal> will not yet be
-		  initialized.</para>
-
-		<para>If you do not wish to run ppp in <option>-auto</option>,
-		  this line should be moved to the
-                  <filename>ppp.linkup</filename> file.</para>
+		  special word <literal>HISADDR</literal> is replaced
+		  with the gateway address specified on line 17.  It
+		  is important that this line appears after line 17,
+		  otherwise <literal>HISADDR</literal> will not yet
+		  be initialized.</para>
+
+		<para>If you do not wish to run ppp in
+		  <option>-auto</option>, this line should be moved
+		  to the <filename>ppp.linkup</filename> file.</para>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
 
 	  <para>It is not necessary to add an entry to
-	    <filename>ppp.linkup</filename> when you have a static IP
-	    address and are running ppp in <option>-auto</option> mode as your
-            routing table entries are already correct before you connect.
-            You may however wish to create an entry to invoke programs after
-            connection.  This is explained later with the sendmail
-            example.</para>
+	    <filename>ppp.linkup</filename> when you have a static
+	    IP address and are running ppp in <option>-auto</option>
+	    mode as your routing table entries are already correct
+	    before you connect.  You may however wish to create an
+	    entry to invoke programs after connection.  This is
+	    explained later with the sendmail example.</para>
 
 	  <para>Example configuration files can be found in the
-	    <filename class="directory">/usr/share/examples/ppp/</filename> directory.</para>
+	    <filename
+	      class="directory">/usr/share/examples/ppp/</filename>
+	    directory.</para>
 	</sect4>
 
 	<sect4 id="userppp-dynamicIP">
@@ -607,31 +628,33 @@ protocol: ppp</screen>
 	      <term>Line 17:</term>
 
 	      <listitem>
-		<para>The number after the <literal>/</literal> character
-		  is the number of bits of the address that ppp will
-		  insist on.  You may wish to use IP numbers more
-		  appropriate to your circumstances, but the above example
-		  will always work.</para>
-
-		<para>The last argument (<literal>0.0.0.0</literal>) tells
-		  PPP to start negotiations using address <hostid
-		  role="ipaddr">0.0.0.0</hostid> rather than <hostid
-		  role="ipaddr">10.0.0.1</hostid> and is necessary for some
-                  ISPs.  Do not use <literal>0.0.0.0</literal> as the first
-                  argument to <command>set ifaddr</command> as it prevents
-                  PPP from setting up an initial route in
-                  <option>-auto</option> mode.</para>
+		<para>The number after the <literal>/</literal>
+		  character is the number of bits of the address that
+		  ppp will insist on.  You may wish to use IP numbers
+		  more appropriate to your circumstances, but the
+		  above example will always work.</para>
+
+		<para>The last argument (<literal>0.0.0.0</literal>)
+		  tells PPP to start negotiations using address
+		  <hostid role="ipaddr">0.0.0.0</hostid> rather than
+		  <hostid role="ipaddr">10.0.0.1</hostid> and is
+		  necessary for some ISPs.  Do not use
+		  <literal>0.0.0.0</literal> as the first argument
+		  to <command>set ifaddr</command> as it prevents
+		  PPP from setting up an initial route in
+		  <option>-auto</option> mode.</para>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
 
-	  <para>If you are not running in <option>-auto</option> mode, you
-	    will need to create an entry in
-            <filename>/etc/ppp/ppp.linkup</filename>.
-	    <filename>ppp.linkup</filename> is used after a connection has
-	    been established.  At this point, <command>ppp</command> will
-	    have assigned the interface addresses and it will now be
-	    possible to add the routing table entries:</para>
+	  <para>If you are not running in <option>-auto</option> mode,
+	    you will need to create an entry in
+	    <filename>/etc/ppp/ppp.linkup</filename>.
+	    <filename>ppp.linkup</filename> is used after a connection
+	    has been established.  At this point,
+	    <command>ppp</command> will have assigned the interface
+	    addresses and it will now be possible to add the routing
+	    table entries:</para>
 
 	  <programlisting>1     provider:
 2      add default HISADDR</programlisting>
@@ -683,82 +706,82 @@ protocol: ppp</screen>
 	  </indexterm>
 
 	  <para>When you configure <application>ppp</application> to
-	    receive incoming calls on a machine connected to a LAN, you
-	    must decide if you wish to forward packets to the LAN.  If you
-	    do, you should allocate the peer an IP number from your LAN's
-	    subnet, and use the command <command>enable proxy</command> in
-	    your <filename>/etc/ppp/ppp.conf</filename> file.  You should
-	    also confirm that the <filename>/etc/rc.conf</filename> file
-	    contains the following:</para>
+	    receive incoming calls on a machine connected to a LAN,
+	    you must decide if you wish to forward packets to the LAN.
+	    If you do, you should allocate the peer an IP number from
+	    your LAN's subnet, and use the command <command>enable
+	      proxy</command> in your
+	    <filename>/etc/ppp/ppp.conf</filename> file.  You should
+	    also confirm that the <filename>/etc/rc.conf</filename>
+	    file contains the following:</para>
 
 	  <programlisting>gateway_enable="YES"</programlisting>
 	</sect4>
 
-	  <sect4>
-	    <title>Which getty?</title>
+	<sect4>
+	  <title>Which getty?</title>
 
-	    <para><link linkend="dialup">Configuring FreeBSD for Dial-up
-	      Services</link> provides a good description on enabling
-	      dial-up services using &man.getty.8;.</para>
-
-	    <para>An alternative to <command>getty</command> is <ulink
-		url="http://mgetty.greenie.net/">mgetty</ulink> (from
-	      <filename role="package">comms/mgetty+sendfax</filename>
-	      port),
-	      a smarter version of <command>getty</command> designed
-	      with dial-up lines in mind.</para>
-
-	    <para>The advantages of using <command>mgetty</command> is
-	      that it actively <emphasis>talks</emphasis> to modems,
-	      meaning if port is turned off in
-	      <filename>/etc/ttys</filename> then your modem will not answer
-	      the phone.</para>
-
-	    <para>Later versions of <command>mgetty</command> (from
-	      0.99beta onwards) also support the automatic detection of
-	      PPP streams, allowing your clients script-less access to
-	      your server.</para>
+	  <para><link linkend="dialup">Configuring FreeBSD for
+	      Dial-up Services</link> provides a good description
+	    on enabling dial-up services using &man.getty.8;.</para>
+
+	  <para>An alternative to <command>getty</command> is <ulink
+	      url="http://mgetty.greenie.net/">mgetty</ulink> (from
+	    <filename role="package">comms/mgetty+sendfax</filename>
+	    port), a smarter version of <command>getty</command>
+	    designed with dial-up lines in mind.</para>
+
+	  <para>The advantages of using <command>mgetty</command> is
+	    that it actively <emphasis>talks</emphasis> to modems,
+	    meaning if port is turned off in
+	    <filename>/etc/ttys</filename> then your modem will not
+	    answer the phone.</para>
+
+	  <para>Later versions of <command>mgetty</command> (from
+	    0.99beta onwards) also support the automatic detection of
+	    PPP streams, allowing your clients script-less access to
+	    your server.</para>
 
-	    <para>Refer to <link linkend="userppp-mgetty">Mgetty and
+	  <para>Refer to <link linkend="userppp-mgetty">Mgetty and
 	      AutoPPP</link> for more information on
-	      <command>mgetty</command>.</para>
-	  </sect4>
+	    <command>mgetty</command>.</para>
+	</sect4>
 
-	  <sect4>
-	    <title><application>PPP</application> Permissions</title>
+	<sect4>
+	  <title><application>PPP</application> Permissions</title>
 
-	    <para>The <command>ppp</command> command must normally be
-	      run as the <username>root</username> user.  If however,
-	      you wish to allow <command>ppp</command> to run in
-	      server mode as a normal user by executing
-	      <command>ppp</command> as described below, that user
-	      must be given permission to run <command>ppp</command>
-	      by adding them to the <groupname>network</groupname> group
-	      in <filename>/etc/group</filename>.</para>
-
-	    <para>You will also need to give them access to one or more
-	      sections of the configuration file using the
-	      <command>allow</command> command:</para>
-
-	    <programlisting>allow users fred mary</programlisting>
-
-	    <para>If this command is used in the <literal>default</literal>
-	      section, it gives the specified users access to
-	      everything.</para>
-	  </sect4>
+	  <para>The <command>ppp</command> command must normally be
+	    run as the <username>root</username> user.  If however,
+	    you wish to allow <command>ppp</command> to run in
+	    server mode as a normal user by executing
+	    <command>ppp</command> as described below, that user
+	    must be given permission to run <command>ppp</command>
+	    by adding them to the <groupname>network</groupname>
+	    group in <filename>/etc/group</filename>.</para>
+
+	  <para>You will also need to give them access to one or more
+	    sections of the configuration file using the
+	    <command>allow</command> command:</para>
+
+	  <programlisting>allow users fred mary</programlisting>
+
+	  <para>If this command is used in the
+	    <literal>default</literal> section, it gives the specified
+	    users access to everything.</para>
+	</sect4>
 
-	  <sect4>
-	    <title>PPP Shells for Dynamic-IP Users</title>
+	<sect4>
+	  <title>PPP Shells for Dynamic-IP Users</title>
 
-	    <indexterm>
-	      <primary>PPP shells</primary>
-	    </indexterm>
+	  <indexterm>
+	    <primary>PPP shells</primary>
+	  </indexterm>
 
-	    <para>Create a file called
-	      <filename>/etc/ppp/ppp-shell</filename> containing the
-	      following:</para>
+	  <para>Create a file called
+	    <filename>/etc/ppp/ppp-shell</filename> containing the
+	    following:</para>
 
-	    <programlisting>#!/bin/sh
+	  <programlisting>#!/bin/sh
 IDENT=`echo $0 | sed -e 's/^.*-\(.*\)$/\1/'`
 CALLEDAS="$IDENT"
 TTY=`tty`
@@ -772,30 +795,31 @@ echo "Starting PPP for $IDENT"
 
 exec /usr/sbin/ppp -direct $IDENT</programlisting>
 
-	    <para>This script should be executable.  Now make a symbolic
-	      link called <filename>ppp-dialup</filename> to this script
-	      using the following commands:</para>
-
-	    <screen>&prompt.root; <userinput>ln -s ppp-shell /etc/ppp/ppp-dialup</userinput></screen>
-
-	    <para>You should use this script as the
-	      <emphasis>shell</emphasis> for all of your dialup users.
-	      This is an example from <filename>/etc/passwd</filename>
-	      for a dialup PPP user with username
-	      <username>pchilds</username> (remember do not directly edit
-	      the password file, use &man.vipw.8;).</para>
+	  <para>This script should be executable.  Now make a
+	    symbolic link called <filename>ppp-dialup</filename> to
+	    this script using the following commands:</para>
+
+	  <screen>&prompt.root; <userinput>ln -s ppp-shell /etc/ppp/ppp-dialup</userinput></screen>
+
+	  <para>You should use this script as the
+	    <emphasis>shell</emphasis> for all of your dialup users.
+	    This is an example from <filename>/etc/passwd</filename>
+	    for a dialup PPP user with username
+	    <username>pchilds</username> (remember do not directly
+	    edit the password file, use &man.vipw.8;).</para>
 
 	    <programlisting>pchilds:*:1011:300:Peter Childs PPP:/home/ppp:/etc/ppp/ppp-dialup</programlisting>
 
-	    <para>Create a <filename class="directory">/home/ppp</filename> directory that
+	    <para>Create a <filename
+		class="directory">/home/ppp</filename> directory that
 	      is world readable containing the following 0 byte
 	      files:</para>
 
 	    <screen>-r--r--r--   1 root     wheel           0 May 27 02:23 .hushlogin
 -r--r--r--   1 root     wheel           0 May 27 02:22 .rhosts</screen>
 
-	    <para>which prevents <filename>/etc/motd</filename> from being
-	      displayed.</para>
+	    <para>which prevents <filename>/etc/motd</filename> from
+	      being displayed.</para>
 	  </sect4>
 
 	  <sect4>
@@ -805,31 +829,32 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 	      <primary>PPP shells</primary>
 	    </indexterm>
 
-	    <para>Create the <filename>ppp-shell</filename> file as above,
-	      and for each account with statically assigned IPs create a
-	      symbolic link to <filename>ppp-shell</filename>.</para>
+	    <para>Create the <filename>ppp-shell</filename> file as
+	      above, and for each account with statically assigned
+	      IPs create a symbolic link to
+	      <filename>ppp-shell</filename>.</para>
 
 	    <para>For example, if you have three dialup customers,
-	      <username>fred</username>, <username>sam</username>, and
-	      <username>mary</username>, that you route /24 CIDR networks
-	      for, you would type the following:</para>
+	      <username>fred</username>, <username>sam</username>,
+	      and <username>mary</username>, that you route /24 CIDR
+	      networks for, you would type the following:</para>
 
 	    <screen>&prompt.root; <userinput>ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-fred</userinput>
 &prompt.root; <userinput>ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-sam</userinput>
 &prompt.root; <userinput>ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-mary</userinput></screen>
 
-	    <para>Each of these users dialup accounts should have their
-	      shell set to the symbolic link created above (for example,
-	      <username>mary</username>'s shell should be
+	    <para>Each of these users dialup accounts should have
+	      their shell set to the symbolic link created above (for
+	      example, <username>mary</username>'s shell should be
 	      <filename>/etc/ppp/ppp-mary</filename>).</para>
 	  </sect4>
 
 	  <sect4>
-	    <title>Setting Up <filename>ppp.conf</filename> for Dynamic-IP
-	      Users</title>
+	    <title>Setting Up <filename>ppp.conf</filename> for
+	      Dynamic-IP Users</title>
 
-	    <para>The <filename>/etc/ppp/ppp.conf</filename> file should
-	      contain something along the lines of:</para>
+	    <para>The <filename>/etc/ppp/ppp.conf</filename> file
+	      should contain something along the lines of:</para>
 
 	    <programlisting>default:
   set debug phase lcp chat
@@ -847,17 +872,17 @@ ttyu1:
 	      <para>The indenting is important.</para>
 	    </note>
 
-	    <para>The <literal>default:</literal> section is loaded for
-	      each session.  For each dialup line enabled in
-	      <filename>/etc/ttys</filename> create an entry similar to
-	      the one for <literal>ttyu0:</literal> above.  Each line
-	      should get a unique IP address from your pool of IP
-	      addresses for dynamic users.</para>
+	    <para>The <literal>default:</literal> section is loaded
+	      for each session.  For each dialup line enabled in
+	      <filename>/etc/ttys</filename> create an entry similar
+	      to the one for <literal>ttyu0:</literal> above.  Each
+	      line should get a unique IP address from your pool of
+	      IP addresses for dynamic users.</para>
 	  </sect4>
 
 	  <sect4>
-	    <title>Setting Up <filename>ppp.conf</filename> for Static-IP
-	      Users</title>
+	    <title>Setting Up <filename>ppp.conf</filename> for
+	      Static-IP Users</title>
 
 	    <para>Along with the contents of the sample
 	      <filename>/usr/share/examples/ppp/ppp.conf</filename>
@@ -891,140 +916,146 @@ mary:
   add 203.14.103.0 netmask 255.255.255.0 HISADDR</programlisting>
 	</sect4>
 
-	  <sect4 id="userppp-mgetty">
-	    <title><command>mgetty</command> and AutoPPP</title>
+	<sect4 id="userppp-mgetty">
+	  <title><command>mgetty</command> and AutoPPP</title>
 
-	    <indexterm>
-	      <primary><command>mgetty</command></primary>
-	    </indexterm>
+	  <indexterm>
+	    <primary><command>mgetty</command></primary>
+	  </indexterm>
 
-	    <indexterm>
-	      <primary>AutoPPP</primary>
-	    </indexterm>
+	  <indexterm>
+	    <primary>AutoPPP</primary>
+	  </indexterm>
 
-	    <indexterm>
-	      <primary>LCP</primary>
-	    </indexterm>
+	  <indexterm>
+	    <primary>LCP</primary>
+	  </indexterm>
 
-	    <para>By default the <filename
+	  <para>By default the <filename
 	      role="package">comms/mgetty+sendfax</filename> port
-	      comes
-	      with the <literal>AUTO_PPP</literal> option enabled
-	      allowing <command>mgetty</command> to detect the LCP phase
-	      of PPP connections and automatically spawn off a ppp
-	      shell.  However, since the default login/password
-	      sequence does not occur it is necessary to authenticate
-	      users using either PAP or CHAP.</para>
+	    comes with the <literal>AUTO_PPP</literal> option enabled
+	    allowing <command>mgetty</command> to detect the LCP
+	    phase of PPP connections and automatically spawn off a
+	    ppp shell.  However, since the default login/password
+	    sequence does not occur it is necessary to authenticate
+	    users using either PAP or CHAP.</para>
 
-	    <para>This section assumes the user has successfully
-	      compiled, and installed the <filename
+	  <para>This section assumes the user has successfully
+	    compiled, and installed the <filename
 	      role="package">comms/mgetty+sendfax</filename> port on
-	      his system.</para>
+	    his system.</para>
 
-	    <para>Make sure your
-	      <filename>/usr/local/etc/mgetty+sendfax/login.config</filename>
-	      file has the following in it:</para>
+	  <para>Make sure your
+	    <filename>/usr/local/etc/mgetty+sendfax/login.config</filename>
+	    file has the following in it:</para>
 
-	    <programlisting>/AutoPPP/ -     -		      /etc/ppp/ppp-pap-dialup</programlisting>
+	  <programlisting>/AutoPPP/ -     - /etc/ppp/ppp-pap-dialup</programlisting>
 
-	    <para>This will tell <command>mgetty</command> to run the
-	      <filename>ppp-pap-dialup</filename> script for detected
-	      PPP connections.</para>
+	  <para>This will tell <command>mgetty</command> to run the
+	    <filename>ppp-pap-dialup</filename> script for detected
+	    PPP connections.</para>
 
-	    <para>Create a file called
-	      <filename>/etc/ppp/ppp-pap-dialup</filename> containing the
-	      following (the file should be executable):</para>
+	  <para>Create a file called
+	    <filename>/etc/ppp/ppp-pap-dialup</filename> containing
+	    the following (the file should be executable):</para>
 
-	    <programlisting>#!/bin/sh
+	  <programlisting>#!/bin/sh
 exec /usr/sbin/ppp -direct pap$IDENT</programlisting>
 
-	    <para>For each dialup line enabled in
-	      <filename>/etc/ttys</filename>, create a corresponding entry
-	      in <filename>/etc/ppp/ppp.conf</filename>.  This will
-	      happily co-exist with the definitions we created
-	      above.</para>
+	  <para>For each dialup line enabled in
+	    <filename>/etc/ttys</filename>, create a corresponding
+	    entry in <filename>/etc/ppp/ppp.conf</filename>.  This
+	    will happily co-exist with the definitions we created
+	    above.</para>
 
-	    <programlisting>pap:
+	  <programlisting>pap:
   enable pap
   set ifaddr 203.14.100.1 203.14.100.20-203.14.100.40
   enable proxy</programlisting>
 
-	    <para>Each user logging in with this method will need to have

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

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 15:09:11 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])
 by hub.freebsd.org (Postfix) with ESMTP id 0CF5C961;
 Mon, 28 Jan 2013 15:09:11 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D80C71E7;
 Mon, 28 Jan 2013 15:09:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SF9AV0011232;
 Mon, 28 Jan 2013 15:09:10 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SF9Ah1011231;
 Mon, 28 Jan 2013 15:09:10 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201301281509.r0SF9Ah1011231@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Mon, 28 Jan 2013 15:09:10 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40779 - head/en_US.ISO8859-1/books/handbook/users
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 28 Jan 2013 15:09:11 -0000

Author: dru
Date: Mon Jan 28 15:09:10 2013
New Revision: 40779
URL: http://svnweb.freebsd.org/changeset/doc/40779

Log:
  White space fix only. Translators can ignore.
  
  Approved by:  bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/users/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/users/chapter.xml	Mon Jan 28 15:05:36 2013	(r40778)
+++ head/en_US.ISO8859-1/books/handbook/users/chapter.xml	Mon Jan 28 15:09:10 2013	(r40779)
@@ -9,7 +9,7 @@
   <chapterinfo>
     <authorgroup>
       <author>
-        <firstname>Neil</firstname>
+	<firstname>Neil</firstname>
 	<surname>Blakey-Milner</surname>
 	<contrib>Contributed by </contrib>
       </author>
@@ -22,22 +22,21 @@
   <sect1 id="users-synopsis">
     <title>Synopsis</title>
 
-    <para>FreeBSD allows multiple users to use the computer at the same time.
-      Obviously, only one of those users can be sitting in front of the screen and
-      keyboard at any one time
-      <footnote>
-	<para>Well, unless you hook up multiple terminals, but we will
-	save that for <xref linkend="serialcomms"/>.</para>
-      </footnote>, but any number of users can log in through the
-      network to get their work done.  To use the system every user must have
-      an account.</para>
+    <para>FreeBSD allows multiple users to use the computer at the
+      same time.  Obviously, only one of those users can be sitting in
+      front of the screen and keyboard at any one time
+      <footnote><para>Well, unless you hook up multiple terminals, but
+	  we will save that for <xref linkend="serialcomms"/>.</para>
+	</footnote>, but any number of users can log in through the
+	network to get their work done.  To use the system every user
+	must have an account.</para>
 
     <para>After reading this chapter, you will know:</para>
 
     <itemizedlist>
       <listitem>
-	<para>The differences between the various user accounts on a FreeBSD
-	  system.</para>
+	<para>The differences between the various user accounts on a
+	  FreeBSD system.</para>
       </listitem>
 
       <listitem>
@@ -49,18 +48,19 @@
       </listitem>
 
       <listitem>
-	<para>How to change account details, such as the user's full name, or
-	preferred shell.</para>
+	<para>How to change account details, such as the user's full
+	  name, or preferred shell.</para>
       </listitem>
 
       <listitem>
 	<para>How to set limits on a per-account basis, to control the
-	  resources such as memory and CPU time that accounts and groups of
-	  accounts are allowed to access.</para>
+	  resources such as memory and CPU time that accounts and
+	  groups of accounts are allowed to access.</para>
       </listitem>
 
       <listitem>
-	<para>How to use groups to make account management easier.</para>
+	<para>How to use groups to make account management
+	  easier.</para>
       </listitem>
     </itemizedlist>
 
@@ -81,8 +81,8 @@
       processes are run by users, so user and account management are
       of integral importance on FreeBSD systems.</para>
 
-    <para>Every account on a FreeBSD system has certain information associated
-      with it to identify the account.</para>
+    <para>Every account on a FreeBSD system has certain information
+      associated with it to identify the account.</para>
 
     <variablelist>
       <varlistentry>
@@ -90,12 +90,12 @@
 
 	<listitem>
 	  <para>The user name as it would be typed at the
-	    <prompt>login:</prompt> prompt.  User names must be unique across
-	    the computer; you may not have two users with the same
-	    user name.  There are a number of rules for creating valid user
-	    names, documented in &man.passwd.5;; you would typically use user
-	    names that consist of eight or fewer all lower case
-	    characters.</para>
+	    <prompt>login:</prompt> prompt.  User names must be unique
+	    across the computer; you may not have two users with the
+	    same user name.  There are a number of rules for creating
+	    valid user names, documented in &man.passwd.5;; you would
+	    typically use user names that consist of eight or fewer
+	    all lower case characters.</para>
 	</listitem>
       </varlistentry>
 
@@ -103,10 +103,10 @@
 	<term>Password</term>
 
 	<listitem>
-	  <para>Each account has a password associated with it.  The password
-	    may be blank, in which case no password will be required to access
-	    the system.  This is normally a very bad idea; every account
-	    should have a password.</para>
+	  <para>Each account has a password associated with it.  The
+	    password may be blank, in which case no password will be
+	    required to access the system.  This is normally a very
+	    bad idea; every account should have a password.</para>
 	</listitem>
       </varlistentry>
 
@@ -114,19 +114,21 @@
 	<term>User ID (UID)</term>
 
 	<listitem>
-	  <para>The UID is a number, traditionally from 0 to 65535<footnote id="users-largeuidgid">
+	  <para>The UID is a number, traditionally from 0 to
+	    65535<footnote id="users-largeuidgid">
 	      <para>It is possible to use UID/GIDs as large as
 		4294967295, but such IDs can cause serious problems
 		with software that makes assumptions about the values
 		of IDs.</para>
-	    </footnote>, used to uniquely identify
-	    the user to the system.  Internally, FreeBSD uses the UID to
-	    identify users&mdash;any FreeBSD commands that allow you to
-	    specify a user name will convert it to the UID before working with
-	    it.  This means that you can have several accounts with different
-	    user names but the same UID.  As far as FreeBSD is concerned these
-	    accounts are one user.  It is unlikely you will ever need to do
-	    this.</para>
+	      </footnote>, used to uniquely identify the user to the
+		system.  Internally, FreeBSD uses the UID to
+		identify users&mdash;any FreeBSD commands that allow
+		you to specify a user name will convert it to the UID
+		before working with it.  This means that you can have
+		several accounts with different user names but the
+		same UID.  As far as FreeBSD is concerned these
+		accounts are one user.  It is unlikely you will ever
+		need to do this.</para>
 	</listitem>
       </varlistentry>
 
@@ -134,11 +136,13 @@
 	<term>Group ID (GID)</term>
 
 	<listitem>
-	  <para>The GID is a number, traditionally from 0 to 65535<footnoteref linkend="users-largeuidgid"/>, used to uniquely identify
-	    the primary group that the user belongs to.  Groups are a
-	    mechanism for controlling access to resources based on a user's
-	    GID rather than their UID.  This can significantly reduce the size
-	    of some configuration files.  A user may also be in more than one
+	  <para>The GID is a number, traditionally from 0 to
+	    65535<footnoteref linkend="users-largeuidgid"/>, used to
+	    uniquely identify the primary group that the user belongs
+	    to.  Groups are a mechanism for controlling access to
+	    resources based on a user's GID rather than their UID.
+	    This can significantly reduce the size of some
+	    configuration files.  A user may also be in more than one
 	    group.</para>
 	</listitem>
       </varlistentry>
@@ -147,9 +151,9 @@
 	<term>Login class</term>
 
 	<listitem>
-	  <para>Login classes are an extension to the group mechanism that
-	    provide additional flexibility when tailoring the system to
-	    different users.</para>
+	  <para>Login classes are an extension to the group mechanism
+	    that provide additional flexibility when tailoring the
+	    system to different users.</para>
 	</listitem>
       </varlistentry>
 
@@ -157,10 +161,11 @@
 	<term>Password change time</term>
 
 	<listitem>
-	  <para>By default FreeBSD does not force users to change their
-	    passwords periodically.  You can enforce this on a per-user basis,
-	    forcing some or all of your users to change their passwords after
-	    a certain amount of time has elapsed.</para>
+	  <para>By default FreeBSD does not force users to change
+	    their passwords periodically.  You can enforce this on a
+	    per-user basis, forcing some or all of your users to
+	    change their passwords after a certain amount of time has
+	    elapsed.</para>
 	</listitem>
       </varlistentry>
 
@@ -168,13 +173,13 @@
 	<term>Account expiry time</term>
 
 	<listitem>
-	  <para>By default FreeBSD does not expire accounts.  If you are
-	    creating accounts that you know have a limited lifespan, for
-	    example, in a school where you have accounts for the students,
-	    then you can specify when the account expires.  After the expiry
-	    time has elapsed the account cannot be used to log in to the
-	    system, although the account's directories and files will
-	    remain.</para>
+	  <para>By default FreeBSD does not expire accounts.  If you
+	    are creating accounts that you know have a limited
+	    lifespan, for example, in a school where you have accounts
+	    for the students, then you can specify when the account
+	    expires.  After the expiry time has elapsed the account
+	    cannot be used to log in to the system, although the
+	    account's directories and files will remain.</para>
 	</listitem>
       </varlistentry>
 
@@ -182,9 +187,10 @@
 	<term>User's full name</term>
 
 	<listitem>
-	  <para>The user name uniquely identifies the account to FreeBSD, but
-	    does not necessarily reflect the user's real name.  This
-	    information can be associated with the account.</para>
+	  <para>The user name uniquely identifies the account to
+	    FreeBSD, but does not necessarily reflect the user's real
+	    name.  This information can be associated with the
+	    account.</para>
 	</listitem>
       </varlistentry>
 
@@ -192,14 +198,16 @@
 	<term>Home directory</term>
 
 	<listitem>
-	  <para>The home directory is the full path to a directory on the
-	    system in which the user will start when logging on to the
-	    system.  A common convention is to put all user home directories
-	    under
+	  <para>The home directory is the full path to a directory on
+	    the system in which the user will start when logging on to
+	    the system.  A common convention is to put all user home
+	    directories under
 	    <filename>/home/<replaceable>username</replaceable></filename>
-	    or <filename>/usr/home/<replaceable>username</replaceable></filename>.
-	    The user would store their personal files in their home directory,
-	    and any directories they may create in there.</para>
+	    or
+	    <filename>/usr/home/<replaceable>username</replaceable></filename>.
+	    The user would store their personal files in their home
+	    directory, and any directories they may create in
+	    there.</para>
 	</listitem>
       </varlistentry>
 
@@ -207,10 +215,11 @@
 	<term>User shell</term>
 
 	<listitem>
-	  <para>The shell provides the default environment users use to
-	    interact with the system.  There are many different kinds of
-	    shells, and experienced users will have their own preferences,
-	    which can be reflected in their account settings.</para>
+	  <para>The shell provides the default environment users use
+	    to interact with the system.  There are many different
+	    kinds of shells, and experienced users will have their own
+	    preferences, which can be reflected in their account
+	    settings.</para>
 	</listitem>
       </varlistentry>
     </variablelist>
@@ -345,26 +354,31 @@
 	  <row>
 	    <entry>&man.adduser.8;</entry>
 	    <entry>The recommended command-line application for adding
-	    new users.</entry>
+	      new users.</entry>
 	  </row>
+
 	  <row>
 	    <entry>&man.rmuser.8;</entry>
 	    <entry>The recommended command-line application for
-	    removing users.</entry>
+	      removing users.</entry>
 	  </row>
+
 	  <row>
 	    <entry>&man.chpass.1;</entry>
-	    <entry>A flexible tool to change user database information.</entry>
+	    <entry>A flexible tool to change user database
+	      information.</entry>
 	  </row>
+
 	  <row>
 	    <entry>&man.passwd.1;</entry>
 	    <entry>The simple command-line tool to change user
-	    passwords.</entry>
+	      passwords.</entry>
 	  </row>
+
 	  <row>
 	    <entry>&man.pw.8;</entry>
 	    <entry>A powerful and flexible tool to modify all aspects
-	    of user accounts.</entry>
+	      of user accounts.</entry>
 	  </row>
 	</tbody>
       </tgroup>
@@ -374,21 +388,23 @@
       <title><command>adduser</command></title>
 
       <indexterm>
-        <primary>accounts</primary>
-        <secondary>adding</secondary>
+	<primary>accounts</primary>
+	<secondary>adding</secondary>
       </indexterm>
       <indexterm>
-        <primary><command>adduser</command></primary>
+	<primary><command>adduser</command></primary>
       </indexterm>
       <indexterm>
-        <primary><filename class="directory">/usr/share/skel</filename></primary>
+	<primary><filename
+	  class="directory">/usr/share/skel</filename></primary>
       </indexterm>
       <indexterm><primary>skeleton directory</primary></indexterm>
       <para>&man.adduser.8; is a simple program for
 	adding new users.  It creates entries in the system
 	<filename>passwd</filename> and <filename>group</filename>
 	files.  It will also create a home directory for the new user,
-	copy in the default configuration files (<quote>dotfiles</quote>) from
+	copy in the default configuration files
+	(<quote>dotfiles</quote>) from
 	<filename>/usr/share/skel</filename>, and can optionally mail
 	the new user a welcome message.</para>
 
@@ -428,9 +444,9 @@ Goodbye!
       </example>
 
       <note>
-	<para>The password you type in is not echoed, nor are asterisks
-	  displayed.  Make sure that you do not mistype the password.
-	  </para>
+	<para>The password you type in is not echoed, nor are
+	  asterisks displayed.  Make sure that you do not mistype the
+	  password.</para>
       </note>
     </sect2>
 
@@ -439,13 +455,12 @@ Goodbye!
 
       <indexterm><primary><command>rmuser</command></primary></indexterm>
       <indexterm>
-        <primary>accounts</primary>
-        <secondary>removing</secondary>
+	<primary>accounts</primary>
+	<secondary>removing</secondary>
       </indexterm>
 
-      <para>You can use &man.rmuser.8; to
-	completely remove a user from the system.
-	&man.rmuser.8; performs the following
+      <para>You can use &man.rmuser.8; to completely remove a user
+	from the system.  &man.rmuser.8; performs the following
 	steps:</para>
 
       <procedure>
@@ -453,51 +468,60 @@ Goodbye!
 	  <para>Removes the user's &man.crontab.1; entry (if
 	    any).</para>
 	</step>
+
 	<step>
 	  <para>Removes any &man.at.1; jobs belonging to the
 	    user.</para>
 	</step>
+
 	<step>
 	  <para>Kills all processes owned by the user.</para>
 	</step>
+
 	<step>
 	  <para>Removes the user from the system's local password
 	    file.</para>
 	</step>
+
 	<step>
 	  <para>Removes the user's home directory (if it is owned by
 	    the user).</para>
 	</step>
+
 	<step>
 	  <para>Removes the incoming mail files belonging to the user
 	    from <filename>/var/mail</filename>.</para>
 	</step>
+
 	<step>
 	  <para>Removes all files owned by the user from temporary
-	    file storage areas such as <filename>/tmp</filename>.</para>
+	    file storage areas such as
+	    <filename>/tmp</filename>.</para>
 	</step>
+
 	<step>
 	  <para>Finally, removes the username from all groups to which
 	    it belongs in <filename>/etc/group</filename>.</para>
 
-	    <note>
-	      <para>If a group becomes empty and the group name is the
-		same as the username, the group is removed; this
-		complements the per-user unique groups created by
-		&man.adduser.8;.</para>
-	    </note>
+	  <note>
+	    <para>If a group becomes empty and the group name is the
+	      same as the username, the group is removed; this
+	      complements the per-user unique groups created by
+	      &man.adduser.8;.</para>
+	  </note>
 	</step>
       </procedure>
 
-      <para>&man.rmuser.8; cannot be used to remove
-	superuser accounts, since that is almost always an indication
-	of massive destruction.</para>
+      <para>&man.rmuser.8; cannot be used to remove superuser
+	accounts, since that is almost always an indication of massive
+	destruction.</para>
 
       <para>By default, an interactive mode is used, which attempts to
 	make sure you know what you are doing.</para>
 
       <example>
-	<title><command>rmuser</command> Interactive Account Removal</title>
+	<title><command>rmuser</command> Interactive Account
+	  Removal</title>
 
 	<screen>&prompt.root; <userinput>rmuser jru</userinput>
 Matching password entry:
@@ -534,11 +558,13 @@ Removing files belonging to jru from /va
 
       <note>
 	<para>You will be asked for your password
-	 after exiting the editor if you are not the superuser.</para>
+	  after exiting the editor if you are not the
+	  superuser.</para>
       </note>
 
       <example>
-	<title>Interactive <command>chpass</command> by Superuser</title>
+	<title>Interactive <command>chpass</command> by
+	  Superuser</title>
 
 	<screen>#Changing user database information for jru.
 Login: jru
@@ -561,7 +587,8 @@ Other information:</screen>
 	information, and only for themselves.</para>
 
       <example>
-	<title>Interactive <command>chpass</command> by Normal User</title>
+	<title>Interactive <command>chpass</command> by Normal
+	  User</title>
 
 	<screen>#Changing user database information for jru.
 Shell: /usr/local/bin/zsh
@@ -579,8 +606,9 @@ Other information:</screen>
 	  &man.ypchfn.1;, and
 	  &man.ypchsh.1;.  NIS support is automatic, so
 	  specifying the <literal>yp</literal> before the command is
-	  not necessary.  If this is confusing to you, do not worry, NIS will
-	  be covered in <xref linkend="network-servers"/>.</para>
+	  not necessary.  If this is confusing to you, do not worry,
+	  NIS will be covered in <xref
+	    linkend="network-servers"/>.</para>
       </note>
     </sect2>
     <sect2 id="users-passwd">
@@ -588,16 +616,17 @@ Other information:</screen>
 
       <indexterm><primary><command>passwd</command></primary></indexterm>
       <indexterm>
-        <primary>accounts</primary>
-        <secondary>changing password</secondary>
+	<primary>accounts</primary>
+	<secondary>changing password</secondary>
       </indexterm>
       <para>&man.passwd.1; is the usual way to
 	change your own password as a user, or another user's password
 	as the superuser.</para>
 
       <note>
-	<para>To prevent accidental or unauthorized changes, the original
-	  password must be entered before a new password can be set.</para>
+	<para>To prevent accidental or unauthorized changes, the
+	  original password must be entered before a new password can
+	  be set.</para>
       </note>
 
       <example>
@@ -613,7 +642,8 @@ passwd: done</screen>
       </example>
 
       <example>
-	<title>Changing Another User's Password as the Superuser</title>
+	<title>Changing Another User's Password as the
+	  Superuser</title>
 
         <screen>&prompt.root; <userinput>passwd jru</userinput>
 Changing local password for jru.
@@ -634,6 +664,7 @@ passwd: done</screen>
 
     <sect2 id="users-pw">
       <title><command>pw</command></title>
+
       <indexterm><primary><command>pw</command></primary></indexterm>
 
       <para>&man.pw.8; is a command line utility to create, remove,
@@ -673,35 +704,36 @@ passwd: done</screen>
       they
       provide a way to quickly check that usage without
       calculating it every time.  Quotas are discussed in <xref
-      linkend="quotas"/>.</para>
+	linkend="quotas"/>.</para>
 
-    <para>The other resource limits include ways to limit the amount of
-      CPU, memory, and other resources a user may consume.  These are
-      defined using login classes and are discussed here.</para>
+    <para>The other resource limits include ways to limit the amount
+      of CPU, memory, and other resources a user may consume.  These
+      are defined using login classes and are discussed here.</para>
 
     <indexterm>
       <primary><filename>/etc/login.conf</filename></primary>
     </indexterm>
     <para>Login classes are defined in
       <filename>/etc/login.conf</filename>.  The precise semantics are
-      beyond the scope of this section, but are described in detail in the
-      &man.login.conf.5; manual page.  It is sufficient to say that each
-      user is assigned to a login class (<literal>default</literal> by
-      default), and that each login class has a set of login capabilities
-      associated with it.  A login capability is a
+      beyond the scope of this section, but are described in detail in
+      the &man.login.conf.5; manual page.  It is sufficient to say
+      that each user is assigned to a login class
+      (<literal>default</literal> by default), and that each login
+      class has a set of login capabilities associated with it.  A
+      login capability is a
       <literal><replaceable>name</replaceable>=<replaceable>value</replaceable></literal>
       pair, where <replaceable>name</replaceable> is a well-known
       identifier and <replaceable>value</replaceable> is an arbitrary
-      string processed accordingly depending on the name.  Setting up login
-      classes and capabilities is rather straight-forward and is also
-      described in &man.login.conf.5;.</para>
+      string processed accordingly depending on the name.  Setting up
+      login classes and capabilities is rather straight-forward and is
+      also described in &man.login.conf.5;.</para>
 
     <note>
       <para>The system does not normally read the configuration in
-	<filename>/etc/login.conf</filename> directly, but reads the database
-	file <filename>/etc/login.conf.db</filename> which provides
-	faster lookups.
-	To generate <filename>/etc/login.conf.db</filename> from
+	<filename>/etc/login.conf</filename> directly, but reads the
+	database file <filename>/etc/login.conf.db</filename> which
+	provides faster lookups.  To generate
+	<filename>/etc/login.conf.db</filename> from
 	<filename>/etc/login.conf</filename>, execute the following
 	command:</para>
 
@@ -709,230 +741,230 @@ passwd: done</screen>
     </note>
 
     <para>Resource limits are different from plain vanilla login
-      capabilities in two ways.  First, for every limit, there is a soft
-      (current) and hard limit.  A soft limit may be adjusted by the user
-      or application, but may be no higher than the hard limit.  The latter
-      may be lowered by the user, but never raised.  Second, most resource
-      limits apply per process to a specific user, not the user as a whole.
-      Note, however, that these differences are mandated by the specific
-      handling of the limits, not by the implementation of the login
-      capability framework (i.e., they are not <emphasis>really</emphasis>
-      a special case of login capabilities).</para>
+      capabilities in two ways.  First, for every limit, there is a
+      soft (current) and hard limit.  A soft limit may be adjusted by
+      the user or application, but may be no higher than the hard
+      limit.  The latter may be lowered by the user, but never raised.
+      Second, most resource limits apply per process to a specific
+      user, not the user as a whole.  Note, however, that these
+      differences are mandated by the specific handling of the limits,
+      not by the implementation of the login capability framework
+      (i.e., they are not <emphasis>really</emphasis> a special case
+      of login capabilities).</para>
 
-    <para>And so, without further ado, below are the most commonly used
-      resource limits (the rest, along with all the other login
+    <para>And so, without further ado, below are the most commonly
+      used resource limits (the rest, along with all the other login
       capabilities, may be found in &man.login.conf.5;).</para>
 
     <variablelist>
       <varlistentry>
-        <term><literal>coredumpsize</literal></term>
+	<term><literal>coredumpsize</literal></term>
 
 	<listitem>
-    <indexterm><primary>coredumpsize</primary></indexterm>
-    <indexterm>
-      <primary>limiting users</primary>
-      <secondary>coredumpsize</secondary>
-    </indexterm>
-	  <para>The limit on the size of a core file generated by a program
-	  is, for obvious reasons, subordinate to other limits on disk
-	  usage (e.g., <literal>filesize</literal>, or disk quotas).
-	  Nevertheless, it is often used as a less-severe method of
-	  controlling disk space consumption: since users do not generate
-	  core files themselves, and often do not delete them, setting this
-	  may save them from running out of disk space should a large
-	  program (e.g., <application>emacs</application>) crash.</para>
+	  <indexterm><primary>coredumpsize</primary></indexterm>
+	  <indexterm><primary>limiting users</primary>
+	    <secondary>coredumpsize</secondary>
+	  </indexterm>
+	  <para>The limit on the size of a core file generated by a
+	    program is, for obvious reasons, subordinate to other
+	    limits on disk usage (e.g., <literal>filesize</literal>,
+	    or disk quotas).  Nevertheless, it is often used as a
+	    less-severe method of controlling disk space consumption:
+	    since users do not generate core files themselves, and
+	    often do not delete them, setting this may save them from
+	    running out of disk space should a large program (e.g.,
+	    <application>emacs</application>) crash.</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><literal>cputime</literal></term>
+	<term><literal>cputime</literal></term>
 
 	<listitem>
-    <indexterm><primary>cputime</primary></indexterm>
-    <indexterm>
-      <primary>limiting users</primary>
-      <secondary>cputime</secondary>
-    </indexterm>
-	  <para>This is the maximum amount of CPU time a user's process may
-	    consume.  Offending processes will be killed by the kernel.</para>
-
-	    <note>
-	      <para>This is a limit on CPU <emphasis>time</emphasis>
-	        consumed, not percentage of the CPU as displayed in some
-	        fields by &man.top.1; and &man.ps.1;.  A limit on the
-	        latter is, at the time of this writing, not possible, and
-	        would be rather useless: a compiler&mdash;probably a
-	        legitimate task&mdash;can easily use almost 100% of a CPU
-	        for some time.</para>
-	    </note>
+	  <indexterm><primary>cputime</primary></indexterm>
+	  <indexterm>
+	    <primary>limiting users</primary>
+	    <secondary>cputime</secondary>
+	  </indexterm>
+	  <para>This is the maximum amount of CPU time a user's
+	    process may consume.  Offending processes will be killed
+	    by the kernel.</para>
+
+	  <note>
+	    <para>This is a limit on CPU <emphasis>time</emphasis>
+	      consumed, not percentage of the CPU as displayed in
+	      some fields by &man.top.1; and &man.ps.1;.  A limit on
+	      the latter is, at the time of this writing, not
+	      possible, and would be rather useless: a
+	      compiler&mdash;probably a legitimate task&mdash;can
+	      easily use almost 100% of a CPU for some time.</para>
+	  </note>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><literal>filesize</literal></term>
+	<term><literal>filesize</literal></term>
 
 	<listitem>
-    <indexterm><primary>filesize</primary></indexterm>
-    <indexterm>
-      <primary>limiting users</primary>
-      <secondary>filesize</secondary>
-    </indexterm>
-	  <para>This is the maximum size of a file the user may possess.
-	    Unlike <link linkend="quotas">disk quotas</link>, this limit is
-	    enforced on individual files, not the set of all files a user
-	    owns.</para>
+	  <indexterm><primary>filesize</primary></indexterm>
+	  <indexterm>
+	    <primary>limiting users</primary>
+	    <secondary>filesize</secondary>
+	  </indexterm>
+	  <para>This is the maximum size of a file the user may
+	    possess.  Unlike <link linkend="quotas">disk
+	      quotas</link>, this limit is enforced on individual
+	    files, not the set of all files a user owns.</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><literal>maxproc</literal></term>
+	<term><literal>maxproc</literal></term>
 
 	<listitem>
-    <indexterm><primary>maxproc</primary></indexterm>
-        <indexterm>
-      <primary>limiting users</primary>
-      <secondary>maxproc</secondary>
-    </indexterm>
+	  <indexterm><primary>maxproc</primary></indexterm>
+	  <indexterm>
+	    <primary>limiting users</primary>
+	    <secondary>maxproc</secondary>
+	  </indexterm>
 	  <para>This is the maximum number of processes a user may be
-	    running.  This includes foreground and background processes
-	    alike.  For obvious reasons, this may not be larger than the
-	    system limit specified by the <varname>kern.maxproc</varname>
-	    &man.sysctl.8;.  Also note that setting this
-	    too small may hinder a
-	    user's productivity: it is often useful to be logged in
-	    multiple times or execute pipelines.  Some tasks, such as
-	    compiling a large program, also spawn multiple processes (e.g.,
-	    &man.make.1;, &man.cc.1;, and other intermediate
+	    running.  This includes foreground and background
+	    processes alike.  For obvious reasons, this may not be
+	    larger than the system limit specified by the
+	    <varname>kern.maxproc</varname> &man.sysctl.8;.  Also note
+	    that setting this too small may hinder a user's
+	    productivity: it is often useful to be logged in multiple
+	    times or execute pipelines.  Some tasks, such as
+	    compiling a large program, also spawn multiple processes
+	    (e.g., &man.make.1;, &man.cc.1;, and other intermediate
 	    preprocessors).</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><literal>memorylocked</literal></term>
+	<term><literal>memorylocked</literal></term>
 
 	<listitem>
-    <indexterm><primary>memorylocked</primary></indexterm>
-    <indexterm>
-      <primary>limiting users</primary>
-      <secondary>memorylocked</secondary>
-    </indexterm>
+	  <indexterm><primary>memorylocked</primary></indexterm>
+	  <indexterm>
+	    <primary>limiting users</primary>
+	    <secondary>memorylocked</secondary>
+	  </indexterm>
 	  <para>This is the maximum amount a memory a process may have
 	    requested to be locked into main memory (e.g., see
 	    &man.mlock.2;).  Some system-critical programs, such as
-            &man.amd.8;, lock into main memory such that in the event
+	    &man.amd.8;, lock into main memory such that in the event
 	    of being swapped out, they do not contribute to
 	    a system's thrashing in time of trouble.</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><literal>memoryuse</literal></term>
+	<term><literal>memoryuse</literal></term>
 
 	<listitem>
-    <indexterm><primary>memoryuse</primary></indexterm>
-    <indexterm>
-      <primary>limiting users</primary>
-      <secondary>memoryuse</secondary>
-    </indexterm>
-	  <para>This is the maximum amount of memory a process may consume
-	    at any given time.  It includes both core memory and swap
-	    usage.  This is not a catch-all limit for restricting memory
-	    consumption, but it is a good start.</para>
+	  <indexterm><primary>memoryuse</primary></indexterm>
+	  <indexterm><primary>limiting users</primary>
+	    <secondary>memoryuse</secondary>
+	</indexterm>
+	<para>This is the maximum amount of memory a process may
+	  consume at any given time.  It includes both core memory and
+	  swap usage.  This is not a catch-all limit for restricting
+	  memory consumption, but it is a good start.</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><literal>openfiles</literal></term>
+	<term><literal>openfiles</literal></term>
 
 	<listitem>
-    <indexterm><primary>openfiles</primary></indexterm>
-    <indexterm>
-      <primary>limiting users</primary>
-      <secondary>openfiles</secondary>
-    </indexterm>
+	  <indexterm><primary>openfiles</primary></indexterm>
+	  <indexterm><primary>limiting users</primary>
+	    <secondary>openfiles</secondary>
+	  </indexterm>
 	  <para>This is the maximum amount of files a process may have
-	    open.  In FreeBSD, files are also used to represent sockets and
-	    IPC channels; thus, be careful not to set this too low.  The
-	    system-wide limit for this is defined by the
+	    open.  In FreeBSD, files are also used to represent
+	    sockets and IPC channels; thus, be careful not to set this
+	    too low.  The system-wide limit for this is defined by the
 	    <varname>kern.maxfiles</varname> &man.sysctl.8;.</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><literal>sbsize</literal></term>
+	<term><literal>sbsize</literal></term>
 
 	<listitem>
-    <indexterm><primary>sbsize</primary></indexterm>
-    <indexterm>
-      <primary>limiting users</primary>
-      <secondary>sbsize</secondary>
-    </indexterm>
-	  <para>This is the limit on the amount of network memory, and thus
-	    mbufs, a user may consume.  This originated as a response to an
-	    old DoS attack by creating a lot of sockets, but can be
-	    generally used to limit network communications.</para>
+	  <indexterm><primary>sbsize</primary></indexterm>
+	  <indexterm><primary>limiting users</primary>
+	    <secondary>sbsize</secondary>
+	  </indexterm>
+	  <para>This is the limit on the amount of network memory, and
+	    thus mbufs, a user may consume.  This originated as a
+	    response to an old DoS attack by creating a lot of
+	    sockets, but can be generally used to limit network
+	    communications.</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><literal>stacksize</literal></term>
+	<term><literal>stacksize</literal></term>
 
 	<listitem>
-    <indexterm><primary>stacksize</primary></indexterm>
-    <indexterm>
-      <primary>limiting users</primary>
-      <secondary>stacksize</secondary>
-    </indexterm>
+	  <indexterm><primary>stacksize</primary></indexterm>
+	  <indexterm><primary>limiting users</primary>
+	    <secondary>stacksize</secondary>
+	  </indexterm>
 	  <para>This is the maximum size a process' stack may grow to.
-	    This alone is not sufficient to limit the amount of memory a
-	    program may use; consequently, it should be used in conjunction
-	    with other limits.</para>
+	    This alone is not sufficient to limit the amount of memory
+	    a program may use; consequently, it should be used in
+	    conjunction with other limits.</para>
 	</listitem>
       </varlistentry>
     </variablelist>
 
-    <para>There are a few other things to remember when setting resource
-      limits.  Following are some general tips, suggestions, and
-      miscellaneous comments.</para>
+    <para>There are a few other things to remember when setting
+      resource limits.  Following are some general tips, suggestions,
+      and miscellaneous comments.</para>
 
     <itemizedlist>
       <listitem>
-        <para>Processes started at system startup by
-          <filename>/etc/rc</filename> are assigned to the
-          <literal>daemon</literal> login class.</para>
+	<para>Processes started at system startup by
+	  <filename>/etc/rc</filename> are assigned to the
+	  <literal>daemon</literal> login class.</para>
       </listitem>
 
       <listitem>
-        <para>Although the <filename>/etc/login.conf</filename> that comes
-          with the system is a good source of reasonable values for most
-          limits, only you, the administrator, can know what is appropriate
-          for your system.  Setting a limit too high may open your system
-          up to abuse, while setting it too low may put a strain on
-          productivity.</para>
+	<para>Although the <filename>/etc/login.conf</filename> that
+	  comes with the system is a good source of reasonable values
+	  for most limits, only you, the administrator, can know what
+	  is appropriate for your system.  Setting a limit too high
+	  may open your system up to abuse, while setting it too low
+	  may put a strain on productivity.</para>
       </listitem>
 
       <listitem>
-        <para>Users of the X Window System (X11) should probably be granted
-	  more resources than other users.  X11 by itself takes a lot of
-	  resources, but it also encourages users to run more programs
-	  simultaneously.</para>
+	<para>Users of the X Window System (X11) should probably be
+	  granted more resources than other users.  X11 by itself
+	  takes a lot of resources, but it also encourages users to
+	  run more programs simultaneously.</para>
       </listitem>
 
       <listitem>
-        <para>Remember that many limits apply to individual processes, not
-          the user as a whole.  For example, setting
-	  <varname>openfiles</varname> to 50 means
-          that each process the user runs may open up to 50 files.  Thus,
-          the gross amount of files a user may open is the value of
-          <literal>openfiles</literal> multiplied by the value of
-          <literal>maxproc</literal>.  This also applies to memory
-          consumption.</para>
+	<para>Remember that many limits apply to individual processes,
+	  not the user as a whole.  For example, setting
+	  <varname>openfiles</varname> to 50 means that each process
+	  the user runs may open up to 50 files.  Thus, the gross
+	  amount of files a user may open is the value of
+	  <literal>openfiles</literal> multiplied by the value of
+	  <literal>maxproc</literal>.  This also applies to memory
+	  consumption.</para>
       </listitem>
     </itemizedlist>
 
-    <para>For further information on resource limits and login classes and
-      capabilities in general, please consult the relevant manual pages:
-      &man.cap.mkdb.1;, &man.getrlimit.2;, &man.login.conf.5;.</para>
+    <para>For further information on resource limits and login classes
+      and capabilities in general, please consult the relevant manual
+      pages: &man.cap.mkdb.1;, &man.getrlimit.2;,
+      &man.login.conf.5;.</para>
   </sect1>
 
   <sect1 id="users-groups">
@@ -947,27 +979,28 @@ passwd: done</screen>
       <secondary>groups</secondary>
     </indexterm>
     <para>A group is simply a list of users.  Groups are identified by
-      their group name and GID (Group ID).  In FreeBSD (and most other &unix; like
-      systems), the two factors the kernel uses to decide whether a process
-      is allowed to do something is its user ID and list of groups it
-      belongs to.  Unlike a user ID, a process has a list of groups
-      associated with it.  You may hear some things refer to the <quote>group ID</quote>
-      of a user or process; most of the time, this just means the first
-      group in the list.</para>
+      their group name and GID (Group ID).  In FreeBSD (and most other
+      &unix; like systems), the two factors the kernel uses to decide
+      whether a process is allowed to do something is its user ID and
+      list of groups it belongs to.  Unlike a user ID, a process has a
+      list of groups associated with it.  You may hear some things
+      refer to the <quote>group ID</quote> of a user or process; most
+      of the time, this just means the first group in the list.</para>
 
     <para>The group name to group ID map is in
-      <filename>/etc/group</filename>.  This is a plain text file with four
-      colon-delimited fields.  The first field is the group name, the
-      second is the encrypted password, the third the group ID, and the
-      fourth the comma-delimited list of members.  It can safely be edited
-      by hand (assuming, of course, that you do not make any syntax
-      errors!).  For a more complete description of the syntax, see the
-      &man.group.5; manual page.</para>
+      <filename>/etc/group</filename>.  This is a plain text file with
+      four colon-delimited fields.  The first field is the group name,
+      the second is the encrypted password, the third the group ID,
+      and the fourth the comma-delimited list of members.  It can
+      safely be edited by hand (assuming, of course, that you do not
+      make any syntax errors!).  For a more complete description of
+      the syntax, see the &man.group.5; manual page.</para>
 
     <para>If you do not want to edit <filename>/etc/group</filename>
-      manually, you can use the &man.pw.8; command to add and edit groups.
-      For example, to add a group called <groupname>teamtwo</groupname> and
-      then confirm that it exists you can use:</para>
+      manually, you can use the &man.pw.8; command to add and edit
+      groups.  For example, to add a group called
+      <groupname>teamtwo</groupname> and then confirm that it exists
+      you can use:</para>
 
     <example>
       <title>Adding a Group Using &man.pw.8;</title>
@@ -977,14 +1010,16 @@ passwd: done</screen>
 teamtwo:*:1100:</screen>
     </example>
 
-    <para>The number <literal>1100</literal> above is the group ID of the
-      group <groupname>teamtwo</groupname>.  Right now,
-      <groupname>teamtwo</groupname> has no members, and is thus rather
-      useless.  Let's change that by inviting <username>jru</username> to
-      the <groupname>teamtwo</groupname> group.</para>
+    <para>The number <literal>1100</literal> above is the group ID of
+      the group <groupname>teamtwo</groupname>.  Right now,
+      <groupname>teamtwo</groupname> has no members, and is thus
+      rather useless.  Let's change that by inviting
+      <username>jru</username> to the <groupname>teamtwo</groupname>
+      group.</para>

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

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 15:12:11 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])
 by hub.freebsd.org (Postfix) with ESMTP id 62AF0A14;
 Mon, 28 Jan 2013 15:12:11 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3CE3C209;
 Mon, 28 Jan 2013 15:12:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SFCBrL013365;
 Mon, 28 Jan 2013 15:12:11 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SFCBcJ013364;
 Mon, 28 Jan 2013 15:12:11 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201301281512.r0SFCBcJ013364@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Mon, 28 Jan 2013 15:12:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40780 -
 head/en_US.ISO8859-1/books/handbook/virtualization
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, 28 Jan 2013 15:12:11 -0000

Author: dru
Date: Mon Jan 28 15:12:10 2013
New Revision: 40780
URL: http://svnweb.freebsd.org/changeset/doc/40780

Log:
  White space fix only. Translators can ignore.
  
  Approved by:  bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml	Mon Jan 28 15:09:10 2013	(r40779)
+++ head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml	Mon Jan 28 15:12:10 2013	(r40780)
@@ -718,9 +718,9 @@ xenbr1          8000.feffffffffff   no  
 
 	<para>In this case it will find the &os; installation media
 	  and begin a normal <application>sysinstall</application>
-	  based installation as described in <xref linkend="install"/>.
-	  You may install, but do not attempt to configure X11 at this
-	  time.</para>
+	  based installation as described in
+	  <xref linkend="install"/>.  You may install, but do not
+	  attempt to configure X11 at this time.</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -1125,10 +1125,11 @@ EndSection</programlisting>
       and &os;.  It is equally capable at running &windows; or &unix;
       like guests.  It is released as open source software, but with
       closed-source components available in a separate extension pack.
-      These components include support for USB 2.0 devices, among others.
-      More information may be found on the <quote>Downloads</quote> page
-      of the <application>&virtualbox;</application> wiki, at
-      <ulink url="http://www.virtualbox.org/wiki/Downloads"></ulink>.
+      These components include support for USB 2.0 devices, among
+      others.  More information may be found on the
+      <quote>Downloads</quote> page of the
+      <application>&virtualbox;</application> wiki, at <ulink
+	url="http://www.virtualbox.org/wiki/Downloads"></ulink>.
       Currently, these extensions are not available for &os;.</para>
 
     <sect2 id="virtualization-virtualbox-install">

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 15:13:30 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])
 by hub.freebsd.org (Postfix) with ESMTP id 0AD0DC45;
 Mon, 28 Jan 2013 15:13:30 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F0D25228;
 Mon, 28 Jan 2013 15:13:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SFDT4i013674;
 Mon, 28 Jan 2013 15:13:29 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SFDTIt013672;
 Mon, 28 Jan 2013 15:13:29 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201301281513.r0SFDTIt013672@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Mon, 28 Jan 2013 15:13:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40781 - head/en_US.ISO8859-1/books/handbook/vinum
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, 28 Jan 2013 15:13:30 -0000

Author: dru
Date: Mon Jan 28 15:13:29 2013
New Revision: 40781
URL: http://svnweb.freebsd.org/changeset/doc/40781

Log:
  White space fix only. Translators can ignore.
  
  Approved by:  bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/vinum/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/vinum/chapter.xml	Mon Jan 28 15:12:10 2013	(r40780)
+++ head/en_US.ISO8859-1/books/handbook/vinum/chapter.xml	Mon Jan 28 15:13:29 2013	(r40781)
@@ -31,25 +31,25 @@
 
     <itemizedlist>
       <listitem>
-        <para>They can be too small.</para>
+	<para>They can be too small.</para>
       </listitem>
 
       <listitem>
-        <para>They can be too slow.</para>
+	<para>They can be too slow.</para>
       </listitem>
 
       <listitem>
-        <para>They can be too unreliable.</para>
+	<para>They can be too unreliable.</para>
       </listitem>
     </itemizedlist>
 
     <para>Various solutions to these problems have been proposed and
-      implemented.  One way some users safeguard themselves against such
-      issues is through the use of multiple, and sometimes redundant,
-      disks.  In addition to supporting various cards and controllers
-      for hardware RAID systems, the base &os; system includes the
-      Vinum Volume Manager, a block device driver that implements
-      virtual disk drives.  <emphasis>Vinum</emphasis> is a
+      implemented.  One way some users safeguard themselves against
+      such issues is through the use of multiple, and sometimes
+      redundant, disks.  In addition to supporting various cards and
+      controllers for hardware RAID systems, the base &os; system
+      includes the Vinum Volume Manager, a block device driver that
+      implements virtual disk drives.  <emphasis>Vinum</emphasis> is a
       so-called <emphasis>Volume Manager</emphasis>, a virtual disk
       driver that addresses these three problems.  Vinum provides more
       flexibility, performance, and reliability than traditional disk
@@ -57,26 +57,27 @@
       individually and in combination.</para>
 
     <para>This chapter provides an overview of potential problems with
-      traditional disk storage, and an introduction to the Vinum Volume
-      Manager.</para>
+      traditional disk storage, and an introduction to the Vinum
+      Volume Manager.</para>
 
     <note>
-      <para>Starting with &os;&nbsp;5, Vinum has been rewritten in order
-	to fit into the GEOM architecture (<xref linkend="GEOM"/>),
-	retaining the original ideas, terminology, and on-disk
-	metadata.  This rewrite is called <emphasis>gvinum</emphasis>
-	(for <emphasis> GEOM vinum</emphasis>).  The following text
-	usually refers to <emphasis>Vinum</emphasis> as an abstract
-	name, regardless of the implementation variant.  Any command
-	invocations should now be done using
-	the <command>gvinum</command> command, and the name of the
-	kernel module has been changed
-	from <filename>vinum.ko</filename>
-	to <filename>geom_vinum.ko</filename>, and all device nodes
-	reside under <filename class="directory">/dev/gvinum</filename> instead
-	of <filename class="directory">/dev/vinum</filename>.  As of &os;&nbsp;6, the old
-	Vinum implementation is no longer available in the code
-	base.</para>
+      <para>Starting with &os;&nbsp;5, Vinum has been rewritten in
+	order to fit into the GEOM architecture (<xref
+	  linkend="GEOM"/>), retaining the original ideas,
+	terminology, and on-disk metadata.  This rewrite is called
+	<emphasis>gvinum</emphasis> (for <emphasis> GEOM
+	  vinum</emphasis>).  The following text usually refers to
+	<emphasis>Vinum</emphasis> as an abstract name, regardless of
+	the implementation variant.  Any command invocations should
+	now be done using the <command>gvinum</command> command, and
+	the name of the kernel module has been changed from
+	<filename>vinum.ko</filename> to
+	<filename>geom_vinum.ko</filename>, and all device nodes
+	reside under <filename
+	  class="directory">/dev/gvinum</filename> instead of
+	<filename class="directory">/dev/vinum</filename>.  As of
+	&os;&nbsp;6, the old Vinum implementation is no longer
+	available in the code base.</para>
     </note>
 
   </sect1>
@@ -86,7 +87,7 @@
 
     <indexterm><primary>Vinum</primary></indexterm>
     <indexterm><primary>RAID</primary>
-    <secondary>software</secondary></indexterm>
+      <secondary>software</secondary></indexterm>
 
     <para>Disks are getting bigger, but so are data storage
       requirements.  Often you will find you want a file system that
@@ -137,8 +138,7 @@
       it uses several smaller disks with the same aggregate storage
       space.  Each disk is capable of positioning and transferring
       independently, so the effective throughput increases by a factor
-      close to the number of disks used.
-    </para>
+      close to the number of disks used.</para>
 
     <para>The exact throughput improvement is, of course, smaller than
       the number of disks involved: although each drive is capable of
@@ -175,9 +175,9 @@
     <para>
       <figure id="vinum-concat">
 	<title>Concatenated Organization</title>
+
 	<graphic fileref="vinum/vinum-concat"/>
-      </figure>
-    </para>
+      </figure></para>
 
     <indexterm>
       <primary>disk striping</primary>
@@ -200,152 +200,150 @@
 
     <footnote>
       <para><acronym>RAID</acronym> stands for <emphasis>Redundant
-      Array of Inexpensive Disks</emphasis> and offers various forms
-      of fault tolerance, though the latter term is somewhat
-      misleading: it provides no redundancy.</para> </footnote>.
-
-    Striping requires somewhat more effort to locate the data, and it
-    can cause additional I/O load where a transfer is spread over
-    multiple disks, but it can also provide a more constant load
-    across the disks.  <xref linkend="vinum-striped"/> illustrates the
-    sequence in which storage units are allocated in a striped
-    organization.</para>
+	  Array of Inexpensive Disks</emphasis> and offers various
+	forms of fault tolerance, though the latter term is somewhat
+	misleading: it provides no redundancy.</para> </footnote>.
+
+      Striping requires somewhat more effort to locate the
+      data, and it can cause additional I/O load where a transfer is
+      spread over multiple disks, but it can also provide a more
+      constant load across the disks.  <xref linkend="vinum-striped"/>
+      illustrates the sequence in which storage units are allocated in
+      a striped organization.</para>
 
     <para>
       <figure id="vinum-striped">
-        <title>Striped Organization</title>
+	<title>Striped Organization</title>
+
 	<graphic fileref="vinum/vinum-striped"/>
-      </figure>
-    </para>
+      </figure></para>
   </sect1>
 
   <sect1 id="vinum-data-integrity">
     <title>Data Integrity</title>
 
-      <para>The final problem with current disks is that they are
-	unreliable.  Although disk drive reliability has increased
-	tremendously over the last few years, they are still the most
-	likely core component of a server to fail.  When they do, the
-	results can be catastrophic: replacing a failed disk drive and
-	restoring data to it can take days.</para>
-
-      <indexterm>
-	<primary>disk mirroring</primary>
-      </indexterm>
-      <indexterm>
-	<primary>Vinum</primary>
-	<secondary>mirroring</secondary>
-      </indexterm>
-      <indexterm>
-	<primary>RAID-1</primary>
-      </indexterm>
-
-      <para>The traditional way to approach this problem has been
-	<emphasis>mirroring</emphasis>, keeping two copies of the data
-	on different physical hardware.  Since the advent of the
-	<acronym>RAID</acronym> levels, this technique has also been
-	called <acronym>RAID level 1</acronym> or
-	<acronym>RAID-1</acronym>.  Any write to the volume writes to
-	both locations; a read can be satisfied from either, so if one
-	drive fails, the data is still available on the other
-	drive.</para>
+    <para>The final problem with current disks is that they are
+      unreliable.  Although disk drive reliability has increased
+      tremendously over the last few years, they are still the most
+      likely core component of a server to fail.  When they do, the
+      results can be catastrophic: replacing a failed disk drive and
+      restoring data to it can take days.</para>
 
-      <para>Mirroring has two problems:</para>
+    <indexterm>
+      <primary>disk mirroring</primary>
+    </indexterm>
+    <indexterm><primary>Vinum</primary>
+      <secondary>mirroring</secondary>
+    </indexterm>
+    <indexterm><primary>RAID-1</primary>
+    </indexterm>
 
-	<itemizedlist>
-	  <listitem>
-	    <para>The price.  It requires twice as much disk storage as
-	      a non-redundant solution.</para>
-	  </listitem>
+    <para>The traditional way to approach this problem has been
+      <emphasis>mirroring</emphasis>, keeping two copies of the data
+      on different physical hardware.  Since the advent of the
+      <acronym>RAID</acronym> levels, this technique has also been
+      called <acronym>RAID level 1</acronym> or
+      <acronym>RAID-1</acronym>.  Any write to the volume writes to
+      both locations; a read can be satisfied from either, so if one
+      drive fails, the data is still available on the other
+      drive.</para>
 
-	  <listitem>
-	    <para>The performance impact.  Writes must be performed to
-	      both drives, so they take up twice the bandwidth of a
-	      non-mirrored volume.  Reads do not suffer from a
-	      performance penalty: it even looks as if they are
-	      faster.</para>
-	  </listitem>
-	</itemizedlist>
-
-      <para><indexterm><primary>RAID-5</primary></indexterm>An
-	alternative solution is <emphasis>parity</emphasis>,
-	implemented in the <acronym>RAID</acronym> levels 2, 3, 4 and
-	5.  Of these, <acronym>RAID-5</acronym> is the most
-	interesting. As implemented in Vinum, it is a variant on a
-	striped organization which dedicates one block of each stripe
-	to parity one of the other blocks. As implemented by Vinum, a
-	<acronym>RAID-5</acronym> plex is similar to a striped plex,
-	except that it implements <acronym>RAID-5</acronym> by
-	including a parity block in each stripe.  As required by
-	<acronym>RAID-5</acronym>, the location of this parity block
-	changes from one stripe to the next.  The numbers in the data
-	blocks indicate the relative block numbers.</para>
+    <para>Mirroring has two problems:</para>
 
-      <para>
-	<figure id="vinum-raid5-org">
-	  <title>RAID-5 Organization</title>
-	  <graphic fileref="vinum/vinum-raid5-org"/>
-	</figure>
-      </para>
-
-      <para>Compared to mirroring, <acronym>RAID-5</acronym> has the
-	advantage of requiring significantly less storage space.  Read
-	access is similar to that of striped organizations, but write
-	access is significantly slower, approximately 25% of the read
-	performance.  If one drive fails, the array can continue to
-	operate in degraded mode: a read from one of the remaining
-	accessible drives continues normally, but a read from the
-	failed drive is recalculated from the corresponding block from
-	all the remaining drives.
-      </para>
+    <itemizedlist>
+      <listitem>
+	<para>The price.  It requires twice as much disk storage as
+	  a non-redundant solution.</para>
+      </listitem>
+
+      <listitem>
+	<para>The performance impact.  Writes must be performed to
+	  both drives, so they take up twice the bandwidth of a
+	  non-mirrored volume.  Reads do not suffer from a
+	  performance penalty: it even looks as if they are
+	  faster.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para><indexterm><primary>RAID-5</primary></indexterm>An
+      alternative solution is <emphasis>parity</emphasis>, implemented
+      in the <acronym>RAID</acronym> levels 2, 3, 4 and 5.  Of these,
+      <acronym>RAID-5</acronym> is the most interesting.  As
+      implemented in Vinum, it is a variant on a striped organization
+      which dedicates one block of each stripe to parity one of the
+      other blocks.  As implemented by Vinum, a
+      <acronym>RAID-5</acronym> plex is similar to a striped plex,
+      except that it implements <acronym>RAID-5</acronym> by
+      including a parity block in each stripe.  As required by
+      <acronym>RAID-5</acronym>, the location of this parity block
+      changes from one stripe to the next.  The numbers in the data
+      blocks indicate the relative block numbers.</para>
+
+    <para>
+      <figure id="vinum-raid5-org">
+	<title>RAID-5 Organization</title>
+
+	<graphic fileref="vinum/vinum-raid5-org"/>
+      </figure></para>
+
+    <para>Compared to mirroring, <acronym>RAID-5</acronym> has the
+      advantage of requiring significantly less storage space.  Read
+      access is similar to that of striped organizations, but write
+      access is significantly slower, approximately 25% of the read
+      performance.  If one drive fails, the array can continue to
+      operate in degraded mode: a read from one of the remaining
+      accessible drives continues normally, but a read from the
+      failed drive is recalculated from the corresponding block from
+      all the remaining drives.</para>
   </sect1>
 
   <sect1 id="vinum-objects">
     <title>Vinum Objects</title>
-      <para>In order to address these problems, Vinum implements a four-level
-	hierarchy of objects:</para>
 
-      <itemizedlist>
-	<listitem>
-	  <para>The most visible object is the virtual disk, called a
-	    <emphasis>volume</emphasis>.  Volumes have essentially the same
-	    properties as a &unix; disk drive, though there are some minor
-	    differences.  They have no size limitations.</para>
-	</listitem>
+    <para>In order to address these problems, Vinum implements a
+      four-level hierarchy of objects:</para>
 
-	<listitem>
-	  <para>Volumes are composed of <emphasis>plexes</emphasis>,
-	    each of which represent the total address space of a
-	    volume.  This level in the hierarchy thus provides
-	    redundancy.  Think of plexes as individual disks in a
-	    mirrored array, each containing the same data.</para>
-	</listitem>
+    <itemizedlist>
+      <listitem>
+	<para>The most visible object is the virtual disk, called a
+	  <emphasis>volume</emphasis>.  Volumes have essentially the
+	  same properties as a &unix; disk drive, though there are
+	  some minor differences.  They have no size
+	  limitations.</para>
+      </listitem>
 
-	<listitem>
-	  <para>Since Vinum exists within the &unix; disk storage
-	    framework, it would be possible to use &unix;
-	    partitions as the building block for multi-disk plexes,
-	    but in fact this turns out to be too inflexible:
-	    &unix; disks can have only a limited number of
-	    partitions.  Instead, Vinum subdivides a single
-	    &unix; partition (the <emphasis>drive</emphasis>)
-	    into contiguous areas called
-	    <emphasis>subdisks</emphasis>, which it uses as building
-	    blocks for plexes.</para>
-	</listitem>
+      <listitem>
+	<para>Volumes are composed of <emphasis>plexes</emphasis>,
+	  each of which represent the total address space of a
+	  volume.  This level in the hierarchy thus provides
+	  redundancy.  Think of plexes as individual disks in a
+	  mirrored array, each containing the same data.</para>
+      </listitem>
 
-	<listitem>
-	  <para>Subdisks reside on Vinum <emphasis>drives</emphasis>,
-	    currently &unix; partitions.  Vinum drives can
-	    contain any number of subdisks.  With the exception of a
-	    small area at the beginning of the drive, which is used
-	    for storing configuration and state information, the
-	    entire drive is available for data storage.</para>
-	</listitem>
-      </itemizedlist>
+      <listitem>
+	<para>Since Vinum exists within the &unix; disk storage
+	  framework, it would be possible to use &unix; partitions
+	  as the building block for multi-disk plexes, but in fact
+	  this turns out to be too inflexible: &unix; disks can have
+	  only a limited number of partitions.  Instead, Vinum
+	  subdivides a single &unix; partition (the
+	  <emphasis>drive</emphasis>) into contiguous areas called
+	  <emphasis>subdisks</emphasis>, which it uses as building
+	  blocks for plexes.</para>
+      </listitem>
+
+      <listitem>
+	<para>Subdisks reside on Vinum <emphasis>drives</emphasis>,
+	  currently &unix; partitions.  Vinum drives can contain any
+	  number of subdisks.  With the exception of a small area at
+	  the beginning of the drive, which is used for storing
+	  configuration and state information, the entire drive is
+	  available for data storage.</para>
+      </listitem>
+    </itemizedlist>
 
-      <para>The following sections describe the way these objects provide the
-	functionality required of Vinum.</para>
+    <para>The following sections describe the way these objects
+      provide the functionality required of Vinum.</para>
 
     <sect2>
       <title>Volume Size Considerations</title>
@@ -358,6 +356,7 @@
 
     <sect2>
       <title>Redundant Data Storage</title>
+
       <para>Vinum implements mirroring by attaching multiple plexes to
 	a volume.  Each plex is a representation of the data in a
 	volume.  A volume may contain between one and eight
@@ -395,8 +394,9 @@
 
     <sect2>
       <title>Which Plex Organization?</title>
-      <para>The version of Vinum supplied with &os;&nbsp;&rel.current; implements
-	two kinds of plex:</para>
+
+      <para>The version of Vinum supplied with &os;&nbsp;&rel.current;
+	implements two kinds of plex:</para>
 
       <itemizedlist>
 	<listitem>
@@ -409,7 +409,7 @@
 	    measurable.  On the other hand, they are most susceptible
 	    to hot spots, where one disk is very active and others are
 	    idle.</para>
-        </listitem>
+	</listitem>
 
 	<listitem>
 	  <para>The greatest advantage of striped
@@ -427,19 +427,20 @@
 	</listitem>
       </itemizedlist>
 
-      <para><xref linkend="vinum-comparison"/> summarizes the advantages
-	and disadvantages of each plex organization.</para>
+      <para><xref linkend="vinum-comparison"/> summarizes the
+	advantages and disadvantages of each plex organization.</para>
 
       <table id="vinum-comparison" frame="none">
 	<title>Vinum Plex Organizations</title>
+
 	<tgroup cols="5">
 	  <thead>
 	    <row>
 	      <entry>Plex type</entry>
-	  	<entry>Minimum subdisks</entry>
-	  	<entry>Can add subdisks</entry>
-	  	<entry>Must be equal size</entry>
-	  	<entry>Application</entry>
+	      <entry>Minimum subdisks</entry>
+	      <entry>Can add subdisks</entry>
+	      <entry>Must be equal size</entry>
+	      <entry>Application</entry>
 	    </row>
 	  </thead>
 
@@ -449,8 +450,8 @@
 	      <entry>1</entry>
 	      <entry>yes</entry>
 	      <entry>no</entry>
-	      <entry>Large data storage with maximum placement flexibility
-	        and moderate performance</entry>
+	      <entry>Large data storage with maximum placement
+		flexibility and moderate performance</entry>
 	    </row>
 
 	    <row>
@@ -458,8 +459,8 @@
 	      <entry>2</entry>
 	      <entry>no</entry>
 	      <entry>yes</entry>
-	      <entry>High performance in combination with highly concurrent
-		access</entry>
+	      <entry>High performance in combination with highly
+		concurrent access</entry>
 	    </row>
 	  </tbody>
 	</tgroup>
@@ -471,7 +472,7 @@
     <title>Some Examples</title>
 
     <para>Vinum maintains a <emphasis>configuration
-      database</emphasis> which describes the objects known to an
+	database</emphasis> which describes the objects known to an
       individual system.  Initially, the user creates the
       configuration database from one or more configuration files with
       the aid of the &man.gvinum.8; utility program.  Vinum stores a
@@ -482,11 +483,11 @@
 
     <sect2>
       <title>The Configuration File</title>
-      <para>The configuration file describes individual Vinum objects.  The
-	definition of a simple volume might be:</para>
 
-      <programlisting>
-    drive a device /dev/da3h
+      <para>The configuration file describes individual Vinum objects.
+	The definition of a simple volume might be:</para>
+
+      <programlisting>    drive a device /dev/da3h
     volume myvol
       plex org concat
         sd length 512m drive a</programlisting>
@@ -505,9 +506,9 @@
 	</listitem>
 
 	<listitem>
-	  <para>The <emphasis>volume</emphasis> line describes a volume.
-	    The only required attribute is the name, in this case
-	    <emphasis>myvol</emphasis>.</para>
+	  <para>The <emphasis>volume</emphasis> line describes a
+	    volume.  The only required attribute is the name, in this
+	    case <emphasis>myvol</emphasis>.</para>
 	</listitem>
 
 	<listitem>
@@ -535,8 +536,8 @@
 	</listitem>
       </itemizedlist>
 
-      <para>After processing this file, &man.gvinum.8; produces the following
-	output:</para>
+      <para>After processing this file, &man.gvinum.8; produces the
+	following output:</para>
 
       <programlisting width="97">
       &prompt.root; gvinum -&gt; <userinput>create config1</userinput>
@@ -554,15 +555,16 @@
 
 	S myvol.p0.s0           State: up       PO:        0  B Size:        512 MB</programlisting>
 
-      <para>This output shows the brief listing format of &man.gvinum.8;.  It
-	is represented graphically in <xref linkend="vinum-simple-vol"/>.</para>
+      <para>This output shows the brief listing format of
+	&man.gvinum.8;.  It is represented graphically in <xref
+	  linkend="vinum-simple-vol"/>.</para>
 
       <para>
 	<figure id="vinum-simple-vol">
 	  <title>A Simple Vinum Volume</title>
+
 	  <graphic fileref="vinum/vinum-simple-vol"/>
-	</figure>
-      </para>
+	</figure></para>
 
       <para>This figure, and the ones which follow, represent a
 	volume, which contains the plexes, which in turn contain the
@@ -587,8 +589,7 @@
 	that a drive failure will not take down both plexes.  The
 	following configuration mirrors a volume:</para>
 
-      <programlisting>
-	drive b device /dev/da4h
+      <programlisting>	drive b device /dev/da4h
 	volume mirror
       plex org concat
         sd length 512m drive a
@@ -628,9 +629,9 @@
       <para>
 	<figure id="vinum-mirrored-vol">
 	  <title>A Mirrored Vinum Volume</title>
+
 	  <graphic fileref="vinum/vinum-mirrored-vol"/>
-	</figure>
-      </para>
+	</figure></para>
 
       <para>In this example, each plex contains the full 512&nbsp;MB
 	of address space.  As in the previous example, each plex
@@ -650,8 +651,7 @@
 	shows a volume with a plex striped across four disk
 	drives:</para>
 
-	<programlisting>
-	drive c device /dev/da5h
+	<programlisting>	drive c device /dev/da5h
 	drive d device /dev/da6h
 	volume stripe
 	plex org striped 512k
@@ -660,9 +660,9 @@
 	  sd length 128m drive c
 	  sd length 128m drive d</programlisting>
 
-      <para>As before, it is not necessary to define the drives which are
-	already known to Vinum.  After processing this definition, the
-	configuration looks like:</para>
+      <para>As before, it is not necessary to define the drives which
+	are already known to Vinum.  After processing this definition,
+	the configuration looks like:</para>
 
       <programlisting width="92">
 	Drives:         4 (4 configured)
@@ -695,27 +695,26 @@
       <para>
 	<figure id="vinum-striped-vol">
 	  <title>A Striped Vinum Volume</title>
+
 	  <graphic fileref="vinum/vinum-striped-vol"/>
-	</figure>
-      </para>
+	</figure></para>
 
       <para>This volume is represented in
-	<xref linkend="vinum-striped-vol"/>.  The darkness of the stripes
-	indicates the position within the plex address space: the lightest stripes
-	come first, the darkest last.</para>
+	<xref linkend="vinum-striped-vol"/>.  The darkness of the
+	stripes indicates the position within the plex address space:
+	the lightest stripes come first, the darkest last.</para>
     </sect2>
 
     <sect2>
       <title>Resilience and Performance</title>
 
-      <para><anchor id="vinum-resilience"/>With sufficient hardware, it
-	is possible to build volumes which show both increased
+      <para><anchor id="vinum-resilience"/>With sufficient hardware,
+	it is possible to build volumes which show both increased
 	resilience and increased performance compared to standard
 	&unix; partitions.  A typical configuration file might
 	be:</para>
 
-      <programlisting>
-	volume raid10
+      <programlisting>	volume raid10
       plex org striped 512k
         sd length 102480k drive a
         sd length 102480k drive b
@@ -729,19 +728,20 @@
         sd length 102480k drive a
         sd length 102480k drive b</programlisting>
 
-      <para>The subdisks of the second plex are offset by two drives from those
-	of the first plex: this helps ensure that writes do not go to the same
-	subdisks even if a transfer goes over two drives.</para>
+      <para>The subdisks of the second plex are offset by two drives
+	from those of the first plex: this helps ensure that writes do
+	not go to the same subdisks even if a transfer goes over two
+	drives.</para>
 
-      <para><xref linkend="vinum-raid10-vol"/> represents the structure
-	of this volume.</para>
+      <para><xref linkend="vinum-raid10-vol"/> represents the
+	structure of this volume.</para>
 
       <para>
 	<figure id="vinum-raid10-vol">
 	  <title>A Mirrored, Striped Vinum Volume</title>
+
 	  <graphic fileref="vinum/vinum-raid10-vol"/>
-        </figure>
-      </para>
+	</figure></para>
     </sect2>
   </sect1>
 
@@ -762,19 +762,21 @@
       drives may be up to 32 characters long.</para>
 
     <para>Vinum objects are assigned device nodes in the hierarchy
-      <filename class="directory">/dev/gvinum</filename>.  The configuration shown above
-      would cause Vinum to create the following device nodes:</para>
+      <filename class="directory">/dev/gvinum</filename>.  The
+      configuration shown above would cause Vinum to create the
+      following device nodes:</para>
 
     <itemizedlist>
       <listitem>
 	<para>Device entries for each volume.
-	  These are the main devices used by Vinum.  Thus the configuration
-	  above would include the devices
+	  These are the main devices used by Vinum.  Thus the
+	  configuration above would include the devices
 	  <filename class="devicefile">/dev/gvinum/myvol</filename>,
 	  <filename class="devicefile">/dev/gvinum/mirror</filename>,
 	  <filename class="devicefile">/dev/gvinum/striped</filename>,
-	  <filename class="devicefile">/dev/gvinum/raid5</filename> and
-	  <filename class="devicefile">/dev/gvinum/raid10</filename>.</para>
+	  <filename class="devicefile">/dev/gvinum/raid5</filename>
+	  and <filename
+	    class="devicefile">/dev/gvinum/raid10</filename>.</para>
       </listitem>
 
       <listitem>
@@ -785,15 +787,15 @@
       <listitem>
 	<para>The directories
 	  <filename class="directory">/dev/gvinum/plex</filename>, and
-	  <filename class="directory">/dev/gvinum/sd</filename>, which contain
-	  device nodes for each plex and for each subdisk,
+	  <filename class="directory">/dev/gvinum/sd</filename>, which
+	  contain device nodes for each plex and for each subdisk,
 	  respectively.</para>
       </listitem>
     </itemizedlist>
 
-    <para>For example, consider the following configuration file:</para>
-	<programlisting>
-	drive drive1 device /dev/sd1h
+    <para>For example, consider the following configuration
+      file:</para>
+    <programlisting>	drive drive1 device /dev/sd1h
 	drive drive2 device /dev/sd2h
 	drive drive3 device /dev/sd3h
 	drive drive4 device /dev/sd4h
@@ -804,11 +806,11 @@
         sd length 100m drive drive3
         sd length 100m drive drive4</programlisting>
 
-    <para>After processing this file, &man.gvinum.8; creates the following
-      structure in <filename class="directory">/dev/gvinum</filename>:</para>
+    <para>After processing this file, &man.gvinum.8; creates the
+      following structure in <filename
+	class="directory">/dev/gvinum</filename>:</para>
 
-    <programlisting>
-	drwxr-xr-x  2 root  wheel       512 Apr 13 16:46 plex
+    <programlisting>	drwxr-xr-x  2 root  wheel       512 Apr 13 16:46 plex
 	crwxr-xr--  1 root  wheel   91,   2 Apr 13 16:46 s64
 	drwxr-xr-x  2 root  wheel       512 Apr 13 16:46 sd
 
@@ -839,15 +841,16 @@
 	  utilities, notably &man.newfs.8;, which previously tried to
 	  interpret the last letter of a Vinum volume name as a
 	  partition identifier.  For example, a disk drive may have a
-	  name like <filename class="devicefile">/dev/ad0a</filename> or
-	  <filename class="devicefile">/dev/da2h</filename>.  These names represent
-	  the first partition (<devicename>a</devicename>) on the
-	  first (0) IDE disk (<devicename>ad</devicename>) and the
-	  eighth partition (<devicename>h</devicename>) on the third
-	  (2) SCSI disk (<devicename>da</devicename>) respectively.
-	  By contrast, a Vinum volume might be called
-	  <filename class="devicefile">/dev/gvinum/concat</filename>, a name which has
-	  no relationship with a partition name.</para>
+	  name like <filename class="devicefile">/dev/ad0a</filename>
+	  or <filename class="devicefile">/dev/da2h</filename>.  These
+	  names represent the first partition
+	  (<devicename>a</devicename>) on the first (0) IDE disk
+	  (<devicename>ad</devicename>) and the eighth partition
+	  (<devicename>h</devicename>) on the third (2) SCSI disk
+	  (<devicename>da</devicename>) respectively.  By contrast, a
+	  Vinum volume might be called <filename
+	    class="devicefile">/dev/gvinum/concat</filename>, a name
+	  which has no relationship with a partition name.</para>
 
 	<para>In order to create a file system on this volume, use
 	  &man.newfs.8;:</para>
@@ -864,8 +867,8 @@
       Vinum, but this is not recommended.  The standard way to start
       Vinum is as a kernel module (<acronym>kld</acronym>).  You do
       not even need to use &man.kldload.8; for Vinum: when you start
-      &man.gvinum.8;, it checks whether the module has been loaded, and
-      if it is not, it loads it automatically.</para>
+      &man.gvinum.8;, it checks whether the module has been loaded,
+      and if it is not, it loads it automatically.</para>
 
 
     <sect2>
@@ -878,7 +881,7 @@
 	configuration files.  For example, a disk configuration might
 	contain the following text:</para>
 
-	<programlisting width="119">volume myvol state up
+      <programlisting width="119">volume myvol state up
 volume bigraid state down
 plex name myvol.p0 state up org concat vol myvol
 plex name myvol.p1 state up org concat vol myvol
@@ -909,96 +912,96 @@ sd name bigraid.p0.s4 drive e plex bigra
 	  if they have been assigned different &unix; drive
 	  IDs.</para>
 
-      <sect3 id="vinum-rc-startup">
-	<title>Automatic Startup</title>
-
-	<para>
-	<emphasis>Gvinum</emphasis> always
-	features an automatic startup once the kernel module is
-	loaded, via &man.loader.conf.5;.  To load the
-	<emphasis>Gvinum</emphasis> module at boot time, add
-	<literal>geom_vinum_load="YES"</literal> to
-	<filename>/boot/loader.conf</filename>.</para>
-
-	<para>When you start Vinum with the <command>gvinum
-	  start</command> command, Vinum reads the configuration
-	  database from one of the Vinum drives.  Under normal
-	  circumstances, each drive contains an identical copy of the
-	  configuration database, so it does not matter which drive is
-	  read.  After a crash, however, Vinum must determine which
-	  drive was updated most recently and read the configuration
-	  from this drive.  It then updates the configuration if
-	  necessary from progressively older drives.</para>
-
-      </sect3>
-    </sect2>
-  </sect1>
-
-  <sect1 id="vinum-root">
-    <title>Using Vinum for the Root Filesystem</title>
+	<sect3 id="vinum-rc-startup">
+	  <title>Automatic Startup</title>
 
-    <para>For a machine that has fully-mirrored filesystems using
-      Vinum, it is desirable to also mirror the root filesystem.
-      Setting up such a configuration is less trivial than mirroring
-      an arbitrary filesystem because:</para>
+	  <para><emphasis>Gvinum</emphasis> always features an
+	    automatic startup once the kernel module is loaded, via
+	    &man.loader.conf.5;.  To load the
+	    <emphasis>Gvinum</emphasis> module at boot time, add
+	    <literal>geom_vinum_load="YES"</literal> to
+	    <filename>/boot/loader.conf</filename>.</para>
 
-    <itemizedlist>
-      <listitem>
-	<para>The root filesystem must be available very early during
-	  the boot process, so the Vinum infrastructure must already be
-	  available at this time.</para>
-      </listitem>
-      <listitem>
-	<para>The volume containing the root filesystem also contains
-	  the system bootstrap and the kernel, which must be read
-	  using the host system's native utilities (e. g. the BIOS on
-	  PC-class machines) which often cannot be taught about the
-	  details of Vinum.</para>
-      </listitem>
-    </itemizedlist>
+	  <para>When you start Vinum with the <command>gvinum
+	      start</command> command, Vinum reads the configuration
+	    database from one of the Vinum drives.  Under normal
+	    circumstances, each drive contains an identical copy of
+	    the configuration database, so it does not matter which
+	    drive is read.  After a crash, however, Vinum must
+	    determine which drive was updated most recently and read
+	    the configuration from this drive.  It then updates the
+	    configuration if necessary from progressively older
+	    drives.</para>
+	</sect3>
+      </sect2>
+    </sect1>
+
+    <sect1 id="vinum-root">
+      <title>Using Vinum for the Root Filesystem</title>
+
+      <para>For a machine that has fully-mirrored filesystems using
+	Vinum, it is desirable to also mirror the root filesystem.
+	Setting up such a configuration is less trivial than mirroring
+	an arbitrary filesystem because:</para>
 
-    <para>In the following sections, the term <quote>root
-      volume</quote> is generally used to describe the Vinum volume
-      that contains the root filesystem.  It is probably a good idea
-      to use the name <literal>"root"</literal> for this volume, but
-      this is not technically required in any way.  All command
-      examples in the following sections assume this name though.</para>
+      <itemizedlist>
+	<listitem>
+	  <para>The root filesystem must be available very early
+	    during the boot process, so the Vinum infrastructure must
+	    alrqeady be available at this time.</para>
+	</listitem>
+	<listitem>
+	  <para>The volume containing the root filesystem also
+	    contains the system bootstrap and the kernel, which must
+	    be read using the host system's native utilities (e. g.
+	    the BIOS on PC-class machines) which often cannot be
+	    taught about the details of Vinum.</para>
+	</listitem>
+      </itemizedlist>
 
-    <sect2>
-      <title>Starting up Vinum Early Enough for the Root
-	Filesystem</title>
+      <para>In the following sections, the term <quote>root
+	  volume</quote> is generally used to describe the Vinum
+	volume that contains the root filesystem.  It is probably a
+	good idea to use the name <literal>"root"</literal> for this
+	volume, but this is not technically required in any way.  All
+	command examples in the following sections assume this name
+	though.</para>
+
+      <sect2>
+	<title>Starting up Vinum Early Enough for the Root
+	  Filesystem</title>
 
-      <para>There are several measures to take for this to
-	happen:</para>
+	<para>There are several measures to take for this to
+	  happen:</para>
 
-      <itemizedlist>
-	<listitem>
-	  <para>Vinum must be available in the kernel at boot-time.
-	    Thus, the method to start Vinum automatically described in
-	    <xref linkend="vinum-rc-startup"/> is not applicable to
-	    accomplish this task, and the
-	    <literal>start_vinum</literal> parameter must actually
-	    <emphasis>not</emphasis> be set when the following setup
-	    is being arranged.	The first option would be to compile
-	    Vinum statically into the kernel, so it is available all
-	    the time, but this is usually not desirable.  There is
-	    another option as well, to have
-	    <filename>/boot/loader</filename> (<xref
-	    linkend="boot-loader"/>) load the vinum kernel module
-	    early, before starting the kernel.	This can be
-	    accomplished by putting the line:</para>
+	<itemizedlist>
+	  <listitem>
+	    <para>Vinum must be available in the kernel at boot-time.
+	      Thus, the method to start Vinum automatically described
+	      in <xref linkend="vinum-rc-startup"/> is not applicable
+	      to accomplish this task, and the
+	      <literal>start_vinum</literal> parameter must actually
+	      <emphasis>not</emphasis> be set when the following setup
+	      is being arranged.  The first option would be to compile
+	      Vinum statically into the kernel, so it is available all
+	      the time, but this is usually not desirable.  There is
+	      another option as well, to have
+	      <filename>/boot/loader</filename> (<xref
+		linkend="boot-loader"/>) load the vinum kernel module
+	      early, before starting the kernel.  This can be
+	      accomplished by putting the line:</para>
 
-	  <programlisting>geom_vinum_load="YES"</programlisting>
+	    <programlisting>geom_vinum_load="YES"</programlisting>
 
 	  <para>into the file
 	    <filename>/boot/loader.conf</filename>.</para>
 	</listitem>
 
 	<listitem>
-	  <para>For <emphasis>Gvinum</emphasis>, all startup
-	  is done automatically once the kernel module has been
-	  loaded, so the procedure described above is all that is
-	  needed.</para>
+	  <para>For <emphasis>Gvinum</emphasis>, all startup is done
+	    automatically once the kernel module has been loaded, so
+	    the procedure described above is all that is
+	    needed.</para>
 	</listitem>
       </itemizedlist>
     </sect2>
@@ -1012,7 +1015,7 @@ sd name bigraid.p0.s4 drive e plex bigra
 	<filename>/boot/loader</filename>) from the UFS filesystem, it
 	is sheer impossible to also teach it about internal Vinum
 	structures so it could parse the Vinum configuration data, and
-	figure out about the elements of a boot volume itself.	Thus,
+	figure out about the elements of a boot volume itself.  Thus,
 	some tricks are necessary to provide the bootstrap code with
 	the illusion of a standard <literal>"a"</literal> partition
 	that contains the root filesystem.</para>
@@ -1036,19 +1039,19 @@ sd name bigraid.p0.s4 drive e plex bigra
 	filesystem.  The bootstrap process will, however, only use one
 	of these replica for finding the bootstrap and all the files,
 	until the kernel will eventually mount the root filesystem
-	itself.	 Each single subdisk within these plexes will then
+	itself.  Each single subdisk within these plexes will then
 	need its own <literal>"a"</literal> partition illusion, for
 	the respective device to become bootable.  It is not strictly
 	needed that each of these faked <literal>"a"</literal>
 	partitions is located at the same offset within its device,
 	compared with other devices containing plexes of the root
-	volume.	 However, it is probably a good idea to create the
+	volume.  However, it is probably a good idea to create the
 	Vinum volumes that way so the resulting mirrored devices are
 	symmetric, to avoid confusion.</para>
 
-      <para>In order to set up these <literal>"a"</literal> partitions,
-	for each device containing part of the root volume, the
-	following needs to be done:</para>
+      <para>In order to set up these <literal>"a"</literal>
+	partitions, for each device containing part of the root
+	volume, the following needs to be done:</para>
 
       <procedure>
 	<step>
@@ -1094,9 +1097,9 @@ sd name bigraid.p0.s4 drive e plex bigra
 	    <literal>"offset"</literal> value for the new
 	    <literal>"a"</literal> partition.  The
 	    <literal>"size"</literal> value for this partition can be
-	    taken verbatim from the calculation above.	The
+	    taken verbatim from the calculation above.  The
 	    <literal>"fstype"</literal> should be
-	    <literal>4.2BSD</literal>.	The
+	    <literal>4.2BSD</literal>.  The
 	    <literal>"fsize"</literal>, <literal>"bsize"</literal>,
 	    and <literal>"cpg"</literal> values should best be chosen
 	    to match the actual filesystem, though they are fairly
@@ -1144,8 +1147,7 @@ sd name bigraid.p0.s4 drive e plex bigra
       <para>After the Vinum root volume has been set up, the output of
 	<command>gvinum l -rv root</command> could look like:</para>
 
-	<screen>
-...
+      <screen>...
 Subdisk root.p0.s0:
 		Size:        125829120 bytes (120 MB)
 		State: up
@@ -1156,37 +1158,35 @@ Subdisk root.p1.s0:
 		Size:        125829120 bytes (120 MB)
 		State: up
 		Plex root.p1 at offset 0 (0  B)
-		Drive disk1 (/dev/da1h) at offset 135680 (132 kB)
-	</screen>
+		Drive disk1 (/dev/da1h) at offset 135680 (132 kB)</screen>
 
       <para>The values to note are <literal>135680</literal> for the
 	offset (relative to partition
-	<filename class="devicefile">/dev/da0h</filename>).  This translates to 265
-	512-byte disk blocks in <command>bsdlabel</command>'s terms.
-	Likewise, the size of this root volume is 245760 512-byte

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

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 15:14:37 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])
 by hub.freebsd.org (Postfix) with ESMTP id 53D64DFE;
 Mon, 28 Jan 2013 15:14:37 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 37B5124F;
 Mon, 28 Jan 2013 15:14:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SFEbRm013876;
 Mon, 28 Jan 2013 15:14:37 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SFEbcW013874;
 Mon, 28 Jan 2013 15:14:37 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201301281514.r0SFEbcW013874@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Mon, 28 Jan 2013 15:14:37 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40782 - head/en_US.ISO8859-1/books/handbook/cutting-edge
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 28 Jan 2013 15:14:37 -0000

Author: dru
Date: Mon Jan 28 15:14:36 2013
New Revision: 40782
URL: http://svnweb.freebsd.org/changeset/doc/40782

Log:
  White space fix only. Translators can ignore.
  
  Approved by:  bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Mon Jan 28 15:13:29 2013	(r40781)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Mon Jan 28 15:14:36 2013	(r40782)
@@ -113,10 +113,10 @@
     </itemizedlist>
 
     <note>
-      <para>Throughout this chapter, the <command>svn</command> command
-	is used to obtain and update &os; sources.  To use it, you will
-	need to install the port or the package for <filename
-	role="package">devel/subversion</filename>.</para>
+      <para>Throughout this chapter, the <command>svn</command>
+	command is used to obtain and update &os; sources.  To use it,
+	you will need to install the port or the package for <filename
+	  role="package">devel/subversion</filename>.</para>
     </note>
   </sect1>
 
@@ -362,10 +362,11 @@ MergeChanges /etc/ /var/named/etc/</prog
 
       <para><emphasis>Major version</emphasis> upgrades are when &os;
 	is upgraded from one major version to another, like from
-	&os;&nbsp;8.X to &os;&nbsp;9.X.  Major version upgrades will remove old object files and
-	libraries which will break most third party applications.
-	It is recommended that all installed ports either be removed
-	and re-installed or upgraded after a major version upgrade by using the
+	&os;&nbsp;8.X to &os;&nbsp;9.X.  Major version upgrades will
+	remove old object files and libraries which will break most
+	third party applications.  It is recommended that all
+	installed ports either be removed and re-installed or upgraded
+	after a major version upgrade by using the
 	<filename role="package">ports-mgmt/portupgrade</filename>
 	utility.  A brute-force rebuild of all installed
 	applications can be accomplished with this command:</para>
@@ -383,45 +384,47 @@ MergeChanges /etc/ /var/named/etc/</prog
 	<title>Dealing with Custom Kernels</title>
 
 	<para>If a custom kernel is in use, the upgrade process is
-	  slightly more involved, and the procedure varies depending on
-	  the version of &os;.</para>
+	  slightly more involved, and the procedure varies depending
+	  on the version of &os;.</para>
 
 	<sect4 id="freebsd-update-custom-kernel-8x">
 	  <title>Custom Kernels with &os;&nbsp;8.X and Earlier</title>
 
 	  <para>A copy of the
-	    <filename>GENERIC</filename> kernel is needed, and it should
-	    be placed in
-	    <filename class="directory">/boot/GENERIC</filename>.  If the
-	    <filename>GENERIC</filename> kernel is not already present in
-	    the system, it may be obtained using one of the following
-	    methods:</para>
+	    <filename>GENERIC</filename> kernel is needed, and it
+	    should be placed in <filename
+	      class="directory">/boot/GENERIC</filename>.  If the
+	    <filename>GENERIC</filename> kernel is not already present
+	    in the system, it may be obtained using one of the
+	    following methods:</para>
 
 	  <itemizedlist>
 	    <listitem>
 	      <para>If a custom kernel has only been built once, the
-		kernel in
-	        <filename class="directory">/boot/kernel.old</filename> is
+		kernel in <filename
+		  class="directory">/boot/kernel.old</filename> is
 		actually the <filename>GENERIC</filename> one.  Simply
 		rename this directory to <filename
 		  class="directory">/boot/GENERIC</filename>.</para>
 	    </listitem>
 
 	    <listitem>
-	      <para>Assuming physical access to the machine is possible, a
-		copy of the <filename>GENERIC</filename> kernel can be
-		installed from the CD-ROM media.  Insert your installation
-		disc and use the following commands:</para>
+	      <para>Assuming physical access to the machine is
+		possible, a copy of the <filename>GENERIC</filename>
+		kernel can be installed from the CD-ROM media.  Insert
+		your installation disc and use the following
+		commands:</para>
 
 	      <screen>&prompt.root; <userinput>mount /cdrom</userinput>
 &prompt.root; <userinput>cd /cdrom/<replaceable>X.Y-RELEASE</replaceable>/kernels</userinput>
 &prompt.root; <userinput>./install.sh GENERIC</userinput></screen>
 
 	      <para>Replace <filename
-	          class="directory"><replaceable>X.Y-RELEASE</replaceable></filename>
-		with the actual version of the release you are using.  The
-		<filename>GENERIC</filename> kernel will be installed in
-		<filename class="directory">/boot/GENERIC</filename> by
+		  class="directory"><replaceable>X.Y-RELEASE</replaceable></filename>
+		with the actual version of the release you are using.
+		The <filename>GENERIC</filename> kernel will be
+		installed in <filename
+		  class="directory">/boot/GENERIC</filename> by
 		default.</para>
 	    </listitem>
 
@@ -438,14 +441,15 @@ MergeChanges /etc/ /var/named/etc/</prog
 	      <para>For this kernel to be picked up as
 		<filename>GENERIC</filename>
 		by <command>freebsd-update</command>, the
-		<filename>GENERIC</filename> configuration file must not
-		have been modified in any way.  It is also suggested that
-		it is built without any other special options.</para>
+		<filename>GENERIC</filename> configuration file must
+		not have been modified in any way.  It is also
+		suggested that it is built without any other special
+		options.</para>
 	    </listitem>
 	  </itemizedlist>
 
-	  <para>Rebooting to the <filename>GENERIC</filename> kernel is
-	    not required at this stage.</para>
+	  <para>Rebooting to the <filename>GENERIC</filename> kernel
+	    is not required at this stage.</para>
 	</sect4>
 
 	<sect4 id="freebsd-update-custom-kernel-9x">
@@ -455,7 +459,8 @@ MergeChanges /etc/ /var/named/etc/</prog
 	    <listitem>
 	      <para>If a custom kernel has only been built once, the
 		kernel in
-		<filename class="directory">/boot/kernel.old</filename>
+		<filename
+		  class="directory">/boot/kernel.old</filename>
 		is actually the <literal>GENERIC</literal> kernel.
 		Rename this directory to <filename
 		  class="directory">/boot/kernel</filename>.</para>
@@ -490,8 +495,8 @@ MergeChanges /etc/ /var/named/etc/</prog
 	    </listitem>
 	  </itemizedlist>
 
-	  <para>Rebooting to the <filename>GENERIC</filename> kernel is
-	    not required at this stage.</para>
+	  <para>Rebooting to the <filename>GENERIC</filename> kernel
+	    is not required at this stage.</para>
 	</sect4>
       </sect3>
 
@@ -507,10 +512,11 @@ MergeChanges /etc/ /var/named/etc/</prog
 
 	<para>After the command has been received,
 	  <command>freebsd-update</command> will evaluate the
-	  configuration file and current system in an attempt to gather
-	  the information necessary to update the system.  A screen
-	  listing will display what components have been detected and
-	  what components have not been detected.  For example:</para>
+	  configuration file and current system in an attempt to
+	  gather the information necessary to update the system.  A
+	  screen listing will display what components have been
+	  detected and what components have not been detected.  For
+	  example:</para>
 
 	<screen>Looking up update.FreeBSD.org mirrors... 1 mirrors found.
 Fetching metadata signature for 8.0-RELEASE from update1.FreeBSD.org... done.
@@ -531,11 +537,11 @@ Does this look reasonable (y/n)? y</scre
 
 	<para>At this point, <command>freebsd-update</command> will
 	  attempt to download all files required for the upgrade.  In
-	  some cases, the user may be prompted with questions regarding
-	  what to install or how to proceed.</para>
+	  some cases, the user may be prompted with questions
+	  regarding what to install or how to proceed.</para>
 
-	<para>When using a custom kernel, the above step will produce a
-	  warning similar to the following:</para>
+	<para>When using a custom kernel, the above step will produce
+	  a warning similar to the following:</para>
 
 	<screen>WARNING: This system is running a "<replaceable>MYKERNEL</replaceable>" kernel, which is not a
 kernel configuration distributed as part of FreeBSD 8.0-RELEASE.
@@ -543,20 +549,21 @@ This kernel will not be updated: you MUS
 before running "/usr/sbin/freebsd-update install"</screen>
 
 	<para>This warning may be safely ignored at this point.  The
-	  updated <filename>GENERIC</filename> kernel will be used as an
-	  intermediate step in the upgrade process.</para>
+	  updated <filename>GENERIC</filename> kernel will be used as
+	  an intermediate step in the upgrade process.</para>
 
 	<para>After all patches have been downloaded to the local
 	  system, they will then be applied.  This process may take a
 	  while depending on the speed and workload of the machine.
-	  Configuration files will then be merged&nbsp;&mdash; this part
-	  of the process requires some user intervention as a file may
-	  be merged or an editor may appear on screen for a manual
-	  merge.  The results of every successful merge will be shown to
-	  the user as the process continues.  A failed or ignored merge
-	  will cause the process to abort.  Users may wish to make a
-	  backup of <filename class="directory">/etc</filename> and
-	  manually merge important files, such as
+	  Configuration files will then be merged&nbsp;&mdash; this
+	  part of the process requires some user intervention as a
+	  file may be merged or an editor may appear on screen for a
+	  manual merge.  The results of every successful merge will be
+	  shown to the user as the process continues.  A failed or
+	  ignored merge will cause the process to abort.  Users may
+	  wish to make a backup of <filename
+	    class="directory">/etc</filename> and manually merge
+	  important files, such as
 	  <filename>master.passwd</filename> or
 	  <filename>group</filename> at a later time.</para>
 
@@ -576,8 +583,8 @@ before running "/usr/sbin/freebsd-update
 
 	<para>The kernel and kernel modules will be patched first.  At
 	  this point the machine must be rebooted.  If the system was
-	  running with a custom kernel, use the &man.nextboot.8; command
-	  to set the kernel for the next boot to
+	  running with a custom kernel, use the &man.nextboot.8;
+	  command to set the kernel for the next boot to
 	  <filename class="directory">/boot/GENERIC</filename> (which
 	  was updated):</para>
 
@@ -585,16 +592,16 @@ before running "/usr/sbin/freebsd-update
 
 	<warning>
 	  <para>Before rebooting with the <filename>GENERIC</filename>
-	    kernel, make sure it contains all drivers required for your
-	    system to boot properly (and connect to the network, if the
-	    machine that is being updated is accessed remotely).  In
-	    particular, if the previously running custom kernel
-	    contained built-in functionality usually provided by kernel
-	    modules, make sure to temporarily load these modules into
-	    the <filename>GENERIC</filename> kernel using the
-	    <filename>/boot/loader.conf</filename> facility.  You may
-	    also wish to disable non-essential services, disk and
-	    network mounts, etc. until the upgrade process is
+	    kernel, make sure it contains all drivers required for
+	    your system to boot properly (and connect to the network,
+	    if the machine that is being updated is accessed
+	    remotely).  In particular, if the previously running
+	    custom kernel contained built-in functionality usually
+	    provided by kernel modules, make sure to temporarily load
+	    these modules into the <filename>GENERIC</filename> kernel
+	    using the <filename>/boot/loader.conf</filename> facility.
+	    You may also wish to disable non-essential services, disk
+	    and network mounts, etc. until the upgrade process is
 	    complete.</para>
 	</warning>
 
@@ -607,9 +614,9 @@ before running "/usr/sbin/freebsd-update
 	  <command>freebsd-update</command> will need to be started
 	  again.  The state of the process has been saved and thus,
 	  <command>freebsd-update</command> will not start from the
-	  beginning, but will remove all old shared libraries and object
-	  files.  To continue to this stage, issue the following
-	  command:</para>
+	  beginning, but will remove all old shared libraries and
+	  object files.  To continue to this stage, issue the
+	  following command:</para>
 
 	<screen>&prompt.root; <userinput>freebsd-update install</userinput></screen>
 
@@ -623,10 +630,10 @@ before running "/usr/sbin/freebsd-update
       <sect3 id="freebsdupdate-portsrebuild">
 	<title>Rebuilding Ports After a Major Version Upgrade</title>
 
-	<para>After a major version upgrade, all third party software will now need to be rebuilt and
-	  re-installed.  This is required as installed software may
-	  depend on libraries which have been removed during the upgrade
-	  process.  The
+	<para>After a major version upgrade, all third party software
+	  will now need to be rebuilt and re-installed.  This is
+	  required as installed software may depend on libraries which
+	  have been removed during the upgrade process.  The
 	  <filename role="package">ports-mgmt/portupgrade</filename>
 	  command may be used to automate this process.  The following
 	  commands may be used to begin this process:</para>
@@ -637,19 +644,19 @@ before running "/usr/sbin/freebsd-update
 &prompt.root; <userinput>rm /var/db/pkg/pkgdb.db /usr/ports/INDEX-*.db</userinput>
 &prompt.root; <userinput>portupgrade -af</userinput></screen>
 
-        <para>Once this has completed, finish the upgrade process with a
-	  final call to <command>freebsd-update</command>.  Issue the
-	  following command to tie up all loose ends in the upgrade
-	  process:</para>
+	<para>Once this has completed, finish the upgrade process with
+	  a final call to <command>freebsd-update</command>.  Issue
+	  the following command to tie up all loose ends in the
+	  upgrade process:</para>
 
 	<screen>&prompt.root; <userinput>freebsd-update install</userinput></screen>
 
-	<para>If the <filename>GENERIC</filename> kernel was temporarily
-	  used, this is the time to build and install a new custom
-	  kernel in the usual way.</para>
+	<para>If the <filename>GENERIC</filename> kernel was
+	  temporarily used, this is the time to build and install a
+	  new custom kernel in the usual way.</para>
 
-	<para>Reboot the machine into the new &os; version.  The process
-	  is complete.</para>
+	<para>Reboot the machine into the new &os; version.  The
+	  process is complete.</para>
       </sect3>
     </sect2>
 
@@ -1493,16 +1500,18 @@ Fetching 133 new ports or files... done.
 	      </indexterm>
 
 	      <listitem>
-		<para>Use the <link linkend="svn">svn</link> program to
-		  check out the desired development or release branch.
-		  This is the recommended method, providing access to
-		  &os; development as it occurs.  The preferred URL
-		  prefix for <application>Subversion</application>
-		  checkout of the -CURRENT base system is
-		  <literal>http://svn.freebsd.org/base/head/</literal>;
+		<para>Use the <link linkend="svn">svn</link> program
+		  to check out the desired development or release
+		  branch.  This is the recommended method, providing
+		  access to &os; development as it occurs.  The
+		  preferred URL prefix for
+		  <application>Subversion</application> checkout of
+		  the -CURRENT base system is
+
+<literal>http://svn.freebsd.org/base/head/</literal>;
 		  because of the size of the repository, it is
-		  recommended that only desired subtrees be checked out.
-		  </para>
+		  recommended that only desired subtrees be checked
+		  out.</para>
 	      </listitem>
 
 	      <listitem>
@@ -1516,8 +1525,8 @@ Fetching 133 new ports or files... done.
 		  environment.</para>
 
 		<warning>
-		  <para><command>cvsup</command> has been deprecated by
-		  the Project, and is not recommended.</para>
+		  <para><command>cvsup</command> has been deprecated
+		    by the Project, and is not recommended.</para>
 		</warning>
 
 		<note>
@@ -1557,7 +1566,7 @@ Fetching 133 new ports or files... done.
 		  for fairly long periods of time.  We recommend using
 		  <application><link
 		    linkend="svn">Subversion</link></application> for
-		    any system with Internet connectivity.</para>
+		  any system with Internet connectivity.</para>
 	      </listitem>
 	    </orderedlist>
 	  </listitem>
@@ -1730,22 +1739,22 @@ Fetching 133 new ports or files... done.
 	      </indexterm>
 
 	      <listitem>
-		<para>Use the <link linkend="svn">svn</link> program to
-		  check out the desired development or release branch.
-		  This is the recommended method, providing access to
-		  &os; development as it occurs.  Branch names include
-		  <literal>head</literal> for the current development
-		  head, and branches identified in <ulink
-		  url="&url.base;/releng/">the release engineering page</ulink>,
-		  such as
+		<para>Use the <link linkend="svn">svn</link> program
+		  to check out the desired development or release
+		  branch.  This is the recommended method, providing
+		  access to &os; development as it occurs.  Branch
+		  names include <literal>head</literal> for the
+		  current development head, and branches identified in
+		  <ulink url="&url.base;/releng/">the release
+		    engineering page</ulink>, such as
 		  <literal>stable/9</literal> or
 		  <literal>releng/9.0</literal>.  The preferred URL
 		  prefix for <application>Subversion</application>
 		  checkout of the base system is
 		  <literal>http://svn.freebsd.org/base/</literal>;
 		  because of the size of the repository, it is
-		  recommended that only desired subtrees be checked out.
-		  </para>
+		  recommended that only desired subtrees be checked
+		  out.</para>
 	      </listitem>
 
 	      <listitem>
@@ -1760,8 +1769,8 @@ Fetching 133 new ports or files... done.
 		  your environment.</para>
 
 		<warning>
-		  <para><command>cvsup</command> has been deprecated by
-		    the Project, and is not recommended.</para>
+		  <para><command>cvsup</command> has been deprecated
+		    by the Project, and is not recommended.</para>
 		</warning>
 	      </listitem>
 
@@ -1839,25 +1848,25 @@ Fetching 133 new ports or files... done.
       <secondary>anonymous</secondary>
     </indexterm>
 
-    <para><application>Subversion</application>, <application>Anonymous
-      CVS</application> and <application>CVSup</application> use the
+    <para><application>Subversion</application>,
+      <application>Anonymous CVS</application> and
+      <application>CVSup</application> use the
       <emphasis>pull</emphasis> model of updating sources.  For
-      <application>Subversion</application>,
-      the user (or a <command>cron</command> script) invokes the
+      <application>Subversion</application>, the user (or a
+      <command>cron</command> script) invokes the
       <command>svn</command> program, and it brings files up-to-date.
       <application>Subversion</application> is the preferred means of
-      updating local source trees.
-      <command>cvsup</command> and <command>cvs</command> work under
-      similar principles, but are now deprecated in favour of Subversion.
-      The updates you receive are up-to-the-minute and
-      you get them when, and only when, you want them.  You can easily
-      restrict your updates to the specific files or directories that
-      are of interest to you.  Updates are generated on the fly by the
-      server, according to what you have and what you want to have.
-      Unless the reason is truly compelling,
-      <application>Subversion</application> should be used in preference
-      to other synchronization mechanisms, which have been deprecated
-      and will be discontinued in the future.</para>
+      updating local source trees.  <command>cvsup</command> and
+      <command>cvs</command> work under similar principles, but are
+      now deprecated in favour of Subversion.  The updates you receive
+      are up-to-the-minute and you get them when, and only when, you
+      want them.  You can easily restrict your updates to the specific
+      files or directories that are of interest to you.  Updates are
+      generated on the fly by the server, according to what you have
+      and what you want to have.  Unless the reason is truly
+      compelling, <application>Subversion</application> should be used
+      in preference to other synchronization mechanisms, which have
+      been deprecated and will be discontinued in the future.</para>
 
     <indexterm>
       <primary><application>CTM</application></primary>

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 15:15:46 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])
 by hub.freebsd.org (Postfix) with ESMTP id E9129E6E;
 Mon, 28 Jan 2013 15:15:46 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DB52425E;
 Mon, 28 Jan 2013 15:15:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SFFkNJ014073;
 Mon, 28 Jan 2013 15:15:46 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SFFkvV014072;
 Mon, 28 Jan 2013 15:15:46 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201301281515.r0SFFkvV014072@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Mon, 28 Jan 2013 15:15:46 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40783 - head/en_US.ISO8859-1/books/handbook/serialcomms
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, 28 Jan 2013 15:15:47 -0000

Author: dru
Date: Mon Jan 28 15:15:46 2013
New Revision: 40783
URL: http://svnweb.freebsd.org/changeset/doc/40783

Log:
  White space fix only. Translators can ignore.
  
  Approved by:  bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml	Mon Jan 28 15:14:36 2013	(r40782)
+++ head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml	Mon Jan 28 15:15:46 2013	(r40783)
@@ -13,12 +13,13 @@
 
     <indexterm><primary>serial communications</primary></indexterm>
 
-    <para>&unix; has always had support for serial communications.  In fact,
-      the very first &unix; machines relied on serial lines for user input
-      and output.  Things have changed a lot from the days when the average
-      <quote>terminal</quote> consisted of a 10-character-per-second serial
-      printer and a keyboard.  This chapter will cover some of the ways in
-      which FreeBSD uses serial communications.</para>
+    <para>&unix; has always had support for serial communications.  In
+      fact, the very first &unix; machines relied on serial lines for
+      user input and output.  Things have changed a lot from the days
+      when the average <quote>terminal</quote> consisted of a
+      10-character-per-second serial printer and a keyboard.  This
+      chapter will cover some of the ways in which FreeBSD uses serial
+      communications.</para>
 
     <para>After reading this chapter, you will know:</para>
 
@@ -52,9 +53,9 @@
 	    linkend="basics"/>).</para>
       </listitem>
       <listitem>
-	<para>Have access to the technical manual for the serial hardware
-	  (modem or multi-port card) that you would like to use with
-	  FreeBSD.</para>
+	<para>Have access to the technical manual for the serial
+	  hardware (modem or multi-port card) that you would like to
+	  use with FreeBSD.</para>
       </listitem>
     </itemizedlist>
   </sect1>
@@ -103,7 +104,8 @@
 	  <listitem>
 	    <indexterm><primary>DCE</primary></indexterm>
 
-	    <para>Data Communications Equipment &mdash; your modem</para>
+	    <para>Data Communications Equipment &mdash; your
+	      modem</para>
 	  </listitem>
 	</varlistentry>
 
@@ -113,7 +115,8 @@
 	  <listitem>
 	    <indexterm><primary>RS-232C cables</primary></indexterm>
 
-	    <para>EIA standard for hardware serial communications</para>
+	    <para>EIA standard for hardware serial
+	      communications</para>
 	  </listitem>
 	</varlistentry>
       </variablelist>
@@ -122,18 +125,18 @@
 	does not use the term <quote>baud</quote>.  Baud refers to the
 	number of electrical state transitions that may be made in a
 	period of time, while <quote>bps</quote> (bits per second) is
-	the <emphasis>correct</emphasis> term to use (at least it does not
-	seem to bother the curmudgeons quite as much).</para>
+	the <emphasis>correct</emphasis> term to use (at least it does
+	not seem to bother the curmudgeons quite as much).</para>
     </sect2>
 
     <sect2 id="serial-cables-ports">
       <title>Cables and Ports</title>
 
       <para>To connect a modem or terminal to your FreeBSD system, you
-	will need a serial port on your computer and the proper cable to
-	connect to your serial device.  If you are already familiar with your
-	hardware and the cable it requires, you can safely skip this
-	section.</para>
+	will need a serial port on your computer and the proper cable
+	to connect to your serial device.  If you are already familiar
+	with your hardware and the cable it requires, you can safely
+	skip this section.</para>
 
       <sect3 id="term-cables">
 	<title>Cables</title>
@@ -141,8 +144,8 @@
 	<para>There are several different kinds of serial cables.  The
 	  two most common types for our purposes are null-modem cables
 	  and standard (<quote>straight</quote>) RS-232 cables.  The
-	  documentation for your hardware should describe the type of cable
-	  required.</para>
+	  documentation for your hardware should describe the type of
+	  cable required.</para>
 
 	<sect4 id="term-cables-null">
 	  <title>Null-modem Cables</title>
@@ -152,20 +155,21 @@
 	  </indexterm>
 
 	  <para>A null-modem cable passes some signals, such as
-	    <quote>Signal Ground</quote>, straight through, but switches other
-	    signals.  For example, the <quote>Transmitted Data</quote> pin on
-	    one end goes to the <quote>Received Data</quote> pin on the other
-	    end.</para>
-
-	  <para>You can also construct your own null-modem cable for use with
-	    terminals (e.g., for quality purposes).  This table shows the
-	    RS-232C <link linkend="serialcomms-signal-names">signals</link>
-	    and the pin numbers on a DB-25 connector.  Note that the standard
-	    also calls for a straight-through pin 1 to pin 1
-	    <emphasis>Protective Ground</emphasis> line, but it is often
-	    omitted.  Some terminals work OK using only pins 2, 3 and 7,
-	    while others require different configurations than the examples
-	    shown below.</para>
+	    <quote>Signal Ground</quote>, straight through, but
+	    switches other signals.  For example, the
+	    <quote>Transmitted Data</quote> pin on one end goes to the
+	    <quote>Received Data</quote> pin on the other end.</para>
+
+	  <para>You can also construct your own null-modem cable for
+	    use with terminals (e.g., for quality purposes).  This
+	    table shows the RS-232C <link
+	      linkend="serialcomms-signal-names">signals</link>
+	    and the pin numbers on a DB-25 connector.  Note that the
+	    standard also calls for a straight-through pin 1 to pin 1
+	    <emphasis>Protective Ground</emphasis> line, but it is
+	    often omitted.  Some terminals work OK using only pins 2,
+	    3 and 7, while others require different configurations
+	    than the examples shown below.</para>
 
 	  <table frame="none" pgwide="1">
 	    <title>DB-25 to DB-25 Null-Modem Cable</title>
@@ -257,7 +261,8 @@
 	    </tgroup>
 	  </table>
 
-	  <para>Here are two other schemes more common nowadays.</para>
+	  <para>Here are two other schemes more common
+	    nowadays.</para>
 
 	  <table frame="none" pgwide="1">
 	    <title>DB-9 to DB-9 Null-Modem Cable</title>
@@ -441,87 +446,92 @@
 
 	  <note>
 	    <para>When one pin at one end connects to a pair of pins
-	      at the other end, it is usually implemented with one short
-	      wire between the pair of pins in their connector and a
-	      long wire to the other single pin.</para>
+	      at the other end, it is usually implemented with one
+	      short wire between the pair of pins in their connector
+	      and a long wire to the other single pin.</para>
 	  </note>
 
-	  <para>The above designs seems to be the most popular.  In another
-	    variation (explained in the book <emphasis>RS-232 Made
-	      Easy</emphasis>) SG connects to SG, TD connects to RD, RTS and
-	    CTS connect to DCD, DTR connects to DSR, and vice-versa.</para>
+	  <para>The above designs seems to be the most popular.  In
+	    another variation (explained in the book <emphasis>RS-232
+	      Made Easy</emphasis>) SG connects to SG, TD connects to
+	    RD, RTS and CTS connect to DCD, DTR connects to DSR, and
+	    vice-versa.</para>
 	</sect4>
 
 	<sect4 id="term-cables-std">
 	  <title>Standard RS-232C Cables</title>
+
 	  <indexterm><primary>RS-232C cables</primary></indexterm>
 
-	  <para>A standard serial cable passes all of the RS-232C signals
-	    straight through.  That is, the <quote>Transmitted Data</quote>
-	    pin on one end of the cable goes to the
-	    <quote>Transmitted Data</quote> pin on the other end.  This is
-	    the type of cable to use to connect a modem to your FreeBSD
-	    system, and is also appropriate for some terminals.</para>
+	  <para>A standard serial cable passes all of the RS-232C
+	    signals straight through.  That is, the <quote>Transmitted
+	      Data</quote> pin on one end of the cable goes to the
+	    <quote>Transmitted Data</quote> pin on the other end.
+	    This is the type of cable to use to connect a modem to
+	    your FreeBSD system, and is also appropriate for some
+	    terminals.</para>
 	</sect4>
       </sect3>
 
       <sect3 id="term-ports">
 	<title>Ports</title>
 
-	<para>Serial ports are the devices through which data is transferred
-	  between the FreeBSD host computer and the terminal. This section
-	  describes the kinds of ports that exist and how they are addressed
-	  in FreeBSD.</para>
+	<para>Serial ports are the devices through which data is
+	  transferred between the FreeBSD host computer and the
+	  terminal.  This section describes the kinds of ports that
+	  exist and how they are addressed in FreeBSD.</para>
 
 	<sect4 id="term-portkinds">
 	  <title>Kinds of Ports</title>
 
-	  <para>Several kinds of serial ports exist.  Before you purchase or
-	    construct a cable, you need to make sure it will fit the ports on
-	    your terminal and on the FreeBSD system.</para>
-
-	  <para>Most terminals will have DB-25 ports.  Personal computers,
-	    including PCs running FreeBSD, will have DB-25 or DB-9 ports.  If
-	    you have a multiport serial card for your PC, you may have RJ-12 or
-	    RJ-45 ports.</para>
-
-	  <para>See the documentation that accompanied the hardware for
-	    specifications on the kind of port in use.  A visual inspection of
-	    the port often works too.</para>
+	  <para>Several kinds of serial ports exist.  Before you
+	    purchase or construct a cable, you need to make sure it
+	    will fit the ports on your terminal and on the FreeBSD
+	    system.</para>
+
+	  <para>Most terminals will have DB-25 ports.  Personal
+	    computers, including PCs running FreeBSD, will have DB-25
+	    or DB-9 ports.  If you have a multiport serial card for
+	    your PC, you may have RJ-12 or RJ-45 ports.</para>
+
+	  <para>See the documentation that accompanied the hardware
+	    for specifications on the kind of port in use.  A visual
+	    inspection of the port often works too.</para>
 	</sect4>
 
 	<sect4 id="term-portnames">
 	  <title>Port Names</title>
 
-	  <para>In FreeBSD, you access each serial port through an entry in
-	    the <filename>/dev</filename> directory.  There are two different
-	    kinds of entries:</para>
+	  <para>In FreeBSD, you access each serial port through an
+	    entry in the <filename>/dev</filename> directory.  There
+	    are two different kinds of entries:</para>
 
 	  <itemizedlist>
 	    <listitem>
 	      <para>Call-in ports are named
 		<filename>/dev/ttyu<replaceable>N</replaceable></filename>
 		where <replaceable>N</replaceable> is the port number,
-		starting from zero.  Generally, you use the call-in port for
-		terminals.  Call-in ports require that the serial line assert
-		the data carrier detect (DCD) signal to work correctly.</para>
+		starting from zero.  Generally, you use the call-in
+		port for terminals.  Call-in ports require that the
+		serial line assert the data carrier detect (DCD)
+		signal to work correctly.</para>
 	    </listitem>
 
 	    <listitem>
 	      <para>Call-out ports are named
 		<filename>/dev/cuau<replaceable>N</replaceable></filename>.
-		You usually do not use the call-out port for terminals, just
-		for modems.  You may use the call-out port if the serial cable
-		or the terminal does not support the carrier detect
-		signal.</para>
+		You usually do not use the call-out port for
+		terminals, just for modems.  You may use the call-out
+		port if the serial cable or the terminal does not
+		support the carrier detect signal.</para>
 	    </listitem>
 	  </itemizedlist>
 
-	  <para>If you have connected a terminal to the first serial port
-	    (<devicename>COM1</devicename> in &ms-dos;), then you will
-	    use <filename>/dev/ttyu0</filename> to refer to the terminal.  If
-	    the terminal is on the second serial port (also known as
-	    <devicename>COM2</devicename>), use
+	  <para>If you have connected a terminal to the first serial
+	    port(<devicename>COM1</devicename> in &ms-dos;), then you
+	    will use <filename>/dev/ttyu0</filename> to refer to the
+	    terminal.  If the terminal is on the second serial port
+	    (also known as <devicename>COM2</devicename>), use
 	    <filename>/dev/ttyu1</filename>, and so forth.</para>
 
 	</sect4>
@@ -540,27 +550,28 @@
 	<quote>dumb</quote> multiport serial interface cards, such as
 	the BocaBoard 1008 and 2016, as well as more
 	intelligent multi-port cards such as those made by Digiboard
-	and Stallion Technologies.  However, the default kernel only looks
-	for the standard COM ports.</para>
+	and Stallion Technologies.  However, the default kernel only
+	looks for the standard COM ports.</para>
 
-      <para>To see if your kernel recognizes any of your serial ports, watch
-	for messages while the kernel is booting, or use the
-	<command>/sbin/dmesg</command> command to replay the kernel's boot
-	messages.  In particular, look for messages that start with the
-	characters <literal>uart</literal> if you use &os;&nbsp;8.0 or
-	higher, or <literal>sio</literal> for &os;&nbsp;7.4 or older.</para>
+      <para>To see if your kernel recognizes any of your serial ports,
+	watch for messages while the kernel is booting, or use the
+	<command>/sbin/dmesg</command> command to replay the kernel's
+	boot messages.  In particular, look for messages that start
+	with the characters <literal>uart</literal> if you use
+	&os;&nbsp;8.0 or higher, or <literal>sio</literal> for
+	&os;&nbsp;7.4 or older.</para>
 
       <tip><para>To view just the messages that have the word
-	<literal>uart</literal> or <literal>sio</literal> depending on the
-	installed version of &os;, use the commands:</para>
+	<literal>uart</literal> or <literal>sio</literal> depending
+	on the installed version of &os;, use the commands:</para>
 
       <screen>&prompt.root; <userinput>/sbin/dmesg | grep 'uart'</userinput>
 &prompt.root; <userinput>/sbin/dmesg | grep 'sio'</userinput></screen>
       </tip>
 
       <para>For example, on a &os;&nbsp;7.<replaceable>X</replaceable>
-	system with four serial ports, these are the serial-port specific
-	kernel boot messages:</para>
+	system with four serial ports, these are the serial-port
+	specific kernel boot messages:</para>
 
       <screen>sio0 at 0x3f8-0x3ff irq 4 on isa
 sio0: type 16550A
@@ -574,28 +585,28 @@ sio3: type 16550A</screen>
       <para>If your kernel does not recognize all of your serial
 	ports, you will probably need to configure your kernel
 	in the <filename>/boot/device.hints</filename> file.  You can
-	also comment-out or completely remove lines for devices you do not
-	have.</para>
+	also comment-out or completely remove lines for devices you
+	do not have.</para>
 
       <para>Please refer to the &man.sio.4; manual page for
-	more information on serial ports and multiport boards configuration.
-	Be careful if you are using a configuration
+	more information on serial ports and multiport boards
+	configuration.  Be careful if you are using a configuration
 	file that was previously used for a different version of
-	FreeBSD because the device flags and the syntax have changed between
-	versions.</para>
+	FreeBSD because the device flags and the syntax have changed
+	between versions.</para>
 
       <note>
 	<para><literal>port IO_COM1</literal> is a substitution for
 	  <literal>port 0x3f8</literal>, <literal>IO_COM2</literal> is
 	  <literal>0x2f8</literal>, <literal>IO_COM3</literal> is
 	  <literal>0x3e8</literal>, and <literal>IO_COM4</literal> is
-	  <literal>0x2e8</literal>, which are fairly common port addresses for
-	  their respective serial ports; interrupts 4, 3, 5, and 9 are fairly
-	  common interrupt request lines.  Also note that regular serial ports
-	  <emphasis>cannot</emphasis> share interrupts on ISA-bus PCs
-	  (multiport boards have on-board electronics that allow all the
-	  16550A's on the board to share one or two interrupt request
-	  lines).</para>
+	  <literal>0x2e8</literal>, which are fairly common port
+	  addresses for their respective serial ports; interrupts 4,
+	  3, 5, and 9 are fairly common interrupt request lines.  Also
+	  note that regular serial ports <emphasis>cannot</emphasis>
+	  share interrupts on ISA-bus PCs (multiport boards have
+	  on-board electronics that allow all the 16550A's on the
+	  board to share one or two interrupt request lines).</para>
       </note>
 
     </sect2>
@@ -603,27 +614,29 @@ sio3: type 16550A</screen>
     <sect2>
       <title>Device Special Files</title>
 
-      <para>Most devices in the kernel are accessed through <quote>device
-	special files</quote>, which are located in the
-	<filename>/dev</filename> directory.  The <devicename>sio</devicename>
-	devices are accessed through the
-	<filename>/dev/ttyu<replaceable>N</replaceable></filename> (dial-in)
-	and <filename>/dev/cuau<replaceable>N</replaceable></filename>
-	(call-out) devices.  FreeBSD also provides initialization devices
-	(<filename>/dev/ttyu<replaceable>N</replaceable>.init</filename> and
+      <para>Most devices in the kernel are accessed through
+	<quote>device special files</quote>, which are located in the
+	<filename>/dev</filename> directory.  The
+	<devicename>sio</devicename> devices are accessed through the
+	<filename>/dev/ttyu<replaceable>N</replaceable></filename>
+	(dial-in) and
+	<filename>/dev/cuau<replaceable>N</replaceable></filename>
+	(call-out) devices.  FreeBSD also provides initialization
+	devices
+	(<filename>/dev/ttyu<replaceable>N</replaceable>.init</filename>
+	and
 	<filename>/dev/cuau<replaceable>N</replaceable>.init</filename>)
+	and locking devices
+	(<filename>/dev/ttyu<replaceable>N</replaceable>.lock</filename>
 	and
-	locking devices
-	(<filename>/dev/ttyu<replaceable>N</replaceable>.lock</filename> and
 	<filename>/dev/cuau<replaceable>N</replaceable>.lock</filename>).
-	The
-	initialization devices are used to initialize communications port
-	parameters each time a port is opened, such as
-	<literal>crtscts</literal> for modems which use
-	<literal>RTS/CTS</literal> signaling for flow control.  The locking
-	devices are used to lock flags on ports to prevent users or programs
-	changing certain parameters; see the manual pages &man.termios.4;,
-	  &man.sio.4;, and &man.stty.1; for
+	The initialization devices are used to initialize
+	communications port parameters each time a port is opened,
+	such as <literal>crtscts</literal> for modems which use
+	<literal>RTS/CTS</literal> signaling for flow control.  The
+	locking devices are used to lock flags on ports to prevent
+	users or programs changing certain parameters; see the manual
+	pages &man.termios.4;, &man.sio.4;, and &man.stty.1; for
 	information on the terminal settings, locking and initializing
 	devices, and setting terminal options, respectively.</para>
     </sect2>
@@ -632,49 +645,53 @@ sio3: type 16550A</screen>
     <sect2 id="serial-hw-config">
       <title>Serial Port Configuration</title>
 
-    <indexterm><primary><devicename>ttyu</devicename></primary></indexterm>
-    <indexterm><primary><devicename>cuau</devicename></primary></indexterm>
+      <indexterm><primary><devicename>ttyu</devicename></primary></indexterm>
+      <indexterm><primary><devicename>cuau</devicename></primary></indexterm>
 
-    <para>The <devicename>ttyu<replaceable>N</replaceable></devicename> (or
-      <devicename>cuau<replaceable>N</replaceable></devicename>) device is the
-      regular device you will want to open for your applications.  When a
-      process opens the device, it will have a default set of terminal I/O
-      settings.  You can see these settings with the command</para>
-
-    <screen>&prompt.root; <userinput>stty -a -f /dev/ttyu1</userinput></screen>
-
-    <para>When you change the settings to this device, the settings are in
-      effect until the device is closed.  When it is reopened, it goes back to
-      the default set.  To make changes to the default set, you can open and
-      adjust the settings of the <quote>initial state</quote> device. For
-      example, to turn on <option>CLOCAL</option> mode, 8 bit communication,
-      and <option>XON/XOFF</option> flow control by default for
-      <devicename>ttyu5</devicename>, type:</para>
+      <para>The
+	<devicename>ttyu<replaceable>N</replaceable></devicename> (or
+	<devicename>cuau<replaceable>N</replaceable></devicename>)
+	device is the regular device you will want to open for your
+	applications.  When a process opens the device, it will have a
+	default set of terminal I/O settings.  You can see these
+	settings with the command</para>
+
+      <screen>&prompt.root; <userinput>stty -a -f /dev/ttyu1</userinput></screen>
+
+      <para>When you change the settings to this device, the settings
+	are in effect until the device is closed.  When it is
+	reopened, it goes back to the default set.  To make changes to
+	the default set, you can open and adjust the settings of the
+	<quote>initial state</quote> device.  For example, to turn on
+	<option>CLOCAL</option> mode, 8 bit communication, and
+	<option>XON/XOFF</option> flow control by default for
+	<devicename>ttyu5</devicename>, type:</para>
 
     <screen>&prompt.root; <userinput>stty -f /dev/ttyu5.init clocal cs8 ixon ixoff</userinput></screen>
 
-    <indexterm>
-      <primary>rc files</primary>
-      <secondary><filename>rc.serial</filename></secondary>
-    </indexterm>
-
-    <para>System-wide initialization of the serial devices is
-      controlled in <filename>/etc/rc.d/serial</filename>.  This file
-      affects the default settings of serial devices.</para>
-
-    <para>To prevent certain settings from being changed by an
-      application, make adjustments to the <quote>lock state</quote>
-      device.  For example, to lock the speed of
-      <devicename>ttyu5</devicename> to 57600&nbsp;bps, type:</para>
+      <indexterm>
+	<primary>rc files</primary>
+	<secondary><filename>rc.serial</filename></secondary>
+      </indexterm>
+
+      <para>System-wide initialization of the serial devices is
+	controlled in <filename>/etc/rc.d/serial</filename>.  This
+	file affects the default settings of serial devices.</para>
+
+      <para>To prevent certain settings from being changed by an
+	application, make adjustments to the <quote>lock state</quote>
+	device.  For example, to lock the speed of
+	<devicename>ttyu5</devicename> to 57600&nbsp;bps, type:</para>
 
     <screen>&prompt.root; <userinput>stty -f /dev/ttyu5.lock 57600</userinput></screen>
 
-    <para>Now, an application that opens
-      <devicename>ttyu5</devicename> and tries to change the speed of
-      the port will be stuck with 57600&nbsp;bps.</para>
-
-    <para>Naturally, you should make the initial state and lock state devices
-      writable only by the <username>root</username> account.</para>
+      <para>Now, an application that opens
+	<devicename>ttyu5</devicename> and tries to change the speed
+	of the port will be stuck with 57600&nbsp;bps.</para>
+
+      <para>Naturally, you should make the initial state and lock
+	state devices writable only by the <username>root</username>
+	account.</para>
     </sect2>
   </sect1>
 
@@ -706,33 +723,35 @@ sio3: type 16550A</screen>
     <indexterm><primary>terminals</primary></indexterm>
 
     <para>Terminals provide a convenient and low-cost way to access
-      your FreeBSD system when you are not at the computer's console or on
-      a connected network.  This section describes how to use terminals with
-      FreeBSD.</para>
+      your FreeBSD system when you are not at the computer's console
+      or on a connected network.  This section describes how to use
+      terminals with FreeBSD.</para>
 
     <sect2 id="term-uses">
       <title>Uses and Types of Terminals</title>
 
-      <para>The original &unix; systems did not have consoles.  Instead, people
-	logged in and ran programs through terminals that were connected to
-	the computer's serial ports.  It is quite similar to using a modem and
-	terminal software to dial into a remote system to do text-only
-	work.</para>
-
-      <para>Today's PCs have consoles capable of high quality graphics, but
-	the ability to establish a login session on a serial port still exists
-	in nearly every &unix; style operating system today; FreeBSD is no
-	exception.  By using a terminal attached to an unused serial port, you
-	can log in and run any text program that you would normally run on the
-	console or in an <command>xterm</command> window in the X Window
-	System.</para>
-
-      <para>For the business user, you can attach many terminals to a FreeBSD
-	system and place them on your employees' desktops.  For a home user, a
-	spare computer such as an older IBM PC or a &macintosh; can be a
-	terminal wired into a more powerful computer running FreeBSD.  You can
-	turn what might otherwise be a single-user computer into a powerful
-	multiple user system.</para>
+      <para>The original &unix; systems did not have consoles.
+	Instead, people logged in and ran programs through terminals
+	that were connected to the computer's serial ports.  It is
+	quite similar to using a modem and terminal software to dial
+	into a remote system to do text-only work.</para>
+
+      <para>Today's PCs have consoles capable of high quality
+	graphics, but the ability to establish a login session on a
+	serial port still exists in nearly every &unix; style
+	operating system today; FreeBSD is no exception.  By using a
+	terminal attached to an unused serial port, you can log in and
+	run any text program that you would normally run on the
+	console or in an <command>xterm</command> window in the X
+	Window System.</para>
+
+      <para>For the business user, you can attach many terminals to a
+	FreeBSD system and place them on your employees' desktops.
+	For a home user, a spare computer such as an older IBM PC or a
+	&macintosh; can be a terminal wired into a more powerful
+	computer running FreeBSD. You can turn what might otherwise be
+	a single-user computer into a powerful multiple user
+	system.</para>
 
       <para>For FreeBSD, there are three kinds of terminals:</para>
 
@@ -742,7 +761,8 @@ sio3: type 16550A</screen>
 	</listitem>
 
 	<listitem>
-	  <para><link linkend="term-pcs">PCs acting as terminals</link></para>
+	  <para><link linkend="term-pcs">PCs acting as
+	      terminals</link></para>
 	</listitem>
 
 	<listitem>
@@ -755,39 +775,41 @@ sio3: type 16550A</screen>
       <sect3 id="term-dumb">
 	<title>Dumb Terminals</title>
 
-	<para>Dumb terminals are specialized pieces of hardware that let you
-	  connect to computers over serial lines.  They are called
-	  <quote>dumb</quote> because they have only enough computational power
-	  to display, send, and receive text.  You cannot run any programs on
-	  them.  It is the computer to which you connect them that has all the
-	  power to run text editors, compilers, email, games, and so
-	  forth.</para>
-
-	<para>There are hundreds of kinds of dumb terminals made by many
-	  manufacturers, including Digital Equipment Corporation's VT-100 and
-	  Wyse's WY-75.  Just about any kind will work with FreeBSD. Some
-	  high-end terminals can even display graphics, but only certain
-	  software packages can take advantage of these advanced
-	  features.</para>
-
-	<para>Dumb terminals are popular in work environments where workers do
-	  not need access to graphical applications such as those provided by
-	  the X Window System.</para>
+	<para>Dumb terminals are specialized pieces of hardware that
+	  let you connect to computers over serial lines.  They are
+	  called <quote>dumb</quote> because they have only enough
+	  computational power to display, send, and receive text.  You
+	  cannot run any programs on them.  It is the computer to
+	  which you connect them that has all the power to run text
+	  editors, compilers, email, games, and so forth.</para>
+
+	<para>There are hundreds of kinds of dumb terminals made by
+	  many manufacturers, including Digital Equipment
+	  Corporation's VT-100 and Wyse's WY-75.  Just about any kind
+	  will work with FreeBSD. Some high-end terminals can even
+	  display graphics, but only certain software packages can
+	  take advantage of these advanced features.</para>
+
+	<para>Dumb terminals are popular in work environments where
+	  workers do not need access to graphical applications such as
+	  those provided by the X Window System.</para>
       </sect3>
 
       <sect3 id="term-pcs">
 	<title>PCs Acting as Terminals</title>
 
-	<para>If a <link linkend="term-dumb">dumb terminal</link> has just
-	  enough ability to display, send, and receive text, then certainly
-	  any spare personal computer can be a dumb terminal. All you need is
-	  the proper cable and some <emphasis>terminal emulation</emphasis>
-	  software to run on the computer.</para>
-
-	<para>Such a configuration is popular in homes.  For example, if your
-	  spouse is busy working on your FreeBSD system's console, you can do
-	  some text-only work at the same time from a less powerful personal
-	  computer hooked up as a terminal to the FreeBSD system.</para>
+	<para>If a <link linkend="term-dumb">dumb terminal</link> has
+	  just enough ability to display, send, and receive text, then
+	  certainly any spare personal computer can be a dumb
+	  terminal.  All you need is the proper cable and some
+	  <emphasis>terminal emulation</emphasis> software to run on
+	  the computer.</para>
+
+	<para>Such a configuration is popular in homes.  For example,
+	  if your spouse is busy working on your FreeBSD system's
+	  console, you can do some text-only work at the same time
+	  from a less powerful personal computer hooked up as a
+	  terminal to the FreeBSD system.</para>
 
 	<para>There are at least two utilities in the base-system of
 	  &os; that can be used to work through a serial connection:
@@ -807,19 +829,19 @@ sio3: type 16550A</screen>
 	  port number.</para>
 
 	<note>
-	  <para>Note that device numbers in &os; start from zero and not
-	    one (like they do, for instance in &ms-dos;-derived systems).
-	    This means that what &ms-dos;-based systems call
-	    <devicename>COM1</devicename> is usually
+	  <para>Note that device numbers in &os; start from zero and
+	    not one (like they do, for instance in &ms-dos;-derived
+	    systems).  This means that what &ms-dos;-based systems
+	    call <devicename>COM1</devicename> is usually
 	    <filename>/dev/cuau0</filename> in &os;.</para>
 	</note>
 
 	<note>
 	  <para>Some people prefer to use other programs, available
-	    through the Ports Collection.  The Ports include quite a few
-	    utilities which can work in ways similar to &man.cu.1; and
-	    &man.tip.1;,
-	    i.e., <filename role="package">comms/minicom</filename>.</para>
+	    through the Ports Collection.  The Ports include quite a
+	    few utilities which can work in ways similar to &man.cu.1;
+	    and &man.tip.1;, i.e., <filename
+	      role="package">comms/minicom</filename>.</para>
 	</note>
       </sect3>
 
@@ -827,23 +849,26 @@ sio3: type 16550A</screen>
 	<title>X Terminals</title>
 
 	<para>X terminals are the most sophisticated kind of terminal
-	  available.  Instead of connecting to a serial port, they usually
-	  connect to a network like Ethernet.  Instead of being relegated to
-	  text-only applications, they can display any X application.</para>
-
-	<para>We introduce X terminals just for the sake of completeness.
-	  However, this chapter does <emphasis>not</emphasis> cover setup,
-	  configuration, or use of X terminals.</para>
+	  available.  Instead of connecting to a serial port, they
+	  usually connect to a network like Ethernet.  Instead of
+	  being relegated to text-only applications, they can display
+	  any X application.</para>
+
+	<para>We introduce X terminals just for the sake of
+	  completeness.  However, this chapter does
+	  <emphasis>not</emphasis> cover setup, configuration, or use
+	  of X terminals.</para>
       </sect3>
     </sect2>
 
     <sect2 id="term-config">
       <title>Configuration</title>
 
-      <para>This section describes what you need to configure on your FreeBSD
-	system to enable a login session on a terminal.  It assumes you have
-	already configured your kernel to support the serial port to which the
-	terminal is connected&mdash;and that you have connected it.</para>
+      <para>This section describes what you need to configure on your
+	FreeBSD system to enable a login session on a terminal.  It
+	assumes you have already configured your kernel to support the
+	serial port to which the terminal is connected&mdash;and that
+	you have connected it.</para>
 
       <para>Recall from <xref linkend="boot"/> that the
 	<command>init</command> process is responsible for all process
@@ -856,18 +881,19 @@ sio3: type 16550A</screen>
 	program.</para>
 
       <para>Thus, to configure terminals for your FreeBSD system the
-	following steps should be taken as <username>root</username>:</para>
+	following steps should be taken as
+	<username>root</username>:</para>
 
       <procedure>
 	<step>
-	  <para>Add a line to <filename>/etc/ttys</filename> for the entry in
-	    the <filename>/dev</filename> directory for the serial port if it
-	    is not already there.</para>
+	  <para>Add a line to <filename>/etc/ttys</filename> for the
+	    entry in the <filename>/dev</filename> directory for the
+	    serial port if it is not already there.</para>
 	</step>
 
 	<step>
-	  <para>Specify that <command>/usr/libexec/getty</command> be run on
-	    the port, and specify the appropriate
+	  <para>Specify that <command>/usr/libexec/getty</command>
+	    be run on the port, and specify the appropriate
 	    <replaceable>getty</replaceable> type from the
 	    <filename>/etc/gettytab</filename> file.</para>
 	</step>
@@ -892,31 +918,34 @@ sio3: type 16550A</screen>
       </procedure>
 
       <para>As an optional step, you may wish to create a custom
-	<replaceable>getty</replaceable> type for use in step 2 by making an
-	entry in <filename>/etc/gettytab</filename>.  This chapter does
-	not explain how to do so; you are encouraged to see the
-	  &man.gettytab.5; and the &man.getty.8; manual pages for more
-	information.</para>
+	<replaceable>getty</replaceable> type for use in step 2 by
+	making an entry in <filename>/etc/gettytab</filename>.  This
+	chapter does not explain how to do so; you are encouraged to
+	see the &man.gettytab.5; and the &man.getty.8; manual pages
+	for more information.</para>
 
       <sect3 id="term-etcttys">
-	<title>Adding an Entry to <filename>/etc/ttys</filename></title>
+	<title>Adding an Entry to
+	  <filename>/etc/ttys</filename></title>
 
-	<para>The <filename>/etc/ttys</filename> file lists all of the ports
-	  on your FreeBSD system where you want to allow logins.  For example,
-	  the first virtual console <devicename>ttyv0</devicename> has an entry
-	  in this file.  You can log in on the console using this entry.  This
-	  file also contains entries for the other virtual consoles, serial
-	  ports, and pseudo-ttys.  For a hardwired terminal, just list the
-	  serial port's <filename>/dev</filename> entry without the
-	  <filename>/dev</filename> part (for example,
+	<para>The <filename>/etc/ttys</filename> file lists all of the
+	  ports on your FreeBSD system where you want to allow logins.
+	  For example, the first virtual console
+	  <devicename>ttyv0</devicename> has an entry in this file.
+	  You can log in on the console using this entry.  This
+	  file also contains entries for the other virtual consoles,
+	  serial ports, and pseudo-ttys.  For a hardwired terminal,
+	  just list the serial port's <filename>/dev</filename> entry
+	  without the <filename>/dev</filename> part (for example,
 	  <filename>/dev/ttyv0</filename> would be listed as
 	  <devicename>ttyv0</devicename>).</para>
 
 	<para>A default FreeBSD install includes an
-	  <filename>/etc/ttys</filename> file with support for the first
-	  four serial ports: <devicename>ttyu0</devicename> through
-	  <devicename>ttyu3</devicename>.  If you are attaching a terminal
-	  to one of those ports, you do not need to add another entry.</para>
+	  <filename>/etc/ttys</filename> file with support for the
+	  first four serial ports: <devicename>ttyu0</devicename>
+	  through <devicename>ttyu3</devicename>.  If you are
+	  attaching a terminal to one of those ports, you do not need
+	  to add another entry.</para>
 
 	<example id="ex-etc-ttys">
 	  <title>Adding Terminal Entries to
@@ -937,14 +966,13 @@ sio3: type 16550A</screen>
 	      id="co-ttys-line1col3"/>  on<co
 	      id="co-ttys-line1col4"/>  insecure<co
 	      id="co-ttys-line1col5"/>
-ttyu5   "/usr/libexec/getty std.19200"  vt100  on  insecure
-	  </programlisting>
+ttyu5   "/usr/libexec/getty std.19200"  vt100  on insecure</programlisting>
 
 	  <calloutlist>
 	    <callout arearefs="co-ttys-line1col1">
 	      <para>The first field normally specifies the name of
-	      the terminal special file as it is found in
-	      <filename>/dev</filename>.</para>
+		the terminal special file as it is found in
+		<filename>/dev</filename>.</para>
 	    </callout>
 
 	    <callout arearefs="co-ttys-line1col2">
@@ -959,18 +987,18 @@ ttyu5   "/usr/libexec/getty std.19200"  
 		<replaceable>getty</replaceable> type.  A
 		<replaceable>getty</replaceable> type configures
 		characteristics on the terminal line, like bps rate
-		and parity. The <command>getty</command> program reads
-		these characteristics from the file
+		and parity.  The <command>getty</command> program
+		reads these characteristics from the file
 		<filename>/etc/gettytab</filename>.</para>
 
 	      <para>The file <filename>/etc/gettytab</filename>
 		contains lots of entries for terminal lines both old
 		and new.  In almost all cases, the entries that start
 		with the text <literal>std</literal> will work for
-		hardwired terminals. These entries ignore parity.
+		hardwired terminals.  These entries ignore parity.
 		There is a <literal>std</literal> entry for each bps
 		rate from 110 to 115200.  Of course, you can add your
-		own entries to this file. The &man.gettytab.5; manual
+		own entries to this file.  The &man.gettytab.5; manual
 		page provides more information.</para>
 
 	      <para>When setting the <replaceable>getty</replaceable>
@@ -979,8 +1007,8 @@ ttyu5   "/usr/libexec/getty std.19200"  
 		match.</para>
 
 	      <para>For our example, the Wyse-50 uses no parity and
-		connects at 38400&nbsp;bps.  The 286&nbsp;PC uses no parity
-		and connects at 19200&nbsp;bps.</para>
+		connects at 38400&nbsp;bps.  The 286&nbsp;PC uses no
+		parity and connects at 19200&nbsp;bps.</para>
 	    </callout>
 
 	    <callout arearefs="co-ttys-line1col3">
@@ -1038,13 +1066,15 @@ ttyu5   "/usr/libexec/getty std.19200"  
 	<para>After making the necessary changes to the
 	  <filename>/etc/ttys</filename> file you should send a SIGHUP
 	  (hangup) signal to the <command>init</command> process to
-	  force it to re-read its configuration file.  For example:</para>
+	  force it to re-read its configuration file.  For
+	  example:</para>
 
 	<screen>&prompt.root; <userinput>kill -HUP 1</userinput></screen>
 
 	<note>
-	  <para><command>init</command> is always the first process run
-	    on a system, therefore it will always have PID 1.</para>
+	  <para><command>init</command> is always the first process
+	    run on a system, therefore it will always have PID
+	    1.</para>
 	</note>
 
 	<para>If everything is set up correctly, all cables are in
@@ -1058,31 +1088,31 @@ ttyu5   "/usr/libexec/getty std.19200"  
     <sect2 id="term-debug">
       <title>Troubleshooting Your Connection</title>
 
-      <para>Even with the most meticulous attention to detail, something could
-	still go wrong while setting up a terminal.  Here is a list of
-	symptoms and some suggested fixes.</para>
+      <para>Even with the most meticulous attention to detail,
+	something could still go wrong while setting up a terminal.
+	Here is a list of symptoms and some suggested fixes.</para>
 
       <sect3>
 	<title>No Login Prompt Appears</title>
 
-	<para>Make sure the terminal is plugged in and powered up. If it
-	  is a personal computer acting as a terminal, make sure it is
-	  running terminal emulation software on the correct serial
+	<para>Make sure the terminal is plugged in and powered up.  If
+	  it is a personal computer acting as a terminal, make sure it
+	  is running terminal emulation software on the correct serial
 	  port.</para>
 
-	<para>Make sure the cable is connected firmly to both the terminal
-	  and the FreeBSD computer.  Make sure it is the right kind of
-	  cable.</para>
-
-	<para>Make sure the terminal and FreeBSD agree on the bps rate and
-	  parity settings.  If you have a video display terminal, make
-	  sure the contrast and brightness controls are turned up.  If it
-	  is a printing terminal, make sure paper and ink are in good
-	  supply.</para>
-
-	<para>Make sure that a <command>getty</command> process is running
-	  and serving the terminal.  For example, to get a list of
-	  running <command>getty</command> processes with
+	<para>Make sure the cable is connected firmly to both the
+	  terminal and the FreeBSD computer.  Make sure it is the
+	  right kind of cable.</para>
+
+	<para>Make sure the terminal and FreeBSD agree on the bps rate
+	  and parity settings.  If you have a video display terminal,
+	  make sure the contrast and brightness controls are turned
+	  up.  If it is a printing terminal, make sure paper and ink
+	  are in good supply.</para>
+
+	<para>Make sure that a <command>getty</command> process is
+	  running and serving the terminal.  For example, to get a
+	  list of running <command>getty</command> processes with
 	  <command>ps</command>, type:</para>
 
 	<screen>&prompt.root; <userinput>ps -axww|grep getty</userinput></screen>
@@ -1096,24 +1126,25 @@ ttyu5   "/usr/libexec/getty std.19200"  
 
 	<screen>22189  d1  Is+    0:00.03 /usr/libexec/getty std.38400 ttyu1</screen>
 
-	<para>If no <command>getty</command> process is running, make sure
-	  you have enabled the port in <filename>/etc/ttys</filename>.
-	  Also remember to run <command>kill -HUP 1</command>
-	  after modifying the <filename>ttys</filename> file.</para>
+	<para>If no <command>getty</command> process is running, make
+	  sure you have enabled the port in
+	  <filename>/etc/ttys</filename>.  Also remember to run
+	  <command>kill -HUP 1</command> after modifying the
+	  <filename>ttys</filename> file.</para>
 
 	<para>If the <command>getty</command> process is running
 	  but the terminal still does not display a login prompt,
 	  or if it displays a prompt but will not allow you to
 	  type, your terminal or cable may not support hardware
-	  handshaking. Try changing the entry in
+	  handshaking.  Try changing the entry in
 	  <filename>/etc/ttys</filename> from
 	  <literal>std.38400</literal> to
 	  <literal>3wire.38400</literal> (remember to run
 	  <command>kill -HUP 1</command> after modifying
-	  <filename>/etc/ttys</filename>). The
+	  <filename>/etc/ttys</filename>).  The
 	  <literal>3wire</literal> entry is similar to
 	  <literal>std</literal>, but ignores hardware
-	  handshaking. You may need to reduce the baud rate or
+	  handshaking.  You may need to reduce the baud rate or
 	  enable software flow control when using
 	  <literal>3wire</literal> to prevent buffer
 	  overflows.</para>
@@ -1123,12 +1154,12 @@ ttyu5   "/usr/libexec/getty std.19200"  
       <sect3>
 	<title>If Garbage Appears Instead of a Login Prompt</title>
 
-	<para>Make sure the terminal and FreeBSD agree on the bps rate and
-	  parity settings.  Check the <command>getty</command> processes
-	  to make sure the
-	  correct <replaceable>getty</replaceable> type is in use.  If
-	  not, edit <filename>/etc/ttys</filename> and run <command>kill
-	  -HUP 1</command>.</para>
+	<para>Make sure the terminal and FreeBSD agree on the bps rate
+	  and parity settings.  Check the <command>getty</command>
+	  processes to make sure the correct
+	  <replaceable>getty</replaceable> type is in use.  If not,
+	  edit <filename>/etc/ttys</filename> and run <command>kill
+	    -HUP 1</command>.</para>
 
       </sect3>
 
@@ -1137,8 +1168,8 @@ ttyu5   "/usr/libexec/getty std.19200"  
 	  Typed</title>
 
 	<para>Switch the terminal (or the terminal emulation software)
-	  from <quote>half duplex</quote> or <quote>local echo</quote> to
-	  <quote>full duplex.</quote></para>
+	  from <quote>half duplex</quote> or <quote>local echo</quote>
+	  to <quote>full duplex.</quote></para>
 
       </sect3>
     </sect2>
@@ -1181,24 +1212,26 @@ ttyu5   "/usr/libexec/getty std.19200"  
       similar to connecting terminals except that you are dealing with
       modems instead of terminals.</para>
 
-      <sect2>
-	<title>External Versus Internal Modems</title>
+    <sect2>
+      <title>External Versus Internal Modems</title>
 
-	<para>External modems seem to be more convenient for dial-up, because
-	  external modems often can be semi-permanently configured via
-	  parameters stored in non-volatile RAM and they usually provide
-	  lighted indicators that display the state of important RS-232
-	  signals.  Blinking lights impress visitors, but lights are also very
-	  useful to see whether a modem is operating properly.</para>
-
-	<para>Internal modems usually lack non-volatile RAM, so their
-	  configuration may be limited only to setting DIP switches.  If your
-	  internal modem has any signal indicator lights, it is probably
-	  difficult to view the lights when the system's cover is in
-	  place.</para>
+      <para>External modems seem to be more convenient for dial-up,
+	because external modems often can be semi-permanently
+	configured via parameters stored in non-volatile RAM and they
+	usually provide lighted indicators that display the state of
+	important RS-232 signals.  Blinking lights impress visitors,
+	but lights are also very useful to see whether a modem is
+	operating properly.</para>
+
+      <para>Internal modems usually lack non-volatile RAM, so their
+	configuration may be limited only to setting DIP switches.
+	If your internal modem has any signal indicator lights, it is
+	probably difficult to view the lights when the system's cover
+	is in place.</para>
 
       <sect3>

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

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 15:35: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])
 by hub.freebsd.org (Postfix) with ESMTP id 6E1145E8;
 Mon, 28 Jan 2013 15:35:07 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 44F3637D;
 Mon, 28 Jan 2013 15:35:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SFZ7Xs019966;
 Mon, 28 Jan 2013 15:35:07 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SFZ78c019965;
 Mon, 28 Jan 2013 15:35:07 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201301281535.r0SFZ78c019965@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Mon, 28 Jan 2013 15:35:07 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40784 - head/en_US.ISO8859-1/books/handbook/multimedia
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, 28 Jan 2013 15:35:07 -0000

Author: dru
Date: Mon Jan 28 15:35:06 2013
New Revision: 40784
URL: http://svnweb.freebsd.org/changeset/doc/40784

Log:
  White space fix only. Translators can ignore.
  
  Approved by:  bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml	Mon Jan 28 15:15:46 2013	(r40783)
+++ head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml	Mon Jan 28 15:35:06 2013	(r40784)
@@ -6,19 +6,20 @@
 -->
 
 <chapter id="multimedia">
- <chapterinfo>
-  <authorgroup>
-   <author>
-    <firstname>Ross</firstname>
-    <surname>Lippert</surname>
-    <contrib>Edited by </contrib>
-   </author>
-  </authorgroup>
- </chapterinfo>
+  <chapterinfo>
+    <authorgroup>
+      <author>
+	<firstname>Ross</firstname>
+	<surname>Lippert</surname>
+	<contrib>Edited by </contrib>
+      </author>
+    </authorgroup>
+  </chapterinfo>
+
+  <title>Multimedia</title>
 
- <title>Multimedia</title>
   <sect1 id="multimedia-synopsis">
-  <title>Synopsis</title>
+    <title>Synopsis</title>
 
     <para>FreeBSD supports a wide variety of sound cards, allowing you
       to enjoy high fidelity output from your computer.  This includes
@@ -32,10 +33,10 @@
       playback of video files and DVDs.  The number of applications
       to encode, convert, and playback various video media is more
       limited than the number of sound applications.  For example as
-      of this writing, there are no good re-encoding applications in the
-      FreeBSD Ports Collection that could be used to convert
+      of this writing, there are no good re-encoding applications
+      in the FreeBSD Ports Collection that could be used to convert
       between formats, as there is with <filename
-      role="package">audio/sox</filename>.  However, the software
+	role="package">audio/sox</filename>.  However, the software
       landscape in this area is changing rapidly.</para>
 
     <para>This chapter will describe the necessary steps to configure
@@ -48,37 +49,38 @@
 
     <itemizedlist>
       <listitem>
-        <para>How to configure your system so that your sound card is
-          recognized.</para>
+	<para>How to configure your system so that your sound card
+	  is recognized.</para>
       </listitem>
 
       <listitem>
-        <para>Methods to test whether your card is working.</para>
+	<para>Methods to test whether your card is working.</para>
       </listitem>
 
       <listitem>
-        <para>How to troubleshoot your sound setup.</para>
+	<para>How to troubleshoot your sound setup.</para>
       </listitem>
 
       <listitem>
-        <para>How to playback and encode MP3s and other audio.</para>
+	<para>How to playback and encode MP3s and other audio.</para>
       </listitem>
 
       <listitem>
-        <para>How video is supported by the X server.</para>
+	<para>How video is supported by the X server.</para>
       </listitem>
 
       <listitem>
-        <para>Some video player/encoder ports which give good results.</para>
+	<para>Some video player/encoder ports which give good
+	  results.</para>
       </listitem>
 
       <listitem>
-        <para>How to playback DVDs, <filename>.mpg</filename> and
-          <filename>.avi</filename> files.</para>
+	<para>How to playback DVDs, <filename>.mpg</filename> and
+	  <filename>.avi</filename> files.</para>
       </listitem>
 
       <listitem>
-        <para>How to rip CD and DVD content into files.</para>
+	<para>How to rip CD and DVD content into files.</para>
       </listitem>
 
       <listitem>
@@ -93,16 +95,15 @@
     <para>Before reading this chapter, you should:</para>
 
     <itemizedlist>
-      <listitem><para>Know how to configure and install a new kernel (<xref
-        linkend="kernelconfig"/>).</para></listitem>
+      <listitem><para>Know how to configure and install a new kernel
+	(<xref linkend="kernelconfig"/>).</para></listitem>
     </itemizedlist>
 
     <warning>
-      <para>Trying to mount audio CDs
-        with the &man.mount.8; command will
-        result in an error, at least, and a <emphasis>kernel
-        panic</emphasis>, at worst.  These media have specialized
-        encodings which differ from the usual ISO-filesystem.</para>
+      <para>Trying to mount audio CDs with the &man.mount.8; command
+	will result in an error, at least, and a <emphasis>kernel
+	panic</emphasis>, at worst.  These media have specialized
+	encodings which differ from the usual ISO-filesystem.</para>
     </warning>
 
   </sect1>
@@ -110,49 +111,49 @@
   <sect1 id="sound-setup">
     <sect1info>
       <authorgroup>
-        <author>
-	 <firstname>Moses</firstname>
-	 <surname>Moore</surname>
-	 <contrib>Contributed by </contrib>
-	 <!-- 20 November 2000 -->
-        </author>
+	<author>
+	  <firstname>Moses</firstname>
+	  <surname>Moore</surname>
+	  <contrib>Contributed by </contrib>
+	  <!-- 20 November 2000 -->
+	</author>
       </authorgroup>
       <authorgroup>
-        <author>
-	 <firstname>Marc</firstname>
-	 <surname>Fonvieille</surname>
-	 <contrib>Enhanced by </contrib>
-	 <!-- 13 September 2004 -->
-        </author>
+	<author>
+	  <firstname>Marc</firstname>
+	  <surname>Fonvieille</surname>
+	  <contrib>Enhanced by </contrib>
+	  <!-- 13 September 2004 -->
+	</author>
       </authorgroup>
     </sect1info>
 
     <title>Setting Up the Sound Card</title>
 
-  <sect2 id="sound-device">
-    <title>Configuring the System</title>
-
-    <indexterm><primary>PCI</primary></indexterm>
-    <indexterm><primary>ISA</primary></indexterm>
-    <indexterm><primary>sound cards</primary></indexterm>
-    <para>Before you begin, you should know the model of the card you
-      have, the chip it uses, and whether it is a PCI or ISA card.
-      FreeBSD supports a wide variety of both PCI and ISA cards.
-      Check the supported audio devices list of the <ulink
-      url="&rel.current.hardware;">Hardware Notes</ulink> to see if
-      your card is supported.  The Hardware Notes will also mention which
-      driver supports your card.</para>
+    <sect2 id="sound-device">
+      <title>Configuring the System</title>
 
-    <indexterm>
-      <primary>kernel</primary>
-      <secondary>configuration</secondary>
-    </indexterm>
-
-    <para>To use your sound device, you will need to load the proper
-      device driver.  This may be accomplished in one of two ways.
-      The easiest way is to simply load a kernel module for your sound
-      card with &man.kldload.8; which can either be done from the
-      command line:</para>
+      <indexterm><primary>PCI</primary></indexterm>
+      <indexterm><primary>ISA</primary></indexterm>
+      <indexterm><primary>sound cards</primary></indexterm>
+      <para>Before you begin, you should know the model of the card
+	you have, the chip it uses, and whether it is a PCI or ISA
+	card.  FreeBSD supports a wide variety of both PCI and ISA
+	cards.  Check the supported audio devices list of the <ulink
+	  url="&rel.current.hardware;">Hardware Notes</ulink> to
+	see if your card is supported.  The Hardware Notes will
+	also mention which driver supports your card.</para>
+
+      <indexterm>
+	<primary>kernel</primary>
+	<secondary>configuration</secondary>
+      </indexterm>
+
+      <para>To use your sound device, you will need to load the proper
+	device driver.  This may be accomplished in one of two ways.
+	The easiest way is to simply load a kernel module for your
+	sound card with &man.kldload.8; which can either be done from
+	the command line:</para>
 
     <screen>&prompt.root; <userinput>kldload snd_emu10k1</userinput></screen>
 
@@ -187,40 +188,42 @@
       recompiling your kernel, please see <xref
       linkend="kernelconfig"/>.</para>
 
-    <sect3>
-      <title>Configuring a Custom Kernel with Sound Support</title>
+  <sect3>
+    <title>Configuring a Custom Kernel with Sound Support</title>
+
+    <para>The first thing to do is add the audio framework driver
+      &man.sound.4; to the kernel; for that you will need to
+      add the following line to the kernel configuration file:</para>
+
+    <programlisting>device sound</programlisting>
 
-      <para>The first thing to do is add the audio framework driver
-	&man.sound.4; to the kernel; for that you will need to
-	add the following line to the kernel configuration file:</para>
-
-      <programlisting>device sound</programlisting>
-
-      <para>Next, you have to add the support for your sound card.
-	Therefore, you need to know which driver supports the card.
-	Check the supported audio devices list of the <ulink
+    <para>Next, you have to add the support for your sound card.
+      Therefore, you need to know which driver supports the card.
+      Check the supported audio devices list of the <ulink
 	url="&rel.current.hardware;">Hardware Notes</ulink>, to
-	determine the correct driver for your sound card.  For
-	example, a Creative &soundblaster; Live! sound card is
-	supported by the &man.snd.emu10k1.4; driver.  To add the support
-	for this card, use the following:</para>
+      determine the correct driver for your sound card.  For
+      example, a Creative &soundblaster; Live! sound card is
+      supported by the &man.snd.emu10k1.4; driver.  To add the support
+      for this card, use the following:</para>
 
       <programlisting>device snd_emu10k1</programlisting>
 
       <para>Be sure to read the manual page of the driver for the
-	syntax to use.  The explicit syntax for the kernel configuration
-	of every supported sound driver can also be found in the
-	<filename>/usr/src/sys/conf/NOTES</filename> file.</para>
-
-      <para>Non-PnP ISA sound cards may require you to provide the kernel
-	with information on the card settings (IRQ, I/O port,
-	etc), as is true of all non-PnP ISA cards.  This is done via the
-	<filename>/boot/device.hints</filename> file.  During the boot process,
-	the &man.loader.8; will read this file and pass the settings
-	to the kernel.  For example, an old
-	Creative &soundblaster; 16 ISA non-PnP card will use the
-	&man.snd.sbc.4; driver in conjunction with <literal>snd_sb16</literal>.  For this card the following lines must be added to
-	the kernel configuration file:</para>
+	syntax to use.  The explicit syntax for the kernel
+	configuration of every supported sound driver can also be
+	found in the <filename>/usr/src/sys/conf/NOTES</filename>
+	file.</para>
+
+      <para>Non-PnP ISA sound cards may require you to provide the
+	kernel with information on the card settings (IRQ, I/O port,
+	etc), as is true of all non-PnP ISA cards.  This is done via
+	the <filename>/boot/device.hints</filename> file.  During the
+	boot process, the &man.loader.8; will read this file and pass
+	the settings to the kernel.  For example, an old Creative
+	&soundblaster; 16 ISA non-PnP card will use the
+	&man.snd.sbc.4; driver in conjunction with
+	<literal>snd_sb16</literal>.  For this card the following
+	lines must be added to the kernel configuration file:</para>
 
       <programlisting>device snd_sbc
 device snd_sb16</programlisting>
@@ -270,33 +273,34 @@ pcm0: &lt;Intel ICH3 (82801CA)&gt; at io
 kld snd_ich (1p/2r/0v channels duplex default)</screen>
 
     <para>The output from your system may vary.  If no
-      <devicename>pcm</devicename> devices are listed, go back and review
-      what was done earlier.  Go through your kernel
+      <devicename>pcm</devicename> devices are listed, go back and
+      review what was done earlier.  Go through your kernel
       configuration file again and make sure the correct
       device driver was chosen.  Common problems are listed in <xref
-      linkend="troubleshooting"/>.</para>
+	linkend="troubleshooting"/>.</para>
 
     <para>If all goes well, you should now have a functioning sound
-      card.  If your CD-ROM or DVD-ROM drive's audio-out pins are properly connected to
-      your sound card, you can put a CD in the drive and play it
-      with &man.cdcontrol.1;:</para>
+      card.  If your CD-ROM or DVD-ROM drive's audio-out pins are
+      properly connected to your sound card, you can put a CD in the
+      drive and play it with &man.cdcontrol.1;:</para>
 
       <screen>&prompt.user; <userinput>cdcontrol -f /dev/acd0 play 1</userinput></screen>
 
     <para>Various applications, such as <filename
-      role="package">audio/workman</filename> can provide a friendlier
-      interface.  You may want to install an application such as
-      <filename role="package">audio/mpg123</filename> to listen to
-      MP3 audio files.</para>
+	role="package">audio/workman</filename> can provide a
+      friendlier interface.  You may want to install an application
+      such as <filename role="package">audio/mpg123</filename> to
+      listen to MP3 audio files.</para>
 
     <para>Another quick way to test the card is sending data
       to <filename>/dev/dsp</filename>, like this:</para>
 
     <screen>&prompt.user; <userinput>cat <replaceable>filename</replaceable> &gt; /dev/dsp</userinput></screen>
 
-    <para>where <filename><replaceable>filename</replaceable></filename> can be any file.
-      This command line should produce some noise, confirming the
-      sound card is actually working.</para>
+    <para>where
+      <filename><replaceable>filename</replaceable></filename> can
+      be any file.  This command line should produce some noise,
+      confirming the sound card is actually working.</para>
 
     <note>
       <para>The device nodes <filename>/dev/dsp*</filename> will be
@@ -318,52 +322,62 @@ kld snd_ich (1p/2r/0v channels duplex de
       <indexterm><primary>DSP</primary></indexterm>
 
       <informaltable frame="none" pgwide="1">
-         <tgroup cols="2">
-  	  <thead>
+	<tgroup cols="2">
+	  <thead>
 	    <row>
-	     <entry>Error</entry>
+	      <entry>Error</entry>
 	      <entry>Solution</entry>
 	    </row>
-          </thead>
+	  </thead>
 
 	  <tbody>
-            <row>
-              <entry><errorname>sb_dspwr(XX) timed out</errorname></entry>
-              <entry><para>The I/O port is not set correctly.</para></entry>
-            </row>
-
-            <row>
-              <entry><errorname>bad irq XX</errorname></entry>
-	      <entry><para>The IRQ is set incorrectly.  Make sure that
-  	        the set IRQ and the sound IRQ are the same.</para></entry>
-            </row>
-
-            <row>
-              <entry><errorname>xxx: gus pcm not attached, out of memory</errorname></entry>
-              <entry><para>There is not enough available memory to use
-                the device.</para></entry>
-            </row>
-
-            <row>
-              <entry><errorname>xxx: can't open /dev/dsp!</errorname></entry>
-              <entry><para>Check with <command>fstat | grep dsp</command>
-                if another application is holding the device open.
-                Noteworthy troublemakers are <application>esound</application> and <application>KDE</application>'s sound
-                support.</para></entry>
-            </row>
-          </tbody>
-        </tgroup>
+	    <row>
+	      <entry><errorname>sb_dspwr(XX) timed
+		  out</errorname></entry>
+	      <entry><para>The I/O port is not set
+		correctly.</para></entry>
+	    </row>
+
+	    <row>
+	      <entry><errorname>bad irq XX</errorname></entry>
+	      <entry><para>The IRQ is set incorrectly.  Make sure
+		that the set IRQ and the sound IRQ are the
+		same.</para></entry>
+	    </row>
+
+	    <row>
+	      <entry><errorname>xxx: gus pcm not attached, out of
+		  memory</errorname></entry>
+	      <entry><para>There is not enough available memory to
+		use the device.</para></entry>
+	    </row>
+
+	    <row>
+	      <entry><errorname>xxx: can't open
+		  /dev/dsp!</errorname></entry>
+	      <entry><para>Check with <command>fstat | grep
+		  dsp</command>
+		if another application is holding the device open.
+		Noteworthy troublemakers are
+		<application>esound</application> and
+		<application>KDE</application>'s sound
+		support.</para></entry>
+	    </row>
+	  </tbody>
+	</tgroup>
       </informaltable>
 
-      <para>Another issue is that modern graphics cards often come with their
-        own sound driver, for use with <acronym>HDMI</acronym> and similar.
-        This sound device will sometimes be enumerated before the actual
-        soundcard and the soundcard will subsequently not be used as the
-        default playback device.  To check if this is the case, run
-        <application>dmesg</application> and look for <literal>pcm</literal>.
-        The output looks something like this:</para>
+      <para>Another issue is that modern graphics cards often come
+	with their own sound driver, for use with
+	<acronym>HDMI</acronym> and similar.  This sound device will
+	sometimes be enumerated before the actual soundcard and the
+	soundcard will subsequently not be used as the default
+	playback device.  To check if this is the case, run
+	<application>dmesg</application> and look for
+	<literal>pcm</literal>.  The output looks something like
+	this:</para>
 
-<programlisting>...
+      <programlisting>...
 hdac0: HDA Driver Revision: 20100226_0142
 hdac1: HDA Driver Revision: 20100226_0142
 hdac0: HDA Codec #0: NVidia (Unknown)
@@ -381,18 +395,19 @@ pcm6: &lt;HDA Realtek ALC889 PCM #2 Digi
 pcm7: &lt;HDA Realtek ALC889 PCM #3 Digital&gt; at cad 2 nid 1 on hdac1
 ...</programlisting>
 
-      <para>Here the graphics card (<literal>NVidia</literal>) has been
-        enumerated before the sound card (<literal>Realtek ALC889</literal>).
-        To use the sound card as default playback device, change
-        <literal>hw.snd.default_unit</literal> to the unit that should be used
-        for playback, enter the following:</para>
+      <para>Here the graphics card (<literal>NVidia</literal>) has
+	been enumerated before the sound card (<literal>Realtek
+	ALC889</literal>).  To use the sound card as default playback
+	device, change <literal>hw.snd.default_unit</literal> to the
+	unit that should be used for playback, enter the
+	following:</para>
 
       <screen>&prompt.root; <userinput>sysctl hw.snd.default_unit=<replaceable>n</replaceable></userinput></screen>
 
-      <para>Here, <literal>n</literal> is the number of the sound device to
-        use, in this example <literal>4</literal>. You can make this change
-        permanent by adding the following line to
-        <filename>/etc/sysctl.conf</filename>:</para>
+      <para>Here, <literal>n</literal> is the number of the sound
+	device to use, in this example <literal>4</literal>. You can
+	make this change permanent by adding the following line to
+	<filename>/etc/sysctl.conf</filename>:</para>
 
       <programlisting>hw.snd.default_unit=<replaceable>4</replaceable></programlisting>
     </sect3>
@@ -400,13 +415,13 @@ pcm7: &lt;HDA Realtek ALC889 PCM #3 Digi
 
   <sect2 id="sound-multiple-sources">
     <sect2info>
-     <authorgroup>
-      <author>
-       <firstname>Munish</firstname>
-       <surname>Chopra</surname>
-       <contrib>Contributed by </contrib>
-      </author>
-     </authorgroup>
+      <authorgroup>
+	<author>
+	  <firstname>Munish</firstname>
+	  <surname>Chopra</surname>
+	  <contrib>Contributed by </contrib>
+	</author>
+      </authorgroup>
     </sect2info>
     <title>Utilizing Multiple Sound Sources</title>
 
@@ -417,42 +432,45 @@ pcm7: &lt;HDA Realtek ALC889 PCM #3 Digi
       sound device with a certain application.</para>
 
     <para>FreeBSD lets you do this through <emphasis>Virtual Sound
-      Channels</emphasis>, which can be enabled with the &man.sysctl.8;
-      facility.  Virtual channels allow you to multiplex your sound
-      card's playback by mixing sound in the kernel.</para>
-
-    <para>To set the number of virtual channels, there are three sysctl
-      knobs which, if you are the <username>root</username> user, can
-      be set like this:</para>
+	Channels</emphasis>, which can be enabled with the
+      &man.sysctl.8; facility.  Virtual channels allow you to
+      multiplex your sound card's playback by mixing sound in the
+      kernel.</para>
+
+    <para>To set the number of virtual channels, there are three
+      sysctl knobs which, if you are the <username>root</username>
+      user, can be set like this:</para>
+
     <screen>&prompt.root; <userinput>sysctl dev.pcm.0.play.vchans=4</userinput>
 &prompt.root; <userinput>sysctl dev.pcm.0.rec.vchans=4</userinput>
 &prompt.root; <userinput>sysctl hw.snd.maxautovchans=4</userinput></screen>
 
-    <para>The above example allocates four virtual channels, which is a
-      practical number for everyday use.  Both <varname>dev.pcm.0.play.vchans=4</varname>
-      and <varname>dev.pcm.0.rec.vchans=4</varname>
-      are the number of virtual channels <devicename>pcm0</devicename> has for playback and recording, and are configurable
-      once a device has been attached.
-      <literal>hw.snd.maxautovchans</literal> is the number of virtual channels
-      a new audio device is given when it is attached using
-      &man.kldload.8;.  Since the <devicename>pcm</devicename> module
-      can be loaded independently of the hardware drivers,
-      <varname>hw.snd.maxautovchans</varname> can store how many
-      virtual channels any devices which are attached later will be
-      given.  Refer to &man.pcm.4; manual page for more
-      information.</para>
+    <para>The above example allocates four virtual channels, which
+      is a practical number for everyday use.  Both
+      <varname>dev.pcm.0.play.vchans=4</varname> and
+      <varname>dev.pcm.0.rec.vchans=4</varname> are the number of
+      virtual channels <devicename>pcm0</devicename> has for playback
+      and recording, and are configurable once a device has been
+      attached.  <literal>hw.snd.maxautovchans</literal> is the number
+      of virtual channels a new audio device is given when it is
+      attached using &man.kldload.8;.  Since the
+      <devicename>pcm</devicename> module can be loaded independently
+      of the hardware drivers, <varname>hw.snd.maxautovchans</varname>
+      can store how many virtual channels any devices which are
+      attached later will be given.  Refer to &man.pcm.4; manual page
+      for more information.</para>
 
     <note>
       <para>You cannot change the number of virtual channels for a
-	device while it is in use.  First close any programs using the
-	device, such as music players or sound daemons.</para>
+	device while it is in use.  First close any programs using
+	the device, such as music players or sound daemons.</para>
     </note>
 
     <para>
       The correct <devicename>pcm</devicename> device will
       automatically be allocated transparently to a program
       that requests <filename>/dev/dsp0</filename>.</para>
-   </sect2>
+  </sect2>
 
   <sect2>
     <sect2info>
@@ -468,32 +486,32 @@ pcm7: &lt;HDA Realtek ALC889 PCM #3 Digi
     <title>Setting Default Values for Mixer Channels</title>
 
     <para>The default values for the different mixer channels are
-      hardcoded in the sourcecode of the &man.pcm.4; driver.  There are
-      many different applications and daemons that allow
+      hardcoded in the sourcecode of the &man.pcm.4; driver.  There
+      are many different applications and daemons that allow
       you to set values for the mixer that are remembered between
       invocations, but this is not a clean solution.  It is possible
       to set default mixer values at the driver level &mdash; this
-      is accomplished by defining the appropriate
-      values in <filename>/boot/device.hints</filename>, e.g.:</para>
+      is accomplished by defining the appropriate values in
+      <filename>/boot/device.hints</filename>, e.g.:</para>
 
-<programlisting>hint.pcm.0.vol="50"</programlisting>
+    <programlisting>hint.pcm.0.vol="50"</programlisting>
 
     <para>This will set the volume channel to a default value of
       50 when the &man.pcm.4; module is loaded.</para>
   </sect2>
 </sect1>
 
-  <sect1 id="sound-mp3">
-    <sect1info>
-      <authorgroup>
-	<author>
-	  <firstname>Chern</firstname>
-	  <surname>Lee</surname>
-	  <contrib>Contributed by </contrib>
-	</author>
-      </authorgroup>
-      <!-- 11 Sept 2001 -->
-    </sect1info>
+<sect1 id="sound-mp3">
+  <sect1info>
+    <authorgroup>
+      <author>
+	<firstname>Chern</firstname>
+	<surname>Lee</surname>
+	<contrib>Contributed by </contrib>
+      </author>
+    </authorgroup>
+    <!-- 11 Sept 2001 -->
+  </sect1info>
 
     <title>MP3 Audio</title>
 
@@ -507,27 +525,29 @@ pcm7: &lt;HDA Realtek ALC889 PCM #3 Digi
       <para>By far, the most popular X11 MP3 player is
 	<application>XMMS</application> (X Multimedia System).
 	<application>Winamp</application>
-	skins can be used with <application>XMMS</application> since the
-	GUI is almost identical to that of Nullsoft's
+	skins can be used with <application>XMMS</application> since
+	the GUI is almost identical to that of Nullsoft's
 	<application>Winamp</application>.
 	<application>XMMS</application> also has native plug-in
 	support.</para>
 
-      <para><application>XMMS</application> can be installed from the
-	<filename role="package">multimedia/xmms</filename> port or package.</para>
+      <para><application>XMMS</application> can be installed from
+	the <filename role="package">multimedia/xmms</filename> port
+	or package.</para>
 
       <para><application>XMMS</application>'s interface is intuitive,
 	with a playlist, graphic equalizer, and more.  Those familiar
 	with <application>Winamp</application> will find
 	<application>XMMS</application> simple to use.</para>
 
-      <para>The <filename role="package">audio/mpg123</filename> port is an alternative,
-	command-line MP3 player.</para>
+      <para>The <filename role="package">audio/mpg123</filename> port
+	is an alternative, command-line MP3 player.</para>
 
       <para><application>mpg123</application> can be run by specifying
-	the sound device and the MP3 file on the command line.  Assuming your
-	audio device is <devicename>/dev/dsp1.0</devicename> and you want
-	to play the MP3 file <replaceable>Foobar-GreatestHits.mp3</replaceable>
+	the sound device and the MP3 file on the command line.
+	Assuming your audio device is
+	<devicename>/dev/dsp1.0</devicename> and you want to play the
+	MP3 file <replaceable>Foobar-GreatestHits.mp3</replaceable>
 	you would enter the following:</para>
 
       <screen>&prompt.root; <userinput>mpg123 -a <devicename>/dev/dsp1.0</devicename> <replaceable>Foobar-GreatestHits.mp3</replaceable></userinput>
@@ -541,8 +561,7 @@ THIS SOFTWARE COMES WITH ABSOLUTELY NO W
 
 
 Playing MPEG stream from Foobar-GreatestHits.mp3 ...
-MPEG 1.0 layer III, 128 kbit/s, 44100 Hz joint-stereo
-</screen>
+MPEG 1.0 layer III, 128 kbit/s, 44100 Hz joint-stereo</screen>
     </sect2>
 
     <sect2 id="rip-cd">
@@ -574,7 +593,7 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz
       <para>The <option>-D <replaceable>0,1,0</replaceable></option>
 	indicates the SCSI device <devicename>0,1,0</devicename>,
 	which corresponds to the output of <command>cdrecord
-	-scanbus</command>.</para>
+	  -scanbus</command>.</para>
 
       <para>To rip individual tracks, make use of the
 	<option>-t</option> option as shown:</para>
@@ -587,9 +606,10 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz
 
       <screen>&prompt.root; <userinput>cdda2wav -D <replaceable>0,1,0</replaceable> -t 1+7</userinput></screen>
 
-      <para>The utility &man.dd.1; can also be used to extract audio tracks
-	on ATAPI drives, read <xref linkend="duplicating-audiocds"/>
-	for more information on that possibility.</para>
+      <para>The utility &man.dd.1; can also be used to extract audio
+	tracks on ATAPI drives, read <xref
+	  linkend="duplicating-audiocds"/> for more information on
+	that possibility.</para>
 
     </sect2>
 
@@ -599,10 +619,13 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz
       <para>Nowadays, the mp3 encoder of choice is
 	<application>lame</application>.
 	<application>Lame</application> can be found at
-	<filename role="package">audio/lame</filename> in the ports tree.</para>
+	<filename role="package">audio/lame</filename> in the ports
+	tree.</para>
 
       <para>Using the ripped WAV files, the following command will
-	convert <filename><replaceable>audio01.wav</replaceable></filename> to
+	convert
+	<filename><replaceable>audio01.wav</replaceable></filename>
+	to
 	<filename><replaceable>audio01.mp3</replaceable></filename>:</para>
 
       <screen>&prompt.root; <userinput>lame -h -b <replaceable>128</replaceable> \
@@ -614,9 +637,9 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz
 --tg "<replaceable>Genre</replaceable>" \
 <replaceable>audio01.wav audio01.mp3</replaceable></userinput></screen>
 
-      <para>128&nbsp;kbits seems to be the standard MP3 bitrate in use.
-	Many enjoy the higher quality 160, or 192.  The higher the
-	bitrate, the more disk space the resulting MP3 will
+      <para>128&nbsp;kbits seems to be the standard MP3 bitrate in
+	use.  Many enjoy the higher quality 160, or 192.  The higher
+	the bitrate, the more disk space the resulting MP3 will
 	consume--but the quality will be higher.  The
 	<option>-h</option> option turns on the <quote>higher quality
 	but a little slower</quote> mode.  The options beginning with
@@ -632,8 +655,8 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz
       <para>In order to burn an audio CD from MP3s, they must be
 	converted to a non-compressed WAV format.  Both
 	<application>XMMS</application> and
-	<application>mpg123</application> support the output of MP3 to
-	an uncompressed file format.</para>
+	<application>mpg123</application> support the output of MP3
+	to an uncompressed file format.</para>
 
       <para>Writing to Disk in <application>XMMS</application>:</para>
 
@@ -685,58 +708,60 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz
 	</step>
       </procedure>
 
-      <para>Writing to stdout in <application>mpg123</application>:</para>
+      <para>Writing to stdout in
+	<application>mpg123</application>:</para>
 
       <procedure>
 	<step>
-	  <para>Run <command>mpg123 -s <replaceable>audio01.mp3</replaceable>
-	    &gt; <replaceable>audio01.pcm</replaceable></command></para>
+	  <para>Run <command>mpg123 -s
+	      <replaceable>audio01.mp3</replaceable> &gt;
+	      <replaceable>audio01.pcm</replaceable></command></para>
 	</step>
       </procedure>
 
       <para><application>XMMS</application> writes a file in the WAV
 	format, while <application>mpg123</application> converts the
 	MP3 into raw PCM audio data.  Both of these formats can be
-	used with <application>cdrecord</application> to create audio CDs.
-	You have to use raw PCM with &man.burncd.8;.
-	If you use WAV files, you will notice a small tick sound at the
+	used with <application>cdrecord</application> to create audio
+	CDs.  You have to use raw PCM with &man.burncd.8;.  If you
+	use WAV files, you will notice a small tick sound at the
 	beginning of each track, this sound is the header of the WAV
-	file.  You can simply remove the header of a WAV file with the
-	utility <application>SoX</application> (it can be installed from
-	the <filename role="package">audio/sox</filename> port or
-	package):</para>
+	file.  You can simply remove the header of a WAV file with
+	the utility <application>SoX</application> (it can be
+	installed from the <filename
+	  role="package">audio/sox</filename> port or package):</para>
 
       <screen>&prompt.user; <userinput>sox -t wav -r 44100 -s -w -c 2 <replaceable>track.wav track.raw</replaceable></userinput></screen>
 
-      <para>Read <xref linkend="creating-cds"/> for more information on using a
-	  CD burner in FreeBSD.</para>
+      <para>Read <xref linkend="creating-cds"/> for more information
+	on using a CD burner in FreeBSD.</para>
     </sect2>
- </sect1>
+  </sect1>
 
- <sect1 id="video-playback">
-  <sect1info>
-    <authorgroup>
-      <author>
-        <firstname>Ross</firstname>
-	<surname>Lippert</surname>
-	<contrib>Contributed by </contrib>
-      </author>
-    </authorgroup>
-    <!-- 5 June 2002 -->
-  </sect1info>
+  <sect1 id="video-playback">
+    <sect1info>
+      <authorgroup>
+	<author>
+	  <firstname>Ross</firstname>
+	  <surname>Lippert</surname>
+	  <contrib>Contributed by </contrib>
+	</author>
+      </authorgroup>
+      <!-- 5 June 2002 -->
+    </sect1info>
 
-  <title>Video Playback</title>
+    <title>Video Playback</title>
 
-    <para>Video playback is a very new and rapidly developing application
-      area.  Be patient.  Not everything is going to work as smoothly as
-      it did with sound.</para>
+    <para>Video playback is a very new and rapidly developing
+      application area.  Be patient.  Not everything is going to work
+      as smoothly as it did with sound.</para>
 
     <para>Before you begin, you should know the model of the video
-      card you have and the chip it uses.  While <application>&xorg;</application> supports a
-      wide variety of video cards, fewer give good playback
-      performance.  To obtain a list of extensions supported by the
-      X server using your card use the command &man.xdpyinfo.1; while
-      X11 is running.</para>
+      card you have and the chip it uses.  While
+      <application>&xorg;</application> supports a wide variety of
+      video cards, fewer give good playback performance.  To obtain
+      a list of extensions supported by the X server using your card
+      use the command &man.xdpyinfo.1; while X11 is running.</para>
 
     <para>It is a good idea to have a short MPEG file which can be
       treated as a test file for evaluating various players and
@@ -745,7 +770,7 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz
       name hardcoded in them, you might find it useful to make
       symbolic links to the proper devices:</para>
 
-      <screen>&prompt.root; <userinput>ln -sf /dev/acd0 /dev/dvd</userinput>
+    <screen>&prompt.root; <userinput>ln -sf /dev/acd0 /dev/dvd</userinput>
 &prompt.root; <userinput>ln -sf /dev/acd0 /dev/rdvd</userinput></screen>
 
     <para>Note that due to the nature of &man.devfs.5;,
@@ -765,7 +790,7 @@ link acd0 rdvd</programlisting>
       recommended that the values of some &man.sysctl.8; variables
       should be increased:</para>
 
-      <programlisting>kern.ipc.shmmax=67108864
+    <programlisting>kern.ipc.shmmax=67108864
 kern.ipc.shmall=32768</programlisting>
 
   <sect2 id="video-interface">
@@ -778,48 +803,55 @@ kern.ipc.shmall=32768</programlisting>
     <para>There are several possible ways to display video under X11.
       What will really work is largely hardware dependent.  Each
       method described below will have varying quality across
-      different hardware.  Secondly, the rendering of video in X11 is
-      a topic receiving a lot of attention lately, and with each
-      version of <application>&xorg;</application>, there may be significant improvement.</para>
+      different hardware.  Secondly, the rendering of video in X11
+      is a topic receiving a lot of attention lately, and with each
+      version of <application>&xorg;</application>, there may be
+      significant improvement.</para>
 
     <para>A list of common video interfaces:</para>
 
     <orderedlist>
-    <listitem>
-      <para>X11: normal X11 output using shared memory.</para>
-    </listitem>
-    <listitem>
-      <para>XVideo: an extension to the X11
-      interface which supports video in any X11 drawable.</para>
-    </listitem>
-    <listitem>
-      <para>SDL: the Simple Directmedia Layer.</para>
-    </listitem>
-    <listitem>
-      <para>DGA: the Direct Graphics Access.</para>
-    </listitem>
-    <listitem>
-      <para>SVGAlib: low level console graphics layer.</para>
-    </listitem>
+      <listitem>
+	<para>X11: normal X11 output using shared memory.</para>
+      </listitem>
+
+      <listitem>
+	<para>XVideo: an extension to the X11 interface which supports
+	  video in any X11 drawable.</para>
+      </listitem>
+
+      <listitem>
+	<para>SDL: the Simple Directmedia Layer.</para>
+      </listitem>
+
+      <listitem>
+	<para>DGA: the Direct Graphics Access.</para>
+      </listitem>
+
+      <listitem>
+	<para>SVGAlib: low level console graphics layer.</para>
+      </listitem>
     </orderedlist>
 
     <sect3 id="video-interface-xvideo">
-    <title>XVideo</title>
+      <title>XVideo</title>
 
       <para><application>&xorg;</application> has an extension called
-        <emphasis>XVideo</emphasis> (aka Xvideo, aka Xv, aka xv) which
-        allows video to be directly displayed in drawable objects
-        through a special acceleration.  This extension provides very
-        good quality playback even on low-end machines.</para>
+	<emphasis>XVideo</emphasis> (aka Xvideo, aka Xv, aka xv) which
+	allows video to be directly displayed in drawable objects
+	through a special acceleration.  This extension provides very
+	good quality playback even on low-end machines.</para>
 
-      <para>To check whether the extension is running,
-      use <command>xvinfo</command>:</para>
+      <para>To check whether the extension is running, use
+	<command>xvinfo</command>:</para>
 
-        <screen>&prompt.user; <userinput>xvinfo</userinput></screen>
+      <screen>&prompt.user; <userinput>xvinfo</userinput></screen>
 
-      <para>XVideo is supported for your card if the result looks like:</para>
-<screen>X-Video Extension version 2.2
-screen #0
+      <para>XVideo is supported for your card if the result looks
+	like:</para>
+
+      <screen>X-Video Extension version 2.2
+  screen #0
   Adaptor #0: "Savage Streams Engine"
     number of ports: 1
     port base: 43
@@ -887,12 +919,13 @@ screen #0
         depth: 1
         red, green, blue masks: 0x0, 0x0, 0x0</screen>
 
-    <para>Also note that the formats listed (YUV2, YUV12, etc) are not
-     present with every implementation of XVideo and their absence may
-     hinder some players.</para>
+    <para>Also note that the formats listed (YUV2, YUV12, etc) are
+      not present with every implementation of XVideo and their
+      absence may hinder some players.</para>
 
     <para>If the result looks like:</para>
-<screen>X-Video Extension version 2.2
+
+    <screen>X-Video Extension version 2.2
 screen #0
 no adaptors present</screen>
 
@@ -904,11 +937,11 @@ no adaptors present</screen>
       video card and processor, though, you might still be able to
       have a satisfying experience.  You should probably read about
       ways of improving performance in the advanced reading <xref
-      linkend="video-further-reading"/>.</para>
+	linkend="video-further-reading"/>.</para>
 
-    </sect3>
+  </sect3>
 
-    <sect3 id="video-interface-SDL">
+  <sect3 id="video-interface-SDL">
     <title>Simple Directmedia Layer</title>
 
     <para>The Simple Directmedia Layer, SDL, was intended to be a
@@ -918,11 +951,12 @@ no adaptors present</screen>
       low-level abstraction to the hardware which can sometimes be
       more efficient than the X11 interface.</para>
 
-    <para>The SDL can be found at <filename role="package">devel/sdl12</filename>.</para>
+    <para>The SDL can be found at <filename
+	role="package">devel/sdl12</filename>.</para>
 
-    </sect3>
+  </sect3>
 
-    <sect3 id="video-interface-DGA">
+  <sect3 id="video-interface-DGA">
     <title>Direct Graphics Access</title>
 
     <para>Direct Graphics Access is an X11 extension which allows
@@ -936,9 +970,8 @@ no adaptors present</screen>
       changes the colors of the display whenever a key is pressed.  To
       quit, use <keycap>q</keycap>.</para>
 
-    </sect3>
-
-  </sect2>
+  </sect3>
+</sect2>
 
   <sect2 id="video-ports">
     <title>Ports and Packages Dealing with Video</title>
@@ -958,101 +991,105 @@ no adaptors present</screen>
       beta-quality.  Some of the problems that you may encounter with
       video packages on FreeBSD include:</para>
 
-      <orderedlist>
+    <orderedlist>
 
       <listitem>
-        <para>An application cannot playback a file which another
-          application produced.</para>
+	<para>An application cannot playback a file which another
+	  application produced.</para>
       </listitem>
 
       <listitem>
-        <para>An application cannot playback a file which the
-          application itself produced.</para>
+	<para>An application cannot playback a file which the
+	  application itself produced.</para>
       </listitem>
 
       <listitem>
-        <para>The same application on two different machines,
-          rebuilt on each machine for that machine, plays back the same
-          file differently.</para>
+	<para>The same application on two different machines,
+	  rebuilt on each machine for that machine, plays back the
+	  same file differently.</para>
       </listitem>
 
       <listitem>
-        <para>A seemingly trivial filter like rescaling of the image
-          size results in very bad artifacts from a buggy rescaling
-          routine.</para>
+	<para>A seemingly trivial filter like rescaling of the image
+	  size results in very bad artifacts from a buggy rescaling

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

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 15:53:25 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])
 by hub.freebsd.org (Postfix) with ESMTP id 88788135;
 Mon, 28 Jan 2013 15:53:25 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 762DB750;
 Mon, 28 Jan 2013 15:53:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SFrPPV025509;
 Mon, 28 Jan 2013 15:53:25 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SFrP07025508;
 Mon, 28 Jan 2013 15:53:25 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201301281553.r0SFrP07025508@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Mon, 28 Jan 2013 15:53:25 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40785 - head/ja_JP.eucJP/books/handbook/introduction
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, 28 Jan 2013 15:53:25 -0000

Author: ryusuke
Date: Mon Jan 28 15:53:24 2013
New Revision: 40785
URL: http://svnweb.freebsd.org/changeset/doc/40785

Log:
  - Merge the following from the English version:
  
  	r40601 -> r40774	head/ja_JP.eucJP/books/handbook/introduction/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/introduction/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/introduction/chapter.xml	Mon Jan 28 15:35:06 2013	(r40784)
+++ head/ja_JP.eucJP/books/handbook/introduction/chapter.xml	Mon Jan 28 15:53:24 2013	(r40785)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40601
+     Original revision: r40774
      $FreeBSD$
 -->
 
@@ -745,7 +745,9 @@
 	RELENG_8 ¥Ö¥é¥ó¥Á¤«¤é¤Î¥ê¥ê¡¼¥¹¤Ï¡¢°ú¤­Â³¤­¹Ô¤ï¤ì¤ëͽÄê¤Ç¤¹¡£</para>
 
       <para>2011 ǯ 9 ·î¤Ë RELENG_9 ¥Ö¥é¥ó¥Á¤¬ºîÀ®¤µ¤ì¡¢
-	¤³¤Î¥Ö¥é¥ó¥Á¤«¤é¤ÎºÇ½é¤Î¥ê¥ê¡¼¥¹¤Ç¤¢¤ë &rel.current;-RELEASE ¤Ï
+	¤³¤Î¥Ö¥é¥ó¥Á¤«¤é¤ÎºÇ½é¤Î¥ê¥ê¡¼¥¹¤Ç¤¢¤ë 9.0-RELEASE ¤Ï
+	2012 ǯ 1 ·î¤Ë¸ø³«¤µ¤ì¤Þ¤·¤¿¡£
+	ºÇ¿·¤Î &rel.current;-RELEASE ¤Ï
 	&rel.current.date; ¤Ë¸ø³«¤µ¤ì¤Þ¤·¤¿¡£
 	RELENG_9 ¥Ö¥é¥ó¥Á¤«¤é¤Î¥ê¥ê¡¼¥¹¤Ï¡¢°ú¤­Â³¤­¹Ô¤ï¤ì¤Þ¤¹¡£</para>
 

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 15:54:23 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])
 by hub.freebsd.org (Postfix) with ESMTP id C0369196;
 Mon, 28 Jan 2013 15:54:23 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A5EEB756;
 Mon, 28 Jan 2013 15:54:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SFsNom025671;
 Mon, 28 Jan 2013 15:54:23 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SFsM3G025665;
 Mon, 28 Jan 2013 15:54:22 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201301281554.r0SFsM3G025665@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Mon, 28 Jan 2013 15:54:22 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40786 - in head/nl_NL.ISO8859-1/books/handbook:
 multimedia ppp-and-slip serialcomms users vinum virtualization
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, 28 Jan 2013 15:54:23 -0000

Author: rene
Date: Mon Jan 28 15:54:22 2013
New Revision: 40786
URL: http://svnweb.freebsd.org/changeset/doc/40786

Log:
  MFen the Dutch Handbook (language/igor fixes and SRCID bumps only):
  
  - multimedia r39631 -> r40784
  - ppp-and-slip r39631 -> r40778
  - serialcomms r39631 -> r40783
  - users r39631 -> r40779
  - vinum r39631 -> r40781
  - virtualization r39948 -> r40780

Modified:
  head/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/users/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml

Modified: head/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml	Mon Jan 28 15:53:24 2013	(r40785)
+++ head/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.xml	Mon Jan 28 15:54:22 2013	(r40786)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
-     %SRCID%	39631
+     %SRCID%	40784
 -->
 
 <chapter id="multimedia">

Modified: head/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Mon Jan 28 15:53:24 2013	(r40785)
+++ head/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Mon Jan 28 15:54:22 2013	(r40786)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE% en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
-     %SRCID%  39631
+     %SRCID%  40778
 -->
 
 <chapter id="ppp-and-slip">
@@ -55,7 +55,7 @@
 	<para>Hoe gebruikers PPP opgezet kan worden.</para>
       </listitem>
       <listitem>
-	<para>Hoe kernel PPP opgezet kan worden (alleen voor
+	<para>Hoe kernel-PPP opgezet kan worden (alleen voor
 	  &os;&nbsp;7.X).</para>
       </listitem>
       <listitem>
@@ -67,19 +67,19 @@
 	  over ATM).</para>
       </listitem>
       <listitem>
-	<para>Hoe een SLIP server en cliënt opgezet kan worden en
+	<para>Hoe een SLIP-server en cliënt opgezet kan worden en
 	  hoe dat geconfigureerd wordt (alleen voor &os;&nbsp;7.X).</para>
       </listitem>
     </itemizedlist>
 
     <indexterm id="ppp-ppp-user">
       <primary>PPP</primary>
-      <secondary>gebruiker PPP</secondary>
+      <secondary>gebruiker-PPP</secondary>
     </indexterm>
 
     <indexterm id="ppp-ppp-kernel">
       <primary>PPP</primary>
-      <secondary>kernel PPP</secondary>
+      <secondary>kernel-PPP</secondary>
     </indexterm>
 
     <indexterm id="ppp-ppp-ethernet">
@@ -100,18 +100,18 @@
       </listitem>
     </itemizedlist>
 
-    <para>U kunt zich afvragen wat het verschil is tussen gebruiker PPP
-      en kernel PPP.  Het antwoord is simpel: gebruiker PPP verwerkt
+    <para>U kunt zich afvragen wat het verschil is tussen gebruiker-PPP
+      en kernel-PPP.  Het antwoord is simpel: gebruiker-PPP verwerkt
       inkomend en uitgaande data in het gebruikersland in plaats van
       in de kernel.  Dit is duur in de zin van het kopiëren van de
       data tussen de kernel en het gebruikersland, maar levert meer
       mogelijkheden voor de PPP implementatie.  Gebruikers PPP gebruikt
       het <devicename>tun</devicename> apparaat om te communiceren met
-      de buitenwereld.  Kernel PPP maakt gebruik van het
+      de buitenwereld.  Kernel-PPP maakt gebruik van het
       <devicename>ppp</devicename> apparaat.</para>
 
     <note>
-      <para>Voor de rest van dit hoofdstuk, zal gebruiker PPP gebruikt
+      <para>Voor de rest van dit hoofdstuk, zal gebruiker-PPP gebruikt
 	worden als <application>ppp</application> tenzij er onderscheid
 	gemaakt moet worden met andere PPP software zoals
 	<application>pppd</application>.  Tenzij anders vermeld moeten
@@ -153,7 +153,7 @@
       </authorgroup>
     </sect1info>
 
-    <title>Gebruik maken van gebruiker PPP</title>
+    <title>Gebruikmaken van gebruiker-PPP</title>
 
     <warning>
       <para>Met ingang van &os;&nbsp;8.0 zijn apparaatknooppunten voor
@@ -167,7 +167,7 @@
     </warning>
 
     <sect2>
-      <title>Gebruiker PPP</title>
+      <title>Gebruiker-PPP</title>
 
       <sect3>
 	<title>Vereisten</title>
@@ -201,29 +201,29 @@
 	  </listitem>
 
 	  <listitem>
-	  <indexterm id="ppp-pap">
-	    <primary>PAP</primary>
-	  </indexterm>
+	    <indexterm id="ppp-pap">
+	      <primary>PAP</primary>
+	    </indexterm>
 
-	  <indexterm id="ppp-chap">
-	    <primary>CHAP</primary>
-	  </indexterm>
+	    <indexterm id="ppp-chap">
+	      <primary>CHAP</primary>
+	    </indexterm>
 
-	  <indexterm id="ppp-unix">
-	    <primary>UNIX</primary>
-	  </indexterm>
+	    <indexterm id="ppp-unix">
+	      <primary>UNIX</primary>
+	    </indexterm>
 
-	  <indexterm id="ppp-login">
-	    <primary>loginnaam</primary>
-	  </indexterm>
+	    <indexterm id="ppp-login">
+	      <primary>loginnaam</primary>
+	    </indexterm>
 
-	  <indexterm id="ppp-password">
-	    <primary>wachtwoord</primary>
-	  </indexterm>
+	    <indexterm id="ppp-password">
+	      <primary>wachtwoord</primary>
+	    </indexterm>
 
-	    <para>Uw loginnaam en wachtwoord (danwel een standaard &unix;
-	      stijl login en wachtwoord combinatie of een PAP of CHAP
-	      login en wachtwoord combinatie).</para>
+	    <para>Uw loginnaam en wachtwoord (danwel een combinatie van een
+	      standaard &unix;-stijl login en wachtwoord of een PAP of CHAP
+	      login en wachtwoordcombinatie).</para>
 	  </listitem>
 
 	  <listitem>
@@ -231,7 +231,7 @@
 	      <primary>naamserver</primary>
 	    </indexterm>
 
-	    <para>Het IP adres van één of meerdere
+	    <para>Het IP-adres van één of meerdere
 	      naamservers.  Normaal gesproken krijgt u twee IP
 	      adressen van uw ISP om te gebruiken.  Als u er echter geen
 	      één gekregen heeft, kunt u het commando
@@ -249,14 +249,14 @@
 
 	<itemizedlist>
 	  <listitem>
-	    <para>Het IP adres van de router van uw ISP.  De router is
+	    <para>Het IP-adres van de router van uw ISP.  De router is
 	      de machine waarmee u verbinding maakt en welke ingesteld
 	      wordt als de <emphasis>standaard route</emphasis>.  Als
 	      u deze informatie niet heeft, kunt u een willekeurig
 	      adres verzinnen waarna de PPP server van de ISP het juiste
 	      adres vertelt zodra u verbinding maakt.</para>
 
-	    <para>Dit IP adres wordt door <application>ppp</application>
+	    <para>Dit IP-adres wordt door <application>ppp</application>
 	      <literal>HISADDR</literal> genoemd.</para>
 	  </listitem>
 
@@ -269,10 +269,10 @@
 
 	  <listitem>
 	    <indexterm id="ppp-static-ip">
-	      <primary>statisch ip adres</primary>
+	      <primary>statisch IP-adres</primary>
 	    </indexterm>
 
-	    <para>Als uw ISP u een vast IP adres en hostnaam levert,
+	    <para>Als uw ISP u een vast IP-adres en hostnaam levert,
 	      kunt u deze invoeren.  In andere gevallen bepaalt de
 	      andere kant welk adres er uitgegeven wordt.</para>
 	  </listitem>
@@ -294,7 +294,8 @@
       </sect3>
 
       <sect3>
-	<title>Automatische <application>PPP</application> configuratie</title>
+	<title>Automatische configuratie van
+	  <application>PPP</application></title>
 
 	<indexterm>
 	  <primary>PPP</primary>
@@ -305,24 +306,24 @@
 	  (de implementatie van PPP op kernel niveau) gebruiken de
 	  configuratie bestanden die zich in de map <filename
 	    class="directory">/etc/ppp</filename> bevinden.  Voorbeelden
-	  configuraties voor gebruiker PPP kunnen gevonden worden in
+	  configuraties voor gebruiker-PPP kunnen gevonden worden in
 	  <filename
 	    class="directory">/usr/share/examples/ppp/</filename>.</para>
 
 	<para>Het configureren van <command>ppp</command> vereist
 	  dat u een aantal bestanden bewerkt, afhankelijk van uw
 	  eisen.  Wat u moet invoeren is deels afhankelijk van wat
-	  uw ISP u aanbied met oog op statische IP adressen (lees u
+	  uw ISP u aanbied met oog op statische IP-adressen (lees u
 	  krijgt een statisch adres welke u altijd gebruikt) of
-	  dynamisch (lees: uw IP adres veranderd elke keer als
+	  dynamisch (lees: uw IP-adres veranderd elke keer als
 	  u verbinding maakt met uw ISP).</para>
 
 	<sect4 id="userppp-staticIP">
-	  <title>PPP en statische ip adressen</title>
+	  <title>PPP en statische IP-adressen</title>
 
 	  <indexterm>
 	    <primary>PPP</primary>
-	    <secondary>met statische IP adressen</secondary>
+	    <secondary>met statische IP-adressen</secondary>
 	  </indexterm>
 
 	  <para>U moet het <filename>/etc/ppp/ppp.conf</filename>
@@ -423,10 +424,10 @@
 	      <listitem>
 		<indexterm>
 		  <primary>PPP</primary>
-		  <secondary>gebruiker PPP</secondary>
+		  <secondary>gebruiker-PPP</secondary>
 		</indexterm>
 
-		<para>De inbelregel.  Gebruiker PPP gebruikt een
+		<para>De inbelregel.  Gebruiker-PPP gebruikt een
 		  <quote>expect-send</quote> syntax wat vergelijkbaar is
 		  met het &man.chat.8; programma.  Bekijk de handleiding
 		  voor meer informatie over de mogelijkheden van deze
@@ -579,10 +580,10 @@ protocol: ppp</screen>
 
 		<para>Stelt het interface adres in.  De regel
 		  <replaceable>x.x.x.x</replaceable> moet vervangen
-		  worden door het IP adres dat uw provider aan u heeft
+		  worden door het IP-adres dat uw provider aan u heeft
 		  uitgegeven.  De regel
 		  <replaceable>y.y.y.y</replaceable> moet vervangen
-		  worden door het IP adres dat uw provider aan u
+		  worden door het IP-adres dat uw provider aan u
 		  heeft gegeven voor de router (de machine waarmee
 		  u verbinding maakt).  Als uw ISP u geen router
 		  adres heeft gegeven, gebruik dan <hostid
@@ -620,7 +621,7 @@ protocol: ppp</screen>
 
 	  <para>Het is niet nodig om een regel toe te voegen aan
 	    <filename>ppp.linkup</filename> wanneer u een statisch
-	    IP adres krijgt en ppp met de <option>-auto</option> mode
+	    IP-adres krijgt en ppp met de <option>-auto</option> mode
 	    gestart is omdat uw routerings tabel al correcte regels
 	    heeft voordat u verbinding maakt.  U kunt echter een regel
 	    aanmaken om programma's te starten nadat de verbinding
@@ -633,21 +634,21 @@ protocol: ppp</screen>
 	</sect4>
 
 	<sect4 id="userppp-dynamicIP">
-	  <title>PPP en dynamische ip adressen</title>
+	  <title>PPP en dynamische IP-adressen</title>
 
 	  <indexterm>
 	    <primary>PPP</primary>
-	    <secondary>met dynamische ip adressen</secondary>
+	    <secondary>met dynamische IP-adressen</secondary>
 	  </indexterm>
 
 	  <indexterm>
 	    <primary>IPCP</primary>
 	  </indexterm>
 
-	  <para>Als uw provider geen statisch IP adres aanlevert kan
+	  <para>Als uw provider geen statisch IP-adres aanlevert kan
 	    <command>ppp</command> geconfigureerd worden om het lokale
 	    en het remote adres te onderhandelen.  Dit wordt gedaan door
-	    het <quote>gokken</quote> van een IP adres en PPP toestaan
+	    het <quote>gokken</quote> van een IP-adres en PPP toestaan
 	    dit adres te corrigeren door gebruik te maken van het
 	    IP Configuration Protocol (IPCP) nadat er een verbinding
 	    opgezet is.  De <filename>ppp.conf</filename> configuratie
@@ -668,7 +669,7 @@ protocol: ppp</screen>
 	      <listitem>
 		<para>Het nummer achter het <literal>/</literal> karakter
 		  is het aantal netwerk master bits van het adres die ppp
-		  eist.  Het is mogelijk dat u IP adressen wilt gebruiken
+		  eist.  Het is mogelijk dat u IP-adressen wilt gebruiken
 		  die meer van toepassing zijn op uw situatie, maar
 		  bovenstaand voorbeeld zal altijd werken.</para>
 
@@ -707,7 +708,7 @@ protocol: ppp</screen>
 		  <filename>ppp.linkup</filename> volgens de volgende
 		  criteria: Als eerste, probeert het hetzelfde label te
 		  vinden zoals gebruikt in <filename>ppp.conf</filename>.
-		  Als dat mislukt, zoek dan een regel waarin het IP adres
+		  Als dat mislukt, zoek dan een regel waarin het IP-adres
 		  van onze router in voorkomt.  Deze regel bevat een IP
 		  stijl van 4 octetten.  Als nu nog steeds geen
 		  corresponderende regel gevonden is wordt er gezocht
@@ -723,7 +724,7 @@ protocol: ppp</screen>
 		  een standaard routering toe te voegen die wijst
 		  richting <literal>HISADDR</literal>.
 		  <literal>HISADDR</literal> wordt vervangen door
-		  het IP adres van de router zoals onderhandeld door
+		  het IP-adres van de router zoals onderhandeld door
 		  IPCP.</para>
 	      </listitem>
 	    </varlistentry>
@@ -749,7 +750,7 @@ protocol: ppp</screen>
 	    is om inkomende gesprekken te ontvangen op een machine die
 	    verbonden is met een LAN, moet u beslissen of er pakketten
 	    worden doorgestuurd naar het LAN.  Als u dat doet, moet
-	    u de andere kant een IP adres geven uit het subnet van uw
+	    u de andere kant een IP-adres geven uit het subnet van uw
 	    LAN, en zult u gebruik moeten maken van het command
 	    <command>enable proxy</command> in het
 	    <filename>/etc/ppp/ppp.conf</filename> bestand.  U zult ook
@@ -819,7 +820,7 @@ protocol: ppp</screen>
 	</sect4>
 
 	<sect4>
-	  <title>PPP shells voor dynamische IP gebruikers</title>
+	  <title>PPP shells voor dynamische IP-gebruikers</title>
 
 	  <indexterm>
 	    <primary>PPP shells</primary>
@@ -873,7 +874,7 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 	</sect4>
 
 	<sect4>
-	  <title>PPP shells voor statische IP gebruikers</title>
+	  <title>PPP shells voor statische IP-gebruikers</title>
 
 	  <indexterm>
 	    <primary>PPP shells</primary>
@@ -881,7 +882,7 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 
 	  <para>Creeër het <filename>ppp-shell</filename> bestand
 	    zoals hierboven, en voor elk account met een statisch
-	    toegewezen IP adres creeërt u een symbolische link naar
+	    toegewezen IP-adres creeërt u een symbolische link naar
 	    <filename>ppp-shell</filename>.</para>
 
 	  <para>Als u bijvoorbeeld drie inbel gebruikers hebt genaamd
@@ -901,7 +902,7 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 
 	<sect4>
 	  <title>Het instellen van <filename>ppp.conf</filename> voor
-	    dynamische IP gebruikers</title>
+	    dynamische IP-gebruikers</title>
 
 	  <para>Het <filename>/etc/ppp/ppp.conf</filename> bestand moet
 	    iets zoals hieronder bevatten:</para>
@@ -926,13 +927,13 @@ ttyu1:
 	    geladen.  Voor elke inbellijn die ingeschakeld is in
 	    <filename>/etc/ttys</filename> moet een soortgelijke
 	    regel worden gemaakt als die voor <literal>ttyu0:</literal>
-	    hierboven.  Elke regel moet een uniek IP adres krijgen van
-	    uw pool van IP adressen voor dynamische gebruikers.</para>
+	    hierboven.  Elke regel moet een uniek IP-adres krijgen van
+	    uw pool van IP-adressen voor dynamische gebruikers.</para>
 	</sect4>
 
 	<sect4>
 	  <title>Het instellen van <filename>ppp.conf</filename> voor
-	    statische IP gebruikers.</title>
+	    statische IP-gebruikers.</title>
 
 	  <para>Samen met de inhoud van het voorbeeld
 	    <filename>/usr/share/examples/ppp/ppp.conf</filename>
@@ -953,7 +954,7 @@ mary:
 
 	  <para>Het <filename>/etc/ppp/ppp.linkup</filename> bestand
 	    moet ook informatie over routeringen bevatten voor elke
-	    statische IP gebruiker waar nodig.  De regel hieronder
+	    statische IP-gebruiker waar nodig.  De regel hieronder
 	    voegt een routering toe voor het
 	    <hostid role="ipaddr">203.14.201.0/24</hostid> netwerk
 	    via de ppp link van de gebruiker.</para>
@@ -1033,7 +1034,7 @@ exec /usr/sbin/ppp -direct pap$IDENT</pr
 
 	  <programlisting>enable passwdauth</programlisting>
 
-	  <para>Als u een aantal gebruikers een statisch IP adres wilt
+	  <para>Als u een aantal gebruikers een statisch IP-adres wilt
 	    geven, kan dat gespecificeerd worden als het derde argument
 	    in <filename>/etc/ppp/ppp.secret</filename>.  Zie
 	    <filename>/usr/share/examples/ppp/ppp.secret.sample</filename>
@@ -1106,9 +1107,9 @@ set nbns 203.14.100.5</programlisting>
 	    om stiekem mee te luisteren.</para>
 
 	  <para>Terug verwijzende naar de <link
-	      linkend="userppp-staticIP">PPP en statische IP adressen</link>
+	      linkend="userppp-staticIP">PPP en statische IP-adressen</link>
 	    of <link
-	      linkend="userppp-dynamicIP">PPP en dynamische IP adressen</link>
+	      linkend="userppp-dynamicIP">PPP en dynamische IP-adressen</link>
 	    secties moeten de volgende aanpassingen gedaan worden:</para>
 
 	  <programlisting>13      set authname <replaceable>Mijngebruikersnaam</replaceable>
@@ -1189,7 +1190,7 @@ set nbns 203.14.100.5</programlisting>
       </sect3>
 
       <sect3 id="userppp-nat">
-	<title>PPP's netwerk adres translatie mogelijkheden
+	<title>De vertaalmogelijkheden van PPP voor netwerkadressen
 	  gebruiken</title>
 
 	<indexterm>
@@ -1224,7 +1225,7 @@ nat port tcp 10.0.0.2:http http</program
       </sect3>
 
       <sect3 id="userppp-final">
-	<title>Laatste systeem configuratie</title>
+	<title>Laatste systeemconfiguratie</title>
 
 	<indexterm>
 	  <primary>PPP</primary>
@@ -1370,7 +1371,7 @@ ifconfig_tun0=</programlisting>
 	  </step>
 
 	  <step>
-	    <para>Als u dynamische IP adressen heeft, creeër een
+	    <para>Als u dynamische IP-adressen heeft, creeër een
 	      regel in <filename>/etc/ppp/ppp.linkup</filename>.</para>
 	  </step>
 
@@ -1450,10 +1451,10 @@ ifconfig_tun0=</programlisting>
       </authorgroup>
     </sect1info>
 
-    <title>Kernel PPP gebruiken</title>
+    <title>Kernel-PPP gebruiken</title>
 
     <sect2>
-      <title>Het opzetten van kernel PPP</title>
+      <title>Het opzetten van kernel-PPP</title>
 
       <warning>
 	<para>Deze sectie geldt en is alleen geldig voor &os;&nbsp;7.X.</para>
@@ -1462,7 +1463,7 @@ ifconfig_tun0=</programlisting>
       <indexterm>
 	<primary>PPP</primary>
 
-	<secondary>kernel PPP</secondary>
+	<secondary>kernel-PPP</secondary>
       </indexterm>
 
       <para>Voordat u begint met het opzetten van PPP op uw machine,
@@ -1536,14 +1537,14 @@ ifconfig_tun0=</programlisting>
 
       <programlisting>crtscts         # Schakel hardware flow controle in
 modem           # modem controle lijn
-noipdefault     # De PPP server aan de andere kant moet uw IP adres
+noipdefault     # De PPP-server aan de andere kant moet uw IP-adres
                 # opgeven, als de machine aan de andere kant uw IP
                 # adres niet meegeeft tijdens de IPCP onderhandeling
                 # moet deze optie worden verwijderd
 passive         # Wacht op LCP pakketten
 domain ppp.foo.com      # Vul uw domein naam hier in
 
-:<replaceable>remote_ip</replaceable>    # Vul het IP adres van de PPP
+:<replaceable>remote_ip</replaceable>    # Vul het IP-adres van de PPP
                 # server in deze wordt gebruikt om pakketten te
                 # routeren via de PPP link.  Als u de noipdefault optie
                 # niet heeft aangegeven verander dan deze regel in
@@ -1695,14 +1696,14 @@ exit</programlisting>
 crtscts         # Schakel hardware flow controle in
 modem           # modem controle lijn
 connect "/usr/bin/chat -f /etc/ppp/login.chat.script"
-noipdefault     # De PPP server aan de andere kant moet uw IP adres
+noipdefault     # De PPP server aan de andere kant moet uw IP-adres
                 # opgeven, als de machine aan de andere kant uw IP
                 # adres niet meegeeft tijdens de IPCP onderhandeling
                 # moet deze optie worden verwijderd
 passive         # Wacht op LCP pakketten
 domain <replaceable>your.domain</replaceable>   # Vul uw domein naam hier in
 
-:<replaceable>remote_ip</replaceable>    # Vul het IP adres van de PPP
+:<replaceable>remote_ip</replaceable>    # Vul het IP-adres van de PPP
                 # server in deze wordt gebruikt om pakketten te
                 # routeren via de PPP link.  Als u de noipdefault optie
                 # niet heeft aangegeven verander dan deze regel in
@@ -1738,10 +1739,10 @@ defaultroute    # Vul dit in als u wilt 
       <programlisting>crtscts                         # Hardware flow controle
 netmask 255.255.255.0           # netmask (niet vereist)
 192.114.208.20:192.114.208.165  # IP's van lokale en niet lokale hosten
-                                # het lokale ip moet anders zijn dan
+                                # het lokale IP moet anders zijn dan
                                 # degeen die is toegewezen aan de
                                 # Ethernet (of andere) interface op uw
-                                # machine.  remote IP is het IP adres
+                                # machine.  remote IP is het IP-adres
                                 # dat wordt toegewezen aan de machine
                                 # aan de andere kant
 domain ppp.foo.com              # uw domein
@@ -2115,7 +2116,7 @@ OK
       <screen>PPp ON example&gt;</screen>
 
       <para>We hebben ons succesvol geauthenticeerd bij onze
-	provider en we wachten op een IP adres dat ons wordt
+	provider en we wachten op een IP-adres dat ons wordt
 	toegewezen.</para>
 
       <screen>PPP ON example&gt;</screen>
@@ -2570,12 +2571,12 @@ adsl:
 
       <calloutlist>
 	<callout arearefs="co-mpd-ex-self">
-	  <para>Het IP adres van uw &os; computer waar vanaf
+	  <para>Het IP-adres van uw &os; computer waar vanaf
 	    <application>mpd</application> gebruikt wordt.</para>
 	</callout>
 
 	<callout arearefs="co-mpd-ex-peer">
-	  <para>Het IP adres van uw ADSL-modem.  Voor de Alcatel
+	  <para>Het IP-adres van uw ADSL-modem.  Voor de Alcatel
 	    &speedtouch; Home is dit adres standaard <hostid
 	      role="ipaddr">10.0.0.138</hostid>.</para>
 	</callout>
@@ -2721,7 +2722,7 @@ tun0: flags=8051&lt;UP,POINTOPOINT,RUNNI
     </warning>
 
     <sect2 id="slipc">
-      <title>Het opzetten van een SLIP cliënt</title>
+      <title>Het opzetten van een SLIP-cliënt</title>
 
       <indexterm>
 	<primary>SLIP</primary>
@@ -2850,7 +2851,7 @@ nameserver 128.32.136.12</programlisting
       </sect3>
 
       <sect3>
-	<title>Het opzetten van een SLIP verbinding</title>
+	<title>Het opzetten van een SLIP-verbinding</title>
 
 	<indexterm>
 	  <primary>SLIP</primary>
@@ -3004,7 +3005,7 @@ water.CS.Example localhost.Example. UGH 
     </sect2>
 
     <sect2 id="slips">
-      <title>Het opzetten van een SLIP server</title>
+      <title>Het opzetten van een SLIP-server</title>
 
       <indexterm>
 	<primary>SLIP</primary>
@@ -3012,7 +3013,7 @@ water.CS.Example localhost.Example. UGH 
       </indexterm>
 
       <para>Dit document levert suggesties voor het opzetten van een
-	SLIP server op een &os; systeem, welke meestal betekent het
+	SLIP-server op een &os; systeem, welke meestal betekent het
 	configureren van uw systeem om automatisch verbindingen op te
 	zetten wanneer er wordt ingelogt met remote SLIP
 	cliënten.</para>
@@ -3024,10 +3025,10 @@ water.CS.Example localhost.Example. UGH 
 
 	<para>Deze sectie is vrij technisch van aard, dus achtergrond
 	  informatie is vereist.  Er wordt aangenomen dat u bekend bent
-	  met het TCP/IP netwerk protocol, en in dan in het bijzonder
+	  met het TCP/IP-netwerk protocol, en in dan in het bijzonder
 	  met netwerk en node adresseringen, netwerk adres maskers,
 	  subnetten, routes en dynamische routering protocollen
-	  zoals RIP.  Het configureren van een SLIP dienst op een inbel
+	  zoals RIP.  Het configureren van een SLIP-dienst op een inbel
 	  server vereist kennis van deze concepten en als u daarmee niet
 	  bekend bent, leest u dan aub een versie van of
 	  Craig Hunt's <emphasis>TCP/IP Network Administration</emphasis>
@@ -3057,25 +3058,25 @@ water.CS.Example localhost.Example. UGH 
 	<title>Snel overzicht</title>
 
 	<para>In een typische configuratie, werkt het gebruik van &os;
-	  als een SLIP server als volgend: een SLIP gebruiker belt in
-	  op uw &os; SLIP server systeem en logt in met een speciaal
-	  SLIP login ID dat gebruik maakt van
+	  als een SLIP-server als volgend: een SLIP-gebruiker belt in
+	  op uw &os; SLIP-server systeem en logt in met een speciaal
+	  SLIP-login ID dat gebruik maakt van
 	  <filename>/usr/sbin/sliplogin</filename>.  Het
 	  <command>sliplogin</command> programma leest door het
 	  <filename>/etc/sliphome/slip.hosts</filename> bestand om een
 	  corresponderende regel te vinden voor de speciale gebruiker en
 	  als deze een match vindt verbind het de seriële lijn met
-	  een beschikbare SLIP interface waarna het shellscript
+	  een beschikbare SLIP-interface waarna het shellscript
 	  <filename>/etc/sliphome/slip.login</filename> wordt uitgevoerd
-	  om de SLIP interface te configureren.</para>
+	  om de SLIP-interface te configureren.</para>
 
 	<sect4>
-	  <title>Een voorbeeld SLIP server login</title>
+	  <title>Een voorbeeld van SLIP-server login</title>
 
-	  <para>Bijvoorbeeld, als een SLIP user ID is
-	    <username>Shelmerg</username> kan
+	  <para>Bijvoorbeeld, als een SLIP-user-ID
+	    <username>Shelmerg</username>is, kan
 	    <username>Shelmerg</username>'s regel in
-	    <filename>/etc/master.passwd</filename>  er als volgend
+	    <filename>/etc/master.passwd</filename>  er als volgt
 	    uitzien:</para>
 
 	  <programlisting>Shelmerg:password:1964:89::0:0:Guy Helmer - SLIP:/usr/users/Shelmerg:/usr/sbin/sliplogin</programlisting>
@@ -3092,7 +3093,7 @@ water.CS.Example localhost.Example. UGH 
 
 	  <para><command>sliplogin</command> zal de corresponderende
 	    regel vinden en de seriële lijn koppelen aan de eerste
-	    beschikbare SLIP interface, waarna
+	    beschikbare SLIP-interface, waarna
 	    <filename>/etc/sliphome/slip.login</filename> wordt
 	    uitgevoerd zoals volgend:</para>
 
@@ -3102,12 +3103,12 @@ water.CS.Example localhost.Example. UGH 
 	    <filename>/etc/sliphome/slip.login</filename> een
 	    <command>ifconfig</command> commando uitvoeren voor de SLIP
 	    interface waaraan <command>sliplogin</command> zichzelf
-	    koppelt (SLIP interface 0 zoals in bovenstaand voorbeeld
+	    koppelt (SLIP-interface 0 zoals in bovenstaand voorbeeld
 	    was de eerste parameter in de lijst welke gegeven is aan
-	    <filename>slip.login</filename>) om een lokaal IP adres
+	    <filename>slip.login</filename>) om een lokaal IP-adres
 	    in te stellen (<hostid>dc-slip</hostid>), een remote IP
 	    adres (<hostid>sl-helmer</hostid>), een netwerk master voor
-	    de SLIP interface
+	    de SLIP-interface
 	    (<hostid role="netmask">0xfffffc00</hostid>), en enkele
 	    additionele vlaggen (<literal>autocomp</literal>).  Als
 	    er iets misgaat zal <command>sliplogin</command> meestal
@@ -3123,7 +3124,7 @@ water.CS.Example localhost.Example. UGH 
       </sect3>
 
       <sect3>
-	<title>Kernel configuratie</title>
+	<title>Kernel-configuratie</title>
 
 	<indexterm>
 	  <primary>kernel</primary>
@@ -3143,7 +3144,7 @@ water.CS.Example localhost.Example. UGH 
 	<programlisting>device   sl</programlisting>
 
 	<para>Standaard zal uw &os; machine geen pakketten doorsturen.
-	  Als u wilt dat uw &os; SLIP server zich gedraagt als router
+	  Als u wilt dat uw &os; SLIP-server zich gedraagt als router
 	  zult u het bestand <filename>/etc/rc.conf</filename> moeten
 	  bewerken en de instelling van de
 	  <literal>gateway_enable</literal> variabele moeten aanpassen
@@ -3162,7 +3163,7 @@ water.CS.Example localhost.Example. UGH 
       </sect3>
 
       <sect3>
-	<title>Sliplogin configuratie</title>
+	<title>Sliplogin-configuratie</title>
 
 	<para>Zoals eerder vermeld, zijn er drie bestanden in de map
 	  <filename class="directory">/etc/sliphome</filename> die
@@ -3170,9 +3171,9 @@ water.CS.Example localhost.Example. UGH 
 	  <filename>/usr/sbin/sliplogin</filename> (zie
 	  &man.sliplogin.8; voor de actuele handleiding voor
 	  <command>sliplogin</command>): <filename>slip.hosts</filename>,
-	  welke de SLIP gebruikers definieert en de gekoppelde IP
+	  welke de SLIP-gebruikers definieert en de gekoppelde IP
 	  adressen; <filename>slip.login</filename>, welke meestal de
-	  SLIP interface configureert en (optioneel)
+	  SLIP-interface configureert en (optioneel)
 	  <filename>slip.logout</filename>, welke de effecten van
 	  <filename>slip.login</filename> ongedaan maakt wanneer de
 	  seriële verbinding verbroken wordt.</para>
@@ -3186,16 +3187,16 @@ water.CS.Example localhost.Example. UGH 
 
 	  <itemizedlist>
 	    <listitem>
-	      <para>SLIP gebruikers login ID</para>
+	      <para>SLIP-gebruikers login ID</para>
 	    </listitem>
 
 	    <listitem>
-	      <para>Lokale adres (lokaal voor de SLIP server) van de
-		SLIP link</para>
+	      <para>Lokale adres (lokaal voor de SLIP-server) van de
+		SLIP-link</para>
 	    </listitem>
 
 	    <listitem>
-	      <para>Remote adres van de SLIP link</para>
+	      <para>Remote adres van de SLIP-link</para>
 	    </listitem>
 
 	    <listitem>
@@ -3204,7 +3205,7 @@ water.CS.Example localhost.Example. UGH 
 	  </itemizedlist>
 
 	  <para>De lokale en remote adressen mogen host namen zijn
-	    (Welke naar IP adressen vertaald kunnen worden door
+	    (Welke naar IP-adressen vertaald kunnen worden door
 	    <filename>/etc/hosts</filename> of door de
 	    <acronym>DNS</acronym> diensten, afhankelijk van uw
 	    specificaties in het <filename>/etc/nsswitch.conf</filename>,
@@ -3253,29 +3254,29 @@ Shelmerg  dc-slip       sl-helmerg      
 
 	  <para>Uw keuze van een lokaal en remote adres voor uw SLIP
 	    verbindingen is afhankelijk van of u een speciaal toegewezen
-	    TCP/IP subnet gebruikt, of dat u gebruik gaat maken van
-	    <quote>proxy ARP</quote> op uw SLIP server (het is geen
+	    TCP/IP-subnet gebruikt, of dat u gebruik gaat maken van
+	    <quote>proxy ARP</quote> op uw SLIP-server (het is geen
 	    echte <quote>proxy ARP</quote>, maar het is de terminologie
 	    welke in deze sectie gebruikt wordt om het te beschrijven).
 	    Als u niet zeker bent welke methode u moet kiezen, of hoe u
-	    IP adressen moet toewijzen, raadpleegt u dan de TCP/IP
+	    IP-adressen moet toewijzen, raadpleegt u dan de TCP/IP
 	    boeken die vermeld worden in de SLIP vereisten
-	    (<xref linkend="slips-prereqs"/>) en/of vraag uw IP netwerk
+	    (<xref linkend="slips-prereqs"/>) en/of vraag uw IP-netwerk
 	    manager om hulp.</para>
 
 	  <para>Als u gebruik gaat maken van een separaat subnet voor
-	    uw SLIP cliënten, moet u een subnet alloceren uit de
-	    voor u toegewezen IP ruimte, en elke SLIP cliënt een
-	    IP adres geven uit dat subnet.  Daarna moet u waarschijnlijk
-	    een statische route configureren voor uw SLIP subnet via
-	    uw SLIP server naar de dichtsbijzijnde IP router.</para>
+	    uw SLIP-cliënten, moet u een subnet alloceren uit de
+	    voor u toegewezen IP-ruimte, en elke SLIP-cliënt een
+	    IP-adres geven uit dat subnet.  Daarna moet u waarschijnlijk
+	    een statische route configureren voor uw SLIP-subnet via
+	    uw SLIP-server naar de dichtsbijzijnde IP-router.</para>
 
 	  <indexterm><primary>Ethernet</primary></indexterm>
 
 	  <para>In het andere geval moet u gebruik maken van de
 	    <quote>proxy ARP</quote> methode, u moet elke SLIP
-	    cliënt een IP adres geven uit uw SLIP server's
-	    Ethernet subnet, daarnaast moet u het
+	    cliënt een IP-adres geven uit het Ethernet-subnet van
+	    uw SLIP-server, daarnaast moet u het
 	    <filename>/etc/sliphome/slip.login</filename> en het
 	    <filename>/etc/sliphome/slip.logout</filename> script
 	    aanpassen om gebruik te maken van &man.arp.8; om de
@@ -3294,7 +3295,7 @@ Shelmerg  dc-slip       sl-helmerg      
 #       @(#)slip.login  5.1 (Berkeley) 7/1/90
 
 #
-# generiek login bestand voor een slip lijn.  sliplogin voert deze uit
+# generiek loginbestand voor een SLIP-lijn.  sliplogin voert deze uit
 # met de volgende parameters:
 #      1        2         3        4          5         6     7-n
 #   slipunit ttyspeed loginname local-addr remote-addr mask opt-args
@@ -3303,12 +3304,12 @@ Shelmerg  dc-slip       sl-helmerg      
 
 	  <para>Dit <filename>slip.login</filename> bestand start
 	    alleen het <command>ifconfig</command> commando voor de
-	    betreffende SLIP interace met het lokale en remote adres
-	    met het netwerkmasker van de SLIP interface.</para>
+	    betreffende SLIP-interace met het lokale en remote adres
+	    met het netwerkmasker van de SLIP-interface.</para>
 
 	  <para>Als u besloten heeft om gebruik te maken van de
 	    <quote>proxy ARP</quote> methode (in plaats van het
-	    gebruiken van een apart subnet voor uw SLIP cliënten)
+	    gebruiken van een apart subnet voor uw SLIP-cliënten)
 	    moet u het <filename>/etc/sliphome/slip.login</filename>
 	    bestand aanpassen zodat deze er ongeveer als volgend
 	    uitziet:</para>
@@ -3318,24 +3319,24 @@ Shelmerg  dc-slip       sl-helmerg      
 #       @(#)slip.login  5.1 (Berkeley) 7/1/90
 
 #
-# generiek login bestand voor een slip lijn.  sliplogin voert deze uit
+# generiek loginbestand voor een SLIP-lijn.  sliplogin voert deze uit
 # met de volgende parameters:
 #      1        2         3        4          5         6     7-n
 #   slipunit ttyspeed loginname local-addr remote-addr mask opt-args
 #
 /sbin/ifconfig sl$1 inet $4 $5 netmask $6
-# Beantwoord ARP Verzoeken voor de SLIP cliënt met ons Ethernet
+# Beantwoord ARP Verzoeken voor de SLIP-cliënt met ons Ethernet
 # adres
 /usr/sbin/arp -s $5 00:11:22:33:44:55 pub</programlisting>
 
 	  <para>De extra regel in het <filename>slip.login</filename>
 	    bestand,
 	    <command>arp -s &#36;5 00:11:22:33:44:55 pub</command>,
-	    creeërt een ARP regel in de SLIP server's ARP tabel.
-	    Deze ARP regel zorgt ervoor dat de SLIP server antwoord
-	    geeft met het Ethernet MAC adres van de SLIP server wanneer
-	    een andere IP node op het Ethernet vraagt om te communiceren
-	    met het IP adres van de SLIP cliënt.</para>
+	    creeërt een ARP-regel in de ARP-tabel van de SLIP-server.
+	    Deze ARP regel zorgt ervoor dat de SLIP-server antwoord
+	    geeft met het Ethernet MAC adres van de SLIP-server wanneer
+	    een andere IP-node op het Ethernet vraagt om te communiceren
+	    met het IP-adres van de SLIP-cliënt.</para>
 
 	  <indexterm>
 	    <primary>Ethernet</primary>
@@ -3348,7 +3349,7 @@ Shelmerg  dc-slip       sl-helmerg      
 	    (<hostid role="mac">00:11:22:33:44:55</hostid>) veranderd
 	    in het MAC adres van uw systeem's Ethernet kaart, anders
 	    werkt uw <quote>proxy ARP</quote> zeker niet!  U kunt het
-	    Ethernet MAC adres van uw SLIP Server achterhalen door het
+	    Ethernet MAC adres van uw SLIP-server achterhalen door het
 	    bekijken van het resultaat van <command>netstat -i</command>;
 	    de tweede regel met resultaten moet er ongeveer als volgend
 	    uitzien:</para>
@@ -3391,7 +3392,7 @@ Shelmerg  dc-slip       sl-helmerg      
 #       slip.logout
 
 #
-# uitlog bestand voor een slip regel.  sliplogin voert deze uit met de
+# uitlogbestand voor een SLIP-regel.  sliplogin voert deze uit met de
 # parameters:
 #      1        2         3        4          5         6     7-n
 #   slipunit ttyspeed loginname local-addr remote-addr mask opt-args
@@ -3401,25 +3402,25 @@ Shelmerg  dc-slip       sl-helmerg      
 	  <para>Als u gebruik maakt van <quote>proxy ARP</quote> wilt u
 	    waarschijnlijk dat het
 	    <filename>/etc/sliphome/slip.logout</filename> bestand de
-	    ARP regel weghaalt voor de SLIP cliënt:</para>
+	    ARP regel weghaalt voor de SLIP-cliënt:</para>
 
 	  <programlisting>#!/bin/sh -
 #
 #       @(#)slip.logout
 
 #
-# uitlog bestand voor een slip regel.  sliplogin voert deze uit met de
+# uitlogbestand voor een SLIP-regel.  sliplogin voert deze uit met de
 # parameters:
 #      1        2         3        4          5         6     7-n
 #   slipunit ttyspeed loginname local-addr remote-addr mask opt-args
 #
 /sbin/ifconfig sl$1 down
-# Stop met het beantwoorden van ARP verzoeken voor de SLIP cliënt
+# Stop met het beantwoorden van ARP verzoeken voor de SLIP-cliënt
 /usr/sbin/arp -d $5</programlisting>
 
 	  <para>Het <command>arp -d &#36;5</command> verwijderd de ARP
 	    regel, die <quote>proxy ARP</quote> heeft toegevoegd toen
-	    de SLIP cliënt inlogde.</para>
+	    de SLIP-cliënt inlogde.</para>
 
 	  <para>Het is belangrijk om dit te herhalen: zorg ervoor
 	    <filename>/etc/sliphome/slip.logout</filename> het
@@ -3430,7 +3431,7 @@ Shelmerg  dc-slip       sl-helmerg      
       </sect3>
 
       <sect3>
-	<title>Routering overwegingen</title>
+	<title>Routering-overwegingen</title>
 
 	<indexterm>
 	  <primary>SLIP</primary>
@@ -3439,11 +3440,11 @@ Shelmerg  dc-slip       sl-helmerg      
 	</indexterm>
 
 	<para>Als u geen gebruik maakt van de <quote>proxy ARP</quote>
-	  voor het routeren van pakketten tussen uw SLIP cliënts
+	  voor het routeren van pakketten tussen uw SLIP-cliënten
 	  en de rest van uw netwerk (en wellicht het internet), moeten
 	  er misschien een aantal statische routeringen naar de best
 	  bereikbare standaard router ingesteld worden om uw SLIP
-	  cliënts te routeren via uw SLIP server.</para>
+	  cliënts te routeren via uw SLIP0server.</para>
 
 	<sect4>
 	  <title>Statische routeringen</title>
@@ -3456,7 +3457,7 @@ Shelmerg  dc-slip       sl-helmerg      
 	    netwerk heeft met meerdere routers binnen uw organisatie
 	    kan het zijn dat sommige routers, zoals die van Cisco en
 	    Proteon , niet alleen geconfigureerd moeten worden met de
-	    statische route naar het SLIP subnet, maar deze moeten dan
+	    statische route naar het SLIP-subnet, maar deze moeten dan
 	    ook geconfigureerd worden over welke statische routes aan
 	    andere routers verteld moeten worden.  Enige expertise en
 	    fine tunen kan nodig zijn om statische routing te laten

Modified: head/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml	Mon Jan 28 15:53:24 2013	(r40785)
+++ head/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.xml	Mon Jan 28 15:54:22 2013	(r40786)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
-     %SRCID%	39631
+     %SRCID%	40783
 -->
 <chapter id="serialcomms">
   <chapterinfo>

Modified: head/nl_NL.ISO8859-1/books/handbook/users/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/users/chapter.xml	Mon Jan 28 15:53:24 2013	(r40785)
+++ head/nl_NL.ISO8859-1/books/handbook/users/chapter.xml	Mon Jan 28 15:54:22 2013	(r40786)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/users/chapter.xml
-     %SRCID%	39631
+     %SRCID%	40779
 -->
 
 <chapter id="users">
@@ -27,7 +27,7 @@
     <!-- Feb 2000 -->
   </chapterinfo>
 
-  <title>Gebruikers en basis accountbeheer</title>
+  <title>Gebruikers- en basisaccountbeheer</title>
 
   <sect1 id="users-synopsis">
     <title>Overzicht</title>
@@ -39,7 +39,8 @@
 
       <footnote>
 	<para>Tenzij er natuurlijk meerdere terminals worden aangesloten, maar
-	  dat wordt behandeld in <xref linkend="serialcomms"/>.</para></footnote>
+	  dat wordt behandeld in <xref
+	    linkend="serialcomms"/>.</para></footnote>
 
       , maar er kan een groot aantal gebruikers zijn aangemeld via het
       netwerk om dingen met de computer te doen.  Om een systeem te
@@ -258,7 +259,7 @@
   </sect1>
 
   <sect1 id="users-superuser">
-    <title>De superuser account</title>
+    <title>Het superuser-account</title>
 
     <indexterm>
       <primary>accounts</primary>

Modified: head/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml	Mon Jan 28 15:53:24 2013	(r40785)
+++ head/nl_NL.ISO8859-1/books/handbook/vinum/chapter.xml	Mon Jan 28 15:54:22 2013	(r40786)
@@ -11,7 +11,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/vinum/chapter.xml
-     %SRCID%	39631
+     %SRCID%	40781
 -->
 
 <chapter id="vinum-vinum">

Modified: head/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml	Mon Jan 28 15:53:24 2013	(r40785)
+++ head/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.xml	Mon Jan 28 15:54:22 2013	(r40786)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
-     %SRCID%	39948
+     %SRCID%	40780
 -->
 
 <chapter id="virtualization">

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 16:40:41 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])
 by hub.freebsd.org (Postfix) with ESMTP id 1A31E320;
 Mon, 28 Jan 2013 16:40:41 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0B5FCA63;
 Mon, 28 Jan 2013 16:40:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SGee4j038951;
 Mon, 28 Jan 2013 16:40:40 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SGeeIO038950;
 Mon, 28 Jan 2013 16:40:40 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201301281640.r0SGeeIO038950@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 28 Jan 2013 16:40:40 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40787 - head/en_US.ISO8859-1/books/handbook/cutting-edge
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 28 Jan 2013 16:40:41 -0000

Author: wblock
Date: Mon Jan 28 16:40:40 2013
New Revision: 40787
URL: http://svnweb.freebsd.org/changeset/doc/40787

Log:
  CVS is going away soon.  Suggesting it for ports, -STABLE, or -CURRENT,
  even with a deprecation warning, is a disservice to new users.
  
  This change removes cvsup, csup, and CVS references.  SVN URLs are also
  changed to the preferred form and links to the SVN mirrors are added.
  
  Reviewed by:	-doc mailing list

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Mon Jan 28 15:54:22 2013	(r40786)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Mon Jan 28 16:40:40 2013	(r40787)
@@ -70,9 +70,7 @@
       <listitem>
 	<para>How to keep your system up to date with
 	  <application>freebsd-update</application>,
-	  <application>Subversion</application>,
-	  <application>CVSup</application>,
-	  <application>CVS</application>, or
+	  <application>Subversion</application>, or
 	  <application>CTM</application>.</para>
       </listitem>
 
@@ -910,10 +908,14 @@ Fetching 133 new ports or files... done.
       <title>Updating the Documentation Sources</title>
 
       <para>The <application>Subversion</application> program can
-	fetch a clean copy of the documentation sources by
-	typing:</para>
+	fetch a clean copy of the documentation sources from the
+	western US mirror using the HTTPS protocol with this
+	command:</para>
 
-      <screen>&prompt.root; <userinput>svn checkout <literal>svn://svn.FreeBSD.org/doc/head</literal> <filename class="directory">/usr/doc</filename></userinput></screen>
+      <screen>&prompt.root; <userinput>svn checkout <literal>https://svn0.us-west.FreeBSD.org/doc/head</literal> /usr/doc</userinput></screen>
+
+      <para>Please use the closest mirror from the available <link
+	  linkend="svn-mirrors">Subversion mirror sites</link>.</para>
 
       <para>The initial download of the documentation sources may take
 	a while.  Let it run until it completes.</para>
@@ -1480,76 +1482,43 @@ Fetching 133 new ports or files... done.
 	  <listitem>
 	    <para>Grab the sources from a &os;
 	      <link linkend="mirrors">mirror site</link>.  You can do
-	      this in one of three ways:</para>
+	      this in one of several ways:</para>
 
 	    <orderedlist>
 	      <indexterm>
 		<primary><command>svn</command></primary>
 	      </indexterm>
 	      <indexterm>
-		<primary><command>cvsup</command></primary>
+		<primary><command>cron</command></primary>
 	      </indexterm>
 	      <indexterm>
-		<primary><command>cron</command></primary>
+		<primary>-CURRENT</primary>
+		<secondary>Syncing with
+		  <application>Subversion</application>
+		</secondary>
 	      </indexterm>
 	      <indexterm>
 		<primary>-CURRENT</primary>
 		<secondary>Syncing with
-		  <application>CVSup</application>
+		  <application>CTM</application>
 		</secondary>
 	      </indexterm>
 
 	      <listitem>
-		<para>Use the <link linkend="svn">svn</link> program
-		  to check out the desired development or release
-		  branch.  This is the recommended method, providing
-		  access to &os; development as it occurs.  The
-		  preferred URL prefix for
-		  <application>Subversion</application> checkout of
-		  the -CURRENT base system is
-
-<literal>http://svn.freebsd.org/base/head/</literal>;
-		  because of the size of the repository, it is
+		<para>Use the <link linkend="svn">svn</link> program to
+		  check out the desired development or release branch.
+		  This is the recommended method, providing access to
+		  &os; development as it occurs.  Checkout the
+		  -CURRENT code from the <literal>head</literal>
+		  branch of one of the <link
+		    linkend="svn-mirrors">Subversion mirror
+		    sites</link>.
+		  Because of the size of the repository, it is
 		  recommended that only desired subtrees be checked
 		  out.</para>
 	      </listitem>
 
 	      <listitem>
-		<para>Use the <link linkend="cvsup">cvsup</link>
-		  program with the <filename>supfile</filename> named
-		  <filename>standard-supfile</filename> available from
-		  <filename>/usr/share/examples/cvsup</filename>.
-		  You have to customize the sample
-		  <filename>supfile</filename> above, and configure
-		  <link linkend="cvsup">cvsup</link> for your
-		  environment.</para>
-
-		<warning>
-		  <para><command>cvsup</command> has been deprecated
-		    by the Project, and is not recommended.</para>
-		</warning>
-
-		<note>
-		  <para>The sample
-		    <filename>standard-supfile</filename> is intended
-		    for tracking a specific security branch of &os;,
-		    and not &os.current;.  You will need to edit this
-		    file and replace the following line:</para>
-
-		  <programlisting>*default release=cvs tag=RELENG_<replaceable>X</replaceable>_<replaceable>Y</replaceable></programlisting>
-
-		  <para>With this one:</para>
-
-		  <programlisting>*default release=cvs tag=.</programlisting>
-
-		  <para>For a detailed explanation of usable tags,
-		    please refer to the Handbook's
-		    <link linkend="cvs-tags">CVS Tags</link>
-		    section.</para>
-		</note>
-	      </listitem>
-
-	      <listitem>
 		<indexterm>
 		  <primary>-CURRENT</primary>
 		  <secondary>Syncing with CTM</secondary>
@@ -1718,18 +1687,15 @@ Fetching 133 new ports or files... done.
 
 	    <para>If you are already running a previous release of
 	      &os; and wish to upgrade via sources then you can easily
-	      do so from &os;
+	      do so from a &os;
 	      <link linkend="mirrors">mirror site</link>.  This can be
-	      done in one of three ways:</para>
+	      done in one of several ways:</para>
 
 	    <orderedlist>
 	      <indexterm>
 		<primary><command>svn</command></primary>
 	      </indexterm>
 	      <indexterm>
-		<primary><command>cvsup</command></primary>
-	      </indexterm>
-	      <indexterm>
 		<primary><command>cron</command></primary>
 	      </indexterm>
 	      <indexterm>
@@ -1748,33 +1714,17 @@ Fetching 133 new ports or files... done.
 		  <ulink url="&url.base;/releng/">the release
 		    engineering page</ulink>, such as
 		  <literal>stable/9</literal> or
-		  <literal>releng/9.0</literal>.  The preferred URL
-		  prefix for <application>Subversion</application>
-		  checkout of the base system is
-		  <literal>http://svn.freebsd.org/base/</literal>;
-		  because of the size of the repository, it is
+		  <literal>releng/9.0</literal>.  URL
+		  prefixes for <application>Subversion</application>
+		  checkout of the base system are shown in <link
+		    linkend="svn-mirrors">Subversion mirror
+		    sites</link>.
+		  Because of the size of the repository, it is
 		  recommended that only desired subtrees be checked
 		  out.</para>
 	      </listitem>
 
 	      <listitem>
-		<para>Use the <link linkend="cvsup">cvsup</link>
-		  program with the <filename>supfile</filename> named
-		  <filename>stable-supfile</filename> from the
-		  directory
-		  <filename>/usr/share/examples/cvsup</filename>.
-		  You have to customize the
-		  sample <filename>supfile</filename> above, and
-		  configure <link linkend="cvsup">cvsup</link> for
-		  your environment.</para>
-
-		<warning>
-		  <para><command>cvsup</command> has been deprecated
-		    by the Project, and is not recommended.</para>
-		</warning>
-	      </listitem>
-
-	      <listitem>
 		<indexterm>
 		  <primary>-STABLE</primary>
 		  <secondary>syncing with CTM</secondary>
@@ -1792,8 +1742,7 @@ Fetching 133 new ports or files... done.
 	  <listitem>
 	    <para>Essentially, if you need rapid on-demand access to
 	      the source and communications bandwidth is not a
-	      consideration, use <command>cvsup</command> or
-	      <command>ftp</command>.  Otherwise, use
+	      consideration, use <application>Subversion</application>.  Otherwise, use
 	      <application>CTM</application>.</para>
 	  </listitem>
 
@@ -1826,9 +1775,7 @@ Fetching 133 new ports or files... done.
       connection to stay up-to-date with any given area of the &os;
       project sources, or all areas, depending on what interests you.
       The primary services we offer are
-      <link linkend="svn">Subversion</link>,
-      <link linkend="anoncvs">Anonymous CVS</link>,
-      <link linkend="cvsup">CVSup</link>, and
+      <link linkend="svn">Subversion</link> and
       <link linkend="ctm">CTM</link>.</para>
 
     <warning>
@@ -1844,29 +1791,20 @@ Fetching 133 new ports or files... done.
     </warning>
 
     <indexterm>
-      <primary>CVS</primary>
-      <secondary>anonymous</secondary>
+      <primary>Subversion</primary>
     </indexterm>
 
-    <para><application>Subversion</application>,
-      <application>Anonymous CVS</application> and
-      <application>CVSup</application> use the
-      <emphasis>pull</emphasis> model of updating sources.  For
-      <application>Subversion</application>, the user (or a
-      <command>cron</command> script) invokes the
+    <para><application>Subversion</application> uses the
+      <emphasis>pull</emphasis> model of updating sources.
+      The user (or a <command>cron</command> script) invokes the
       <command>svn</command> program, and it brings files up-to-date.
       <application>Subversion</application> is the preferred means of
-      updating local source trees.  <command>cvsup</command> and
-      <command>cvs</command> work under similar principles, but are
-      now deprecated in favour of Subversion.  The updates you receive
-      are up-to-the-minute and you get them when, and only when, you
-      want them.  You can easily restrict your updates to the specific
-      files or directories that are of interest to you.  Updates are
-      generated on the fly by the server, according to what you have
-      and what you want to have.  Unless the reason is truly
-      compelling, <application>Subversion</application> should be used
-      in preference to other synchronization mechanisms, which have
-      been deprecated and will be discontinued in the future.</para>
+      updating local source trees.
+      The updates you receive are up-to-the-minute and
+      you get them when, and only when, you want them.  You can easily
+      restrict your updates to the specific files or directories that
+      are of interest to you.  Updates are generated on the fly by the
+      server, according to what you have and what you want to have.</para>
 
     <indexterm>
       <primary><application>CTM</application></primary>
@@ -1883,21 +1821,19 @@ Fetching 133 new ports or files... done.
       &man.ctm.rmail.1; utility which will automatically decode,
       verify and apply the changes to the user's copy of the sources.
       This process is far more efficient than
-      <application>CVSup</application>, and places less strain on our
+      <application>Subversion</application>, and places less strain on our
       server resources since it is a <emphasis>push</emphasis> rather
       than a <emphasis>pull</emphasis> model.</para>
 
     <para>There are other trade-offs, of course.  If you inadvertently
       wipe out portions of your archive,
-      <application>CVSup</application> will detect and rebuild the
+      <application>Subversion</application> will detect and rebuild the
       damaged portions for you.  <application>CTM</application> will
       not do this, and if you wipe some portion of your source tree
       out (and do not have it backed up) then you will have to start
-      from scratch (from the most recent CVS
+      from scratch (from the most recent CTM
       <quote>base delta</quote>) and rebuild it all with
-      <application>CTM</application> or, with
-      <application>Anonymous CVS</application>, simply delete the bad
-      bits and resync.</para>
+      <application>CTM</application>.</para>
   </sect1>
 
   <sect1 id="makeworld">
@@ -2954,7 +2890,7 @@ Script done, &hellip;</screen>
 	  <answer>
 	    <para>There is no easy answer to this one, as it depends
 	      on the nature of the change.  For example, if you just
-	      ran <application>CVSup</application>, and it has shown
+	      ran <application>Subversion</application>, and it has shown
 	      the following files as being updated:</para>
 
 	    <screen><filename>src/games/cribbage/instr.c</filename>

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 16:48: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])
 by hub.freebsd.org (Postfix) with ESMTP id 74888525;
 Mon, 28 Jan 2013 16:48:01 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 663BCAE7;
 Mon, 28 Jan 2013 16:48:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SGm1eW041342;
 Mon, 28 Jan 2013 16:48:01 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SGm1L6041341;
 Mon, 28 Jan 2013 16:48:01 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201301281648.r0SGm1L6041341@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 28 Jan 2013 16:48:01 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40788 - head/en_US.ISO8859-1/books/handbook/cutting-edge
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 28 Jan 2013 16:48:01 -0000

Author: wblock
Date: Mon Jan 28 16:48:00 2013
New Revision: 40788
URL: http://svnweb.freebsd.org/changeset/doc/40788

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

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Mon Jan 28 16:40:40 2013	(r40787)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Mon Jan 28 16:48:00 2013	(r40788)
@@ -636,7 +636,7 @@ before running "/usr/sbin/freebsd-update
 	  command may be used to automate this process.  The following
 	  commands may be used to begin this process:</para>
 
-        <screen>&prompt.root; <userinput>portupgrade -f ruby</userinput>
+	<screen>&prompt.root; <userinput>portupgrade -f ruby</userinput>
 &prompt.root; <userinput>rm /var/db/pkg/pkgdb.db</userinput>
 &prompt.root; <userinput>portupgrade -f ruby18-bdb</userinput>
 &prompt.root; <userinput>rm /var/db/pkg/pkgdb.db /usr/ports/INDEX-*.db</userinput>
@@ -1505,17 +1505,16 @@ Fetching 133 new ports or files... done.
 	      </indexterm>
 
 	      <listitem>
-		<para>Use the <link linkend="svn">svn</link> program to
-		  check out the desired development or release branch.
-		  This is the recommended method, providing access to
-		  &os; development as it occurs.  Checkout the
-		  -CURRENT code from the <literal>head</literal>
-		  branch of one of the <link
-		    linkend="svn-mirrors">Subversion mirror
-		    sites</link>.
-		  Because of the size of the repository, it is
-		  recommended that only desired subtrees be checked
-		  out.</para>
+		<para>Use the <link linkend="svn">svn</link> program
+		  to check out the desired development or release
+		  branch.  This is the recommended method, providing
+		  access to &os; development as it occurs.  Checkout
+		  the -CURRENT code from the <literal>head</literal>
+		  branch of one of the
+		  <link linkend="svn-mirrors">Subversion mirror
+		    sites</link>.  Because of the size of the
+		  repository, it is recommended that only desired
+		  subtrees be checked out.</para>
 	      </listitem>
 
 	      <listitem>
@@ -1660,7 +1659,7 @@ Fetching 133 new ports or files... done.
 	    <para>Join the relevant <application>SVN</application>
 	      list for the branch you are tracking.  For example, if
 	      you are tracking the 9-STABLE branch, join the
-	      &a.svn-src-stable-9.name; list. This will allow you to
+	      &a.svn-src-stable-9.name; list.  This will allow you to
 	      view the commit log entry for each change as it is made,
 	      along with any pertinent information on possible
 	      side-effects.</para>
@@ -1742,7 +1741,8 @@ Fetching 133 new ports or files... done.
 	  <listitem>
 	    <para>Essentially, if you need rapid on-demand access to
 	      the source and communications bandwidth is not a
-	      consideration, use <application>Subversion</application>.  Otherwise, use
+	      consideration, use
+	      <application>Subversion</application>.  Otherwise, use
 	      <application>CTM</application>.</para>
 	  </listitem>
 
@@ -1795,16 +1795,16 @@ Fetching 133 new ports or files... done.
     </indexterm>
 
     <para><application>Subversion</application> uses the
-      <emphasis>pull</emphasis> model of updating sources.
-      The user (or a <command>cron</command> script) invokes the
+      <emphasis>pull</emphasis> model of updating sources.  The user
+      (or a <command>cron</command> script) invokes the
       <command>svn</command> program, and it brings files up-to-date.
       <application>Subversion</application> is the preferred means of
-      updating local source trees.
-      The updates you receive are up-to-the-minute and
-      you get them when, and only when, you want them.  You can easily
-      restrict your updates to the specific files or directories that
-      are of interest to you.  Updates are generated on the fly by the
-      server, according to what you have and what you want to have.</para>
+      updating local source trees.  The updates you receive are
+      up-to-the-minute and you get them when, and only when, you want
+      them.  You can easily restrict your updates to the specific
+      files or directories that are of interest to you.  Updates are
+      generated on the fly by the server, according to what you have
+      and what you want to have.</para>
 
     <indexterm>
       <primary><application>CTM</application></primary>
@@ -1821,17 +1821,17 @@ Fetching 133 new ports or files... done.
       &man.ctm.rmail.1; utility which will automatically decode,
       verify and apply the changes to the user's copy of the sources.
       This process is far more efficient than
-      <application>Subversion</application>, and places less strain on our
-      server resources since it is a <emphasis>push</emphasis> rather
-      than a <emphasis>pull</emphasis> model.</para>
+      <application>Subversion</application>, and places less strain on
+      our server resources since it is a <emphasis>push</emphasis>
+      rather than a <emphasis>pull</emphasis> model.</para>
 
     <para>There are other trade-offs, of course.  If you inadvertently
       wipe out portions of your archive,
-      <application>Subversion</application> will detect and rebuild the
-      damaged portions for you.  <application>CTM</application> will
-      not do this, and if you wipe some portion of your source tree
-      out (and do not have it backed up) then you will have to start
-      from scratch (from the most recent CTM
+      <application>Subversion</application> will detect and rebuild
+      the damaged portions for you.  <application>CTM</application>
+      will not do this, and if you wipe some portion of your source
+      tree out (and do not have it backed up) then you will have to
+      start from scratch (from the most recent CTM
       <quote>base delta</quote>) and rebuild it all with
       <application>CTM</application>.</para>
   </sect1>
@@ -2727,7 +2727,7 @@ Script done, &hellip;</screen>
 	<para>This will build the necessary directory structure and
 	  install the files.  A lot of the subdirectories that have
 	  been created under <filename>/var/tmp/root</filename> are
-	  empty and should be deleted. The simplest way to do this is
+	  empty and should be deleted.  The simplest way to do this is
 	  to:</para>
 
 	<screen>&prompt.root; <userinput>cd /var/tmp/root</userinput>
@@ -2890,8 +2890,8 @@ Script done, &hellip;</screen>
 	  <answer>
 	    <para>There is no easy answer to this one, as it depends
 	      on the nature of the change.  For example, if you just
-	      ran <application>Subversion</application>, and it has shown
-	      the following files as being updated:</para>
+	      ran <application>Subversion</application>, and it has
+	      shown the following files as being updated:</para>
 
 	    <screen><filename>src/games/cribbage/instr.c</filename>
 <filename>src/games/sail/pl_main.c</filename>

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 19:13: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])
 by hub.freebsd.org (Postfix) with ESMTP id C5CAA2EC;
 Mon, 28 Jan 2013 19:13:20 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B73D362E;
 Mon, 28 Jan 2013 19:13:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SJDK8j085402;
 Mon, 28 Jan 2013 19:13:20 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SJDK0U085400;
 Mon, 28 Jan 2013 19:13:20 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301281913.r0SJDK0U085400@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 28 Jan 2013 19:13:20 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40789 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 28 Jan 2013 19:13:20 -0000

Author: eadler
Date: Mon Jan 28 19:13:20 2013
New Revision: 40789
URL: http://svnweb.freebsd.org/changeset/doc/40789

Log:
  Minor grammar fix
  
  Reported by:	bjk
  Approved by:	jkois (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Mon Jan 28 16:48:00 2013	(r40788)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Jan 28 19:13:20 2013	(r40789)
@@ -5160,7 +5160,7 @@ options    SYSVMSG          # enable for
 
       <qandaentry>
 	<question id="running-X-securelevels">
-	  <para>I <emphasis>tried</emphasis> to run X, but I get an
+	  <para>I <emphasis>tried</emphasis> to run X, but I get a
 	    <errorname>No devices detected.</errorname> error when I
 	    type
 	    <command>startx</command>.  What do I do now?</para>

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 19:13:23 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])
 by hub.freebsd.org (Postfix) with ESMTP id 0CAA82ED;
 Mon, 28 Jan 2013 19:13:23 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F201D62F;
 Mon, 28 Jan 2013 19:13:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SJDMvO085443;
 Mon, 28 Jan 2013 19:13:22 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SJDMwm085442;
 Mon, 28 Jan 2013 19:13:22 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301281913.r0SJDMwm085442@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 28 Jan 2013 19:13:22 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40790 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 28 Jan 2013 19:13:23 -0000

Author: eadler
Date: Mon Jan 28 19:13:22 2013
New Revision: 40790
URL: http://svnweb.freebsd.org/changeset/doc/40790

Log:
  Even though 7.4 is technically still supported, the link is a 404 and
  support is ending in 1.5 months. As such: remove it.
  
  Approved by:	jkois (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Mon Jan 28 19:13:20 2013	(r40789)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Jan 28 19:13:22 2013	(r40790)
@@ -596,12 +596,6 @@
 		can be found in the <ulink
 		  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/">&rel2.current;-RELEASE directory</ulink>.</para>
 	    </listitem>
-
-	    <listitem>
-	      <para>The latest &rel3.stable; release, &rel3.current;-RELEASE
-		can be found in the <ulink
-		  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel3.current;-RELEASE/">&rel3.current;-RELEASE directory</ulink>.</para>
-	    </listitem>
 	  </itemizedlist>
 
 	  <para>Information about obtaining &os; on CD, DVD, and other

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 19:13:25 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])
 by hub.freebsd.org (Postfix) with ESMTP id 416C42F1;
 Mon, 28 Jan 2013 19:13:25 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 33C98632;
 Mon, 28 Jan 2013 19:13:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SJDPp4085477;
 Mon, 28 Jan 2013 19:13:25 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SJDPOW085476;
 Mon, 28 Jan 2013 19:13:25 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301281913.r0SJDPOW085476@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 28 Jan 2013 19:13:25 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40791 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 28 Jan 2013 19:13:25 -0000

Author: eadler
Date: Mon Jan 28 19:13:24 2013
New Revision: 40791
URL: http://svnweb.freebsd.org/changeset/doc/40791

Log:
  sl is too important to not mention.
  
  Submitted by:	Edward <edward@rdtan.net>
  Approved by:	bcr, jkois (mentors)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Mon Jan 28 19:13:22 2013	(r40790)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Jan 28 19:13:24 2013	(r40791)
@@ -8268,6 +8268,19 @@ hint.sio.7.irq="12"</programlisting>
 	    annoyed by it as well.</para>
 	</answer>
       </qandaentry>
+
+      <qandaentry>
+	<question id="punk-my-friend">
+	  <para>My colleague sits at the computer too much, how
+	    can I prank her?</para>
+	</question>
+
+	<answer>
+	  <para>Install <filename role="port">games/sl</filename> and wait
+	    for her to mistype <userinput>sl</userinput> for
+	    <command>ls</command>.</para>
+	</answer>
+      </qandaentry>
     </qandaset>
   </chapter>
 

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 19:42:41 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])
 by hub.freebsd.org (Postfix) with ESMTP id 61B94C29;
 Mon, 28 Jan 2013 19:42:41 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5107A779;
 Mon, 28 Jan 2013 19:42:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SJgfQS094048;
 Mon, 28 Jan 2013 19:42:41 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SJgcU5094032;
 Mon, 28 Jan 2013 19:42:38 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301281942.r0SJgcU5094032@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 28 Jan 2013 19:42:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40792 - in head/en_US.ISO8859-1/books/handbook:
 advanced-networking audit config disks filesystems firewalls jails linuxemu
 mail multimedia network-servers ppp-and-slip security virtua...
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, 28 Jan 2013 19:42:41 -0000

Author: eadler
Date: Mon Jan 28 19:42:38 2013
New Revision: 40792
URL: http://svnweb.freebsd.org/changeset/doc/40792

Log:
  Prefer the use of service(1) to explicit invocation of /etc/rc.d
  scripts: service(1) puts things in one place and abstracts them.  Also, it's less
  typing and easier to autocomplete.
  
  While here modernize script examples by removing the ".sh" suffix.
  
  Discussed on:	-doc
  Reviewed by:	bjk (prior version)
  Approved by:	bcr (mentor)

Modified:
  head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
  head/en_US.ISO8859-1/books/handbook/audit/chapter.xml
  head/en_US.ISO8859-1/books/handbook/config/chapter.xml
  head/en_US.ISO8859-1/books/handbook/disks/chapter.xml
  head/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
  head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
  head/en_US.ISO8859-1/books/handbook/jails/chapter.xml
  head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
  head/en_US.ISO8859-1/books/handbook/mail/chapter.xml
  head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
  head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
  head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
  head/en_US.ISO8859-1/books/handbook/security/chapter.xml
  head/en_US.ISO8859-1/books/handbook/virtualization/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 Jan 28 19:13:24 2013	(r40791)
+++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Mon Jan 28 19:42:38 2013	(r40792)
@@ -1206,7 +1206,7 @@ ifconfig_wlan0="DHCP"</programlisting>
 	    <para>At this point, you are ready to bring up the
 	      wireless interface:</para>
 
-	    <screen>&prompt.root; <userinput>/etc/rc.d/netif start</userinput></screen>
+	    <screen>&prompt.root; <userinput>service netif start</userinput></screen>
 
 	    <para>Once the interface is running, use
 	      <command>ifconfig</command> to see the status of the
@@ -1323,7 +1323,7 @@ ifconfig_wlan0="WPA DHCP"</programlistin
 
 	    <para>Then we can bring up the interface:</para>
 
-	    <screen>&prompt.root; <userinput><filename>/etc/rc.d/netif</filename> start</userinput>
+	    <screen>&prompt.root; <userinput><filename>service netif</filename> start</userinput>
 Starting wpa_supplicant.
 DHCPDISCOVER on wlan0 to 255.255.255.255 port 67 interval 5
 DHCPDISCOVER on wlan0 to 255.255.255.255 port 67 interval 6
@@ -1513,10 +1513,9 @@ wlan0: flags=8843&lt;UP,BROADCAST,RUNNIN
 	    <programlisting>wlans_ath0="wlan0"
 ifconfig_wlan0="WPA DHCP"</programlisting>
 
-	    <para>The next step is to bring up the interface with the
-	      help of the <filename>rc.d</filename> facility:</para>
+	    <para>The next step is to bring up the interface:</para>
 
-	    <screen>&prompt.root; <userinput>/etc/rc.d/netif start</userinput>
+	    <screen>&prompt.root; <userinput>service netif start</userinput>
 Starting wpa_supplicant.
 DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 7
 DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 15
@@ -1607,7 +1606,7 @@ ifconfig_wlan0="WPA DHCP"</programlistin
 
 	    <para>The next step is to bring up the interface:</para>
 
-	    <screen>&prompt.root; <userinput>/etc/rc.d/netif start</userinput>
+	    <screen>&prompt.root; <userinput>service netif start</userinput>
 Starting wpa_supplicant.
 DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 7
 DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 15
@@ -1719,7 +1718,7 @@ ifconfig_wlan0="WPA DHCP"</programlistin
 
 	    <para>Then we can bring up the interface:</para>
 
-	    <screen>&prompt.root; <userinput>/etc/rc.d/netif start</userinput>
+	    <screen>&prompt.root; <userinput>service netif start</userinput>
 Starting wpa_supplicant.
 DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 7
 DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 15
@@ -2090,7 +2089,7 @@ wpa_pairwise=CCMP TKIP <co id="co-ap-wpa
 	  <para>The next step is to start
 	    <application>hostapd</application>:</para>
 
-	  <screen>&prompt.root; <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
+	  <screen>&prompt.root; <userinput>service hostapd forcestart</userinput></screen>
 
 	  <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
   wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 2290
@@ -2330,13 +2329,13 @@ ubt0: Interface 0 endpoints: interrupt=0
 ubt0: Interface 1 (alt.config 5) endpoints: isoc-in=0x83, isoc-out=0x3,
       wMaxPacketSize=49, nframes=6, buffer size=294</screen>
 
-      <para>The <filename>/etc/rc.d/bluetooth</filename> script
+      <para>&man.service.8;
 	is used to start and stop the Bluetooth stack.  It is a good
 	idea to stop the stack before unplugging the device, but it is
 	not (usually) fatal.  When starting the stack, you will
 	receive output similar to the following:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/bluetooth start ubt0</userinput>
+      <screen>&prompt.root; <userinput>service bluetooth start ubt0</userinput>
 BD_ADDR: 00:02:72:00:d4:1a
 Features: 0xff 0xff 0xf 00 00 00 00 00
 &lt;3-Slot&gt; &lt;5-Slot&gt; &lt;Encryption&gt; &lt;Slot offset&gt;
@@ -2687,7 +2686,7 @@ Bluetooth Profile Descriptor List:
       <para>Then the <application>sdpd</application> daemon can be
 	started with:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/sdpd start</userinput></screen>
+      <screen>&prompt.root; <userinput>service sdpd start</userinput></screen>
 
       <para>The local server application that wants to provide
 	Bluetooth service to the remote clients will register service
@@ -4169,7 +4168,7 @@ margaux:ha=0123456789ab:tc=.def100</prog
 	      <filename>/etc/rc.conf</filename> file for this command
 	      to execute correctly:</para>
 
-	    <screen>&prompt.root; <userinput>/etc/rc.d/inetd restart</userinput></screen>
+	    <screen>&prompt.root; <userinput>service inetd restart</userinput></screen>
 	  </step>
 	</procedure>
 
@@ -4208,7 +4207,7 @@ margaux:ha=0123456789ab:tc=.def100</prog
 	      <filename>/etc/rc.conf</filename> at the first step, you
 	      probably want to reboot instead.</para>
 
-	    <screen>&prompt.root; <userinput>/etc/rc.d/mountd restart</userinput></screen>
+	    <screen>&prompt.root; <userinput>service mountd restart</userinput></screen>
 	  </step>
 	</procedure>
       </sect3>
@@ -4442,7 +4441,7 @@ cd /usr/src/etc; make distribution</prog
 	<step>
 	  <para>Restart the NFS server:</para>
 
-	  <screen>&prompt.root; <userinput>/etc/rc.d/nfsd restart</userinput></screen>
+	  <screen>&prompt.root; <userinput>service nfsd restart</userinput></screen>
 	</step>
 
 	<step>
@@ -4460,7 +4459,7 @@ cd /usr/src/etc; make distribution</prog
 	<step>
 	  <para>Restart inetd:</para>
 
-	  <screen>&prompt.root; <userinput>/etc/rc.d/inetd restart</userinput></screen>
+	  <screen>&prompt.root; <userinput>service inetd restart</userinput></screen>
 	</step>
 
 	<step>

Modified: head/en_US.ISO8859-1/books/handbook/audit/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/audit/chapter.xml	Mon Jan 28 19:13:24 2013	(r40791)
+++ head/en_US.ISO8859-1/books/handbook/audit/chapter.xml	Mon Jan 28 19:42:38 2013	(r40792)
@@ -211,7 +211,7 @@ requirements. -->
     <para>Audit support must then be started by a reboot, or by
       manually starting the audit daemon:</para>
 
-    <programlisting>/etc/rc.d/auditd start</programlisting>
+    <programlisting>service auditd start</programlisting>
   </sect1>
 
   <sect1 id="audit-config">

Modified: head/en_US.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/config/chapter.xml	Mon Jan 28 19:13:24 2013	(r40791)
+++ head/en_US.ISO8859-1/books/handbook/config/chapter.xml	Mon Jan 28 19:42:38 2013	(r40792)
@@ -679,7 +679,7 @@ HOME=/var/log
       For instance, &man.sshd.8; can be restarted with the following
       command:</para>
 
-    <screen>&prompt.root; <userinput>/etc/rc.d/sshd restart</userinput></screen>
+    <screen>&prompt.root; <userinput>service sshd restart</userinput></screen>
 
     <para>This procedure is similar for other services.  Of course,
       services are usually started automatically at boot time as
@@ -711,7 +711,7 @@ HOME=/var/log
       <filename>/etc/rc.conf</filename> setting, execute the following
       command:</para>
 
-    <screen>&prompt.root; <userinput>/etc/rc.d/sshd onerestart</userinput></screen>
+    <screen>&prompt.root; <userinput>service sshd onerestart</userinput></screen>
 
     <para>It is easy to check if a service is enabled in
       <filename>/etc/rc.conf</filename> by running the appropriate
@@ -720,7 +720,7 @@ HOME=/var/log
       <command>sshd</command> is in fact enabled in
       <filename>/etc/rc.conf</filename> by running:</para>
 
-    <screen>&prompt.root; <userinput>/etc/rc.d/sshd rcvar</userinput>
+    <screen>&prompt.root; <userinput>service sshd rcvar</userinput>
 # sshd
 $sshd_enable=YES</screen>
 
@@ -734,7 +734,7 @@ $sshd_enable=YES</screen>
       <option>status</option> option is available.  For instance to
       verify that <command>sshd</command> is actually started:</para>
 
-    <screen>&prompt.root; <userinput>/etc/rc.d/sshd status</userinput>
+    <screen>&prompt.root; <userinput>service sshd status</userinput>
 sshd is running as pid 433.</screen>
 
     <para>In some cases it is also possible to <option>reload</option>
@@ -1218,14 +1218,14 @@ ifconfig_dc1="inet 10.0.0.1 netmask 255.
 	configuration errors.  Alternatively you can just relaunch the
 	networking system:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/netif restart</userinput></screen>
+      <screen>&prompt.root; <userinput>service netif restart</userinput></screen>
 
       <note>
 	<para>If a default gateway has been set in
 	  <filename>/etc/rc.conf</filename>, use also this
 	  command:</para>
 
-	<screen>&prompt.root; <userinput>/etc/rc.d/routing restart</userinput></screen>
+	<screen>&prompt.root; <userinput>service routing restart</userinput></screen>
       </note>
 
       <para>Once the networking system has been relaunched, you should

Modified: head/en_US.ISO8859-1/books/handbook/disks/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Mon Jan 28 19:13:24 2013	(r40791)
+++ head/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Mon Jan 28 19:42:38 2013	(r40792)
@@ -3364,7 +3364,7 @@ Filesystem 1K-blocks Used Avail Capacity
 
       <para>Now restart <command>inetd</command>:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/inetd restart</userinput></screen>
+      <screen>&prompt.root; <userinput>service inetd restart</userinput></screen>
     </sect2>
   </sect1>
 
@@ -4422,7 +4422,7 @@ Device          1K-blocks     Used    Av
 	local disk, and start the &man.hastd.8; daemon:</para>
 
       <screen>&prompt.root; <userinput>hastctl create test</userinput>
-&prompt.root; <userinput>/etc/rc.d/hastd onestart</userinput></screen>
+&prompt.root; <userinput>service hastd onestart</userinput></screen>
 
       <note>
 	<para>It is <emphasis>not</emphasis> possible to use GEOM
@@ -4554,7 +4554,7 @@ notify 30 {
 	<para>Restart &man.devd.8; on both nodes to put the new
 	  configuration into effect:</para>
 
-	<screen>&prompt.root; <userinput>/etc/rc.d/devd restart</userinput></screen>
+	<screen>&prompt.root; <userinput>service devd restart</userinput></screen>
 
 	<para>When the <devicename>carp0</devicename> interface goes
 	  up or down (i.e., the interface state changes), the system

Modified: head/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml	Mon Jan 28 19:13:24 2013	(r40791)
+++ head/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml	Mon Jan 28 19:42:38 2013	(r40792)
@@ -189,7 +189,7 @@ vfs.zfs.vdev.cache.size="5M"</programlis
 	commands:</para>
 
       <screen>&prompt.root; <userinput>echo 'zfs_enable="YES"' &gt;&gt; /etc/rc.conf</userinput>
-&prompt.root; <userinput>/etc/rc.d/zfs start</userinput></screen>
+&prompt.root; <userinput>service zfs start</userinput></screen>
 
       <para>The remainder of this document assumes three
 	<acronym>SCSI</acronym> disks are available, and their

Modified: head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml	Mon Jan 28 19:13:24 2013	(r40791)
+++ head/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml	Mon Jan 28 19:42:38 2013	(r40792)
@@ -249,7 +249,7 @@
 
 	<para>Then run the startup script to load the module:</para>
 
-        <screen>&prompt.root; <userinput>/etc/rc.d/pf start</userinput></screen>
+        <screen>&prompt.root; <userinput>service pf start</userinput></screen>
 
 	<para>Note that the PF Module will not load if it cannot find
 	  the ruleset config file.  The default location is
@@ -277,7 +277,7 @@
 
       <para>Then run the startup script to load the module:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/pflog start</userinput></screen>
+      <screen>&prompt.root; <userinput>service pflog start</userinput></screen>
 
       <para>If you need other <acronym>PF</acronym> features you will
 	need to compile <acronym>PF</acronym> support into the
@@ -884,7 +884,7 @@ LOG_ERR - packets which have been logged
       <para>To activate the changes to <filename>/etc/syslog.conf
 	  </filename> you can reboot or bump the &man.syslogd.8;
 	daemon into re-reading <filename>/etc/syslog.conf</filename>
-	by running <command>/etc/rc.d/syslogd reload</command></para>
+	by running <command>service syslogd reload</command></para>
 
       <para>Do not forget to change
 	<filename>/etc/newsyslog.conf</filename> to rotate the new

Modified: head/en_US.ISO8859-1/books/handbook/jails/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/jails/chapter.xml	Mon Jan 28 19:13:24 2013	(r40791)
+++ head/en_US.ISO8859-1/books/handbook/jails/chapter.xml	Mon Jan 28 19:42:38 2013	(r40792)
@@ -370,12 +370,12 @@ jail_<replaceable>www</replaceable>_devf
       </step>
     </procedure>
 
-    <para>The <filename>/etc/rc.d/jail</filename> script can be used to
+    <para>&man.service.8; can be used to
       start or stop a jail by hand, if an entry for it exists in
       <filename>rc.conf</filename>:</para>
 
-    <screen>&prompt.root; <userinput>/etc/rc.d/jail start <replaceable>www</replaceable></userinput>
-&prompt.root; <userinput>/etc/rc.d/jail stop <replaceable>www</replaceable></userinput></screen>
+    <screen>&prompt.root; <userinput>service jail start <replaceable>www</replaceable></userinput>
+&prompt.root; <userinput>service jail stop <replaceable>www</replaceable></userinput></screen>
 
     <para>A clean way to shut down a &man.jail.8; is not available at
       the moment.  This is because commands normally used to accomplish
@@ -857,11 +857,11 @@ jail_www_devfs_enable="YES"</programlist
 	  <step>
 	    <para>In this phase, the jails are built and prepared to
 	      run.  First, mount the required file systems for each
-	      jail, and then start them using the
-	      <filename>/etc/rc.d/jail</filename> script:</para>
+	      jail, and then start them using the jail rc
+	      script.</para>
 
 	    <screen>&prompt.root; <userinput>mount -a</userinput>
-&prompt.root; <userinput>/etc/rc.d/jail start</userinput></screen>
+&prompt.root; <userinput>service jail start</userinput></screen>
 	  </step>
 	</procedure>
 
@@ -933,7 +933,7 @@ jail_www_devfs_enable="YES"</programlist
 	  <step>
 	    <para>The right time to stop the jails is now:</para>
 
-	    <screen>&prompt.root; <userinput>/etc/rc.d/jail stop</userinput></screen>
+	    <screen>&prompt.root; <userinput>service jail stop</userinput></screen>
 	  </step>
 	  <step>
 	    <para>Unmount the original file systems:</para>
@@ -974,7 +974,7 @@ jail_www_devfs_enable="YES"</programlist
 	      start the jails:</para>
 
 	    <screen>&prompt.root; <userinput>mount -a</userinput>
-&prompt.root; <userinput>/etc/rc.d/jail start</userinput></screen>
+&prompt.root; <userinput>service jail start</userinput></screen>
 	  </step>
 	</procedure>
 

Modified: head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Mon Jan 28 19:13:24 2013	(r40791)
+++ head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Mon Jan 28 19:42:38 2013	(r40792)
@@ -656,7 +656,7 @@ done</programlisting>
 	<step><para>Start the license server.</para>
 
 	<para>The following script, installed as
-	  <filename>/usr/local/etc/rc.d/lmgrd.sh</filename> is a
+	  <filename>/usr/local/rtc/rc.d/lmgrd</filename> is a
 	  convenient way to start up <command>lmgrd</command>:</para>
 
 	<programlisting>   ----- snip ------------
@@ -843,7 +843,7 @@ FEATURE Maple maplelmg 2000.0831 permane
 
 	<step>
 	  <para>Create a startup file at
-	    <filename>/usr/local/etc/rc.d/flexlm.sh</filename>.  The
+	    <filename>/usr/local/etc/rc.d/flexlm</filename>.  The
 	    example below is a modified version of the distributed
 	    <filename>$MATLAB/etc/rc.lm.glnx86</filename>.  The
 	    changes are file locations, and startup of the license
@@ -872,7 +872,7 @@ exit 0</programlisting>
 	  <important>
 	    <para>The file must be made executable:</para>
 
-	    <screen>&prompt.root; <userinput>chmod +x /usr/local/etc/rc.d/flexlm.sh</userinput></screen>
+	    <screen>&prompt.root; <userinput>chmod +x /usr/local/etc/rc.d/flexlm</userinput></screen>
 
 	    <para>You must also replace
 	      <replaceable>username</replaceable> above with the name
@@ -884,7 +884,7 @@ exit 0</programlisting>
 	<step>
 	  <para>Start the license manager with the command:</para>
 
-	  <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/flexlm.sh start</userinput></screen>
+	  <screen>&prompt.root; <userinput>service flexlm start</userinput></screen>
 	</step>
       </procedure>
     </sect2>

Modified: head/en_US.ISO8859-1/books/handbook/mail/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/mail/chapter.xml	Mon Jan 28 19:13:24 2013	(r40791)
+++ head/en_US.ISO8859-1/books/handbook/mail/chapter.xml	Mon Jan 28 19:42:38 2013	(r40792)
@@ -1589,7 +1589,7 @@ define(`confDELIVERY_MODE',`deferred')dn
 
 	<para>and finally start the saslauthd daemon:</para>
 
-	<screen>&prompt.root; <userinput>/usr/local/etc/rc.d/saslauthd start</userinput></screen>
+	<screen>&prompt.root; <userinput>service saslauthd start</userinput></screen>
 
 	<para>This daemon serves as a broker for <application>sendmail</application> to
 	  authenticate against your FreeBSD <filename>passwd</filename>

Modified: head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml	Mon Jan 28 19:13:24 2013	(r40791)
+++ head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml	Mon Jan 28 19:42:38 2013	(r40792)
@@ -1638,7 +1638,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM t
       <para>Start the backend:</para>
 
       <screen>&prompt.root; <userinput>echo 'mythbackend_enable="YES"' >> /etc/rc.conf</userinput>
-&prompt.root; <userinput>/usr/local/etc/rc.d/mythbackend start</userinput></screen>
+&prompt.root; <userinput>service mythbackend start</userinput></screen>
     </sect2>
   </sect1>
 

Modified: head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Mon Jan 28 19:13:24 2013	(r40791)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Mon Jan 28 19:42:38 2013	(r40792)
@@ -173,7 +173,7 @@
 	<application>inetd</application> starting at boot time.
 	The command:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/inetd rcvar</userinput></screen>
+      <screen>&prompt.root; <userinput>service inetd rcvar</userinput></screen>
 
       <para>
 	can be run to display the current effective setting.</para>
@@ -272,7 +272,7 @@
 	<title>Reloading the <application>inetd</application>
 	  Configuration File</title>
 
-	<screen>&prompt.root; <userinput>/etc/rc.d/inetd reload</userinput></screen>
+	<screen>&prompt.root; <userinput>service inetd reload</userinput></screen>
       </example>
 
       <para>Each line of the configuration file specifies an
@@ -805,7 +805,7 @@ mountd_flags="-r"</programlisting>
       <para>or by invoking the <command>mountd</command> &man.rc.8;
 	script with the appropriate parameter:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/mountd onereload</userinput></screen>
+      <screen>&prompt.root; <userinput>service mountd onereload</userinput></screen>
 
       <para>Please refer to <xref linkend="configtuning-rcd"/> for
 	more information about using rc scripts.</para>
@@ -872,8 +872,8 @@ rpc_statd_enable="YES"</programlisting>
 
       <para>Start the application by using:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/lockd start</userinput>
-&prompt.root; <userinput>/etc/rc.d/statd start</userinput></screen>
+      <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
@@ -1588,7 +1588,7 @@ Exports list on foobar:
 	    initializing the NIS maps, start the
 	    <application>ypserv</application> daemon manually:</para>
 
-	  <screen>&prompt.root; <userinput>/etc/rc.d/ypserv start</userinput></screen>
+	  <screen>&prompt.root; <userinput>service ypserv start</userinput></screen>
 	</sect4>
 
 	<sect4>
@@ -1875,7 +1875,7 @@ nis_client_enable="YES"</programlisting>
 	    following commands as the superuser:</para>
 
 	  <screen>&prompt.root; <userinput>/etc/netstart</userinput>
-&prompt.root; <userinput>/etc/rc.d/ypbind start</userinput></screen>
+&prompt.root; <userinput>service ypbind start</userinput></screen>
 
 	  <para>After completing these steps, you should be able to
 	    run <command>ypcat passwd</command> and see the NIS
@@ -3009,7 +3009,7 @@ dhcpd_ifaces="dc0"</programlisting>
 	<para>Then, you can proceed to start the server by issuing
 	  the following command:</para>
 
-	<screen>&prompt.root; <userinput>/usr/local/etc/rc.d/isc-dhcpd start</userinput></screen>
+	<screen>&prompt.root; <userinput>service isc-dhcpd start</userinput></screen>
 
 	<para>Should you need to make changes to the configuration
 	  of your server in the future, it is important to note that
@@ -3380,7 +3380,7 @@ dhcpd_ifaces="dc0"</programlisting>
 	To start the server one time with
 	this configuration, use the following command:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/named onestart</userinput></screen>
+      <screen>&prompt.root; <userinput>service named onestart</userinput></screen>
 
       <para>To ensure the <application>named</application> daemon is
 	started at boot each time, put the following line into the
@@ -4629,9 +4629,8 @@ $include Kexample.com.+005+nnnnn.ZSK.key
       <para>The <filename role="package">www/apache22</filename> port
 	installs an &man.rc.8; script to aid in starting, stopping,
 	and restarting <application>Apache</application>, which can be
-	found in the <filename
-	  class="directory">/usr/local/etc/rc.d/</filename>
-	directory.</para>
+	found in <filename
+	  class="directory">/usr/local/etc/rc.d/</filename>.</para>
 
       <para>To launch <application>Apache</application> at system
 	startup, add the following line to
@@ -4653,8 +4652,6 @@ $include Kexample.com.+005+nnnnn.ZSK.key
 	or by the &man.service.8; utility by issuing one of the
 	following commands:</para>
 
-      <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/apache22 configtest</userinput></screen>
-
       <screen>&prompt.root; <userinput>service apache22 configtest</userinput></screen>
 
       <note>
@@ -4667,10 +4664,7 @@ $include Kexample.com.+005+nnnnn.ZSK.key
       <para>If <application>Apache</application> does not report
 	configuration errors, the
 	<application>Apache</application>&nbsp;<command>httpd</command>
-	can be started with the same &man.rc.8; and &man.service.8;
-	mechanisms:</para>
-
-      <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/apache22 start</userinput></screen>
+	can be started with &man.service.8;:</para>
 
       <screen>&prompt.root; <userinput>service apache22 start</userinput></screen>
 
@@ -5095,7 +5089,7 @@ DocumentRoot /www/someotherdomain.tld
 	manually by executing the following command as
 	<username>root</username>:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/ftpd start</userinput></screen>
+      <screen>&prompt.root; <userinput>service ftpd start</userinput></screen>
 
       <para>You can now log on to your FTP server by typing:</para>
 
@@ -5383,7 +5377,7 @@ DocumentRoot /www/someotherdomain.tld
       <para>It is possible then to start
 	<application>Samba</application> at any time by typing:</para>
 
-      <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/samba start</userinput>
+      <screen>&prompt.root; <userinput>service samba start</userinput>
 Starting SAMBA: removing stale tdbs :
 Starting nmbd.
 Starting smbd.</screen>
@@ -5403,7 +5397,7 @@ Starting smbd.</screen>
       <para>You can stop <application>Samba</application> at any time
 	by typing :</para>
 
-      <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/samba stop</userinput></screen>
+      <screen>&prompt.root; <userinput>service samba stop</userinput></screen>
 
       <para><application>Samba</application> is a complex software
 	suite with functionality that allows broad integration with
@@ -5781,7 +5775,7 @@ syslogd_flags="-a logclient.example.com 
       <para>At this point, the <command>syslogd</command> daemon
 	should be restarted and verified:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/syslogd restart</userinput>
+      <screen>&prompt.root; <userinput>service syslogd restart</userinput>
 &prompt.root; <userinput>pgrep syslog</userinput></screen>
 
       <para>If a <acronym>PID</acronym> is returned, the server has
@@ -5857,7 +5851,7 @@ syslogd_flags="-s -v -v"</programlisting
       <para>Once added, <command>syslogd</command> must be restarted
 	for the changes to take effect:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/syslogd restart</userinput></screen>
+      <screen>&prompt.root; <userinput>service syslogd restart</userinput></screen>
 
       <para>To test that log messages are being sent across the
 	network, use &man.logger.1; on the client to send a message to
@@ -5894,7 +5888,7 @@ syslogd_flags="-s -v -v"</programlisting
 
       <programlisting>syslogd_flags="-d -a logclien.example.com -v -v"</programlisting>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/syslogd restart</userinput></screen>
+      <screen>&prompt.root; <userinput>service syslogd restart</userinput></screen>
 
       <para>Debugging data similar to the following will flash on the
 	screen immediately after the restart:</para>
@@ -5919,7 +5913,7 @@ rejected in rule 0 due to name mismatch.
 	<literal>logclien</literal>.  After the proper alterations
 	are made, a restart is issued with expected results:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/syslogd restart</userinput>
+      <screen>&prompt.root; <userinput>service syslogd restart</userinput>
 logmsg: pri 56, flags 4, from logserv.example.com, msg syslogd: restart
 syslogd: restarted
 logmsg: pri 6, flags 4, from logserv.example.com, msg syslogd: kernel boot file is /boot/kernel/kernel

Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Mon Jan 28 19:13:24 2013	(r40791)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Mon Jan 28 19:42:38 2013	(r40792)
@@ -3038,7 +3038,7 @@ water.CS.Example localhost.Example. UGH 
 	<para>To apply the settings immediately you can execute the
 	  following command as <username>root</username>:</para>
 
-	<screen>&prompt.root; /etc/rc.d/routing start</screen>
+	<screen>&prompt.root; service routing start</screen>
 
 	<para>Please refer to <xref linkend="kernelconfig"/> on
 	  Configuring the FreeBSD Kernel for help in

Modified: head/en_US.ISO8859-1/books/handbook/security/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/security/chapter.xml	Mon Jan 28 19:13:24 2013	(r40791)
+++ head/en_US.ISO8859-1/books/handbook/security/chapter.xml	Mon Jan 28 19:42:38 2013	(r40792)
@@ -1483,10 +1483,9 @@ Enter secret pass phrase: <userinput>&lt
 qpopper : ALL : allow</programlisting>
 
       <para>After adding this line, <application>inetd</application>
-	will need to be restarted.  This can be accomplished by use of
-	the &man.kill.1; command, or with the
-	<parameter>restart</parameter> parameter with
-	<filename>/etc/rc.d/inetd</filename>.</para>
+	will need to be restarted by using &man.service.8;:</para>
+
+	<screen>&prompt.root; <userinput>service inetd restart</userinput></screen>
     </sect2>
 
     <sect2>
@@ -1860,8 +1859,8 @@ Password: <userinput>xxxxxxxx</userinput
 Verifying password - Password: <userinput>xxxxxxxx</userinput></screen>
 
       <para>Now it is time to start up the <acronym>KDC</acronym>
-	services.  Run <command>/etc/rc.d/kerberos start</command> and
-	<command>/etc/rc.d/kadmind start</command> to bring up the
+	services.  Run <command>service kerberos start</command> and
+	<command>service kadmind start</command> to bring up the
 	services.  Note that you will not have any kerberized daemons
 	running at this point but you should be able to confirm that
 	the <acronym>KDC</acronym> is functioning by obtaining and
@@ -1985,7 +1984,7 @@ kadmin><userinput> exit</userinput></scr
 	example we will enable the <command>telnet</command> service
 	by putting a line like this into your
 	<filename>/etc/inetd.conf</filename> and then restarting the
-	&man.inetd.8; service with <command>/etc/rc.d/inetd
+	&man.inetd.8; service with <command>service inetd
 	  restart</command>:</para>
 
       <programlisting>telnet    stream  tcp     nowait  root    /usr/libexec/telnetd  telnetd -a user</programlisting>
@@ -3209,10 +3208,10 @@ racoon_enable="yes"</programlisting>
       <para>This will load &man.sshd.8;, the daemon program for
 	<application>OpenSSH</application>, the next time your
 	system initializes.  Alternatively, it is possible to use
-	<filename>/etc/rc.d/sshd</filename> &man.rc.8; script to
+	&man.service.8; to
 	start <application>OpenSSH</application>:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/sshd start</userinput></screen>
+      <screen>&prompt.root; <userinput>service sshd start</userinput></screen>
     </sect2>
 
     <sect2>
@@ -3601,7 +3600,7 @@ user@unfirewalled-system.example.org's p
 	<filename>/etc/ssh/sshd_config</filename> you must tell
 	&man.sshd.8; to reload its config files, by running:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/sshd reload</userinput></screen>
+      <screen>&prompt.root; <userinput>service sshd reload</userinput></screen>
     </sect2>
 
     <sect2>

Modified: head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml	Mon Jan 28 19:13:24 2013	(r40791)
+++ head/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml	Mon Jan 28 19:42:38 2013	(r40792)
@@ -1245,7 +1245,7 @@ add path 'usb/*' mode 0660 group operato
 
       <para>Then, restart devfs:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/devfs restart</userinput></screen>
+      <screen>&prompt.root; <userinput>service devfs restart</userinput></screen>
 
       <para>USB can now be enabled in the guest operating system.  USB
 	devices should be visible in the &virtualbox;
@@ -1293,7 +1293,7 @@ add path 'usb/*' mode 0660 group operato
 perm xpt0 0660
 perm pass* 0660</programlisting>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/devfs restart</userinput></screen>
+      <screen>&prompt.root; <userinput>service devfs restart</userinput></screen>
     </sect2>
 
 <!--

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 19:49:49 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])
 by hub.freebsd.org (Postfix) with ESMTP id D54F1D07
 for <svn-doc-head@freebsd.org>; Mon, 28 Jan 2013 19:49:49 +0000 (UTC)
 (envelope-from lists@eitanadler.com)
Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com
 [209.85.217.179]) by mx1.freebsd.org (Postfix) with ESMTP id 600967B4
 for <svn-doc-head@freebsd.org>; Mon, 28 Jan 2013 19:49:48 +0000 (UTC)
Received: by mail-lb0-f179.google.com with SMTP id j14so4452310lbo.38
 for <svn-doc-head@freebsd.org>; Mon, 28 Jan 2013 11:49:47 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=eitanadler.com; s=0xdeadbeef;
 h=x-received:mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type;
 bh=KziFy0ii30ZzBFr7syKslZwFqHjTEHSGYmQP94JgBv4=;
 b=R1cjicuwiLKe+J/vXxvdF2Jor3VBBluEL4wiiU6+Y2G6WDtNq1+8J5oInZ162UnaN8
 Au8vt9U3ItUGf/LMIQVvFZjSVuBLtp21zHYrlbj/fC8fxIjgG+Lbp5qh+GilRdeLcfki
 SQCwlWRPo7SPggJaYKgiR+Ikf3+lFXRwBRu2E=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=x-received:mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type
 :x-gm-message-state;
 bh=KziFy0ii30ZzBFr7syKslZwFqHjTEHSGYmQP94JgBv4=;
 b=Lq866KsLoBOI2P27Ed8pAqqrXHNoOmNIZDGHxGriVmUuIza9tw8q1aFatxhuOMd3Zs
 75EnCOWb95P8jJ9rSA5L8uR7FEayw9VfADo9Uz6myHgwoBDi5ooK5ksTh0QzWU59Xv1w
 kQXQhegbmy61B6iM/hyKbjCggesOjHYmyCeA9KaUzxvQYO5EL1BtGyLzBoTeQr4T0CMW
 zvwPjXilBs9SZLpNC+E+fvf2U/E3KwXJhJWVUEvxIkiZa7G3aLOYU/zN5vZlXAXaJne3
 ga6rvotsQN4YWhY7ZNfC7N0r30mAINogNe/Y1p00YlRx+8Rq2dZiZHx6hfxU3L+IVRSr
 qapQ==
X-Received: by 10.112.17.137 with SMTP id o9mr6279263lbd.15.1359402587807;
 Mon, 28 Jan 2013 11:49:47 -0800 (PST)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.112.100.164 with HTTP; Mon, 28 Jan 2013 11:49:17 -0800 (PST)
In-Reply-To: <201301280443.r0S4hPnK024498@svn.freebsd.org>
References: <201301280443.r0S4hPnK024498@svn.freebsd.org>
From: Eitan Adler <eadler@freebsd.org>
Date: Mon, 28 Jan 2013 14:49:17 -0500
X-Google-Sender-Auth: OMb0ZFQyJyd_aJfurL7g5gTvwW0
Message-ID: <CAF6rxgkMKntQp+k2s+WfmXv3sKb-QKvfff5CAq=65BR7RrhO-g@mail.gmail.com>
Subject: Re: svn commit: r40774 -
 head/en_US.ISO8859-1/books/handbook/introduction
To: Glen Barber <gjb@freebsd.org>
Content-Type: text/plain; charset=UTF-8
X-Gm-Message-State: ALoCoQkVD6hkXj0g6hxbAs1QQrIFCAtyMxJASEPVN2Yf3PwyZNfDlhRsLmkw7RIf9xHdbiy5WScu
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
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, 28 Jan 2013 19:49:49 -0000

On 27 January 2013 23:43, Glen Barber <gjb@freebsd.org> wrote:
> Author: gjb
> Date: Mon Jan 28 04:43:24 2013
> New Revision: 40774
> URL: http://svnweb.freebsd.org/changeset/doc/40774
>
> Log:
>   Update introduction page after 9.1-RELEASE.

Is there a post-release wiki page of pages to edit?   Perhaps this
should be added if one exists.

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

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 19:56:40 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])
 by hub.freebsd.org (Postfix) with ESMTP id 6477DE86;
 Mon, 28 Jan 2013 19:56:40 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from onyx.glenbarber.us (onyx.glenbarber.us
 [IPv6:2607:fc50:1000:c200::face])
 by mx1.freebsd.org (Postfix) with ESMTP id 1499E7F3;
 Mon, 28 Jan 2013 19:56:40 +0000 (UTC)
Received: from glenbarber.us
 (75-146-225-65-Philadelphia.hfc.comcastbusiness.net [75.146.225.65])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested) (Authenticated sender: gjb)
 by onyx.glenbarber.us (Postfix) with ESMTPSA id 5275123F654;
 Mon, 28 Jan 2013 14:56:38 -0500 (EST)
DKIM-Filter: OpenDKIM Filter v2.7.4 onyx.glenbarber.us 5275123F654
Authentication-Results: onyx.glenbarber.us; dkim=none
 reason="no signature"; dkim-adsp=none (insecure policy)
Date: Mon, 28 Jan 2013 14:56:36 -0500
From: Glen Barber <gjb@FreeBSD.org>
To: Eitan Adler <eadler@freebsd.org>
Subject: Re: svn commit: r40774 -
 head/en_US.ISO8859-1/books/handbook/introduction
Message-ID: <20130128195636.GB1298@glenbarber.us>
References: <201301280443.r0S4hPnK024498@svn.freebsd.org>
 <CAF6rxgkMKntQp+k2s+WfmXv3sKb-QKvfff5CAq=65BR7RrhO-g@mail.gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="7ZAtKRhVyVSsbBD2"
Content-Disposition: inline
In-Reply-To: <CAF6rxgkMKntQp+k2s+WfmXv3sKb-QKvfff5CAq=65BR7RrhO-g@mail.gmail.com>
X-Operating-System: FreeBSD 10.0-CURRENT amd64
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
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, 28 Jan 2013 19:56:40 -0000


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

On Mon, Jan 28, 2013 at 02:49:17PM -0500, Eitan Adler wrote:
> On 27 January 2013 23:43, Glen Barber <gjb@freebsd.org> wrote:
> > Author: gjb
> > Date: Mon Jan 28 04:43:24 2013
> > New Revision: 40774
> > URL: http://svnweb.freebsd.org/changeset/doc/40774
> >
> > Log:
> >   Update introduction page after 9.1-RELEASE.
>=20
> Is there a post-release wiki page of pages to edit?   Perhaps this
> should be added if one exists.
>=20

Not to my knowledge.  But, I'd prefer to have the notes in the
repository directly, rather than an external document.

Glen


--7ZAtKRhVyVSsbBD2
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iQEcBAEBCAAGBQJRBtf0AAoJEFJPDDeguUajqZIH/An0ySnL62kfgO6NgB98crOC
YggxB6r3il/mk5VU9McvbK4mROeZ/CqTo2b46mvFonK0c1AzL0DPv2aK126r92wU
iu6LIVvyFnuzzmAg4lNYEMSWvED+5sGW89KqkAJn9K8R3x6phY6ED7Cthyk/tWz2
ywluo3pQ1S8CqJG6MBd6raPZYpBMajBhkPogxnojH5492i1/o3OgmWZMaJSpf0BE
YGVZGD+HUDt3oTOBZyB6xflqY9JsTZYyoEG8RLxDQsaq9PHniIsuU0MzIkeXFOsZ
7pWLvzeVef9tVjIf/71YPxBwRwTJJQhf5k9hsWeLOlbboqYwPNUfcJP98vS1c/E=
=oPBg
-----END PGP SIGNATURE-----

--7ZAtKRhVyVSsbBD2--

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 20:01:35 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])
 by hub.freebsd.org (Postfix) with ESMTP id 5635679;
 Mon, 28 Jan 2013 20:01:35 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3E625828;
 Mon, 28 Jan 2013 20:01:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SK1Zo9099821;
 Mon, 28 Jan 2013 20:01:35 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SK1Zjr099820;
 Mon, 28 Jan 2013 20:01:35 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301282001.r0SK1Zjr099820@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 28 Jan 2013 20:01:35 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40793 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 28 Jan 2013 20:01:35 -0000

Author: eadler
Date: Mon Jan 28 20:01:34 2013
New Revision: 40793
URL: http://svnweb.freebsd.org/changeset/doc/40793

Log:
  bootmanage-restore is a duplicate of win95-damaged-boot-manager which
  has more detailed instructions, so remove it.
  
  Submitted by:	perryh@pluto.rain.com
  Approved by:	bcr (mentor, implicit)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Mon Jan 28 19:42:38 2013	(r40792)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Mon Jan 28 20:01:34 2013	(r40793)
@@ -2662,23 +2662,6 @@ kern.timecounter.hardware: TSC -&gt; i82
       </qandaentry>
 
       <qandaentry>
-	<question id="bootmanager-restore">
-	  <para>Another operating system destroyed my Boot Manager.  How
-	    do I get it back?</para>
-	</question>
-
-	<answer>
-	  <para>Enter &man.sysinstall.8; and choose
-	    <guimenuitem>Configure</guimenuitem>, then
-	    <guimenuitem>Fdisk</guimenuitem>.  Select the disk the Boot
-	    Manager resided on with <keycap>Space</keycap>.
-	    Press <keycap>W</keycap> to write changes to the drive.  A
-	    prompt will appear asking which boot loader to install.
-	    Select this, and it will be restored.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="indefinite-wait-buffer">
 	  <para>What does the error <errorname>swap_pager: indefinite
 	    wait buffer:</errorname> mean?</para>

From owner-svn-doc-head@FreeBSD.ORG  Mon Jan 28 22:22:26 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])
 by hub.freebsd.org (Postfix) with ESMTP id DC122991;
 Mon, 28 Jan 2013 22:22:26 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CD662FC;
 Mon, 28 Jan 2013 22:22:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SMMQJE042016;
 Mon, 28 Jan 2013 22:22:26 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SMMQYq042015;
 Mon, 28 Jan 2013 22:22:26 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201301282222.r0SMMQYq042015@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 28 Jan 2013 22:22:26 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40794 - head/en_US.ISO8859-1/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 28 Jan 2013 22:22:26 -0000

Author: gjb
Date: Mon Jan 28 22:22:26 2013
New Revision: 40794
URL: http://svnweb.freebsd.org/changeset/doc/40794

Log:
  Add relnotes/9-STABLE URLs (commented for now, as there are other changes
  needed for the links to be active).
  
  Submitted by:	mva

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

Modified: head/en_US.ISO8859-1/htdocs/relnotes.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/relnotes.xml	Mon Jan 28 20:01:34 2013	(r40793)
+++ head/en_US.ISO8859-1/htdocs/relnotes.xml	Mon Jan 28 22:22:26 2013	(r40794)
@@ -75,7 +75,19 @@
 
       <li><a href="&base;/relnotes/CURRENT/errata/index.html">Errata</a></li>
     </ul>
+    <!--
+    <h3>FreeBSD 9-STABLE Release Documentation</h3>
 
+    <ul>
+      <li><a href="&base;/relnotes/9-STABLE/readme/index.html">README</a></li>
+
+      <li><a href="&base;/relnotes/9-STABLE/relnotes/index.html">Release Notes</a></li>
+
+      <li><a href="&base;/relnotes/9-STABLE/hardware/index.html">Hardware Notes</a></li>
+
+      <li><a href="&base;/relnotes/9-STABLE/errata/index.html">Errata</a></li>
+    </ul>
+    -->
     <h3>FreeBSD 8-STABLE Release Documentation</h3>
 
     <ul>

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 06:25:23 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])
 by hub.freebsd.org (Postfix) with ESMTP id A6F3184E;
 Tue, 29 Jan 2013 06:25:23 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8A75D9F8;
 Tue, 29 Jan 2013 06:25:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0T6PN6O086774;
 Tue, 29 Jan 2013 06:25:23 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0T6PNP0086770;
 Tue, 29 Jan 2013 06:25:23 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201301290625.r0T6PNP0086770@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Tue, 29 Jan 2013 06:25:22 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40795 - in head/en_US.ISO8859-1/books/handbook:
 cutting-edge introduction mirrors
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 29 Jan 2013 06:25:23 -0000

Author: hrs
Date: Tue Jan 29 06:25:22 2013
New Revision: 40795
URL: http://svnweb.freebsd.org/changeset/doc/40795

Log:
  Fix index.

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Mon Jan 28 22:22:26 2013	(r40794)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Jan 29 06:25:22 2013	(r40795)
@@ -1486,7 +1486,7 @@ Fetching 133 new ports or files... done.
 
 	    <orderedlist>
 	      <indexterm>
-		<primary><command>svn</command></primary>
+		<primary>Subversion</primary>
 	      </indexterm>
 	      <indexterm>
 		<primary><command>cron</command></primary>
@@ -1692,7 +1692,7 @@ Fetching 133 new ports or files... done.
 
 	    <orderedlist>
 	      <indexterm>
-		<primary><command>svn</command></primary>
+		<primary>Subversion</primary>
 	      </indexterm>
 	      <indexterm>
 		<primary><command>cron</command></primary>

Modified: head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml	Mon Jan 28 22:22:26 2013	(r40794)
+++ head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml	Tue Jan 29 06:25:22 2013	(r40795)
@@ -785,7 +785,10 @@
 	  <listitem>
 	    <indexterm>
 	      <primary>CVS</primary>
-	      <secondary>repository</secondary>
+	    </indexterm>
+
+	    <indexterm>
+	      <primary>CVS Repository</primary>
 	    </indexterm>
 
 	    <indexterm>
@@ -794,13 +797,16 @@
 	    </indexterm>
 
 	    <indexterm>
-	      <primary>SVN</primary>
-	      <secondary>repository</secondary>
+	      <primary>Subversion</primary>
 	    </indexterm>
 
 	    <indexterm>
-	      <primary>Subversion</primary>
-	      <see>SVN</see>
+	      <primary>Subversion Repository</primary>
+	    </indexterm>
+
+	    <indexterm>
+	      <primary>SVN</primary>
+	      <see>Subversion</see>
 	    </indexterm>
 
 	    <para>For several years, the central source tree for &os;

Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml	Mon Jan 28 22:22:26 2013	(r40794)
+++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml	Tue Jan 29 06:25:22 2013	(r40795)
@@ -534,6 +534,10 @@
   <sect1 id="svn">
     <title>Using <application>Subversion</application></title>
 
+    <indexterm>
+      <primary>Subversion</primary>
+    </indexterm>
+
     <sect2 id="svn-intro">
       <title>Introduction</title>
 
@@ -715,7 +719,8 @@
     <title><application>Subversion</application> Sites</title>
 
     <indexterm>
-      <primary>svn</primary>
+      <primary>Subversion Repository</primary>
+      <secondary>Mirror Sites</secondary>
     </indexterm>
 
     <para>All mirrors carry all repositories.</para>

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 10:29:42 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])
 by hub.freebsd.org (Postfix) with ESMTP id C598E166;
 Tue, 29 Jan 2013 10:29:42 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9FE9DE05;
 Tue, 29 Jan 2013 10:29:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0TATgem059105;
 Tue, 29 Jan 2013 10:29:42 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0TATgK8059103;
 Tue, 29 Jan 2013 10:29:42 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201301291029.r0TATgK8059103@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Tue, 29 Jan 2013 10:29:42 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40796 - head/nl_NL.ISO8859-1/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 29 Jan 2013 10:29:42 -0000

Author: rene
Date: Tue Jan 29 10:29:41 2013
New Revision: 40796
URL: http://svnweb.freebsd.org/changeset/doc/40796

Log:
  MFen the Dutch website:
  - about.xml r39632 -> r40760
  - relnotes.xml r39632 -> r40794

Modified:
  head/nl_NL.ISO8859-1/htdocs/about.xml
  head/nl_NL.ISO8859-1/htdocs/relnotes.xml

Modified: head/nl_NL.ISO8859-1/htdocs/about.xml
==============================================================================
--- head/nl_NL.ISO8859-1/htdocs/about.xml	Tue Jan 29 06:25:22 2013	(r40795)
+++ head/nl_NL.ISO8859-1/htdocs/about.xml	Tue Jan 29 10:29:41 2013	(r40796)
@@ -6,7 +6,7 @@
 <!--
      Vertaald door: Rene Ladan
      %SOURCE%	en_US.ISO8859-1/htdocs/about.xml
-     %SRCID%	39632
+     %SRCID%	40760
  -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -59,7 +59,7 @@
 
   <h2>Draai een groot aantal applicaties</h2>
 
-  <p>Met meer dan 20.000 geporteerde bibliotheken en <a
+  <p>Met meer dan 24.000 geporteerde bibliotheken en <a
       href="&base;/applications.html">toepassingen</a> ondersteunt &os;
     toepassingen voor bureaublad-, applicatie-, en embedded omgevingen.</p>
 

Modified: head/nl_NL.ISO8859-1/htdocs/relnotes.xml
==============================================================================
--- head/nl_NL.ISO8859-1/htdocs/relnotes.xml	Tue Jan 29 06:25:22 2013	(r40795)
+++ head/nl_NL.ISO8859-1/htdocs/relnotes.xml	Tue Jan 29 10:29:41 2013	(r40796)
@@ -5,7 +5,7 @@
 ]>
 <!-- Vertaald door: Siebrand Mazeland / Rene Ladan
      %SOURCE%	en_US.ISO8859-1/htdocs/relnotes.xml
-     %SRCID%	39632
+     %SRCID%	40794
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
@@ -78,7 +78,19 @@
 
       <li><a href="&enbase;/relnotes/CURRENT/errata/index.html">Errata</a></li>
     </ul>
+<!--
+    <h3>&os; 9-STABLE uitgavedocumentatie</h3>
 
+    <ul>
+      <li><a href="&enbase;/relnotes/9-STABLE/readme/index.html">README</a></li>
+
+      <li><a href="&enbase;/relnotes/9-STABLE/relnotes/index.html">Uitgavenotities</a></li>
+
+      <li><a href="&enbase;/relnotes/9-STABLE/hardware/index.html">Hardware-notities</a></li>
+
+      <li><a href="&enbase;/relnotes/9-STABLE/errata/index.html">Errata</a></li>
+    </ul>
+-->
     <h3>&os; 8-STABLE uitgavedocumentatie</h3>
 
     <ul>

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 10:31:56 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])
 by hub.freebsd.org (Postfix) with ESMTP id 4C22F205;
 Tue, 29 Jan 2013 10:31:56 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 382E3E16;
 Tue, 29 Jan 2013 10:31:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0TAVuF5061017;
 Tue, 29 Jan 2013 10:31:56 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0TAVuGi061016;
 Tue, 29 Jan 2013 10:31:56 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201301291031.r0TAVuGi061016@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Tue, 29 Jan 2013 10:31:56 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40797 - head/ja_JP.eucJP/books/handbook/cutting-edge
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 29 Jan 2013 10:31:56 -0000

Author: ryusuke
Date: Tue Jan 29 10:31:55 2013
New Revision: 40797
URL: http://svnweb.freebsd.org/changeset/doc/40797

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

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

Modified: head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Tue Jan 29 10:29:41 2013	(r40796)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Tue Jan 29 10:31:55 2013	(r40797)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40739
+     Original revision: r40795
      $FreeBSD$
 -->
 
@@ -68,9 +68,7 @@
 
       <listitem>
 	<para><application>freebsd-update</application>,
-	  <application>Subversion</application>,
-	  <application>CVSup</application>,
-	  <application>CVS</application> ¤â¤·¤¯¤Ï
+	  <application>Subversion</application> ¤â¤·¤¯¤Ï
 	  <application>CTM</application>
 	  ¤ò»È¤Ã¤¿¥·¥¹¥Æ¥à¹¹¿·ÊýË¡</para>
       </listitem>
@@ -112,7 +110,7 @@
 	&os; ¤Î¥½¡¼¥¹¥³¡¼¥É¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤¿¤ê¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤Î¤Ë
 	<command>svn</command> ¥³¥Þ¥ó¥É¤¬ÍѤ¤¤é¤ì¤Þ¤¹¡£
 	¤³¤Î¥³¥Þ¥ó¥É¤ò»È¤¦¤Ë¤Ï¡¢<filename
-	role="package">devel/subversion</filename> port ¤Þ¤¿¤Ï package
+	  role="package">devel/subversion</filename> port ¤Þ¤¿¤Ï package
 	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</para>
     </note>
   </sect1>
@@ -396,11 +394,12 @@ MergeChanges /etc/ /var/named/etc/</prog
 	  <itemizedlist>
 	    <listitem>
 	      <para>¤¿¤À°ìÅÙ¤À¤±¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤·¤¿¤Î¤Ç¤¢¤ì¤Ð¡¢
-	      <filename class="directory">/boot/kernel.old</filename>
-	      ¤Ï <filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤½¤Î¤â¤Î¤Ç¤¹¡£
-	      ¤¿¤Àñ¤Ë¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î̾Á°¤ò
-	      <filename class="directory">/boot/GENERIC</filename>
-	      ¤Ø¤ÈÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+		<filename
+		  class="directory">/boot/kernel.old</filename>
+		¤Ï <filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤½¤Î¤â¤Î¤Ç¤¹¡£
+		¤¿¤Àñ¤Ë¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î̾Á°¤ò
+		<filename class="directory">/boot/GENERIC</filename>
+		¤Ø¤ÈÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 	    </listitem>
 
 	    <listitem>
@@ -417,7 +416,7 @@ MergeChanges /etc/ /var/named/etc/</prog
 		  class="directory"><replaceable>X.Y-RELEASE</replaceable></filename>
 		¤ò¼ÂºÝ¤Î¥ê¥ê¡¼¥¹ÈÖ¹æ¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£
 		<filename>GENERIC</filename> ¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç <filename
-		class="directory">/boot/GENERIC</filename>
+		  class="directory">/boot/GENERIC</filename>
 		¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>
 	    </listitem>
 
@@ -449,7 +448,8 @@ MergeChanges /etc/ /var/named/etc/</prog
 	  <itemizedlist>
 	    <listitem>
 	      <para>¤¿¤À°ìÅÙ¤À¤±¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤·¤¿¤Î¤Ç¤¢¤ì¤Ð¡¢
-		<filename class="directory">/boot/kernel.old</filename>
+		<filename
+		  class="directory">/boot/kernel.old</filename>
 		¤Ï <filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤½¤Î¤â¤Î¤Ç¤¹¡£
 		¤¿¤Àñ¤Ë¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î̾Á°¤ò
 		<filename class="directory">/boot/kernel</filename>
@@ -899,9 +899,14 @@ Fetching 133 new ports or files... done.
       <para>¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤Ï¡¢
 	<application>Subversion</application>
 	¥×¥í¥°¥é¥à¤ò»È¤Ã¤Æ¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Þ¤¹¡£
-	¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	western US ¥ß¥é¡¼¤«¤é HTTPS
+	¥×¥í¥È¥³¥ë¤òÍѤ¤¤Æ¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <screen>&prompt.root; <userinput>svn checkout <literal>https://svn0.us-west.FreeBSD.org/doc/head</literal> /usr/doc</userinput></screen>
 
-      <screen>&prompt.root; <userinput>svn checkout <literal>svn://svn.FreeBSD.org/doc/head</literal> <filename class="directory">/usr/doc</filename></userinput></screen>
+      <para>ÍøÍѲÄǽ¤Ê <link
+	  linkend="svn-mirrors">Subversion ¥ß¥é¡¼¥µ¥¤¥È</link>
+	¤ÎÃ椫¤é¤â¤Ã¤È¤â¶á¤¤¥ß¥é¡¼¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <para>ºÇ½é¤Ë¥É¥­¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Ë¤Ï¾¯¤·»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹¡£
 	¥À¥¦¥ó¥í¡¼¥É¤¬½ª¤ï¤ë¤Þ¤Ç¤ªÂÔ¤Á¤¯¤À¤µ¤¤¡£</para>
@@ -1475,21 +1480,22 @@ Fetching 133 new ports or files... done.
 
           <listitem>
 	    <para>&os; <link linkend="mirrors">¥ß¥é¡¼¥µ¥¤¥È</link>
-	      ¤«¤é¤Î¥½¡¼¥¹¤ÎÆþ¼ê¡£°Ê²¼¤Î 3 ¤Ä¤ÎÊýË¡¤Î¤¤¤º¤ì¤«¤Ç¤Ç¤­¤Þ¤¹¡£</para>
+	      ¤«¤é¥½¡¼¥¹¤ÎÆþ¼ê¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ê¤¤¤¯¤Ä¤«¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
             <orderedlist>
               <indexterm>
-		<primary><command>svn</command></primary>
+		<primary>Subversion</primary>
 	      </indexterm>
 	      <indexterm>
-                <primary><command>cvsup</command></primary>
-              </indexterm>
-              <indexterm>
                 <primary><command>cron</command></primary>
               </indexterm>
               <indexterm>
 	        <primary>-CURRENT</primary>
-		<secondary><application>CVSup</application> ¤ò»È¤Ã¤¿Æ±´ü</secondary>
+		<secondary><application>Subversion</application> ¤ò»È¤Ã¤¿Æ±´ü</secondary>
+	      </indexterm>
+              <indexterm>
+	        <primary>-CURRENT</primary>
+		<secondary><application>CTM</application> ¤ò»È¤Ã¤¿Æ±´ü</secondary>
 	      </indexterm>
 
 	      <listitem>
@@ -1498,48 +1504,13 @@ Fetching 133 new ports or files... done.
 		  ¤â¤·¤¯¤Ï¥ê¥ê¡¼¥¹¥Ö¥é¥ó¥Á¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¤Æ¤¯¤À¤µ¤¤¡£
 		  ¤³¤ÎÊýË¡¤Ï¡¢³«È¯Ãæ¤Î &os; ¥ê¥Ý¥¸¥È¥ê¤Ø¤Î¥¢¥¯¥»¥¹¤òÄ󶡤·¤Æ¤ª¤ê¡¢
 		  ¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-		  <application>Subversion</application> ¤ò»È¤Ã¤Æ
-		  -CURRENT ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤¹¤ëºÝ¤Î
-		  URL ¤Î¥×¥ì¥Õ¥£¥Ã¥¯¥¹¤Ï¡¢
-		  <literal>http://svn.freebsd.org/base/head/</literal>
-		  ¤Ç¤¹¡£
+		  <link linkend="svn-mirrors">Subversion ¥ß¥é¡¼¥µ¥¤¥È</link>
+		  ¤Î¤Ò¤È¤Ä¤Î <literal>head</literal> ¥Ö¥é¥ó¥Á¤«¤é
+		  -CURRENT ¥³¡¼¥É¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¤Æ¤¯¤À¤µ¤¤¡£
 		  ¥ê¥Ý¥¸¥È¥ê¥µ¥¤¥º¤Î´ÑÅÀ¤«¤é¡¢
 		  ´õ˾¤¹¤ë¥µ¥Ö¥Ä¥ê¡¼¤Î¤ß¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤¹¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Þ¤¹¡£</para>
 	      </listitem>
 
-	      <listitem>
-		<para><link linkend="cvsup">cvsup</link> ¤ò
-		  <filename>/usr/share/examples/cvsup</filename> ¤Ë¤¢¤ë
-		  <filename>standard-supfile</filename> ¤È¤¤¤¦Ì¾¾Î¤Î
-		  <filename>supfile</filename> ¤È¹ç¤ï¤»¤Æ»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
-		  ¾å¤Ëµó¤²¤¿¸«ËܤΠ<filename>supfile</filename>
-		  ¤ò¥«¥¹¥¿¥Þ¥¤¥º¤¹¤ë¤È¤È¤â¤Ë¡¢¤¢¤Ê¤¿¤Î´Ä¶­¤Ë¹ç¤ï¤»¤Æ <link
-		  linkend="cvsup">cvsup</link> ¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
-
-		<warning>
-		  <para><command>cvsup</command> ¤Ï¡¢
-		  ¥×¥í¥¸¥§¥¯¥È¤Ë¤ª¤¤¤ÆÇѻߤµ¤ì¤¿¤Î¤Ç¡¢
-		  ¸½ºß¤Ç¤Ï¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£</para>
-		</warning>
-
-		<note>
-		  <para>¥µ¥ó¥×¥ë¥Õ¥¡¥¤¥ë¤Î <filename>standard-supfile</filename>
-		    ¤Ï¡¢&os; ¤ÎÆÃÄê¤Î¥»¥­¥å¥ê¥Æ¥£¥Ö¥é¥ó¥Á¤òÄɤ¤¤«¤±¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¢¤ê¡¢
-		    &os.current; ÍѤǤϤ¢¤ê¤Þ¤»¤ó¡£
-		    ¤³¤Î¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ë¤¢¤ë¼¡¤Î¹Ô¤ò</para>
-
-		  <programlisting>*default release=cvs tag=RELENG_<replaceable>X</replaceable>_<replaceable>Y</replaceable></programlisting>
-
-		  <para>°Ê²¼¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-		  <programlisting>*default release=cvs tag=.</programlisting>
-
-		  <para>»ÈÍѲÄǽ¤Ê¥¿¥°¤Ë´Ø¤¹¤ë¾ÜºÙ¤ÊÀâÌÀ¤Ï¡¢
-		    ¥Ï¥ó¥É¥Ö¥Ã¥¯¤Î <link
-		      linkend="cvs-tags">CVS ¥¿¥°</link> ¤Î¾Ï¤Ë¤¢¤ê¤Þ¤¹¡£</para>
-		</note>
-	      </listitem>
-
               <listitem>
 		<indexterm>
 		  <primary>-CURRENT</primary>
@@ -1709,15 +1680,12 @@ Fetching 133 new ports or files... done.
             <para>¤â¤·¡¢´û¤Ë &os; ¤Î°ÊÁ°¤Î¥ê¥ê¡¼¥¹¤¬Æ°¤¤¤Æ¤¤¤ë¾ì¹ç¤Ç¡¢
               ¤³¤ì¤ò¥½¡¼¥¹¤«¤é¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤è¤¦¤È¤¹¤ë¤Ê¤é¤Ð¡¢
 	      &os; <link linkend="mirrors">¥ß¥é¡¼¥µ¥¤¥È</link>
-	      ¤«¤é´Êñ¤Ë¹Ô¤¨¤Þ¤¹¡£¤³¤ì¤Ë¤Ï¼¡¤Î 3 ¤Ä¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£
+	      ¤«¤é´Êñ¤Ë¹Ô¤¨¤Þ¤¹¡£°Ê²¼¤Î¤è¤¦¤Ê¤¤¤¯¤Ä¤«¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£
             </para>
 
             <orderedlist>
 	      <indexterm>
-		<primary><command>svn</command></primary>
-	      </indexterm>
-	      <indexterm>
-		<primary><command>cvsup</command></primary>
+		<primary>Subversion</primary>
 	      </indexterm>
 	      <indexterm>
 		<primary><command>cron</command></primary>
@@ -1742,30 +1710,14 @@ Fetching 133 new ports or files... done.
                   <literal>releng/9.0</literal> ¤È¤Ê¤ê¤Þ¤¹¡£
 		  <application>Subversion</application>
 		  ¤ò»È¤Ã¤Æ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤¹¤ëºÝ¤Î
-		  URL ¤Î¥×¥ì¥Õ¥£¥Ã¥¯¥¹¤Ï¡¢
-		  <literal>http://svn.freebsd.org/base/</literal>
-		  ¤È¤Ê¤ê¤Þ¤¹¡£
+		  URL ¤Î¥×¥ì¥Õ¥£¥Ã¥¯¥¹¤Ï¡¢<link
+		    linkend="svn-mirrors">Subversion ¥ß¥é¡¼¥µ¥¤¥È</link>
+		  ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 		  ¥ê¥Ý¥¸¥È¥ê¥µ¥¤¥º¤Î´ÑÅÀ¤«¤é¡¢
 		  ´õ˾¤¹¤ë¥µ¥Ö¥Ä¥ê¡¼¤Î¤ß¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤¹¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Þ¤¹¡£</para>
 	      </listitem>
 
 	      <listitem>
-		<para><link linkend="cvsup">cvsup</link> ¤ò
-		  <filename>/usr/share/examples/cvsup</filename> ¤Ë¤¢¤ë
-		  <filename>stable-supfile</filename> ¤È¤¤¤¦Ì¾¾Î¤Î
-		  <filename>supfile</filename> ¤È¹ç¤ï¤»¤Æ»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
-		  ¾å¤Ëµó¤²¤¿¸«ËܤΠ<filename>supfile</filename>
-		  ¤ò¥«¥¹¥¿¥Þ¥¤¥º¤¹¤ë¤È¤È¤â¤Ë¡¢¤¢¤Ê¤¿¤Î´Ä¶­¤Ë¹ç¤ï¤»¤Æ <link
-		  linkend="cvsup">cvsup</link> ¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
-
-		<warning>
-		  <para><command>cvsup</command> ¤Ï¡¢
-		  ¥×¥í¥¸¥§¥¯¥È¤Ë¤ª¤¤¤ÆÇѻߤµ¤ì¤¿¤Î¤Ç¡¢
-		  ¸½ºß¤Ç¤Ï¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£</para>
-		</warning>
-	      </listitem>
-
-	      <listitem>
 		<indexterm>
 		  <primary>-STABLE</primary>
 		  <secondary>CTM ¤ò»È¤Ã¤ÆƱ´ü¤¹¤ë</secondary>
@@ -1782,8 +1734,8 @@ Fetching 133 new ports or files... done.
           <listitem>
             <para>´ðËÜŪ¤Ë¤Ï¡¢
               ¥½¡¼¥¹¤Ë¿×®¤Ç¥ª¥ó¥Ç¥Þ¥ó¥É¤Ê¥¢¥¯¥»¥¹¤¬É¬Íפǡ¢
-              Àܳ¤Î¥Ð¥ó¥ÉÉý¤¬ÌäÂê¤Ç¤Ê¤±¤ì¤Ð¡¢<command>cvsup</command>
-              ¤« <command>ftp</command> ¤ò»È¤¤¤Þ¤·¤ç¤¦¡£¤½¤¦¤Ç
+              Àܳ¤Î¥Ð¥ó¥ÉÉý¤¬ÌäÂê¤Ç¤Ê¤±¤ì¤Ð¡¢
+	      <command>Subversion</command> ¤ò»È¤¤¤Þ¤·¤ç¤¦¡£¤½¤¦¤Ç
               ¤Ê¤¤¾ì¹ç¤Ï <application>CTM</application>
               ¤ò»È¤¤¤Þ¤·¤ç¤¦¡£</para>
           </listitem>
@@ -1820,10 +1772,8 @@ Fetching 133 new ports or files... done.
       ¥×¥í¥¸¥§¥¯¥È¤Î¥½¡¼¥¹¤Î¤¢¤ë°ìÉôʬ¤Þ¤¿¤ÏÁ´ÂΤκǿ·¤ò
       Äɤ¤¤«¤±¤ëÊýË¡¤Ï¿§¡¹¤¢¤ê¤Þ¤¹¡£
       »ä¤¿¤Á¤¬Ä󶡤·¤Æ¤¤¤ë´ðËÜŪ¤Ê¥µ¡¼¥Ó¥¹¤Ï <link
-	linkend="svn">Subversion</link>¡¢<link
-	linkend="anoncvs">Anonymous CVS</link>¡¢<link
-	linkend="cvsup">CVSup</link> ¤È <link linkend="ctm">CTM</link>
-      ¤Ç¤¹:</para>
+	linkend="svn">Subversion</link>
+      ¤È <link linkend="ctm">CTM</link> ¤Ç¤¹¡£</para>
 
     <warning>
       <para>¥½¡¼¥¹¥Ä¥ê¡¼¤Î°ìÉô¤òºÇ¿·¤Î¤â¤Î¤Ë¹¹¿·¤¹¤ë¤³¤È¤Ï²Äǽ¤Ç¤¹¡£
@@ -1839,30 +1789,20 @@ Fetching 133 new ports or files... done.
     </warning>
 
     <indexterm>
-      <primary>CVS</primary>
-      <secondary>anonymous</secondary>
+      <primary>Subversion</primary>
     </indexterm>
 
-    <para><application>Subversion</application>,
-      <application>Anonymous CVS</application> ¤È
-      <application>CVSup</application> ¤Ï <emphasis>pull</emphasis>
-      Ʊ´ü¥â¥Ç¥ë¤òºÎÍѤ·¤Æ¤¤¤Þ¤¹¡£
-      <application>Subversion</application> ¤Î¾ì¹ç¡¢¥æ¡¼¥¶
-      (¤Þ¤¿¤Ï <command>cron</command> ¥¹¥¯¥ê¥×¥È) ¤¬ <command>svn</command>
+    <para><application>Subversion</application>
+      ¤Ï <emphasis>pull</emphasis> Ʊ´ü¥â¥Ç¥ë¤òºÎÍѤ·¤Æ¤¤¤Þ¤¹¡£
+      ¥æ¡¼¥¶ (¤Þ¤¿¤Ï <command>cron</command> ¥¹¥¯¥ê¥×¥È) ¤¬ <command>svn</command>
       ¤òµ¯Æ°¤·¡¢¥Õ¥¡¥¤¥ë¤òºÇ¿·¾õÂ֤ˤ·¤Þ¤¹¡£
       <application>Subversion</application> ¤Ï¡¢
       ¥í¡¼¥«¥ë¤Î¥½¡¼¥¹¥Ä¥ê¡¼¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëºÇ¤â¹¥¤Þ¤·¤¤ÊýË¡¤Ç¤¹¡£
-      <command>cvsup</command> ¤ª¤è¤Ó <command>cvs</command> ¤âƱÍͤθ¶Íý¤ÇÆ°ºî¤·¤Þ¤¹¤¬¡¢
-      Subversion ¤Ø¤Î°Ü¹Ô¤Ëȼ¤¤Çѻߤµ¤ì¤Þ¤·¤¿¡£
       ÆϤ±¤é¤ì¤ë¹¹¿·¾ðÊó¤Ï¤½¤Î»þÅÀ¤ÎºÇ¿·¤Î¤â¤Î¤Ç¤¢¤ê¡¢
       ¤Þ¤¿É¬Íפʻþ¤Ë¤À¤±¼è¤ê´ó¤»¤é¤ì¤Þ¤¹¡£
       ¶½Ì£¤Î¤¢¤ëÆÃÄê¤Î¥Õ¥¡¥¤¥ë¤ä¥Ç¥£¥ì¥¯¥È¥ê¤Ë¸ÂÄꤷ¤Æ¹¹¿·¤¹¤ë¤³¤È¤â´Êñ¤Ë¤Ç¤­¤Þ¤¹¡£
       ¥¯¥é¥¤¥¢¥ó¥È¦¤Î¥½¡¼¥¹¥Ä¥ê¡¼¤Î¾õÂÖ¡¦
-      ÀßÄê¥Õ¥¡¥¤¥ë¤Î»ØÄê¤Ë½¾¤¤¡¢¥µ¡¼¥Ð¤Ë¤è¤Ã¤Æ¹¹¿·¾ðÊó¤¬ÁÇÁ᤯À¸À®¤µ¤ì¤Þ¤¹¡£
-      ËÜÅö¤Ë¤ä¤à¤òÆÀ¤Ê¤¤Íýͳ¤¬¤Ê¤¤¸Â¤ê¡¢Æ±´ü¥·¥¹¥Æ¥à¤È¤·¤Æ¡¢
-      <application>Subversion</application> ¤òÍѤ¤¤ë¤Ù¤­¤Ç¤¹¡£
-      ¾¤ÎƱ´ü¥á¥«¥Ë¥º¥à¤ÏÇѻߤµ¤ì¤Æ¤ª¤ê¡¢¾­ÍèÄä»ß¤¹¤ëͽÄê¤Ç¤¹¡£
-    </para>
+      ÀßÄê¥Õ¥¡¥¤¥ë¤Î»ØÄê¤Ë½¾¤¤¡¢¥µ¡¼¥Ð¤Ë¤è¤Ã¤Æ¹¹¿·¾ðÊó¤¬ÁÇÁ᤯À¸À®¤µ¤ì¤Þ¤¹¡£</para>
 
     <indexterm>
       <primary><application>CTM</application></primary>
@@ -1880,23 +1820,20 @@ Fetching 133 new ports or files... done.
       ¤³¤ì¤é¤Î <quote>CTM ¤Î¥Ç¥ë¥¿</quote> ¤Ï¼«Æ°
       Ū¤Ë¥Ç¥³¡¼¥É¡¢¸¡ºº¤·¤Æ¥æ¡¼¥¶¤Î¥½¡¼¥¹¤Î¥³¥Ô¡¼¤ËÊѹ¹¤òŬÍѤ¹¤ë
 	&man.ctm.rmail.1; ¤Ë¤è¤Ã¤Æ½èÍý²Äǽ¤È¤Ê¤ê¤Þ¤¹¡£
-      ¤³¤Î½èÍý¤Ï <application>CVSup</application> ¤ä
-      <application>Anonymous CVS</application> ¤è¤ê¤º¤Ã¤È¸úΨ
-      Ū¤Ç¤¢¤ê¡¢<emphasis>pull</emphasis> ¥â¥Ç¥ë¤È¤¤¤¦¤è¤ê¤à¤·¤í
+      ¤³¤Î½èÍý¤Ï <application>Subversion</application>
+      ¤è¤ê¤º¤Ã¤È¸úΨŪ¤Ç¤¢¤ê¡¢<emphasis>pull</emphasis> ¥â¥Ç¥ë¤È¤¤¤¦¤è¤ê¤à¤·¤í
       <emphasis>push</emphasis> ¥â¥Ç¥ë¤Ç
       ¤¢¤ë¤¿¤á¡¢»ä¤¿¤Á¤Î¥µ¡¼¥Ð»ñ¸»¤ÎÉé²Ù¤Ï·Ú¤¯¤Ê¤ê¤Þ¤¹¡£</para>
 
     <para>¤â¤Á¤í¤ó¾¤Î¥È¥ì¡¼¥É¥ª¥Õ¤â¤¢¤ê¤Þ¤¹¡£¤¦¤Ã¤«¤ê¥¢¡¼¥«¥¤¥Ö
-      ¤Î°ìÉô¤ò¾Ã¤·¤Æ¤·¤Þ¤Ã¤Æ¤â¡¢<application>CVSup</application>
+      ¤Î°ìÉô¤ò¾Ã¤·¤Æ¤·¤Þ¤Ã¤Æ¤â¡¢<application>Subversion</application>
       ¤Ï²õ¤ì¤¿Éôʬ¤ò¸¡½Ð¤·¤ÆºÆ¹½ÃÛ¤·¤Æ¤¯¤ì¤Þ¤¹¡£
-      <application>CTM</application> ¤Ï¤³¤ì¤ò¤ä¤Ã¤Æ¤¯¤ì¤Þ¤»¤ó¤·¡¢
-      <application>Anonymous CVS</application>
-      ¤Ï¤ª¤½¤é¤¯Â¾¤Î²¿¤è¤ê¤â¿¼¤¯º®Í𤷤Ƥ·¤Þ¤¦¤³¤È¤¬Â¿¤¤¤Ç¤·¤ç¤¦¡£
-      ¤â¤·¥½¡¼¥¹¥Ä¥ê¡¼¤Î°ìÉô¤ò¾Ã¤·¤Æ¤·¤Þ¤Ã¤¿¤é¡¢(ºÇ¿·¤Î CVS
+      <application>CTM</application> ¤Ï¤³¤ì¤ò¤ä¤Ã¤Æ¤¯¤ì¤Þ¤»¤ó¡£
+      ¤â¤·¥½¡¼¥¹¥Ä¥ê¡¼¤Î°ìÉô¤ò¾Ã¤·¤Æ¤·¤Þ¤Ã¤¿¤é
+      (¤½¤·¤Æ¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤Ã¤Æ¤¤¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð)¡¢(ºÇ¿·¤Î CTM
       <quote>¥Ù¡¼¥¹¥Ç¥ë¥¿</quote> ¤«¤é) °ì¤«¤é¤ä¤êľ¤·¡¢
-      <application>CTM</application> ¤« <application>Anonymous CVS</application>
-      ¤ò»È¤Ã¤Æ°­¤¤Éôʬ¤ò¾Ãµî¤·¡¢ºÆƱ´ü¤µ¤»¤ë¤³¤È¤Ë¤è¤Ã¤Æ
-      ¤¹¤Ù¤Æ¤òºÆ¹½ÃÛ¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
+      <application>CTM</application>
+      ¤ò»È¤Ã¤Æ¤¹¤Ù¤Æ¤òºÆ¹½ÃÛ¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
   </sect1>
 
   <sect1 id="makeworld">
@@ -3035,7 +2972,7 @@ Script done, &hellip;</screen>
 	  <answer>
             <para>
               ¤½¤ì¤ÏÊѹ¹¤ÎÀ­¼Á¤Ë¤è¤ë¤Î¤Ç¡¢¤Ê¤ó¤È¤â¸À¤¨¤Þ¤»¤ó¡£
-	      ¤¿¤È¤¨¤Ð¡¢<application>CVSup</application> ¤ò¼Â¹Ô¤·¤¿¤È¤­¡¢ºÇ¸å¤Ë¼Â¹Ô¤·¤¿¤È¤­¤«¤éÈæ¤Ù¤Æ
+	      ¤¿¤È¤¨¤Ð¡¢<application>Subversion</application> ¤ò¼Â¹Ô¤·¤¿¤È¤­¡¢ºÇ¸å¤Ë¼Â¹Ô¤·¤¿¤È¤­¤«¤éÈæ¤Ù¤Æ
 	      ¼¡¤Ë¤¢¤²¤ë¤è¤¦¤Ê¥Õ¥¡¥¤¥ë¤¬¹¹¿·¤µ¤ì¤Æ¤¤¤¿¤È¤·¤Þ¤¹¡£</para>
 
 	    <screen><filename>src/games/cribbage/instr.c</filename>

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 10:44:47 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])
 by hub.freebsd.org (Postfix) with ESMTP id 403F44B8;
 Tue, 29 Jan 2013 10:44:47 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 19B24ECD;
 Tue, 29 Jan 2013 10:44:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0TAikSm064243;
 Tue, 29 Jan 2013 10:44:46 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0TAikCD064242;
 Tue, 29 Jan 2013 10:44:46 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201301291044.r0TAikCD064242@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Tue, 29 Jan 2013 10:44:46 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40798 - head/nl_NL.ISO8859-1/books/handbook/introduction
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, 29 Jan 2013 10:44:47 -0000

Author: rene
Date: Tue Jan 29 10:44:46 2013
New Revision: 40798
URL: http://svnweb.freebsd.org/changeset/doc/40798

Log:
  MFen r40601 -> r40795
  Fix indentation while here.

Modified:
  head/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml

Modified: head/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml	Tue Jan 29 10:31:55 2013	(r40797)
+++ head/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml	Tue Jan 29 10:44:46 2013	(r40798)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/introduction/chapter.xml
-     %SRCID%	40601
+     %SRCID%	40795
 -->
 
 <chapter id="introduction">
@@ -153,35 +153,35 @@
 	</listitem>
 
 	<listitem>
-	<indexterm>
-	  <primary>binaire compatibiliteit</primary>
+	  <indexterm>
+	    <primary>binaire compatibiliteit</primary>
 
-	  <secondary>Linux</secondary>
-	</indexterm>
+	    <secondary>Linux</secondary>
+	  </indexterm>
 
-	<indexterm>
-	  <primary>binaire compatibiliteit</primary>
+	  <indexterm>
+	    <primary>binaire compatibiliteit</primary>
 
-	  <secondary>SCO</secondary>
-	</indexterm>
+	    <secondary>SCO</secondary>
+	  </indexterm>
 
-	<indexterm>
-	  <primary>binaire compatibiliteit</primary>
+	  <indexterm>
+	    <primary>binaire compatibiliteit</primary>
 
-	  <secondary>SVR4</secondary>
-	</indexterm>
+	    <secondary>SVR4</secondary>
+	  </indexterm>
 
-	<indexterm>
-	  <primary>binaire compatibiliteit</primary>
+	  <indexterm>
+	    <primary>binaire compatibiliteit</primary>
 
-	  <secondary>BSD/OS</secondary>
-	</indexterm>
+	    <secondary>BSD/OS</secondary>
+	  </indexterm>
 
-	<indexterm>
-	  <primary>binaire compatibiliteit</primary>
+	  <indexterm>
+	    <primary>binaire compatibiliteit</primary>
 
-	  <secondary>NetBSD</secondary>
-	</indexterm>
+	    <secondary>NetBSD</secondary>
+	  </indexterm>
 
 	  <para>Door <emphasis>binaire compatibiliteit</emphasis> met
 	    veel programma's voor &linux;, SCO, SVR4, BSDI en NetBSD
@@ -893,29 +893,33 @@
 	      id="development-cvs-repository"/></term>
 
 	  <listitem>
-	  <indexterm>
-	    <primary>CVS</primary>
+	    <indexterm>
+	      <primary>CVS</primary>
+	    </indexterm>
 
-	    <secondary>archief</secondary>
-	  </indexterm>
+	    <indexterm>
+	      <primary>CVS-archief</primary>
+	    </indexterm>
 
-	  <indexterm>
-	    <primary>Concurrent Versions System</primary>
+	    <indexterm>
+	      <primary>Concurrent Versions System</primary>
 
-	    <see>CVS</see>
-	  </indexterm>
+	      <see>CVS</see>
+	    </indexterm>
 
-	  <indexterm>
-	    <primary>SVN</primary>
+	    <indexterm>
+	      <primary>Subversion</primary>
+	    </indexterm>
 
-	    <secondary>archief</secondary>
-	  </indexterm>
+	    <indexterm>
+	      <primary>Subversion-archief</primary>
+	    </indexterm>
 
-	  <indexterm>
-	    <primary>Subversion</primary>
+	    <indexterm>
+	      <primary>SVN</primary>
 
-	    <see>SVN</see>
-	  </indexterm>
+	      <see>Subversion</see>
+	    </indexterm>
 
 	    <para>Gedurende een aantal jaren werd de centrale broncode
 	      voor &os; bijgehouden door <ulink

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 10:58:10 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])
 by hub.freebsd.org (Postfix) with ESMTP id A524DAC3;
 Tue, 29 Jan 2013 10:58:10 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from onyx.glenbarber.us (onyx.glenbarber.us
 [IPv6:2607:fc50:1000:c200::face])
 by mx1.freebsd.org (Postfix) with ESMTP id 6BD9CF8D;
 Tue, 29 Jan 2013 10:58:10 +0000 (UTC)
Received: from glenbarber.us (kaos.glenbarber.us [71.224.221.174])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested) (Authenticated sender: gjb)
 by onyx.glenbarber.us (Postfix) with ESMTPSA id 93B4C23F654;
 Tue, 29 Jan 2013 05:58:07 -0500 (EST)
DKIM-Filter: OpenDKIM Filter v2.7.4 onyx.glenbarber.us 93B4C23F654
Authentication-Results: onyx.glenbarber.us; dkim=none
 reason="no signature"; dkim-adsp=none (insecure policy)
Date: Tue, 29 Jan 2013 05:58:05 -0500
From: Glen Barber <gjb@FreeBSD.org>
To: Hiroki Sato <hrs@FreeBSD.org>
Subject: Re: svn commit: r40795 - in head/en_US.ISO8859-1/books/handbook:
 cutting-edge introduction mirrors
Message-ID: <20130129105805.GA1402@glenbarber.us>
References: <201301290625.r0T6PNP0086770@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="XsQoSWH+UP9D9v3l"
Content-Disposition: inline
In-Reply-To: <201301290625.r0T6PNP0086770@svn.freebsd.org>
X-Operating-System: FreeBSD 10.0-CURRENT amd64
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
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, 29 Jan 2013 10:58:10 -0000


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

On Tue, Jan 29, 2013 at 06:25:22AM +0000, Hiroki Sato wrote:
> Author: hrs
> Date: Tue Jan 29 06:25:22 2013
> New Revision: 40795
> URL: http://svnweb.freebsd.org/changeset/doc/40795
>=20
> Log:
>   Fix index.
>=20
> Modified:
>   head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
>   head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
>   head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
>=20

Was there any specific build-time options (i.e., FORMATS) that this
affected?  Several people looked into this, all with the same conclusion
that the local build was fine.

Glen


--XsQoSWH+UP9D9v3l
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iQEcBAEBCAAGBQJRB6s9AAoJEFJPDDeguUajSwQH/RqXc90Hk9Eb97xPdVZYdPR+
C8Vk7fzaqoLvPfwcx1Ec0NIYqYeCjcccWTFwPbNe2lIeVPg4N6XLDFkUMDJq7a/+
MdHsRbs9HJmss5Qk9QBRQqhmrPd0chH2QAXliNiwp2EKWs45IoAx6LXYyV86n6Vv
v8FUS2kGJCQwU/pRScjYQrBiWi9W+SOWOiO5i0graPsLIJnXTSCTXrUwM7SI5K5G
BPYIt7EiAeJpv4v7AJkdD0sihHf5wn4N90sPpVxzkrYuZAHXBPqNR+/MkboxKB2K
urB+Tx2banyMewhx9rCgjEC0MfG/Dec9aFqPAQ1xz58YSPPTaAHSKnRRhiiaoDM=
=CdLc
-----END PGP SIGNATURE-----

--XsQoSWH+UP9D9v3l--

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 11:35: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
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C7860D0F;
 Tue, 29 Jan 2013 11:35:39 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B51003E9;
 Tue, 29 Jan 2013 11:35:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0TBZdtm079237;
 Tue, 29 Jan 2013 11:35:39 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0TBZduX079236;
 Tue, 29 Jan 2013 11:35:39 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201301291135.r0TBZduX079236@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Tue, 29 Jan 2013 11:35:39 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40799 - 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: Tue, 29 Jan 2013 11:35:39 -0000

Author: rene
Date: Tue Jan 29 11:35:38 2013
New Revision: 40799
URL: http://svnweb.freebsd.org/changeset/doc/40799

Log:
  Add GigeNET to the ISP gallery.
  
  PR:		www/173508
  Submitted by:	Chris Armer <chris.armer@gigenet.com>
  Approved by:	remko (mentor)

Modified:
  head/share/xml/commercial.isp.xml

Modified: head/share/xml/commercial.isp.xml
==============================================================================
--- head/share/xml/commercial.isp.xml	Tue Jan 29 10:44:46 2013	(r40798)
+++ head/share/xml/commercial.isp.xml	Tue Jan 29 11:35:38 2013	(r40799)
@@ -282,6 +282,17 @@
     </description>
   </entry>
 
+  <entry id="gigenet">
+    <name>GigeNET</name>
+    <url>http://www.gigenet.com/</url>
+    <description>
+      GigeNET provides dedicated servers, cloud servers, colocation, and
+      DDOS protection services.  We fully support FreeBSD on all our
+      products as of now.  We have integrated FreeBSD 9 in to our Cloud
+      Server product as well.
+    </description>
+  </entry>
+
   <entry id="gradwell">
     <name>gradwell dot com Ltd</name>
     <url>http://www.gradwell.com/</url>

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 11:59:10 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])
 by hub.freebsd.org (Postfix) with ESMTP id 592D07C;
 Tue, 29 Jan 2013 11:59:10 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from mail.allbsd.org (gatekeeper.allbsd.org
 [IPv6:2001:2f0:104:e001::32])
 by mx1.freebsd.org (Postfix) with ESMTP id DF6D06CE;
 Tue, 29 Jan 2013 11:59:09 +0000 (UTC)
Received: from alph.allbsd.org (p1137-ipbf1505funabasi.chiba.ocn.ne.jp
 [118.7.212.137]) (authenticated bits=128)
 by mail.allbsd.org (8.14.5/8.14.5) with ESMTP id r0TBwXDf028478
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Tue, 29 Jan 2013 20:58:43 +0900 (JST) (envelope-from hrs@FreeBSD.org)
Received: from localhost (localhost [127.0.0.1]) (authenticated bits=0)
 by alph.allbsd.org (8.14.5/8.14.5) with ESMTP id r0TBwWLV046739;
 Tue, 29 Jan 2013 20:58:33 +0900 (JST) (envelope-from hrs@FreeBSD.org)
Date: Tue, 29 Jan 2013 20:41:45 +0900 (JST)
Message-Id: <20130129.204145.1684844339298462680.hrs@allbsd.org>
To: gjb@FreeBSD.org
Subject: Re: svn commit: r40795 - in head/en_US.ISO8859-1/books/handbook:
 cutting-edge introduction mirrors
From: Hiroki Sato <hrs@FreeBSD.org>
In-Reply-To: <20130129105805.GA1402@glenbarber.us>
References: <201301290625.r0T6PNP0086770@svn.freebsd.org>
 <20130129105805.GA1402@glenbarber.us>
X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530  FFD7 4F2C D3D8 2793 CF2D
X-Mailer: Mew version 6.5 on Emacs 23.4 / Mule 6.0 (HANACHIRUSATO)
Mime-Version: 1.0
Content-Type: Multipart/Signed; protocol="application/pgp-signature";
 micalg=pgp-sha1;
 boundary="--Security_Multipart(Tue_Jan_29_20_41_45_2013_943)--"
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: clamav-milter 0.97.4 at gatekeeper.allbsd.org
X-Virus-Status: Clean
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
 (mail.allbsd.org [133.31.130.32]); Tue, 29 Jan 2013 20:58:44 +0900 (JST)
X-Spam-Status: No, score=-98.1 required=13.0 tests=CONTENT_TYPE_PRESENT,
 ONLY1HOPDIRECT,SAMEHELOBY2HOP,USER_IN_WHITELIST autolearn=no version=3.3.2
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
 gatekeeper.allbsd.org
Cc: svn-doc-head@FreeBSD.org, svn-doc-all@FreeBSD.org,
 doc-committers@FreeBSD.org
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, 29 Jan 2013 11:59:10 -0000

----Security_Multipart(Tue_Jan_29_20_41_45_2013_943)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Glen Barber <gjb@FreeBSD.org> wrote
  in <20130129105805.GA1402@glenbarber.us>:

gj> On Tue, Jan 29, 2013 at 06:25:22AM +0000, Hiroki Sato wrote:
gj> > Author: hrs
gj> > Date: Tue Jan 29 06:25:22 2013
gj> > New Revision: 40795
gj> > URL: http://svnweb.freebsd.org/changeset/doc/40795
gj> >
gj> > Log:
gj> >   Fix index.
gj> >
gj> > Modified:
gj> >   head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
gj> >   head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
gj> >   head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
gj> >
gj>
gj> Was there any specific build-time options (i.e., FORMATS) that this
gj> affected?  Several people looked into this, all with the same conclusion
gj> that the local build was fine.

 Please try "make GEN_INDEX=yes" for documents whose Makefile has
 HAS_INDEX=yes.  GEN_INDEX is used to generate an index.  For handbook
 it can be found at http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/doc-index.html.

 It is always set as "true" on www.FreeBSD.org but the default value
 is "false" because of the large memory footprint (~100MB in the case
 of the handbook).  Nowadays it is no longer a big deal for x86
 platforms, though.

-- Hiroki

----Security_Multipart(Tue_Jan_29_20_41_45_2013_943)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (FreeBSD)

iEYEABECAAYFAlEHtXkACgkQTyzT2CeTzy3iiwCfer/bMKCaxYgRwdnG1edqbJls
SO8AoJgHffyqV6mvixwuvUlUqtVhLUD0
=moJW
-----END PGP SIGNATURE-----

----Security_Multipart(Tue_Jan_29_20_41_45_2013_943)----

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 12:04: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])
 by hub.freebsd.org (Postfix) with ESMTP id CF6E44E4;
 Tue, 29 Jan 2013 12:04:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from onyx.glenbarber.us (onyx.glenbarber.us
 [IPv6:2607:fc50:1000:c200::face])
 by mx1.freebsd.org (Postfix) with ESMTP id 69927768;
 Tue, 29 Jan 2013 12:04:06 +0000 (UTC)
Received: from glenbarber.us (kaos.glenbarber.us [71.224.221.174])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested) (Authenticated sender: gjb)
 by onyx.glenbarber.us (Postfix) with ESMTPSA id DD3C823F654;
 Tue, 29 Jan 2013 07:04:04 -0500 (EST)
DKIM-Filter: OpenDKIM Filter v2.7.4 onyx.glenbarber.us DD3C823F654
Authentication-Results: onyx.glenbarber.us; dkim=none
 reason="no signature"; dkim-adsp=none (insecure policy)
Date: Tue, 29 Jan 2013 07:04:03 -0500
From: Glen Barber <gjb@FreeBSD.org>
To: Hiroki Sato <hrs@FreeBSD.org>
Subject: Re: svn commit: r40795 - in head/en_US.ISO8859-1/books/handbook:
 cutting-edge introduction mirrors
Message-ID: <20130129120403.GB1402@glenbarber.us>
References: <201301290625.r0T6PNP0086770@svn.freebsd.org>
 <20130129105805.GA1402@glenbarber.us>
 <20130129.204145.1684844339298462680.hrs@allbsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="NMuMz9nt05w80d4+"
Content-Disposition: inline
In-Reply-To: <20130129.204145.1684844339298462680.hrs@allbsd.org>
X-Operating-System: FreeBSD 10.0-CURRENT amd64
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-doc-head@FreeBSD.org, svn-doc-all@FreeBSD.org,
 doc-committers@FreeBSD.org
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, 29 Jan 2013 12:04:06 -0000


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

On Tue, Jan 29, 2013 at 08:41:45PM +0900, Hiroki Sato wrote:
> Glen Barber <gjb@FreeBSD.org> wrote
>   in <20130129105805.GA1402@glenbarber.us>:
>=20
> gj> On Tue, Jan 29, 2013 at 06:25:22AM +0000, Hiroki Sato wrote:
> gj> > Author: hrs
> gj> > Date: Tue Jan 29 06:25:22 2013
> gj> > New Revision: 40795
> gj> > URL: http://svnweb.freebsd.org/changeset/doc/40795
> gj> >
> gj> > Log:
> gj> >   Fix index.
> gj> >
> gj> > Modified:
> gj> >   head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
> gj> >   head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
> gj> >   head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
> gj> >
> gj>
> gj> Was there any specific build-time options (i.e., FORMATS) that this
> gj> affected?  Several people looked into this, all with the same conclus=
ion
> gj> that the local build was fine.
>=20
>  Please try "make GEN_INDEX=3Dyes" for documents whose Makefile has
>  HAS_INDEX=3Dyes.  GEN_INDEX is used to generate an index.  For handbook
>  it can be found at http://www.freebsd.org/doc/en_US.ISO8859-1/books/hand=
book/doc-index.html.
>=20
>  It is always set as "true" on www.FreeBSD.org but the default value
>  is "false" because of the large memory footprint (~100MB in the case
>  of the handbook).  Nowadays it is no longer a big deal for x86
>  platforms, though.
>=20

Aha.  Thanks for the explanation.  I'll add that to my build testing
scripts.

Glen


--NMuMz9nt05w80d4+
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iQEcBAEBCAAGBQJRB7qzAAoJEFJPDDeguUajAzEIAIpX7QUycJxrzaodg27Klkzu
hljqvFabG5dJ9qVX8JwyqOS+Ig68E5c/mqL/7Q6MTGmRV4JX9rRaKCLHztqEavWR
B8WiteO0QLv4Fqsed34Yn/vjMF+uxAxeay0xTngRbjg//RtQ6LFZw+JW/qnOW+dP
yK82OLV2ysASD9zjL5rulFnypeVe4KS36a5pfS7yEUOl4hPloJ2zZrcsuR4yRoJe
KvPF+hnSJGmCxtQnBefAI7HJcAHCTwg2wZ0sBKxDQbE+ULZ+5qdyvJEcVk3ol4fG
u7J4AsPOpGuWqZiAgYPM94AyPpqkboNHhmsJ+QLOZ4Bx0KDDfgQ+SSUiXD0tzw4=
=kphv
-----END PGP SIGNATURE-----

--NMuMz9nt05w80d4+--

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 13:41: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])
 by hub.freebsd.org (Postfix) with ESMTP id CC72C9AD;
 Tue, 29 Jan 2013 13:41:08 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B0057B69;
 Tue, 29 Jan 2013 13:41:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0TDf8lF017395;
 Tue, 29 Jan 2013 13:41:08 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0TDf8jA017394;
 Tue, 29 Jan 2013 13:41:08 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301291341.r0TDf8jA017394@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 29 Jan 2013 13:41:08 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40800 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 29 Jan 2013 13:41:09 -0000

Author: eadler
Date: Tue Jan 29 13:41:08 2013
New Revision: 40800
URL: http://svnweb.freebsd.org/changeset/doc/40800

Log:
  Modernize a number of questions as they relate to bsdinstall.
  
  Also prefer ada over ad
  
  Submitted by:	nwhitehorn
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Tue Jan 29 11:35:38 2013	(r40799)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Tue Jan 29 13:41:08 2013	(r40800)
@@ -1312,63 +1312,26 @@
       </qandaentry>
 
       <qandaentry>
-	<question id="win95-damaged-boot-manager">
-	  <para>&windows; killed my boot manager!  How do I get it
-	    back?</para>
+	<question id="bootmanager-restore">
+	  <para>Another operating system destroyed my Boot Manager.  How
+	    do I get it back?</para>
 	</question>
 
 	<answer>
-	  <para>You can reinstall the boot manager &os; comes with in
-	    one of three ways:</para>
+	  <para>This depends on what boot manager you have installed.
+	    The &os; boot selection menu (likely what you are using
+	    if you end up in this situation) can be reinstalled using
+	    &man.boot0cfg.8;.  For example, to restore the boot menu
+	    onto the disk <replaceable>ada0</replaceable>:</para>
 
-	  <itemizedlist>
-	    <listitem>
-	      <para>Running DOS, go into the <filename
-		  class="directory">tools</filename> directory of your
-		&os; distribution and look for
-		<filename>bootinst.exe</filename>.  You run it like
-		so:</para>
-
-	      <screen><prompt>...\TOOLS&gt;</prompt> <userinput>bootinst.exe boot.bin</userinput></screen>
-
-	      <para>and the boot manager will be reinstalled.</para>
-	    </listitem>
+	  <screen>&prompt.root; <userinput>boot0cfg -B ada0</userinput></screen>
 
-	    <listitem>
-	      <para>Boot the &os; boot floppy again and go to the
-		<guimenuitem>Custom</guimenuitem> menu item for custom
-		installation.  Choose
-		<guimenuitem>Partition</guimenuitem>.  Select the drive
-		which used to contain your boot manager (likely the
-		first one) and when you come to the partition editor for
-		it, as the very first thing (e.g., do not make any
-		changes) press <keycap>W</keycap>.  This will ask for
-		confirmation, select &gui.yes;, and when you get the
-		Boot Manager selection prompt, be sure to select the
-		<application>&os; Boot Manager</application>.  This will
-		re-write the boot manager to disk.  Now quit out of the
-		installation menu and reboot off the hard disk as
-		normal.</para>
-	    </listitem>
+	  <para>The non-interactive MBR bootloader can be installed using
+	    &man.gpart.8;:</para>
 
-	    <listitem>
-	      <para>Boot the &os; boot floppy (or CD-ROM) and choose the
-		<guimenuitem>Fixit</guimenuitem> menu item.  Select
-		either the Fixit floppy or CD-ROM #2 (the
-		<quote>live</quote> file system option) as appropriate
-		and enter the fixit shell.  Then execute the following
-		command:</para>
-
-	      <screen><prompt>Fixit#</prompt> <userinput>fdisk -B -b /boot/boot0 <replaceable>bootdevice</replaceable></userinput></screen>
-
-	      <para>substituting <replaceable>bootdevice</replaceable>
-		for your real boot device such as
-		<devicename>ad0</devicename> (first IDE disk),
-		<devicename>ad4</devicename> (first IDE disk on
-		auxiliary controller), <devicename>da0</devicename>
-		(first SCSI disk), etc.</para>
-	    </listitem>
-	  </itemizedlist>
+	  <screen>&prompt.root; <userinput>gpart bootcode -b /boot/mbr ada0</userinput></screen>
+
+	  <para>For more complex situations, including GPT disks, see &man.gpart.8;.</para>
 	</answer>
       </qandaentry>
 
@@ -3310,10 +3273,9 @@ kern.sched.name: ULE</screen>
 	    paragraph to find out how to move the data after doing
 	    this.</para>
 
-	  <para>Should you decide not to do a fresh install, you need to
-	    partition and label the new disk with either
-	    &man.sysinstall.8;, or &man.fdisk.8; and &man.disklabel.8;.
-	    You should also install booteasy on both disks with
+	  <para>Alternatively, partition and label the new disk with either
+	    &man.sade.8; or &man.gpart.8;. If the disks are MBR-formatted,
+	    you can also install booteasy on both disks with
 	    &man.boot0cfg.8;, so that you can dual boot to the old or
 	    new system after the copying is done.</para>
 
@@ -3355,12 +3317,12 @@ kern.sched.name: ULE</screen>
 	  </procedure>
 
 	  <para>For example, if you are going to move root to
-	    <devicename>/dev/<replaceable>ad1s1a</replaceable></devicename>,
+	    <devicename>/dev/<replaceable>ada1s1a</replaceable></devicename>,
 	    with <filename class="directory"><replaceable>/mnt</replaceable></filename> as
 	    the temporary mount point, it is:</para>
 
-	  <screen>&prompt.root; <userinput>newfs /dev/<replaceable>ad1s1a</replaceable></userinput>
-&prompt.root; <userinput>mount /dev/<replaceable>ad1s1a</replaceable> <replaceable>/mnt</replaceable></userinput>
+	  <screen>&prompt.root; <userinput>newfs /dev/<replaceable>ada1s1a</replaceable></userinput>
+&prompt.root; <userinput>mount /dev/<replaceable>ada1s1a</replaceable> <replaceable>/mnt</replaceable></userinput>
 &prompt.root; <userinput>cd <replaceable>/mnt</replaceable></userinput>
 &prompt.root; <userinput>dump 0af - / | restore rf -</userinput></screen>
 
@@ -3371,8 +3333,8 @@ kern.sched.name: ULE</screen>
 	    as described above, then move the child partition into the
 	    empty directory that the first move created:</para>
 
-	  <screen>&prompt.root; <userinput>newfs /dev/<replaceable>ad1s1a</replaceable></userinput>
-&prompt.root; <userinput>mount /dev/<replaceable>ad1s1a</replaceable> <replaceable>/mnt</replaceable></userinput>
+	  <screen>&prompt.root; <userinput>newfs /dev/<replaceable>ada1s1a</replaceable></userinput>
+&prompt.root; <userinput>mount /dev/<replaceable>ada1s1a</replaceable> <replaceable>/mnt</replaceable></userinput>
 &prompt.root; <userinput>cd <replaceable>/mnt</replaceable></userinput>
 &prompt.root; <userinput>dump 0af - / | restore rf -</userinput>
 &prompt.root; <userinput>cd var</userinput>
@@ -3384,11 +3346,11 @@ kern.sched.name: ULE</screen>
 	    partition on the appropriate directory in the temporary
 	    mount point, then move the old single partition:</para>
 
-	  <screen>&prompt.root; <userinput>newfs /dev/<replaceable>ad1s1a</replaceable></userinput>
-&prompt.root; <userinput>newfs /dev/<replaceable>ad1s1d</replaceable></userinput>
-&prompt.root; <userinput>mount /dev/<replaceable>ad1s1a</replaceable> <replaceable>/mnt</replaceable></userinput>
+	  <screen>&prompt.root; <userinput>newfs /dev/<replaceable>ada1s1a</replaceable></userinput>
+&prompt.root; <userinput>newfs /dev/<replaceable>ada1s1d</replaceable></userinput>
+&prompt.root; <userinput>mount /dev/<replaceable>ada1s1a</replaceable> <replaceable>/mnt</replaceable></userinput>
 &prompt.root; <userinput>mkdir <replaceable>/mnt</replaceable>/var</userinput>
-&prompt.root; <userinput>mount /dev/<replaceable>ad1s1d</replaceable> <replaceable>/mnt</replaceable>/var</userinput>
+&prompt.root; <userinput>mount /dev/<replaceable>ada1s1d</replaceable> <replaceable>/mnt</replaceable>/var</userinput>
 &prompt.root; <userinput>cd <replaceable>/mnt</replaceable></userinput>
 &prompt.root; <userinput>dump 0af - / | restore rf -</userinput></screen>
 
@@ -4594,9 +4556,13 @@ options    SYSVMSG          # enable for
 	      marked as <literal>insecure</literal> in
 	      <filename>/etc/ttys</filename>.  In this case it will be
 	      required to boot from a &os; installation disk, choose
-	      the <guimenuitem>Fixit</guimenuitem> shell from
-	      &man.sysinstall.8; and issue the commands mentioned
-	      above.</para>
+	      the <guimenuitem>Live CD</guimenuitem> or
+	      <guimenuitem>Shell</guimenuitem> at the beginning of the install
+	      process and issue the commands mentioned above. You will need to
+	      mount the specific partition in this case and then chroot to it,
+	      i.e. replace <command>mount -urw /</command> by
+	      <command>mount /dev/ada0p1 /mnt; chroot /mnt</command> for
+	      a system on <replaceable>ada0p1</replaceable>.</para>
 	  </note>
 
 	  <note>

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 13:41:11 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])
 by hub.freebsd.org (Postfix) with ESMTP id 418469AE;
 Tue, 29 Jan 2013 13:41:11 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 34975B6A;
 Tue, 29 Jan 2013 13:41:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0TDfBEP017431;
 Tue, 29 Jan 2013 13:41:11 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0TDfBts017430;
 Tue, 29 Jan 2013 13:41:11 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301291341.r0TDfBts017430@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 29 Jan 2013 13:41:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40801 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 29 Jan 2013 13:41:11 -0000

Author: eadler
Date: Tue Jan 29 13:41:10 2013
New Revision: 40801
URL: http://svnweb.freebsd.org/changeset/doc/40801

Log:
  Minor whitespace fix.
  
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Tue Jan 29 13:41:08 2013	(r40800)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Tue Jan 29 13:41:10 2013	(r40801)
@@ -325,7 +325,7 @@
 	    <listitem>
 	      <para>OpenBSD aims for operating system security above
 		all else.  The OpenBSD team wrote &man.ssh.1; and
-	        &man.pf.4;, which have both been ported to &os;.</para>
+		&man.pf.4;, which have both been ported to &os;.</para>
 	    </listitem>
 
 	    <listitem>

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 14:13: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
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 6CEED926;
 Tue, 29 Jan 2013 14:13:07 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2D641E03;
 Tue, 29 Jan 2013 14:13:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0TED7UX027169;
 Tue, 29 Jan 2013 14:13:07 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0TED6kj027166;
 Tue, 29 Jan 2013 14:13:06 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201301291413.r0TED6kj027166@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Tue, 29 Jan 2013 14:13:06 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40802 - in head/ja_JP.eucJP/books/handbook: introduction
 mirrors
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 29 Jan 2013 14:13:07 -0000

Author: ryusuke
Date: Tue Jan 29 14:13:06 2013
New Revision: 40802
URL: http://svnweb.freebsd.org/changeset/doc/40802

Log:
  - Merge the following from the English version:
  
  	r40774 -> r40795	head/ja_JP.eucJP/books/handbook/introduction/chapter.xml
  	r40675 -> r40795	head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/introduction/chapter.xml
  head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/introduction/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/introduction/chapter.xml	Tue Jan 29 13:41:10 2013	(r40801)
+++ head/ja_JP.eucJP/books/handbook/introduction/chapter.xml	Tue Jan 29 14:13:06 2013	(r40802)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40774
+     Original revision: r40795
      $FreeBSD$
 -->
 
@@ -859,20 +859,28 @@
 	  <listitem>
 	  <indexterm>
 	    <primary>CVS</primary>
-	    <secondary>¥ê¥Ý¥¸¥È¥ê</secondary>
 	  </indexterm>
+
 	  <indexterm>
+	      <primary>CVS ¥ê¥Ý¥¸¥È¥ê</primary>
+	    </indexterm>
+
+	    <indexterm>
 	    <primary>Concurrent Version System</primary>
 	    <see>CVS</see>
 	  </indexterm>
 	  <indexterm>
-	    <primary>SVN</primary>
-	    <secondary>repository</secondary>
+	    <primary>Subversion</primary>
 	  </indexterm>
 	  <indexterm>
-	    <primary>Subversion</primary>
-	    <see>SVN</see>
+	    <primary>Subversion ¥ê¥Ý¥¸¥È¥ê</primary>
 	  </indexterm>
+
+	    <indexterm>
+	      <primary>SVN</primary>
+	      <see>Subversion</see>
+	    </indexterm>
+
 	    <para>Ĺǯ¤Ë¤ï¤¿¤ê &os; ¤Î¥½¡¼¥¹¥Ä¥ê¡¼¤Ï
 	      <ulink url="http://www.nongnu.org/cvs/">CVS</ulink>
 	      (Concurrent Versions System) ¤Ë¤è¤Ã¤Æ¥á¥ó¥Æ¥Ê¥ó¥¹¤µ¤ì¤Æ¤­¤Þ¤·¤¿¡£

Modified: head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml	Tue Jan 29 13:41:10 2013	(r40801)
+++ head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml	Tue Jan 29 14:13:06 2013	(r40802)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40675
+     Original revision: r40795
      $FreeBSD$
 -->
 
@@ -536,6 +536,10 @@
   <sect1 id="svn">
     <title><application>Subversion</application> ¤ò»È¤¦</title>
 
+    <indexterm>
+      <primary>Subversion</primary>
+    </indexterm>
+
     <sect2 id="svn-intro">
       <title>¤Ï¤¸¤á¤Ë</title>
 
@@ -721,7 +725,8 @@
     <title><application>Subversion</application> ¥µ¥¤¥È</title>
 
     <indexterm>
-      <primary>svn</primary>
+      <primary>Subversion Repository</primary>
+      <secondary>¥ß¥é¡¼¥µ¥¤¥È</secondary>
     </indexterm>
 
     <para>¤¹¤Ù¤Æ¤Î¥ß¥é¡¼¤Ï¤¹¤Ù¤Æ¤Î¥ê¥Ý¥¸¥È¥ê¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£</para>

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 14:38: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
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id ED13EE71;
 Tue, 29 Jan 2013 14:38:15 +0000 (UTC)
 (envelope-from wblock@wonkity.com)
Received: from wonkity.com (wonkity.com [67.158.26.137])
 by mx1.freebsd.org (Postfix) with ESMTP id AAE98EFC;
 Tue, 29 Jan 2013 14:38:15 +0000 (UTC)
Received: from wonkity.com (localhost [127.0.0.1])
 by wonkity.com (8.14.6/8.14.6) with ESMTP id r0TEcETs027457;
 Tue, 29 Jan 2013 07:38:14 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Received: from localhost (wblock@localhost)
 by wonkity.com (8.14.6/8.14.6/Submit) with ESMTP id r0TEcEqi027454;
 Tue, 29 Jan 2013 07:38:14 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Date: Tue, 29 Jan 2013 07:38:14 -0700 (MST)
From: Warren Block <wblock@wonkity.com>
To: Hiroki Sato <hrs@FreeBSD.org>
Subject: Re: svn commit: r40795 - in head/en_US.ISO8859-1/books/handbook:
 cutting-edge introduction mirrors
In-Reply-To: <20130129.204145.1684844339298462680.hrs@allbsd.org>
Message-ID: <alpine.BSF.2.00.1301290736140.27370@wonkity.com>
References: <201301290625.r0T6PNP0086770@svn.freebsd.org>
 <20130129105805.GA1402@glenbarber.us>
 <20130129.204145.1684844339298462680.hrs@allbsd.org>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7
 (wonkity.com [127.0.0.1]); Tue, 29 Jan 2013 07:38:14 -0700 (MST)
Cc: svn-doc-head@FreeBSD.org, gjb@FreeBSD.org, svn-doc-all@FreeBSD.org,
 doc-committers@FreeBSD.org
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, 29 Jan 2013 14:38:16 -0000

On Tue, 29 Jan 2013, Hiroki Sato wrote:

> Glen Barber <gjb@FreeBSD.org> wrote
>  in <20130129105805.GA1402@glenbarber.us>:
>
> gj> On Tue, Jan 29, 2013 at 06:25:22AM +0000, Hiroki Sato wrote:
> gj> > Author: hrs
> gj> > Date: Tue Jan 29 06:25:22 2013
> gj> > New Revision: 40795
> gj> > URL: http://svnweb.freebsd.org/changeset/doc/40795
> gj> >
> gj> > Log:
> gj> >   Fix index.
> gj> >
> gj> > Modified:
> gj> >   head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
> gj> >   head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
> gj> >   head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
> gj> >
> gj>
> gj> Was there any specific build-time options (i.e., FORMATS) that this
> gj> affected?  Several people looked into this, all with the same conclusion
> gj> that the local build was fine.
>
> Please try "make GEN_INDEX=yes" for documents whose Makefile has
> HAS_INDEX=yes.  GEN_INDEX is used to generate an index.  For handbook
> it can be found at http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/doc-index.html.
>
> It is always set as "true" on www.FreeBSD.org but the default value
> is "false" because of the large memory footprint (~100MB in the case
> of the handbook).  Nowadays it is no longer a big deal for x86
> platforms, though.

With that, I see the error in index.xml, but don't understand what 
caused it.

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 15:15: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
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 02771BB8;
 Tue, 29 Jan 2013 15:15:48 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from mail.allbsd.org (gatekeeper.allbsd.org
 [IPv6:2001:2f0:104:e001::32])
 by mx1.freebsd.org (Postfix) with ESMTP id 93383157;
 Tue, 29 Jan 2013 15:15:47 +0000 (UTC)
Received: from alph.allbsd.org (p1137-ipbf1505funabasi.chiba.ocn.ne.jp
 [118.7.212.137]) (authenticated bits=128)
 by mail.allbsd.org (8.14.5/8.14.5) with ESMTP id r0TFFVkn053790
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Wed, 30 Jan 2013 00:15:41 +0900 (JST) (envelope-from hrs@FreeBSD.org)
Received: from localhost (localhost [127.0.0.1]) (authenticated bits=0)
 by alph.allbsd.org (8.14.5/8.14.5) with ESMTP id r0TFFTOw049453;
 Wed, 30 Jan 2013 00:15:31 +0900 (JST) (envelope-from hrs@FreeBSD.org)
Date: Wed, 30 Jan 2013 00:15:20 +0900 (JST)
Message-Id: <20130130.001520.2086972082736278129.hrs@allbsd.org>
To: wblock@wonkity.com
Subject: Re: svn commit: r40795 - in head/en_US.ISO8859-1/books/handbook:
 cutting-edge introduction mirrors
From: Hiroki Sato <hrs@FreeBSD.org>
In-Reply-To: <alpine.BSF.2.00.1301290736140.27370@wonkity.com>
References: <20130129105805.GA1402@glenbarber.us>
 <20130129.204145.1684844339298462680.hrs@allbsd.org>
 <alpine.BSF.2.00.1301290736140.27370@wonkity.com>
X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530  FFD7 4F2C D3D8 2793 CF2D
X-Mailer: Mew version 6.5 on Emacs 23.4 / Mule 6.0 (HANACHIRUSATO)
Mime-Version: 1.0
Content-Type: Multipart/Signed; protocol="application/pgp-signature";
 micalg=pgp-sha1;
 boundary="--Security_Multipart(Wed_Jan_30_00_15_20_2013_973)--"
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: clamav-milter 0.97.4 at gatekeeper.allbsd.org
X-Virus-Status: Clean
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
 (mail.allbsd.org [133.31.130.32]); Wed, 30 Jan 2013 00:15:41 +0900 (JST)
X-Spam-Status: No, score=-98.1 required=13.0 tests=CONTENT_TYPE_PRESENT,
 ONLY1HOPDIRECT,SAMEHELOBY2HOP,USER_IN_WHITELIST autolearn=no version=3.3.2
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
 gatekeeper.allbsd.org
Cc: svn-doc-head@FreeBSD.org, gjb@FreeBSD.org, svn-doc-all@FreeBSD.org,
 doc-committers@FreeBSD.org
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, 29 Jan 2013 15:15:48 -0000

----Security_Multipart(Wed_Jan_30_00_15_20_2013_973)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Warren Block <wblock@wonkity.com> wrote
  in <alpine.BSF.2.00.1301290736140.27370@wonkity.com>:

wb> On Tue, 29 Jan 2013, Hiroki Sato wrote:
wb>
wb> > Glen Barber <gjb@FreeBSD.org> wrote
wb> >  in <20130129105805.GA1402@glenbarber.us>:
wb> >
wb> > gj> On Tue, Jan 29, 2013 at 06:25:22AM +0000, Hiroki Sato wrote:
wb> > gj> > Author: hrs
wb> > gj> > Date: Tue Jan 29 06:25:22 2013
wb> > gj> > New Revision: 40795
wb> > gj> > URL: http://svnweb.freebsd.org/changeset/doc/40795
wb> > gj> >
wb> > gj> > Log:
wb> > gj> >   Fix index.
wb> > gj> >
wb> > gj> > Modified:
wb> > gj> >   head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
wb> > gj> >   head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
wb> > gj> >   head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
wb> > gj> >
wb> > gj>
wb> > gj> Was there any specific build-time options (i.e., FORMATS) that
wb> > this
wb> > gj> affected?  Several people looked into this, all with the same
wb> > conclusion
wb> > gj> that the local build was fine.
wb> >
wb> > Please try "make GEN_INDEX=yes" for documents whose Makefile has
wb> > HAS_INDEX=yes.  GEN_INDEX is used to generate an index.  For handbook
wb> > it can be found at
wb> > http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/doc-index.html.
wb> >
wb> > It is always set as "true" on www.FreeBSD.org but the default value
wb> > is "false" because of the large memory footprint (~100MB in the case
wb> > of the handbook).  Nowadays it is no longer a big deal for x86
wb> > platforms, though.
wb>
wb> With that, I see the error in index.xml, but don't understand what
wb> caused it.

 What error is there?

-- Hiroki

----Security_Multipart(Wed_Jan_30_00_15_20_2013_973)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (FreeBSD)

iEYEABECAAYFAlEH54gACgkQTyzT2CeTzy2BVACgqXXLdoY7mQhEe33k635Gj8u4
i5YAn0JkVxM8d+1LflC8LF855i5cBKB3
=HD6P
-----END PGP SIGNATURE-----

----Security_Multipart(Wed_Jan_30_00_15_20_2013_973)----

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 15:34:27 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])
 by hub.freebsd.org (Postfix) with ESMTP id B91AE22F;
 Tue, 29 Jan 2013 15:34:27 +0000 (UTC)
 (envelope-from wblock@wonkity.com)
Received: from wonkity.com (wonkity.com [67.158.26.137])
 by mx1.freebsd.org (Postfix) with ESMTP id 5D3F928F;
 Tue, 29 Jan 2013 15:34:27 +0000 (UTC)
Received: from wonkity.com (localhost [127.0.0.1])
 by wonkity.com (8.14.6/8.14.6) with ESMTP id r0TFYL7P028392;
 Tue, 29 Jan 2013 08:34:21 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Received: from localhost (wblock@localhost)
 by wonkity.com (8.14.6/8.14.6/Submit) with ESMTP id r0TFYLhw028389;
 Tue, 29 Jan 2013 08:34:21 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Date: Tue, 29 Jan 2013 08:34:21 -0700 (MST)
From: Warren Block <wblock@wonkity.com>
To: Hiroki Sato <hrs@FreeBSD.org>
Subject: Re: svn commit: r40795 - in head/en_US.ISO8859-1/books/handbook:
 cutting-edge introduction mirrors
In-Reply-To: <20130130.001520.2086972082736278129.hrs@allbsd.org>
Message-ID: <alpine.BSF.2.00.1301290832200.27370@wonkity.com>
References: <20130129105805.GA1402@glenbarber.us>
 <20130129.204145.1684844339298462680.hrs@allbsd.org>
 <alpine.BSF.2.00.1301290736140.27370@wonkity.com>
 <20130130.001520.2086972082736278129.hrs@allbsd.org>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7
 (wonkity.com [127.0.0.1]); Tue, 29 Jan 2013 08:34:21 -0700 (MST)
Cc: svn-doc-head@FreeBSD.org, gjb@FreeBSD.org, svn-doc-all@FreeBSD.org,
 doc-committers@FreeBSD.org
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, 29 Jan 2013 15:34:27 -0000

On Wed, 30 Jan 2013, Hiroki Sato wrote:

> Warren Block <wblock@wonkity.com> wrote
>  in <alpine.BSF.2.00.1301290736140.27370@wonkity.com>:
>
> wb> On Tue, 29 Jan 2013, Hiroki Sato wrote:
> wb>
> wb> > Glen Barber <gjb@FreeBSD.org> wrote
> wb> >  in <20130129105805.GA1402@glenbarber.us>:
> wb> >
> wb> > gj> On Tue, Jan 29, 2013 at 06:25:22AM +0000, Hiroki Sato wrote:
> wb> > gj> > Author: hrs
> wb> > gj> > Date: Tue Jan 29 06:25:22 2013
> wb> > gj> > New Revision: 40795
> wb> > gj> > URL: http://svnweb.freebsd.org/changeset/doc/40795
> wb> > gj> >
> wb> > gj> > Log:
> wb> > gj> >   Fix index.
> wb> > gj> >
> wb> > gj> > Modified:
> wb> > gj> >   head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
> wb> > gj> >   head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
> wb> > gj> >   head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
> wb> > gj> >
> wb> > gj>
> wb> > gj> Was there any specific build-time options (i.e., FORMATS) that
> wb> > this
> wb> > gj> affected?  Several people looked into this, all with the same
> wb> > conclusion
> wb> > gj> that the local build was fine.
> wb> >
> wb> > Please try "make GEN_INDEX=yes" for documents whose Makefile has
> wb> > HAS_INDEX=yes.  GEN_INDEX is used to generate an index.  For handbook
> wb> > it can be found at
> wb> > http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/doc-index.html.
> wb> >
> wb> > It is always set as "true" on www.FreeBSD.org but the default value
> wb> > is "false" because of the large memory footprint (~100MB in the case
> wb> > of the handbook).  Nowadays it is no longer a big deal for x86
> wb> > platforms, though.
> wb>
> wb> With that, I see the error in index.xml, but don't understand what
> wb> caused it.
>
> What error is there?

http://lists.freebsd.org/pipermail/freebsd-doc/2013-January/021316.html

On my local copy with GEN_INDEX=yes, I see that error.  I have not yet 
updated to get your changes, but thought they were to fix that problem.

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 16:17:11 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])
 by hub.freebsd.org (Postfix) with ESMTP id B30D123E;
 Tue, 29 Jan 2013 16:17:11 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from mail.allbsd.org (gatekeeper.allbsd.org
 [IPv6:2001:2f0:104:e001::32])
 by mx1.freebsd.org (Postfix) with ESMTP id 48E0770E;
 Tue, 29 Jan 2013 16:17:11 +0000 (UTC)
Received: from alph.allbsd.org (p1137-ipbf1505funabasi.chiba.ocn.ne.jp
 [118.7.212.137]) (authenticated bits=128)
 by mail.allbsd.org (8.14.5/8.14.5) with ESMTP id r0TGGsfn061331
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Wed, 30 Jan 2013 01:17:04 +0900 (JST) (envelope-from hrs@FreeBSD.org)
Received: from localhost (localhost [127.0.0.1]) (authenticated bits=0)
 by alph.allbsd.org (8.14.5/8.14.5) with ESMTP id r0TGGqC3050125;
 Wed, 30 Jan 2013 01:16:53 +0900 (JST) (envelope-from hrs@FreeBSD.org)
Date: Wed, 30 Jan 2013 01:07:51 +0900 (JST)
Message-Id: <20130130.010751.920572086109612574.hrs@allbsd.org>
To: wblock@wonkity.com
Subject: Re: svn commit: r40795 - in head/en_US.ISO8859-1/books/handbook:
 cutting-edge introduction mirrors
From: Hiroki Sato <hrs@FreeBSD.org>
In-Reply-To: <alpine.BSF.2.00.1301290832200.27370@wonkity.com>
References: <alpine.BSF.2.00.1301290736140.27370@wonkity.com>
 <20130130.001520.2086972082736278129.hrs@allbsd.org>
 <alpine.BSF.2.00.1301290832200.27370@wonkity.com>
X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530  FFD7 4F2C D3D8 2793 CF2D
X-Mailer: Mew version 6.5 on Emacs 23.4 / Mule 6.0 (HANACHIRUSATO)
Mime-Version: 1.0
Content-Type: Multipart/Signed; protocol="application/pgp-signature";
 micalg=pgp-sha1;
 boundary="--Security_Multipart(Wed_Jan_30_01_07_51_2013_994)--"
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: clamav-milter 0.97.4 at gatekeeper.allbsd.org
X-Virus-Status: Clean
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
 (mail.allbsd.org [133.31.130.32]); Wed, 30 Jan 2013 01:17:05 +0900 (JST)
X-Spam-Status: No, score=-97.9 required=13.0 tests=CONTENT_TYPE_PRESENT,
 ONLY1HOPDIRECT,QENCPTR1,SAMEHELOBY2HOP,USER_IN_WHITELIST autolearn=no
 version=3.3.2
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
 gatekeeper.allbsd.org
Cc: svn-doc-head@FreeBSD.org, gjb@FreeBSD.org, svn-doc-all@FreeBSD.org,
 doc-committers@FreeBSD.org
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, 29 Jan 2013 16:17:11 -0000

----Security_Multipart(Wed_Jan_30_01_07_51_2013_994)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Warren Block <wblock@wonkity.com> wrote
  in <alpine.BSF.2.00.1301290832200.27370@wonkity.com>:

wb> http://lists.freebsd.org/pipermail/freebsd-doc/2013-January/021316.html
wb>
wb> On my local copy with GEN_INDEX=yes, I see that error.  I have not yet
wb> updated to get your changes, but thought they were to fix that
wb> problem.

 The culprit was the following change in cutting-edge/chapter.xml in
 your commit at r40787:

     <indexterm>
-      <primary>CVS</primary>
-      <secondary>anonymous</secondary>
+      <primary>Subversion</primary>
     </indexterm>

 The introduction/chapter.xml file had the following fragment:

 	    <indexterm>
	      <primary>Subversion</primary>
	      <see>SVN</see>
	    </indexterm>

 In short: a word "Subversion" is indexed as "see SVN" in
 introduction/chapter.xml.  However, another index definition of the
 word is in cutting-edge/chapter.xml at the same time.

 If we use <see> to index a word "X" somewhere, we are no longer able
 to define another index for "X" because they always conflict with
 each other.

-- Hiroki

----Security_Multipart(Wed_Jan_30_01_07_51_2013_994)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (FreeBSD)

iEYEABECAAYFAlEH89cACgkQTyzT2CeTzy1MZACfcz+ObZjSwDWbVqLzZ7o285pQ
fWEAoMxj/m9TuAdmAz6JQM5zBcmfUG9X
=9boj
-----END PGP SIGNATURE-----

----Security_Multipart(Wed_Jan_30_01_07_51_2013_994)----

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 16:23:46 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])
 by hub.freebsd.org (Postfix) with ESMTP id B81C5484;
 Tue, 29 Jan 2013 16:23:46 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A00B976A;
 Tue, 29 Jan 2013 16:23:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0TGNkGE066246;
 Tue, 29 Jan 2013 16:23:46 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0TGNkPl066245;
 Tue, 29 Jan 2013 16:23:46 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201301291623.r0TGNkPl066245@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Tue, 29 Jan 2013 16:23:46 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40803 - head/ja_JP.eucJP/books/handbook/multimedia
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, 29 Jan 2013 16:23:46 -0000

Author: ryusuke
Date: Tue Jan 29 16:23:46 2013
New Revision: 40803
URL: http://svnweb.freebsd.org/changeset/doc/40803

Log:
  - Merge the following from the English version:
  
  	r38167 -> r40792	head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml	Tue Jan 29 14:13:06 2013	(r40802)
+++ head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml	Tue Jan 29 16:23:46 2013	(r40803)
@@ -1665,7 +1665,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM t
       <para>¥Ð¥Ã¥¯¥¨¥ó¥É¤òµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>echo 'mythbackend_enable="YES"' >> /etc/rc.conf</userinput>
-&prompt.root; <userinput>/usr/local/etc/rc.d/mythbackend start</userinput></screen>
+&prompt.root; <userinput>service mythbackend start</userinput></screen>
     </sect2>
   </sect1>
 

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 19:00:50 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])
 by hub.freebsd.org (Postfix) with ESMTP id 5CD19E1C;
 Tue, 29 Jan 2013 19:00:50 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 328EA82;
 Tue, 29 Jan 2013 19:00:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0TJ0oSd013354;
 Tue, 29 Jan 2013 19:00:50 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0TJ0oiM013353;
 Tue, 29 Jan 2013 19:00:50 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301291900.r0TJ0oiM013353@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 29 Jan 2013 19:00:50 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40804 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 29 Jan 2013 19:00:50 -0000

Author: eadler
Date: Tue Jan 29 19:00:49 2013
New Revision: 40804
URL: http://svnweb.freebsd.org/changeset/doc/40804

Log:
  Fix            whitespace.
  Add period to end of sentence
  
  Translators may ignore
  
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Tue Jan 29 16:23:46 2013	(r40803)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Tue Jan 29 19:00:49 2013	(r40804)
@@ -5729,20 +5729,20 @@ Key F15        A        A        Menu Wo
       <qandaentry>
 	<question id="diskless-booting">
 	  <para>Where can I get information on <quote>diskless
-	    booting</quote>?</para>
-	  </question>
+	      booting</quote>?</para>
+	</question>
 
 	<answer>
 	  <para><quote>Diskless booting</quote> means that the &os;
 	    box is booted over a network, and reads the necessary
 	    files from a server instead of its hard disk.  For full
-	    details, please read <ulink
-	      url="&url.books.handbook;/network-diskless.html">the Handbook entry on diskless booting</ulink></para>
-	</answer>
-      </qandaentry>
+	      details, please read <ulink
+		url="&url.books.handbook;/network-diskless.html">the Handbook entry on diskless booting</ulink>.</para>
+	  </answer>
+	</qandaentry>
 
-      <qandaentry>
-	<question id="router">
+	<qandaentry>
+	  <question id="router">
 	  <para>Can a &os; box be used as a dedicated network
 	    router?</para>
 	</question>

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 20:12:33 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])
 by hub.freebsd.org (Postfix) with ESMTP id E8E28A30;
 Tue, 29 Jan 2013 20:12:33 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DAF463A4;
 Tue, 29 Jan 2013 20:12:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0TKCXjQ037340;
 Tue, 29 Jan 2013 20:12:33 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0TKCX4X037339;
 Tue, 29 Jan 2013 20:12:33 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201301292012.r0TKCX4X037339@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 29 Jan 2013 20:12:33 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40805 - 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: Tue, 29 Jan 2013 20:12:34 -0000

Author: brooks (src,ports committer)
Date: Tue Jan 29 20:12:33 2013
New Revision: 40805
URL: http://svnweb.freebsd.org/changeset/doc/40805

Log:
  Document __FreeBSD_vesion 1000027: cat -l.

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/book.xml	Tue Jan 29 19:00:49 2013	(r40804)
+++ head/en_US.ISO8859-1/books/porters-handbook/book.xml	Tue Jan 29 20:12:33 2013	(r40805)
@@ -15898,6 +15898,13 @@ Reference: &lt;http://www.freebsd.org/po
 		<svnref>245313</svnref>).  May also be used to indicate
 		the presense of nmtree.</entry>
 	    </row>
+
+	    <row>
+	      <entry>1000027</entry>
+	      <entry>January 29, 2013</entry>
+	      <entry>10-CURRENT after cat gained the -l flag (rev
+		<svnref>246083</svnref>).</entry>
+	    </row>
 	  </tbody>
 	</tgroup>
       </table>

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 22:37:45 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])
 by hub.freebsd.org (Postfix) with ESMTP id A18DEFA1;
 Tue, 29 Jan 2013 22:37:45 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7DE11CCC;
 Tue, 29 Jan 2013 22:37:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0TMbj3f079647;
 Tue, 29 Jan 2013 22:37:45 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0TMbjvt079646;
 Tue, 29 Jan 2013 22:37:45 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201301292237.r0TMbjvt079646@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Tue, 29 Jan 2013 22:37:45 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40806 - head/en_US.ISO8859-1/books/handbook/cutting-edge
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 29 Jan 2013 22:37:45 -0000

Author: wblock
Date: Tue Jan 29 22:37:44 2013
New Revision: 40806
URL: http://svnweb.freebsd.org/changeset/doc/40806

Log:
  Fix some minor grammar and punctuation problems.
  freebsd-update: change one mention to a man entity.
  freebsd-update: Set SRCCONF to null in both custom kernel sections.
  doc: add link to FDP in "building doc from source" section.
  doc: use <replaceable> in svn URL
  Move indexterm in signal 11 FAQ to answer fix rendering.
  Some changes suggested by Mehmet Erol Sanliturk
  <m.e.sanliturk@gmail.com>.

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Jan 29 20:12:33 2013	(r40805)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Jan 29 22:37:44 2013	(r40806)
@@ -12,7 +12,7 @@
 	<firstname>Jim</firstname>
 	<surname>Mock</surname>
 	<contrib>Restructured, reorganized, and parts updated
-	  by</contrib>
+	  by </contrib>
       </author>
       <!-- Mar 2000 -->
     </authorgroup>
@@ -168,7 +168,7 @@
     </note>
 
     <para>If a <command>crontab</command> utilizing the features
-      of <command>freebsd-update</command> exists, it must be
+      of &man.freebsd-update.8; exists, it must be
       disabled before the following operation is started.</para>
 
     <sect2 id="freebsdupdate-config-file">
@@ -432,7 +432,7 @@ MergeChanges /etc/ /var/named/etc/</prog
 		installed from the sources:</para>
 
 	      <screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>env DESTDIR=/boot/GENERIC make kernel __MAKE_CONF=/dev/null</userinput>
+&prompt.root; <userinput>env DESTDIR=/boot/GENERIC make kernel __MAKE_CONF=/dev/null SRCCONF=/dev/null</userinput>
 &prompt.root; <userinput>mv /boot/GENERIC/boot/kernel/* /boot/GENERIC</userinput>
 &prompt.root; <userinput>rm -rf /boot/GENERIC/boot</userinput></screen>
 
@@ -481,7 +481,7 @@ MergeChanges /etc/ /var/named/etc/</prog
 		installed from the sources:</para>
 
 	      <screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>make kernel __MAKE_CONF=/dev/null</userinput></screen>
+&prompt.root; <userinput>make kernel __MAKE_CONF=/dev/null SRCCONF=/dev/null</userinput></screen>
 
 	      <para>For this kernel to be identified as the
 		<literal>GENERIC</literal> kernel by
@@ -912,7 +912,7 @@ Fetching 133 new ports or files... done.
 	western US mirror using the HTTPS protocol with this
 	command:</para>
 
-      <screen>&prompt.root; <userinput>svn checkout <literal>https://svn0.us-west.FreeBSD.org/doc/head</literal> /usr/doc</userinput></screen>
+      <screen>&prompt.root; <userinput>svn checkout <replaceable>https://svn0.us-west.FreeBSD.org</replaceable>/doc/head /usr/doc</userinput></screen>
 
       <para>Please use the closest mirror from the available <link
 	  linkend="svn-mirrors">Subversion mirror sites</link>.</para>
@@ -1021,6 +1021,11 @@ Fetching 133 new ports or files... done.
 
       <screen>&prompt.root; <userinput>cd /usr/doc</userinput>
 &prompt.root; <userinput>make FORMATS='html html-split' install clean</userinput></screen>
+
+      <para>For information on editing and submitting corrections to
+	the documentation, please see the <ulink
+	  url="&url.books.fdp-primer;">FreeBSD Documentation
+	  Project Primer for New Contributors</ulink>.</para>
     </sect2>
 
     <sect2 id="doc-ports">
@@ -2924,13 +2929,13 @@ Script done, &hellip;</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm><primary>signal 11</primary></indexterm>
-
 	    <para>My compile failed with lots of signal 11 (or other
 	      signal number) errors.  What has happened?</para>
 	  </question>
 
 	  <answer>
+	    <indexterm><primary>signal 11</primary></indexterm>
+
 	    <para>This is normally indicative of hardware problems.
 	      (Re)making the world is an effective way to stress test
 	      your hardware, and will frequently throw up memory
@@ -2969,7 +2974,7 @@ Script done, &hellip;</screen>
 	    <para>However, if you know what you are doing you can have
 	      <command>make buildworld</command> skip this step.  This
 	      will make subsequent builds run much faster, since most
-	      of sources will not need to be recompiled.  The flip
+	      of the sources will not need to be recompiled.  The flip
 	      side of this is that subtle dependency problems can
 	      creep in, causing your build to fail in odd ways.  This
 	      frequently generates noise on the &os; mailing lists,

From owner-svn-doc-head@FreeBSD.ORG  Tue Jan 29 23:24:40 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])
 by hub.freebsd.org (Postfix) with ESMTP id 59249D7C;
 Tue, 29 Jan 2013 23:24:40 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3CBE8EE4;
 Tue, 29 Jan 2013 23:24:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0TNOdd9094313;
 Tue, 29 Jan 2013 23:24:39 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0TNOdit094312;
 Tue, 29 Jan 2013 23:24:39 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301292324.r0TNOdit094312@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Tue, 29 Jan 2013 23:24:39 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40807 - head/en_US.ISO8859-1/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 29 Jan 2013 23:24:40 -0000

Author: eadler
Date: Tue Jan 29 23:24:39 2013
New Revision: 40807
URL: http://svnweb.freebsd.org/changeset/doc/40807

Log:
  Update and modernize the features.xml page
  
  Translators take note: this is a full rewrite.  Starting with old
  content will likely not be helpful.
  
  Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com>
  Submitted by:	Isaac (.ike) Levy <ike@blackskyresearch.net>
  Reviewed by:	-doc
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/htdocs/features.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/features.xml	Tue Jan 29 22:37:44 2013	(r40806)
+++ head/en_US.ISO8859-1/htdocs/features.xml	Tue Jan 29 23:24:39 2013	(r40807)
@@ -5,7 +5,7 @@
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
+  <head>
       <title>&title;</title>
 
       <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
@@ -13,222 +13,120 @@
 
     <body class="navinclude.about">
 
-    <h1>FreeBSD offers many advanced features.</h1>
+    <h1>&os; offers many unique features.</h1>
 
-      <p>No matter what the application, you want your system's resources
-	performing at their full potential.  FreeBSD's focus on
-	performance, networking, and storage combine with easy system
-	administration and excellent documentation to allow you to do just
-	that.</p>
+      <p>No matter what the application, you want your system's
+	resources performing at their full potential.  &os;'s focus
+	on performance, networking, and storage, combined with easy
+	system administration and excellent documentation to allow
+	you to do what you want.</p>
 
     <h2>A complete operating system based on 4.4BSD.</h2>
 
-      <p>FreeBSD's distinguished roots derive from the <b>BSD</b>
-	software releases from the Computer Systems Research Group at the
-	University of California, Berkeley.  Over ten years of work have been
-	put into enhancing BSD, adding industry-leading SMP, multithreading,
-	and network performance, as well as new management tools, file
-	systems, and security features.  As a result, FreeBSD may be found
-	across the Internet, in the operating system of core router products,
-	running root name servers, hosting major web sites, and as the
-	foundation for widely used desktop operating systems.  This is only
-	possible because of the diverse and world-wide membership of the
-	volunteer FreeBSD Project.</p>
-
-    <h2>FreeBSD provides advanced operating system features, making it ideal
-	across a range of systems, from embedded environments to high-end
-	multiprocessor servers.</h2>
-
-      <p><b>FreeBSD 7.0</b>, released February 2008, brings many new features
-	and performance enhancements.  With a special focus on storage
-	and multiprocessing performance, FreeBSD 7.0 shipped with support
-	for Sun's <b>ZFS file system</b> and <b>highly scalable
-	multiprocessing performance</b>.  Benchmarks have shown that FreeBSD
-	provides twice the MySQL and PostgreSQL performance as current Linux
-	systems on 8-core servers.</p>
+      <p>&os;'s distinguished roots derive from the <b>BSD</b>
+	software releases from the Computer Systems Research Group at
+	the University of California, Berkeley.  Over fifteen years of
+	work have been put into enhancing &os;, adding
+	industry-leading scalability, network performance, management
+	tools, file systems, and security features.  As a result,
+	&os; may be found across the Internet, in the operating system
+	of core router products, running root name servers, hosting
+	major web sites, and as the foundation for widely used desktop
+	operating systems.  This is only possible because of the
+	diverse and world-wide membership of the
+	volunteer &os; Project.</p>
+
+      <p><b>&os;&nbsp;9.0</b>, brings many new features
+	and performance enhancements with a special focus on desktop
+	support and security features.</p>
 
       <ul>
-	<li><b>SMPng</b>: After seven years of development on advanced SMP
-	  support, FreeBSD 7.0 realizes the goals of a fine-grained kernel
-	  allowing linear scalability to over 8 CPU cores for many workloads.
-	  FreeBSD 7.0 sees an almost complete elimination of the Giant Lock,
-	  removing it from the CAM storage layer and NFS client, and moving
-	  towards more fine-grained locking in the network subsystem.
-	  Significant work has also been performed to optimize kernel
-	  scheduling and locking primitives, and the optional ULE scheduler
-	  allows thread CPU affinity and per-CPU run queues to reduce
-	  overhead and increase cache-friendliness.  The libthr threading
-	  package, providing 1:1 threading, is now the default.  Benchmarks
-	  reveal a dramatic performance advantage over other &unix; operating
-	  systems on identical multicore hardware, and reflect a long
-	  investment in SMP technology for the FreeBSD kernel.</li>
-
-	<li><b>ZFS filesystem</b>: Sun's ZFS is a state-of-the-art file
-	  system offering simple administration, transactional semantics,
-	  end-to-end data integrity, and immense scalability.  From
-	  self-healing to built-in compression, RAID, snapshots, and volume
-	  management, ZFS will allow FreeBSD system administrators to easily
-	  manage large storage arrays.</li>
-
-	<li><b>10Gbps network optimization</b>: With optimized device drivers
-	  from all major 10gbps network vendors, FreeBSD 7.0 has seen
-	  extensive optimization of the network stack for high performance
-	  workloads, including auto-scaling socket buffers, TCP Segment
-	  Offload (TSO), Large Receive Offload (LRO), direct network stack
-	  dispatch, and load balancing of TCP/IP workloads over multiple CPUs
-	  on supporting 10gbps cards or when multiple network interfaces are
-	  in use simultaneously.  Full vendor support is available from
-	  Chelsio, Intel, Myricom, and Neterion.</li>
-
-	<li><b>SCTP</b>: FreeBSD 7.0 is the reference implementation for the
-	  new IETF Stream Control Transmission Protocol (SCTP) protocol,
-	  intended to support VoIP, telecommunications, and other
-	  applications with strong reliability and variable quality
-	  transmission through features such as multi-path delivery,
-	  fail-over, and multi-streaming.</li>
-
-	<li><b>Wireless</b>: FreeBSD 7.0 ships with significantly enhanced
-	  wireless support, including high-power Atheros-based cards, new
-	  drivers for Ralink, Intel, and ZyDAS cards, WPA, background
-	  scanning and roaming, and 802.11n.</li>
-
-	<li><b>New hardware architectures</b>: FreeBSD 7.0 includes
-	  significantly improved  support for the embedded ARM architecture,
-	  as well as preliminary support for the Sun Ultrasparc T1
-	  platform.</li>
+	<li><b>Capsicum Capability Mode</b>:
+	  Capsicum is a set of features for sandboxing support, using
+	  a capability model in which the capabilities are file
+	  descriptors.  Two new kernel options CAPABILITIES and
+	  CAPABILITY_MODE have been added to the GENERIC kernel.</li>
+
+	<li><b>Hhook</b>:  (Helper Hook) and khelp(9) (Kernel Helpers)
+	  KPIs have been implemented.  These are a kind of superset of
+	  pfil(9) framework for more general use in the kernel.  The
+	  hhook(9) KPI provides a way for kernel subsystems to export
+	  hook points that khelp(9) modules can hook to provide
+	  enhanced or new functionality to the kernel.  The khelp(9)
+	  KPI provides a framework for managing khelp(9) modules,
+	  which indirectly use the hhook(9) KPI to register their hook
+	  functions with hook points of interest within the kernel.
+	  These allow a structured way to dynamically extend the
+	  kernel at runtime in an ABI preserving manner.</li>
+	<li><b>Accounting API:</b> has been implemented.  It can keep
+	  per-process, per-jail, and per-loginclass resource
+	  accounting information.  Note that this is not built nor
+	  installed by default.  To build and install them, specify
+	  options RACCT in the kernel configuration file and rebuild
+	  the base system as described in the FreeBSD Handbook</li>
+
+	<li><b>Resource-limiting API:</b> has been implemented.
+	  It works in conjunction with the RACCT resource accounting
+	  implementation and takes user-configurable actions based on
+	  the set of rules it maintains and the current resource
+	  usage.  The rctl(8) utility has been added to manage the
+	  rules in userland.  Note that this is not built nor
+	  installed by default.</li>
+
+	<li><b>Usb:</b> subsystem now supports USB packet filter.
+	  This allows to capture packets which go through each USB
+	  host controller.  The implementation is almost based on
+	  bpf(4) code.  The userland program usbdump(8) has been
+	  added.</li>
+
+	<li><b>Infiniband support:</b>, OFED (OpenFabrics Enterprise
+	  Distribution) version 1.5.3 has been imported into the
+	  base system.</li>
+
+	<li><b>TCP/IP network:</b> stack now supports the mod_cc(9)
+	  pluggable congestion control framework.  This allows TCP
+	  congestion control algorithms to be implemented as
+	  dynamically loadable kernel modules.  The following kernel
+	  modules are available cc_chd(4) for the CAIA-Hamilton-Delay
+	  algorithm, cc_cubic(4) for the CUBIC algorithm, cc_hd(4)
+	  for the Hamilton-Delay algorithm, cc_htcp(4) for the H-TCP
+	  algorithm, cc_newreno(4) for the NewReno algorithm, and
+	  cc_vegas(4) for the Vegas algorithm.  The default algorithm
+	  can be set by a new sysctl(8) variable
+	  net.  inet.  tcp.  cc.  algorithm.</li>
+
+	<li><b>SU+J:</b> &os; Fast File System now supports soft
+	updates with journaling.  It introduces an intent log into a
+	softupdates-enabled file system which eliminates the need for
+	background fsck(8) even on unclean shutdowns.</li>
       </ul>
 
-      <p>FreeBSD has a long history of advanced operating system feature
-	development; you can read about some of these features below:</p>
+      <p><b>&os;&nbsp;8.x</b> brings many new
+	features and performance enhancements.  With special focus on
+	a new USB stack, &os;-8.x shipped with experimental support
+	for NFSv4.  As well as a new TTY layer.  Which improves
+	scalability and resources handling in SMP enabled systems.</p>
 
       <ul>
-	<li><b>A merged virtual memory and filesystem buffer cache</b>
-	  continuously tunes the amount of memory used for programs and the
-	  disk cache.  As a result, programs receive both excellent memory
-	    management and high performance disk access, and the system
-	    administrator is freed from the task of tuning cache sizes.</li>
-
-	<li><b>Compatibility modules</b> enable programs for other operating
-	  systems to run on FreeBSD, including programs for Linux, SCO UNIX,
-	  and System V Release 4.</li>
-
-	<li><b>Soft Updates</b> allows improved filesystem
-	  performance without sacrificing safety and reliability.
-	  It analyzes meta-data filesystem operations to avoid having
-	  to perform all of those operations synchronously.
-	  Instead, it maintains internal state about pending meta-data
-	  operations and uses this information to cache meta-data,
-	  rewrite meta-data operations to combine subsequent
-	  operations on the same files, and reorder meta-data
-	  operations so that they may be processed more efficiently.
-	  Features such as background filesystem checking and
-	  file system snapshots are built on the consistency
-	  and performance foundations of soft updates.</li>
-
-	<li><b>File system snapshots</b>, permitting administrators to take
-	  atomic file system snapshots for backup purposes using the free
-	  space in the file system, as well as facilitating <b>background
-	  fsck</b>, which allows the system to reach multiuser mode without
-	  waiting on file system cleanup operations following power outages.
-	  </li>
-
-	<li>Support for <b>IP Security (IPsec)</b> allows improved security in
-	  networks, and support for the next-generation Internet Protocol,
-	  IPv6.  The FreeBSD IPsec implementation includes support for a
-	  broad range of <b>accelerated crypto hardware</b>.</li>
-
-	<li><b>Out of the box support for IPv6</b> via the KAME IPv6 stack
-	  allows FreeBSD to be seamlessly integrated into next generation
-	  networking environments.  FreeBSD even ships with many applications
-	  extended to support IPv6!</li>
-
-	<li><b>Multi-threaded SMP architecture</b> capable of executing the
-	  kernel in parallel on multiple processors, and with <b>kernel
-	  preemption</b>, allowing high priority kernel tasks to preempt
-	  other kernel activity, reducing latency.  This includes a
-	  <b>multi-threaded network stack</b> and a <b>multi-threaded
-	  virtual memory subsystem</b>.  Beginning with FreeBSD 6.x, support
-	  for a fully parallel VFS allows the UFS file system to run on multiple
-	  processors simultaneously, permitting load sharing of
-	  CPU-intensive I/O optimization.</li>
-
-	<li><b>M:N application threading via pthreads</b> permitting threads
-	  to execute on multiple CPUs in a scalable manner, mapping many user
-	  threads onto a small number of <b>Kernel Schedulable Entities</b>.
-	  By adopting the <b>Scheduler Activation</b> model, the threading
-	  approach can be adapted to the specific requirements of a broad
-	  range of applications.</li>
-
-	<li><b>Netgraph pluggable network stack</b> allows developers to
-	  dynamically and easily extend the network stack through clean
-	  layered network abstractions.  Netgraph nodes can implement a broad
-	  range of new network services, including encapsulation, tunneling,
-	  encryption, and performance adaptation.  As a result, rapid
-	  prototyping and production deployment of enhanced network services
-	  can be performed far more easily and with fewer bugs.</li>
-
-	<li><b>TrustedBSD MAC Framework extensible kernel security</b>,
-	  which allows developers to customize the operating system security
-	  model for specific environments, from creating hardening policies
-	  to deploying mandatory labeled confidentiality of integrity
-	  policies.  Sample security policies include <b>Multi-Level
-	  Security (MLS)</b>, and <b>Biba Integrity Protection</b>.  Third
-	  party modules include <b>SEBSD</b>, a FLASK-based implementation
-	  of <b>Type Enforcement</b>.</li>
-
-	<li><b>TrustedBSD Audit</b> is a security event logging service,
-	  providing fine-grained, secure, reliable logging of system events
-	  via the audit service.  Administrators can configure the nature and
-	  granularity of logging by user, tracking file accesses, commands
-	  executed, network activity, system logins, and a range of other
-	  system behavior.  Audit pipes allow IDS tools to attach to the
-	  kernel audit service and subscribe to events they require for
-	  security monitoring.  FreeBSD supports the industry-standard BSM
-	  audit trail file format and API, allowing existing BSM tools to
-	  run with little or no modification.  This file format is used on
-	  Solaris and Mac OS X, allowing instant interoperability and unified
-	  analysis.</li>
-
-	<li><b>GEOM pluggable storage layer</b>, which permits new storage
-	  services to be quickly developed and cleanly integrated into the
-	  FreeBSD storage subsystem.  GEOM provides a consistent and
-	  coherent model for discovering and layering storage services,
-	  making it possible to layer services such as RAID and volume
-	  management easily.</li>
-
-	<li>FreeBSD's <b>GEOM-Based Disk Encryption (GBDE)</b>, provides
-	  strong cryptographic protection using the GEOM Framework, and can
-	  protect file systems, swap devices, and other use of storage
-	  media.</li>
-
-	<li><b>Kernel Queues</b> allow programs to respond more efficiently
-	  to a variety of asynchronous events including file and socket IO,
-	  improving application and system performance.</li>
-
-	<li><b>Accept Filters</b> allow connection-intensive applications,
-	  such as web servers, to cleanly push part of their functionality into
-	  the operating system kernel, improving performance.</li>
+	<li><b>Netisr framework:</b> has been reimplemented for
+	  parallel threading support.  This is a kernel network
+	  dispatch interface which allows device drivers (and other
+	  packet sources) to direct packets to protocols for directly
+	  dispatched or deferred processing.  The new implementation
+	  supports up to one netisr thread per CPU, and several
+	  benchmarks on SMP machines show substantial performance
+	  improvement over the previous version.</li>
+
+	<li><b>Linux emulation:</b> layer has been updated to version
+	  2.  6.  16 and the default Linux infrastructure port is now
+	  emulators/linux_base-f10 (Fedora 10)</li>
+
+	<li><b>Network Virtualization:</b> Container named vimage has
+	  been implemented, extending the FreeBSD kernel to maintain
+	  multiple independent instances of networking state.
+	  vimage facilities can be used independently to create fully
+	  virtualized network topologies, and jail(8) can directly
+	  take advantage of a fully virtualized network stack.</li>
       </ul>
-
-    <h2>FreeBSD provides many security features
-      to protect networks and servers.</h2>
-
-      <p>The FreeBSD developers are as concerned about security as they are
-	about performance and stability.  FreeBSD includes kernel support for
-	<b>stateful IP firewalling</b>, as well as other services, such as
-	<b>IP proxy gateways</b>, <b>access control lists</b>, <b>mandatory
-	access control</b>, <b>jail-based virtual hosting</b>, and
-	<b>cryptographically protected storage</b>.  These features can be
-	used to support highly secure hosting of mutually untrusting
-	customers or consumers, the strong partitioning of network segments,
-	and the construction of secure pipelines for information scrubbing
-	and information flow control.</p>
-
-      <p>FreeBSD also includes support for encryption software, secure
-	shells, Kerberos authentication, "virtual servers" created using
-	jails, chroot-ing services to restrict application access to the
-	file system, Secure RPC facilities, and access lists for services
-	that support TCP wrappers.</p>
-
   </body>
 </html>

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 00:07:33 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])
 by hub.freebsd.org (Postfix) with ESMTP id C26DD6E8;
 Wed, 30 Jan 2013 00:07:33 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B4D74117;
 Wed, 30 Jan 2013 00:07:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0U07Xre006540;
 Wed, 30 Jan 2013 00:07:33 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0U07X21006539;
 Wed, 30 Jan 2013 00:07:33 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301300007.r0U07X21006539@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 30 Jan 2013 00:07:33 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40808 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 30 Jan 2013 00:07:33 -0000

Author: eadler
Date: Wed Jan 30 00:07:33 2013
New Revision: 40808
URL: http://svnweb.freebsd.org/changeset/doc/40808

Log:
  Fix minor whitespace issues
  
  Translators may ignore
  
  Approved by:	jkois (mentor)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Tue Jan 29 23:24:39 2013	(r40807)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Wed Jan 30 00:07:33 2013	(r40808)
@@ -1073,7 +1073,7 @@
 	<answer>
 	  <para>The official &os; forums are located at <ulink
 	      url="http://forums.FreeBSD.org/">http://forums.FreeBSD.org/</ulink>.</para>
-	  </answer>
+	</answer>
       </qandaentry>
 
       <qandaentry>
@@ -1438,7 +1438,7 @@
       <qandaentry>
 	<question id="panic-on-install-reboot">
 	  <para>Why do I get a <errorname>panic: can't mount
-	    root</errorname> error when rebooting the system after
+	      root</errorname> error when rebooting the system after
 	    installation?</para>
 	</question>
 
@@ -1488,8 +1488,8 @@
 	    </listitem>
 
 	    <listitem>
-		<para>Move the &os; disk onto the primary IDE
-		  controller, so the hard disks are consecutive.</para>
+	      <para>Move the &os; disk onto the primary IDE
+		controller, so the hard disks are consecutive.</para>
 	    </listitem>
 	  </orderedlist>
 	</answer>

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 03:14: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])
 by hub.freebsd.org (Postfix) with ESMTP id C97F6A8A;
 Wed, 30 Jan 2013 03:14:07 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id AD2A69E2;
 Wed, 30 Jan 2013 03:14:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0U3E7Rn064723;
 Wed, 30 Jan 2013 03:14:07 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0U3E75t064722;
 Wed, 30 Jan 2013 03:14:07 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201301300314.r0U3E75t064722@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 30 Jan 2013 03:14:07 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40809 - head/en_US.ISO8859-1/books/handbook/cutting-edge
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 30 Jan 2013 03:14:07 -0000

Author: wblock
Date: Wed Jan 30 03:14:07 2013
New Revision: 40809
URL: http://svnweb.freebsd.org/changeset/doc/40809

Log:
  Rewrite the outdated section explaining make.conf and add a section to
  mention the existence of src.conf.  Warn users that these things,
  although shiny and strangely compelling, are also very sharp.
  
  PR:		172922

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

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Wed Jan 30 00:07:33 2013	(r40808)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Wed Jan 30 03:14:07 2013	(r40809)
@@ -2167,25 +2167,37 @@ Fetching 133 new ports or files... done.
 	<primary><filename>make.conf</filename></primary>
       </indexterm>
 
-      <para>Examine the files
-	<filename>/usr/share/examples/etc/make.conf</filename> and
-	<filename>/etc/make.conf</filename>.  The first contains some
-	default defines &ndash; most of which are commented out.  To
-	make use of them when you rebuild your system from source, add
-	them to <filename>/etc/make.conf</filename>.  Keep in mind
-	that anything you add to <filename>/etc/make.conf</filename>
-	is also used every time you run <command>make</command>, so it
-	is a good idea to set them to something sensible for your
-	system.</para>
-
-      <para>A typical user will probably want to copy and uncomment
-	the <makevar>NO_PROFILE</makevar> line found in
-	<filename>/usr/share/examples/etc/make.conf</filename>
-	to <filename>/etc/make.conf</filename>.</para>
-
-      <para>Examine the other definitions, like
-	<makevar>NOPORTDOCS</makevar>,
-	and decide if they are relevant to you.</para>
+      <para>&man.make.1; options are shown in &man.make.conf.5; and
+	<filename>/usr/share/examples/etc/make.conf</filename>.  These
+	settings can be added to <filename>/etc/make.conf</filename>
+	to control the way &man.make.1; runs and how it builds
+	programs.  Changes to some settings can have far-reaching and
+	potentially surprising effects.  Read the comments in both
+	locations and keep in mind that the defaults have been chosen
+	for a combination of performance and safety.</para>
+
+      <para>Options set in <filename>/etc/make.conf</filename> take
+	effect every time &man.make.1; is used, including compiling
+	applications from the Ports Collection or user-written C
+	programs, or building the &os; operating system itself.</para>
+    </sect2>
+
+    <sect2 id="src-conf">
+      <title>Check <filename>/etc/src.conf</filename></title>
+
+      <indexterm>
+	<primary><filename>src.conf</filename></primary>
+      </indexterm>
+
+      <para><filename>/etc/src.conf</filename> controls the building
+	of the operating system from source code.  Unlike
+	<filename>/etc/make.conf</filename>, the contents of
+	<filename>/etc/src.conf</filename> only take effect when the
+	&os; operating system itself is being built.  Descriptions of
+	the many options available for this file are shown in
+	&man.src.conf.5;.  Be cautious about disabling seemingly
+	unneeded kernel modules and build options.  Sometimes there
+	are unexpected or subtle interactions.</para>
     </sect2>
 
     <sect2 id="updating-etc">

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 07:54:09 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])
 by hub.freebsd.org (Postfix) with ESMTP id 7301F873;
 Wed, 30 Jan 2013 07:54:09 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6566C385;
 Wed, 30 Jan 2013 07:54:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0U7s9nQ046911;
 Wed, 30 Jan 2013 07:54:09 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0U7s9Hl046910;
 Wed, 30 Jan 2013 07:54:09 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201301300754.r0U7s9Hl046910@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 30 Jan 2013 07:54:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40810 - head/en_US.ISO8859-1/articles/portbuild
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 30 Jan 2013 07:54:09 -0000

Author: linimon
Date: Wed Jan 30 07:54:08 2013
New Revision: 40810
URL: http://svnweb.freebsd.org/changeset/doc/40810

Log:
  The ports-<arch> user goes away in favor of user 'portbuild'.

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

Modified: head/en_US.ISO8859-1/articles/portbuild/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/portbuild/article.xml	Wed Jan 30 03:14:07 2013	(r40809)
+++ head/en_US.ISO8859-1/articles/portbuild/article.xml	Wed Jan 30 07:54:08 2013	(r40810)
@@ -189,7 +189,7 @@
       nullfs-mounted for jail builds.</para>
 
     <para>The
-      <username>ports-<replaceable>${arch}</replaceable></username>
+      <username>portbuild</username>
       user can &man.ssh.1; to the client nodes to monitor them.
       Use <command>sudo</command> and check the
       <hostid>portbuild.<replaceable>hostname</replaceable>.conf</hostid>
@@ -548,7 +548,7 @@ PKG_BIN=/usr/local/sbin/pkg</programlist
       </note>
 
       <para>Make sure the <replaceable>${arch}</replaceable> build
-	is run as the ports-<replaceable>${arch}</replaceable> user
+	is run as the <username>portbuild</username> user
 	or it will complain loudly.</para>
 
       <note>
@@ -1553,11 +1553,11 @@ options         NFSSERVER               
 	  <itemizedlist>
 	    <listitem>
 	      <para>Create a
-		<literal>ports-<replaceable>${arch}</replaceable></literal>
+		<literal>portbuild</literal>
 		user and group.  It can have the <literal>'*'</literal> password.</para>
 
 	      <para>Create
-		<filename>/home/ports-<replaceable>${arch}/.ssh/</replaceable></filename>
+		<filename>/home/portbuild/.ssh/</filename>
 		and populate <filename>authorized_keys</filename>.  </para>
 	    </listitem>
 
@@ -1837,7 +1837,7 @@ touch /tmp/.boot_finished</programlistin
 
 	      <programlisting># local changes for package building
 %wheel        ALL=(ALL) ALL
-ports-<replaceable>${arch}</replaceable>    ALL=(ALL) NOPASSWD: ALL</programlisting>
+portbuild     ALL=(ALL) NOPASSWD: ALL</programlisting>
 	    </listitem>
 	  </itemizedlist>
 	</step>
@@ -1858,9 +1858,9 @@ ports-<replaceable>${arch}</replaceable>
 	  <para>As root:</para>
 
 	  <screen>&prompt.root; <userinput>mkdir portbuild</userinput>
-&prompt.root; <userinput>chown ports-<replaceable>${arch}</replaceable>:ports-<replaceable>${arch}</replaceable> portbuild</userinput>
+&prompt.root; <userinput>chown portbuild:portbuild portbuild</userinput>
 &prompt.root; <userinput>mkdir pkgbuild</userinput>
-&prompt.root; <userinput>chown ports-<replaceable>${arch}</replaceable>:ports-<replaceable>${arch}</replaceable> pkgbuild</userinput>
+&prompt.root; <userinput>chown portbuild:portbuild pkgbuild</userinput>
 &prompt.root; <userinput>mkdir squid</userinput>
 &prompt.root; <userinput>mkdir squid/cache</userinput>
 &prompt.root; <userinput>mkdir squid/logs</userinput>
@@ -1894,7 +1894,7 @@ ports-<replaceable>${arch}</replaceable>
       <title>Configuration on the server</title>
 
       <para>These steps need to be taken by a <literal>portmgr</literal>
-	acting as <literal>ports-<replaceable>${arch}</replaceable></literal>
+	acting as <literal>portbuild</literal>
 	on the server.</para>
 
       <procedure>
@@ -1902,13 +1902,13 @@ ports-<replaceable>${arch}</replaceable>
 	  <para>If any of the default TCP ports is not available (see
 	    above), you will need to create an <command>ssh</command>
 	    tunnel for them and include its invocation command in
-	    <literal>ports-<replaceable>${arch}</replaceable></literal>'s
+	    <literal>portbuild</literal>'s
 	    <filename>crontab</filename>.</para>
 	</step>
 
 	<step>
 	  <para>Unless you can use the defaults, add an entry to
-	    <filename>/home/ports-<replaceable>${arch}</replaceable>/.ssh/config</filename>
+	    <filename>/home/portbuild/.ssh/config</filename>
 	    to specify the public IP address, TCP port for
 	    <command>ssh</command>, username, and any other necessary
 	    information.</para>
@@ -1972,7 +1972,7 @@ MASTER_SITE_OVERRIDE= \
 http_proxy="http://localhost:3128/"
 squid_dir=<filename>/<replaceable>usr2</replaceable>/squid</filename>
 scratchdir=<filename>/<replaceable>usr2</replaceable>/pkgbuild</filename>
-client_user=ports-<replaceable>${arch}</replaceable>
+client_user=portbuild
 sudo_cmd="sudo -H"
 rsync_gzip=-z
 
@@ -2014,7 +2014,7 @@ ssh_cmd="/usr/local/bin/ssh"</programlis
       <title>Enabling the node</title>
 
       <para>These steps need to be taken by a <literal>portmgr</literal>
-	acting as <literal>ports-<replaceable>arch</replaceable></literal>:</para>
+	acting as <literal>portbuild</literal>:</para>
 
       <procedure>
 	<step>
@@ -2068,7 +2068,7 @@ ssh_cmd="/usr/local/bin/ssh"</programlis
       </procedure>
 
       <para>Finally, again as <literal>portmgr</literal>
-	acting as <literal>ports-<replaceable>arch</replaceable></literal>:</para>
+	acting as <literal>portbuild</literal>:</para>
 
       <procedure>
 	<step>
@@ -2129,7 +2129,7 @@ ssh_cmd="/usr/local/bin/ssh"</programlis
 
       <note>
 	<para>Again, as
-	  <literal>ports-<replaceable>arch</replaceable></literal>:</para>
+	  <literal>portbuild</literal>:</para>
       </note>
 
       <itemizedlist>
@@ -2279,7 +2279,7 @@ zfs destroy -r a/snap/src-<replaceable>o
       <itemizedlist>
 	<listitem>
 	  <para>Create a new
-	    <literal>ports-<replaceable>arch</replaceable></literal>
+	    <literal>portbuild</literal>
 	    user and group.</para>
 	</listitem>
 
@@ -2294,7 +2294,7 @@ zfs destroy -r a/snap/src-<replaceable>o
       </listitem>
 
 	<listitem>
-	  <screen>&prompt.root; chown ports-<replaceable>arch</replaceable>:portbuild /var/portbuild/<replaceable>arch</replaceable>;
+	  <screen>&prompt.root; chown portbuild:portbuild /var/portbuild/<replaceable>arch</replaceable>;
 &prompt.root; chmod 775 /var/portbuild/<replaceable>arch</replaceable>;
 &prompt.root; cd /var/portbuild/<replaceable>arch</replaceable></screen>
 	</listitem>
@@ -2306,7 +2306,7 @@ zfs destroy -r a/snap/src-<replaceable>o
 
       <note>
 	<para>The next steps are most easily done as user
-	  <literal>ports-<replaceable>arch</replaceable></literal>.</para>
+	  <literal>portbuild</literal>.</para>
       </note>
 
       <itemizedlist>

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 08:11:09 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])
 by hub.freebsd.org (Postfix) with ESMTP id C04F1A6D;
 Wed, 30 Jan 2013 08:11:09 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A4475688;
 Wed, 30 Jan 2013 08:11:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0U8B9Jr052823;
 Wed, 30 Jan 2013 08:11:09 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0U8B9gl052822;
 Wed, 30 Jan 2013 08:11:09 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201301300811.r0U8B9gl052822@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 30 Jan 2013 08:11:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40811 - head/en_US.ISO8859-1/articles/portbuild
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 30 Jan 2013 08:11:09 -0000

Author: linimon
Date: Wed Jan 30 08:11:09 2013
New Revision: 40811
URL: http://svnweb.freebsd.org/changeset/doc/40811

Log:
  Deorbit the use of security/sudo on the master due to new security
  requirements.  The text still needs some back-fill; this is WIP.

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

Modified: head/en_US.ISO8859-1/articles/portbuild/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/portbuild/article.xml	Wed Jan 30 07:54:08 2013	(r40810)
+++ head/en_US.ISO8859-1/articles/portbuild/article.xml	Wed Jan 30 08:11:09 2013	(r40811)
@@ -1836,7 +1836,6 @@ touch /tmp/.boot_finished</programlistin
 		<filename>usr/local/etc/sudoers/sudoers.d/portbuild</filename>:</para>
 
 	      <programlisting># local changes for package building
-%wheel        ALL=(ALL) ALL
 portbuild     ALL=(ALL) NOPASSWD: ALL</programlisting>
 	    </listitem>
 	  </itemizedlist>
@@ -2272,13 +2271,13 @@ zfs destroy -r a/snap/src-<replaceable>o
       <title>Steps necessary before <application>qmanager</application> is started</title>
 
       <note>
-	<para>The initial steps need to be done using
-	  <application>sudo</application>.</para>
+	<para>The initial steps need to be done as
+	  <literal>root</literal>.</para>
       </note>
 
       <itemizedlist>
 	<listitem>
-	  <para>Create a new
+	  <para>If it has not already been done, create the
 	    <literal>portbuild</literal>
 	    user and group.</para>
 	</listitem>
@@ -2397,7 +2396,7 @@ zfs destroy -r a/snap/src-<replaceable>o
       </itemizedlist>
 
       <note>
-	<para>Once again using <application>sudo</application>:</para>
+	<para>Once again as <literal>root</literal>:</para>
       </note>
 
       <itemizedlist>
@@ -2413,14 +2412,10 @@ zfs destroy -r a/snap/src-<replaceable>o
 	</listitem>
       </itemizedlist>
 
-      <note>
-	<para>One last time using <application>sudo</application>:</para>
-      </note>
-
       <itemizedlist>
 	<listitem>
 	  <para>Add an appropriate <replaceable>arch</replaceable> entry for
-	    <filename>/var/portbuild/scripts/dologs</filename> to the root
+	    <filename>/var/portbuild/scripts/dologs</filename> to the portbuild
 	    <filename>crontab</filename>.  (This is a hack and should go away.)</para>
 	</listitem>
       </itemizedlist>
@@ -2430,7 +2425,7 @@ zfs destroy -r a/snap/src-<replaceable>o
       <title>Steps necessary after <application>qmanager</application> is started</title>
 
       <note>
-	<para>Again using <application>sudo</application>:</para>
+	<para>Again as <literal>root</literal>:</para>
       </note>
 
       <itemizedlist>
@@ -2598,11 +2593,17 @@ net/isc-dhcp41-server
 ports-mgmt/pkg
 ports-mgmt/portaudit
 ports-mgmt/portmaster
-security/sudo
 shells/bash
 shells/zsh
 sysutils/screen</programlisting>
 
+	  <note>
+	    <para>The use of <application>sudo</application> on the master,
+	      which was formerly required, is
+	      <emphasis>no longer recommended</emphasis>.
+	    </para>
+	  </note>
+
 	  <para>The following ports (or their latest successors) are handy:</para>
 
 	  <programlisting>benchmarks/bonnie++

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 08: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])
 by hub.freebsd.org (Postfix) with ESMTP id 30800F5A;
 Wed, 30 Jan 2013 08:19:38 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 21B2D6EA;
 Wed, 30 Jan 2013 08:19:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0U8JcJU054067;
 Wed, 30 Jan 2013 08:19:38 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0U8JcjL054066;
 Wed, 30 Jan 2013 08:19:38 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201301300819.r0U8JcjL054066@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 30 Jan 2013 08:19:37 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40812 - head/en_US.ISO8859-1/articles/portbuild
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 30 Jan 2013 08:19:38 -0000

Author: linimon
Date: Wed Jan 30 08:19:37 2013
New Revision: 40812
URL: http://svnweb.freebsd.org/changeset/doc/40812

Log:
  zfs is most definitely required on the master.  While here, clean up
  the inetd flags.

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

Modified: head/en_US.ISO8859-1/articles/portbuild/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/portbuild/article.xml	Wed Jan 30 08:11:09 2013	(r40811)
+++ head/en_US.ISO8859-1/articles/portbuild/article.xml	Wed Jan 30 08:19:37 2013	(r40812)
@@ -2495,7 +2495,8 @@ zfs destroy -r a/snap/src-<replaceable>o
 	  <para>Required entries:</para>
 
 	  <programlisting>hostname="<replaceable>${hostname}</replaceable>"
-sshd_enable="YES"</programlisting>
+sshd_enable="YES"
+zfs_enable="YES"</programlisting>
 
 	  <para>Recommended entries:</para>
 
@@ -2510,8 +2511,7 @@ apache_pidfile="/var/run/httpd.pid"
 gmetad_enable="YES"
 gmond_enable="YES"
 inetd_enable="YES"
-# XXX MCL try these instead.
-inetd_flags="-R 10000 -l -w"
+inetd_flags="-l -w"
 mountd_enable="YES"
 nfs_server_enable="YES"
 nfs_server_flags="-u -t -n 12"
@@ -2521,8 +2521,7 @@ rpcbind_enable="YES"
 rpc_lockd_enable="NO"
 rpc_statd_enable="YES"
 sendmail_enable="NONE"
-smartd_enable="YES"
-zfs_enable="YES"</programlisting>
+smartd_enable="YES"</programlisting>
 	</step>
 
 	<step>

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 08:38:32 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])
 by hub.freebsd.org (Postfix) with ESMTP id 35C113D5;
 Wed, 30 Jan 2013 08:38:32 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BB9DF7B6;
 Wed, 30 Jan 2013 08:38:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0U8cV7g059703;
 Wed, 30 Jan 2013 08:38:31 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0U8cVPM059702;
 Wed, 30 Jan 2013 08:38:31 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201301300838.r0U8cVPM059702@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 30 Jan 2013 08:38:31 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40813 - head/en_US.ISO8859-1/articles/portbuild
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 30 Jan 2013 08:38:32 -0000

Author: linimon
Date: Wed Jan 30 08:38:31 2013
New Revision: 40813
URL: http://svnweb.freebsd.org/changeset/doc/40813

Log:
  Add notes on current rework and label it as WIP.

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

Modified: head/en_US.ISO8859-1/articles/portbuild/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/portbuild/article.xml	Wed Jan 30 08:19:37 2013	(r40812)
+++ head/en_US.ISO8859-1/articles/portbuild/article.xml	Wed Jan 30 08:38:31 2013	(r40813)
@@ -2455,6 +2455,54 @@ zfs destroy -r a/snap/src-<replaceable>o
     <para>Please talk to Mark Linimon before making any changes
       to this section.</para>
 
+    <sect2 id="pointyhat-privsep">
+      <title>Notes on privilege separation</title>
+
+      <para>As of January 2013, a rewrite is in progress to further separate
+	privileges.  The following concepts are introduced:</para>
+
+      <itemizedlist>
+	<listitem>
+	  <para>Server-side user <username>portbuild</username> assumes all
+	    responsiblity for operations involving builds and communicating
+	    with the clients.  This user no longer has access to
+	    <application>sudo</application>.</para>
+	</listitem>
+
+	<listitem>
+	  <para>Server-side user <username>srcbuild</username> is created
+	    and given responsiblity for operations involving both VCS
+	    operations and anything involving src builds for the clients.
+	    This user does not have access to
+	    <application>sudo</application>.</para>
+	</listitem>
+
+	<listitem>
+	  <para>The server-side
+	    <literal>ports-</literal><replaceable>arch</replaceable>
+	    users go away.</para>
+	</listitem>
+
+	<listitem>
+	  <para>None of the above server-side users have
+	    <application>ssh</application> keys.  Individual
+	    <literal>portmgr</literal> will accomplish all those
+	    tasks using <application>ksu</application>.  (This is
+	    still work-in-progress.)</para>
+	</listitem>
+
+	<listitem>
+	  <para>The only client-side user is also named
+	    <username>portbuild</username> and still has access to
+	    <application>sudo</application> for the purpose of managing
+	    jails.</para>
+	</listitem>
+      </itemizedlist>
+
+      <para>This document has not yet been updated with the latest changes.
+	</para>
+    </sect2>
+
     <sect2 id="pointyhat-basics">
       <title>Basic installation</title>
 

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 08:45:22 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])
 by hub.freebsd.org (Postfix) with ESMTP id 0B0B54C3;
 Wed, 30 Jan 2013 08:45:22 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D7EF07FE;
 Wed, 30 Jan 2013 08:45:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0U8jLAO062193;
 Wed, 30 Jan 2013 08:45:21 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0U8jLFU062192;
 Wed, 30 Jan 2013 08:45:21 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201301300845.r0U8jLFU062192@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 30 Jan 2013 08:45:21 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40814 - head/en_US.ISO8859-1/articles/portbuild
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 30 Jan 2013 08:45:22 -0000

Author: linimon
Date: Wed Jan 30 08:45:21 2013
New Revision: 40814
URL: http://svnweb.freebsd.org/changeset/doc/40814

Log:
  Very sneakily note that mkportbuild moves from portbuild/tools to
  portbuild/admin/tools.  Start documenting SRCBUILD_USER.  Remove
  mention of zfsadmin, that has been rewritten 3 times already by now.

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

Modified: head/en_US.ISO8859-1/articles/portbuild/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/portbuild/article.xml	Wed Jan 30 08:38:31 2013	(r40813)
+++ head/en_US.ISO8859-1/articles/portbuild/article.xml	Wed Jan 30 08:45:21 2013	(r40814)
@@ -2524,6 +2524,18 @@ zfs destroy -r a/snap/src-<replaceable>o
 	</step>
 
 	<step>
+	  <para>Similarly, create a user to own the <application>svn</application>
+	    repository, such as <literal>srcbuild</literal>.  It should have the
+	    <literal>'*'</literal> password.</para>
+	</step>
+
+	<step>
+	  <para>Export that value for a later initialization step:</para>
+
+	  <screen>&prompt.root; export SRCBUILD_USER=<replaceable>srcbuild</replaceable></screen>
+	</step>
+
+	<step>
 	  <para>Add the following to <filename>/boot/loader.conf</filename>:</para>
 
 	  <programlisting>console="vidconsole,comconsole"</programlisting>
@@ -2715,7 +2727,7 @@ sysutils/zfs-stats</programlisting>
 	    directory later.)</para>
 
 	  <screen>&prompt.root; mkdir -p /home/<replaceable>portbuild</replaceable>/<replaceable>tmp</replaceable>
-&prompt.root; svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/tools /home/<replaceable>portbuild</replaceable>/<replaceable>tmp</replaceable></screen>
+&prompt.root; svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/admin/tools /home/<replaceable>portbuild</replaceable>/<replaceable>tmp</replaceable></screen>
 	</step>
 
 	<step>
@@ -2755,7 +2767,7 @@ sysutils/zfs-stats</programlisting>
 	</step>
 
 	<step>
-	  <para>set up the repository:</para>
+	  <para>Set up the initial repository:</para>
 
 	  <screen>&prompt.user; svn checkout ${VCS_REPOSITORY}/base/projects/portbuild ${ZFS_MOUNTPOINT}/portbuild</screen>
 	</step>
@@ -2763,9 +2775,7 @@ sysutils/zfs-stats</programlisting>
 
 	    <step>
 	      <para>Set up the <application>zfs</application>
-		<literal>permission set</literal>:</para>
-
-	      <screen>&prompt.root; ${ZFS_MOUNTPOINT}/tools/zfsadmin</screen>
+		<literal>permission sets</literal>.</para>
 	    </step>
 	  </procedure>
 

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 08:46:30 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])
 by hub.freebsd.org (Postfix) with ESMTP id DDC38537;
 Wed, 30 Jan 2013 08:46:30 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CAA0080C;
 Wed, 30 Jan 2013 08:46:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0U8kUAs062375;
 Wed, 30 Jan 2013 08:46:30 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0U8kUnU062374;
 Wed, 30 Jan 2013 08:46:30 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201301300846.r0U8kUnU062374@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 30 Jan 2013 08:46:30 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40815 - head/en_US.ISO8859-1/articles/portbuild
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 30 Jan 2013 08:46:30 -0000

Author: linimon
Date: Wed Jan 30 08:46:30 2013
New Revision: 40815
URL: http://svnweb.freebsd.org/changeset/doc/40815

Log:
  Die, buildproxy, die!

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

Modified: head/en_US.ISO8859-1/articles/portbuild/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/portbuild/article.xml	Wed Jan 30 08:45:21 2013	(r40814)
+++ head/en_US.ISO8859-1/articles/portbuild/article.xml	Wed Jan 30 08:46:30 2013	(r40815)
@@ -2890,8 +2890,7 @@ sysutils/zfs-stats</programlisting>
 	    <filename>/var/portbuild/etc/rc.d/</filename> to
 	    <filename>/usr/local/etc/rc.d/</filename>:</para>
 
-	  <programlisting>buildproxy
-pollmachine
+	  <programlisting>pollmachine
 qmanager</programlisting>
 
 	  <para>As root, start each one of them.  You may find it handy

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 08:54:32 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])
 by hub.freebsd.org (Postfix) with ESMTP id AB6726DD;
 Wed, 30 Jan 2013 08:54:32 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8F0CA86A;
 Wed, 30 Jan 2013 08:54:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0U8sV7V064989;
 Wed, 30 Jan 2013 08:54:31 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0U8sV5U064987;
 Wed, 30 Jan 2013 08:54:31 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201301300854.r0U8sV5U064987@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 30 Jan 2013 08:54:30 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40816 - head/en_US.ISO8859-1/articles/portbuild
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 30 Jan 2013 08:54:32 -0000

Author: linimon
Date: Wed Jan 30 08:54:30 2013
New Revision: 40816
URL: http://svnweb.freebsd.org/changeset/doc/40816

Log:
  More details of the separation between srcbuild and portbuild.  The root
  crontab already went away some time ago; clean up that detail.

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

Modified: head/en_US.ISO8859-1/articles/portbuild/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/portbuild/article.xml	Wed Jan 30 08:46:30 2013	(r40815)
+++ head/en_US.ISO8859-1/articles/portbuild/article.xml	Wed Jan 30 08:54:30 2013	(r40816)
@@ -2887,7 +2887,7 @@ sysutils/zfs-stats</programlisting>
       <procedure>
 	<step>
 	  <para>Copy the following files from
-	    <filename>/var/portbuild/etc/rc.d/</filename> to
+	    <filename>/a/portbuild/admin/etc/rc.d/</filename> to
 	    <filename>/usr/local/etc/rc.d/</filename>:</para>
 
 	  <programlisting>pollmachine
@@ -2917,16 +2917,16 @@ qmanager</programlisting>
 
       <procedure>
 	<step>
-	  <para>As the <replaceable>portbuild</replaceable> user,
+	  <para>As the <replaceable>srcbuild</replaceable> user,
 	    run the following commands manually to create the
 	    <literal>src</literal> and <literal>ports</literal>
 	    repositories, respectively:</para>
 
-	  <screen>&prompt.user; /<replaceable>a</replaceable>/portbuild/scripts/updatesnap.ports
-&prompt.user; /<replaceable>a</replaceable>/portbuild/scripts/updatesnap</screen>
+	  <screen>&prompt.user; /<replaceable>a</replaceable>/portbuild/admin/scripts/updatesnap.ports
+&prompt.user; /<replaceable>a</replaceable>/portbuild/admin/scripts/updatesnap</screen>
 
 	  <para>These will be periodically run from the
-	    <replaceable>portbuild</replaceable>
+	    <replaceable>srcbuild</replaceable>
 	    <filename>crontab</filename>, which you will
 	    install below.</para>
 	</step>
@@ -2944,20 +2944,14 @@ qmanager</programlisting>
 	</step>
 
 	<step>
-	  <para>Copy <filename>/var/portbuild/conf/apache.conf</filename>
+	  <para>Copy <filename>/a/portbuild/admin/conf/apache.conf</filename>
 	    to the appropriate <filename>Includes/</filename> subdirectory, e.g.,
 	    <filename>/usr/local/etc/apache22/Includes/portbuild.conf</filename>.
 	    Configure it as appropriate for your site.</para>
 	</step>
 
 	<step>
-	  <para>Install <filename>/var/portbuild/crontabs/root</filename> as
-	    the <username>root</username> crontab via
-	    <command>crontab -e</command>.</para>
-	</step>
-
-	<step>
-	  <para>Install <filename>/var/portbuild/crontabs/portbuild</filename> as
+	  <para>Install <filename>/a/portbuild/admin/crontabs/portbuild</filename> as
 	    the <username>portbuild</username> crontab via
 	    <command>crontab -u portbuild -e</command>.  If you do
 	    not support all the archs listed there, make sure to comment out
@@ -2965,6 +2959,12 @@ qmanager</programlisting>
 	</step>
 
 	<step>
+	  <para>Install <filename>/a/srcbuild/admin/crontabs/portbuild</filename> as
+	    the <username>srcbuild</username> crontab via
+	    <command>crontab -u srcbuild -e</command>.</para>
+	</step>
+
+	<step>
 	  <para>If your build slaves will be pxebooted, make sure to
 	    enable the <application>tftp</application> entries in
 	    <filename>/etc/inetd.conf</filename>.</para>
@@ -2988,12 +2988,20 @@ qmanager</programlisting>
 	</step>
 
 	<step>
-	  <para>At some point, you will probably find it handy to append
+	  <para>You will probably find it handy to append
 	    the following to the <makevar>PATH</makevar> definition for
 	    the <replaceable>portbuild</replaceable> user:</para>
 
 	  <programlisting>/<replaceable>a</replaceable>/portbuild/scripts:/<replaceable>a</replaceable>/portbuild/tools</programlisting>
 	</step>
+
+	<step>
+	  <para>You will also probably find it handy to append
+	    the following to the <makevar>PATH</makevar> definition for
+	    the <replaceable>srcbuild</replaceable> user:</para>
+
+	  <programlisting>/<replaceable>a</replaceable>/portbuild/admin/scripts:/<replaceable>a</replaceable>/portbuild/admin/tools</programlisting>
+	</step>
       </procedure>
 
       <para>You should now be ready to build packages.</para>

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 12:02:29 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])
 by hub.freebsd.org (Postfix) with ESMTP id C20E4BF6;
 Wed, 30 Jan 2013 12:02:29 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B437333E;
 Wed, 30 Jan 2013 12:02:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UC2T3D021380;
 Wed, 30 Jan 2013 12:02:29 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UC2TgC021379;
 Wed, 30 Jan 2013 12:02:29 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201301301202.r0UC2TgC021379@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 30 Jan 2013 12:02:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40817 - head/nl_NL.ISO8859-1/books/handbook/introduction
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, 30 Jan 2013 12:02:29 -0000

Author: gjb
Date: Wed Jan 30 12:02:29 2013
New Revision: 40817
URL: http://svnweb.freebsd.org/changeset/doc/40817

Log:
  Hack a work around for GEN_INDEX breakage.

Modified:
  head/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml

Modified: head/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml	Wed Jan 30 08:54:30 2013	(r40816)
+++ head/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml	Wed Jan 30 12:02:29 2013	(r40817)
@@ -918,7 +918,7 @@
 	    <indexterm>
 	      <primary>SVN</primary>
 
-	      <see>Subversion</see>
+	      <!--<see>Subversion</see>-->
 	    </indexterm>
 
 	    <para>Gedurende een aantal jaren werd de centrale broncode

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 14:22:19 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])
 by hub.freebsd.org (Postfix) with ESMTP id B79E6FA5;
 Wed, 30 Jan 2013 14:22:19 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9DFA9D04;
 Wed, 30 Jan 2013 14:22:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UEMJMW064165;
 Wed, 30 Jan 2013 14:22:19 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UEMJxB064163;
 Wed, 30 Jan 2013 14:22:19 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201301301422.r0UEMJxB064163@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 30 Jan 2013 14:22:19 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40819 - head/en_US.ISO8859-1/books/handbook/mac
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, 30 Jan 2013 14:22:19 -0000

Author: dru
Date: Wed Jan 30 14:22:19 2013
New Revision: 40819
URL: http://svnweb.freebsd.org/changeset/doc/40819

Log:
  White space fix only. Translators can ignore.
  
  Approved by: bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/mac/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/mac/chapter.xml	Wed Jan 30 14:00:53 2013	(r40818)
+++ head/en_US.ISO8859-1/books/handbook/mac/chapter.xml	Wed Jan 30 14:22:19 2013	(r40819)
@@ -27,38 +27,39 @@
     </indexterm>
 
     <para>&os;&nbsp;5.X introduced new security extensions from the
-      TrustedBSD project based on the &posix;.1e draft.  Two of the most
-      significant new security mechanisms are file system Access Control
-      Lists (<acronym>ACL</acronym>s) and Mandatory Access Control
-      (<acronym>MAC</acronym>) facilities.  Mandatory Access Control allows
-      new access control modules to be loaded, implementing new security
-      policies.  Some provide protections of a narrow subset of the
-      system, hardening a particular service.  Others provide
-      comprehensive labeled security across all subjects and objects.
-      The mandatory part
-      of the definition comes from the fact that the enforcement of
-      the controls is done by administrators and the system, and is
-      not left up to the discretion of users as is done with
-      discretionary access control (<acronym>DAC</acronym>, the standard
-      file and System V <acronym>IPC</acronym> permissions on &os;).</para>
+      TrustedBSD project based on the &posix;.1e draft.  Two of the
+      most significant new security mechanisms are file system Access
+      Control Lists (<acronym>ACL</acronym>s) and Mandatory Access
+      Control (<acronym>MAC</acronym>) facilities.  Mandatory Access
+      Control allows new access control modules to be loaded,
+      implementing new security policies.  Some provide protections
+      of a narrow subset of the system, hardening a particular
+      service.  Others provide comprehensive labeled security across
+      all subjects and objects.  The mandatory part of the definition
+      comes from the fact that the enforcement of the controls is
+      done by administrators and the system, and is not left up to
+      the discretion of users as is done with discretionary access
+      control (<acronym>DAC</acronym>, the standard file and System
+      V <acronym>IPC</acronym> permissions on &os;).</para>
 
     <para>This chapter will focus on the
-      Mandatory Access Control Framework (<acronym>MAC</acronym> Framework), and a set
-      of pluggable security policy modules enabling various security
-      mechanisms.</para>
+      Mandatory Access Control Framework (<acronym>MAC</acronym>
+      Framework), and a set of pluggable security policy modules
+      enabling various security mechanisms.</para>
 
     <para>After reading this chapter, you will know:</para>
 
     <itemizedlist>
       <listitem>
-	<para>What <acronym>MAC</acronym> security policy modules are currently
-          included in &os; and their associated mechanisms.</para>
+	<para>What <acronym>MAC</acronym> security policy modules
+	  are currently included in &os; and their associated
+	  mechanisms.</para>
       </listitem>
 
       <listitem>
-	<para>What <acronym>MAC</acronym> security policy modules implement as
-	  well as the difference between a labeled and non-labeled
-	  policy.</para>
+	<para>What <acronym>MAC</acronym> security policy modules
+	  implement as well as the difference between a labeled and
+	  non-labeled policy.</para>
       </listitem>
 
       <listitem>
@@ -67,19 +68,20 @@
       </listitem>
 
       <listitem>
-	<para>How to configure the different security policy modules included with the
-	  <acronym>MAC</acronym> framework.</para>
+	<para>How to configure the different security policy modules
+	  included with the <acronym>MAC</acronym> framework.</para>
       </listitem>
 
       <listitem>
-        <para>How to implement a more secure environment using the
+	<para>How to implement a more secure environment using the
 	  <acronym>MAC</acronym> framework and the examples
 	  shown.</para>
       </listitem>
 
       <listitem>
 	<para>How to test the <acronym>MAC</acronym> configuration
-	  to ensure the framework has been properly implemented.</para>
+	  to ensure the framework has been properly
+	  implemented.</para>
       </listitem>
     </itemizedlist>
 
@@ -107,36 +109,37 @@
       <para>The improper use of the
 	information contained herein may cause loss of system access,
 	aggravation of users, or inability to access the features
-	provided by X11.  More importantly, <acronym>MAC</acronym> should not
-	be relied upon to completely secure a system.  The
-	<acronym>MAC</acronym> framework only augments
-	existing security policy; without sound security practices and
+	provided by X11.  More importantly, <acronym>MAC</acronym>
+	should not be relied upon to completely secure a system.  The
+	<acronym>MAC</acronym> framework only augments existing
+	security policy; without sound security practices and
 	regular security checks, the system will never be completely
 	secure.</para>
 
       <para>It should also be noted that the examples contained
 	within this chapter are just that, examples.  It is not
 	recommended that these particular settings be rolled out
-	on a production system.  Implementing the various security policy modules takes
-	a good deal of thought and testing.  One who does not fully understand
-	exactly how everything works may find him or herself going
-	back through the entire system and reconfiguring many files
-	or directories.</para>
+	on a production system.  Implementing the various security
+	policy modules takes a good deal of thought and testing.  One
+	who does not fully understand exactly how everything works
+	may find him or herself going back through the entire system
+	and reconfiguring many files or directories.</para>
     </warning>
 
     <sect2>
       <title>What Will Not Be Covered</title>
 
-      <para>This chapter covers a broad range of security issues relating
-	to the <acronym>MAC</acronym> framework.  The
-	development of new <acronym>MAC</acronym> security policy modules
-	will not be covered.  A number of security policy modules included with the
-	<acronym>MAC</acronym> framework have specific characteristics
-	which are provided for both testing and new module
-	development. These include the &man.mac.test.4;,
-	&man.mac.stub.4; and &man.mac.none.4;.
-        For more information on these security policy modules and the various
-	mechanisms they provide, please review the manual pages.</para>
+      <para>This chapter covers a broad range of security issues
+	relating to the <acronym>MAC</acronym> framework.  The
+	development of new <acronym>MAC</acronym> security policy
+	modules will not be covered.  A number of security policy
+	modules included with the <acronym>MAC</acronym> framework
+	have specific characteristics which are provided for both
+	testing and new module development.  These include the
+	&man.mac.test.4;, &man.mac.stub.4; and &man.mac.none.4;.
+	For more information on these security policy modules and
+	the various mechanisms they provide, please review the manual
+	pages.</para>
     </sect2>
   </sect1>
 
@@ -165,29 +168,29 @@
 	  for the purpose of accessing higher level information.  In
 	  most cases, the original level is restored after the process
 	  is complete.  Currently, the &os; <acronym>MAC</acronym>
-	  framework does not have a policy for this, but the definition
-	  is included for completeness.</para>
+	  framework does not have a policy for this, but the
+	  definition is included for completeness.</para>
       </listitem>
 
       <listitem>
 	<para><emphasis>integrity</emphasis>: Integrity, as a key
 	  concept, is the level of trust which can be placed on data.
-	  As the integrity of the data is elevated, so does the ability
-	  to trust that data.</para>
+	  As the integrity of the data is elevated, so does the
+	  ability to trust that data.</para>
       </listitem>
 
       <listitem>
 	<para><emphasis>label</emphasis>: A label is a security
 	  attribute which can be applied to files, directories, or
-	  other items in the system.  It could be considered
-	  a confidentiality stamp; when a label is placed on
-	  a file it describes the security properties for that specific
+	  other items in the system.  It could be considered a
+	  confidentiality stamp; when a label is placed on a file it
+	  describes the security properties for that specific
 	  file and will only permit access by files, users, resources,
 	  etc. with a similar security setting.  The meaning and
-	  interpretation of label values depends on the policy configuration: while
-	  some policies might treat a label as representing the
-	  integrity or secrecy of an object, other policies might use
-	  labels to hold rules for access.</para>
+	  interpretation of label values depends on the policy
+	  configuration: while some policies might treat a label as
+	  representing the integrity or secrecy of an object, other
+	  policies might use labels to hold rules for access.</para>
       </listitem>
 
       <listitem>
@@ -213,20 +216,21 @@
 	  &man.tunefs.8; utility, during the boot operation
 	  using the &man.fstab.5; file, or during the creation of
 	  a new file system.  This option will permit an administrator
-	  to apply different <acronym>MAC</acronym> labels on different
-	  objects.  This option
-	  only applies to security policy modules which support labeling.</para>
+	  to apply different <acronym>MAC</acronym> labels on
+	  different objects.  This option only applies to security
+	  policy modules which support labeling.</para>
       </listitem>
 
       <listitem>
 	<para><emphasis>object</emphasis>: An object or system
 	  object is an entity through which information flows
 	  under the direction of a <emphasis>subject</emphasis>.
-	  This includes directories, files, fields, screens, keyboards,
-	  memory, magnetic storage, printers or any other data
-	  storage/moving device.  Basically, an object is a data container or
-	  a system resource; access to an <emphasis>object</emphasis>
-	  effectively means access to the data.</para>
+	  This includes directories, files, fields, screens,
+	  keyboards, memory, magnetic storage, printers or any other
+	  data storage/moving device.  Basically, an object is a data
+	  container or a system resource; access to an
+	  <emphasis>object</emphasis> effectively means access to the
+	  data.</para>
       </listitem>
 
       <listitem>
@@ -246,7 +250,8 @@
 	  discussing <acronym>MLS</acronym>.  A sensitivity level is
 	  a term used to describe how important or secret the data
 	  should be.  As the sensitivity level increases, so does the
-	  importance of the secrecy, or confidentiality of the data.</para>
+	  importance of the secrecy, or confidentiality of the
+	  data.</para>
       </listitem>
 
       <listitem>
@@ -262,8 +267,8 @@
 	<para><emphasis>subject</emphasis>: a subject is any
 	  active entity that causes information to flow between
 	  <emphasis>objects</emphasis>; e.g., a user, user process,
-	  system process, etc.  On &os;, this is almost always a thread
-	  acting in a process on behalf of a user.</para>
+	  system process, etc.  On &os;, this is almost always a
+	  thread acting in a process on behalf of a user.</para>
       </listitem>
     </itemizedlist>
   </sect1>
@@ -273,53 +278,56 @@
 
     <para>With all of these new terms in mind, consider how the
       <acronym>MAC</acronym> framework augments the security of
-      the system as a whole.  The various security policy modules provided by
-      the <acronym>MAC</acronym> framework could be used to
-      protect the network and file systems, block users from
-      accessing certain ports and sockets, and more.  Perhaps
-      the best use of the policy modules is to blend them together, by loading
-      several security policy modules at a time for a multi-layered
-      security environment.  In a multi-layered security environment,
-      multiple policy modules are in effect to keep security in check.  This
-      is different to a hardening policy, which typically hardens
-      elements of a system that is used only for specific purposes.
-      The only downside is administrative overhead in cases of
-      multiple file system labels, setting network access control
-      user by user, etc.</para>
+      the system as a whole.  The various security policy modules
+      provided by the <acronym>MAC</acronym> framework could be used
+      to protect the network and file systems, block users from
+      accessing certain ports and sockets, and more.  Perhaps the
+      best use of the policy modules is to blend them together, by
+      loading several security policy modules at a time for a
+      multi-layered security environment.  In a multi-layered security
+      environment, multiple policy modules are in effect to keep
+      security in check.  This is different to a hardening policy,
+      which typically hardens elements of a system that is used only
+      for specific purposes.  The only downside is administrative
+      overhead in cases of multiple file system labels, setting
+      network access control user by user, etc.</para>
 
     <para>These downsides are minimal when compared to the lasting
-      effect of the framework; for instance, the ability to pick and choose
-      which policies are required for a specific configuration keeps
-      performance overhead down.  The reduction of support for unneeded
-      policies can increase the overall performance of the system as well as
-      offer flexibility of choice.  A good implementation would
-      consider the overall security requirements and effectively implement
-      the various security policy modules offered by the framework.</para>
+      effect of the framework; for instance, the ability to pick
+      and choose which policies are required for a specific
+      configuration keeps performance overhead down.  The reduction
+      of support for unneeded policies can increase the overall
+      performance of the system as well as offer flexibility of
+      choice.  A good implementation would consider the overall
+      security requirements and effectively implement the various
+      security policy modules offered by the framework.</para>
 
     <para>Thus a system utilizing <acronym>MAC</acronym> features
       should at least guarantee that a user will not be permitted
       to change security attributes at will; all user utilities,
       programs and scripts must work within the constraints of
-      the access rules provided by the selected security policy modules; and
-      that total control of the <acronym>MAC</acronym> access
-      rules are in the hands of the system administrator.</para>
+      the access rules provided by the selected security policy
+      modules; and that total control of the <acronym>MAC</acronym>
+      access rules are in the hands of the system
+      administrator.</para>
 
     <para>It is the sole duty of the system administrator to
-      carefully select the correct security policy modules.  Some environments
-      may need to limit access control over the network; in these
-      cases, the &man.mac.portacl.4;, &man.mac.ifoff.4; and even
-      &man.mac.biba.4; policy modules might make good starting points.  In other
-      cases, strict confidentiality of file system objects might
-      be required.  Policy modules such as &man.mac.bsdextended.4;
-      and &man.mac.mls.4; exist for this purpose.</para>
+      carefully select the correct security policy modules.  Some
+      environments may need to limit access control over the network;
+      in these cases, the &man.mac.portacl.4;, &man.mac.ifoff.4; and
+      even &man.mac.biba.4; policy modules might make good starting
+      points.  In other cases, strict confidentiality of file system
+      objects might be required.  Policy modules such as
+      &man.mac.bsdextended.4; and &man.mac.mls.4; exist for this
+      purpose.</para>
 
     <para>Policy decisions could be made based on network
       configuration.  Perhaps only certain users should be permitted
       access to facilities provided by &man.ssh.1; to access the
       network or the Internet.  The &man.mac.portacl.4; would be
-      the policy module of choice for these situations.  But what should be
-      done in the case of file systems?  Should all access to certain
-      directories be severed from other groups or specific
+      the policy module of choice for these situations.  But what
+      should be done in the case of file systems?  Should all access
+      to certain directories be severed from other groups or specific
       users?  Or should we limit user or utility access to specific
       files by setting certain objects as classified?</para>
 
@@ -330,19 +338,20 @@
       project A might not be permitted to access objects written
       by developers in project B.  Yet they might need to access
       objects created by developers in project C; that is quite a
-      situation indeed.  Using the different security policy modules provided by
-      the <acronym>MAC</acronym> framework; users could
+      situation indeed.  Using the different security policy modules
+      provided by the <acronym>MAC</acronym> framework; users could
       be divided into these groups and then given access to the
       appropriate areas without fear of information
       leakage.</para>
 
-    <para>Thus, each security policy module has a unique way of dealing with
-      the overall security of a system.  Module selection should be based
-      on a well thought out security policy.  In many cases, the
-      overall policy may need to be revised and reimplemented on
-      the system.  Understanding the different security policy modules offered by
-      the <acronym>MAC</acronym> framework will help administrators
-      choose the best policies for their situations.</para>
+    <para>Thus, each security policy module has a unique way of
+      dealing with the overall security of a system.  Module selection
+      should be based on a well thought out security policy.  In many
+      cases, the overall policy may need to be revised and
+      reimplemented on the system.  Understanding the different
+      security policy modules offered by the <acronym>MAC</acronym>
+      framework will help administrators choose the best policies
+      for their situations.</para>
 
     <para>The default &os; kernel does not include the option for
       the <acronym>MAC</acronym> framework; thus the following
@@ -351,7 +360,8 @@
 
     <programlisting>options	MAC</programlisting>
 
-    <para>And the kernel will require a rebuild and a reinstall.</para>
+    <para>And the kernel will require a rebuild and a
+      reinstall.</para>
 
     <caution>
       <para>While the various manual pages for <acronym>MAC</acronym>
@@ -375,11 +385,11 @@
 
     <para>When setting a label, the user must be able to comprehend
       what it is, exactly, that is being done.  The attributes
-      available on an object depend on the policy module loaded, and that
-      policy modules interpret their attributes in different
-      ways.  If improperly configured due to lack of comprehension, or
-      the inability to understand the implications, the result will
-      be the unexpected and perhaps, undesired, behavior of the
+      available on an object depend on the policy module loaded, and
+      that policy modules interpret their attributes in different
+      ways.  If improperly configured due to lack of comprehension,
+      or the inability to understand the implications, the result
+      will be the unexpected and perhaps, undesired, behavior of the
       system.</para>
 
     <para>The security label on an object is used as a part of a
@@ -388,26 +398,27 @@
       to make a decision; in other models, the labels may be processed
       as part of a larger rule set, etc.</para>
 
-    <para>For instance, setting the label of <literal>biba/low</literal>
-      on a file will represent a label maintained by the Biba security policy module,
-      with a value of <quote>low</quote>.</para>
+    <para>For instance, setting the label of
+      <literal>biba/low</literal> on a file will represent a label
+      maintained by the Biba security policy module, with a value
+      of <quote>low</quote>.</para>
 
-    <para>A few policy modules which support the labeling feature in
-      &os; offer three specific predefined labels.  These
+    <para>A few policy modules which support the labeling feature
+      in &os; offer three specific predefined labels.  These
       are the low, high, and equal labels.  Although they enforce
-      access control in a different manner with each policy module, you
-      can be sure that the low label will be the lowest setting,
+      access control in a different manner with each policy module,
+      you can be sure that the low label will be the lowest setting,
       the equal label will set the subject or object to be disabled
       or unaffected, and the high label will enforce the highest
       setting available in the Biba and <acronym>MLS</acronym>
       policy modules.</para>
 
-    <para>Within single label file system environments, only one label may be
-      used on objects.  This will enforce one set of
+    <para>Within single label file system environments, only one
+      label may be used on objects.  This will enforce one set of
       access permissions across the entire system and in many
       environments may be all that is required.  There are a few
-      cases where multiple labels may be set on objects
-      or subjects in the file system.  For those cases, the
+      cases where multiple labels may be set on objects or subjects
+      in the file system.  For those cases, the
       <option>multilabel</option> option may be passed to
       &man.tunefs.8;.</para>
 
@@ -420,13 +431,14 @@
     <para>In most cases the administrator will only be setting up a
       single label to use throughout the file system.</para>
 
-    <para><emphasis>Hey wait, this is similar to <acronym>DAC</acronym>!
-      I thought <acronym>MAC</acronym> gave control strictly to the
-      administrator.</emphasis>  That statement still holds true, to some
-      extent as <username>root</username> is the one in control and who
+    <para><emphasis>Hey wait, this is similar to
+	<acronym>DAC</acronym>!  I thought <acronym>MAC</acronym> gave
+	control strictly to the administrator.</emphasis>  That
+      statement still holds true, to some extent as
+      <username>root</username> is the one in control and who
       configures the policies so that users are placed in the
-      appropriate categories/access levels.  Alas, many policy modules can
-      restrict the <username>root</username> user as well.  Basic
+      appropriate categories/access levels.  Alas, many policy modules
+      can restrict the <username>root</username> user as well.  Basic
       control over objects will then be released to the group, but
       <username>root</username> may revoke or modify the settings
       at any time.  This is the hierarchal/clearance model covered
@@ -456,18 +468,19 @@
 	&man.chmod.1; and &man.chown.8; commands.  In some cases this
 	error may be a <errorname>Permission denied</errorname> and
 	is usually obtained when the label is being set or modified
-	on an object which is restricted.<footnote><para>Other conditions
-	may produce different failures.  For instance, the file may not
-	be owned by the	user attempting to relabel the object, the
-	object may not exist or	may be read only.  A mandatory policy
-	will not allow the process to relabel the file, maybe because
-	of a property of the file, a property of the process, or a
-	property of the proposed new label value.  For example: a user
-	running at low integrity tries to change the label of a high
-	integrity file.  Or perhaps a user running at low integrity
-	tries to change the label of a low integrity file to a high
-	integrity label.</para></footnote>  The system administrator
-	may use the following commands to overcome this:</para>
+	on an object which is restricted.<footnote>Other conditions
+	  may produce different failures.  For instance, the file may
+	  not be owned by the user attempting to relabel the object,
+	  the object may not exist or may be read only.  A mandatory
+	  policy will not allow the process to relabel the file, maybe
+	  because of a property of the file, a property of the
+	  process, or a property of the proposed new label value.  For
+	  example: a user running at low integrity tries to change the
+	  label of a high integrity file.  Or perhaps a user running
+	  at low integrity tries to change the label of a low
+	  integrity file to a high integrity label.</footnote>  The
+	system administrator may use the following commands to
+	overcome this:</para>
 
       <screen>&prompt.root; <userinput>setfmac biba/high test</userinput>
 <errorname>Permission denied</errorname>
@@ -476,15 +489,15 @@
 test: biba/high</screen>
 
       <para>As we see above, <command>setpmac</command>
-	can be used to override the policy module's settings by assigning
-	a different label to the invoked process.  The
-	<command>getpmac</command> utility is usually used with currently
-	running processes, such as <application>sendmail</application>:
-	although it takes a process ID in place of
-	a command the logic is extremely similar.  If users
-	attempt to manipulate a file not in their access, subject to the
-	rules of the loaded policy modules, the
-	<errorname>Operation not permitted</errorname> error
+	can be used to override the policy module's settings by
+	assigning a different label to the invoked process.  The
+	<command>getpmac</command> utility is usually used with
+	currently running processes, such as
+	<application>sendmail</application>: although it takes a
+	process ID in place of a command the logic is extremely
+	similar.  If users attempt to manipulate a file not in their
+	access, subject to the rules of the loaded policy modules,
+	the <errorname>Operation not permitted</errorname> error
 	will be displayed by the <function>mac_set_link</function>
 	function.</para>
 
@@ -512,29 +525,30 @@ test: biba/high</screen>
 	  </listitem>
 
 	  <listitem>
-	    <para>The <literal>high</literal> label grants an object or
-	      subject the highest possible setting.</para>
+	    <para>The <literal>high</literal> label grants an object
+	      or subject the highest possible setting.</para>
 	  </listitem>
 	</itemizedlist>
 
-	<para>With respect to each policy module, each of those settings
-	  will instate a different information flow directive.  Reading
-	  the proper manual pages will further explain the traits of
-	  these generic label configurations.</para>
+	<para>With respect to each policy module, each of those
+	  settings will instate a different information flow
+	  directive.  Reading the proper manual pages will further
+	  explain the traits of these generic label
+	  configurations.</para>
 
-        <sect4>
+	<sect4>
 	  <title>Advanced Label Configuration</title>
 
 	  <para>Numeric grade labels are used for
-	    <literal>comparison:compartment+compartment</literal>; thus
-	    the following:</para>
+	    <literal>comparison:compartment+compartment</literal>;
+	    thus the following:</para>
 
 	  <programlisting>biba/10:2+3+6(5:2+3-20:2+3+4+5+6)</programlisting>
 
 	  <para>May be interpreted as:</para>
 
-	  <para><quote>Biba Policy Label</quote>/<quote>Grade 10</quote>
-	    :<quote>Compartments 2, 3 and 6</quote>:
+	  <para><quote>Biba Policy Label</quote>/<quote>Grade
+	      10</quote>:<quote>Compartments 2, 3 and 6</quote>:
 	    (<quote>grade 5 ...</quote>)</para>
 
 	  <para>In this example, the first grade would be considered
@@ -547,24 +561,24 @@ test: biba/high</screen>
 
 	  <para>When applied to system objects, they will only have a
 	    current grade/compartments as opposed to system subjects
-	    as they reflect the range of available rights in the system,
-	    and network interfaces, where they are used for access
-	    control.</para>
+	    as they reflect the range of available rights in the
+	    system, and network interfaces, where they are used for
+	    access control.</para>
 
-	  <para>The grade and compartments in a subject and object pair
-	    are used to construct a relationship referred to as
+	  <para>The grade and compartments in a subject and object
+	    pair are used to construct a relationship referred to as
 	    <quote>dominance</quote>, in which a subject dominates an
-	    object, the object dominates the subject, neither dominates
-	    the other, or both dominate each other.  The
-	    <quote>both dominate</quote> case occurs when the two labels
-	    are equal.  Due to the information flow nature of Biba, you
-	    have rights to a set of compartments,
+	    object, the object dominates the subject, neither
+	    dominates the other, or both dominate each other.  The
+	    <quote>both dominate</quote> case occurs when the two
+	    labels are equal.  Due to the information flow nature of
+	    Biba, you have rights to a set of compartments,
 	    <quote>need to know</quote>, that might correspond to
 	    projects, but objects also have a set of compartments.
 	    Users may have to subset their rights using
-	    <command>su</command> or <command>setpmac</command> in order
-	    to access objects in a compartment from which they are not
-	    restricted.</para>
+	    <command>su</command> or <command>setpmac</command> in
+	    order to access objects in a compartment from which they
+	    are not restricted.</para>
 	</sect4>
       </sect3>
 
@@ -575,11 +589,11 @@ test: biba/high</screen>
 	  their files and processes may properly interact with the
 	  security policy defined on the system.  This is
 	  configured through the <filename>login.conf</filename> file
-	  by use of login classes.  Every policy module that uses labels
-	  will implement the user class setting.</para>
+	  by use of login classes.  Every policy module that uses
+	  labels will implement the user class setting.</para>
 
-	<para>An example entry containing every policy module setting is displayed
-	  below:</para>
+	<para>An example entry containing every policy module setting
+	  is displayed below:</para>
 
 	<programlisting>default:\
 	:copyright=/etc/COPYRIGHT:\
@@ -657,8 +671,9 @@ test: biba/high</screen>
 	<para>will set the <acronym>MAC</acronym> label of
 	  <literal>biba/equal</literal> on the &man.bge.4; interface.
 	  When using a setting similar to
-	  <literal>biba/high(low-high)</literal> the entire label should
-	  be quoted; otherwise an error will be returned.</para>
+	  <literal>biba/high(low-high)</literal> the entire label
+	  should be quoted; otherwise an error will be
+	  returned.</para>
 
 	<para>Each policy module which supports labeling has a tunable
 	  which may be used to disable the <acronym>MAC</acronym>
@@ -698,8 +713,8 @@ test: biba/high</screen>
 	<acronym>MLS</acronym> and <acronym>SEBSD</acronym>
 	policies.</para>
 
-      <para>In many cases, the <option>multilabel</option> may not need
-	to be set at all.  Consider the following situation and
+      <para>In many cases, the <option>multilabel</option> may not
+	need to be set at all.  Consider the following situation and
 	security model:</para>
 
       <itemizedlist>
@@ -710,32 +725,32 @@ test: biba/high</screen>
 
 	<listitem>
 	  <para>This machine only requires one label,
-	    <literal>biba/high</literal>, for everything in the system.
-	    Here the file system would not require the
+	    <literal>biba/high</literal>, for everything in the
+	    system.  Here the file system would not require the
 	    <option>multilabel</option> option as a single label
 	    will always be in effect.</para>
 	</listitem>
 
 	<listitem>
-	  <para>But, this machine will be a web server and should have
-	    the web server run at <literal>biba/low</literal> to prevent
-	    write up capabilities.  The Biba policy and how it works
-	    will be discussed later, so if the previous comment was
-	    difficult to interpret just continue reading and return.
-	    The server could use a separate partition set at
-	    <literal>biba/low</literal> for most if not all of its
-	    runtime state.  Much is lacking from this example, for
-	    instance the restrictions on data, configuration and user
-	    settings; however, this is just a quick example to prove the
-	    aforementioned point.</para>
+	  <para>But, this machine will be a web server and should
+	    have the web server run at <literal>biba/low</literal>
+	    to prevent write up capabilities.  The Biba policy and
+	    how it works will be discussed later, so if the previous
+	    comment was difficult to interpret just continue reading
+	    and return.  The server could use a separate partition
+	    set at <literal>biba/low</literal> for most if not all
+	    of its runtime state.  Much is lacking from this example,
+	    for instance the restrictions on data, configuration and
+	    user settings; however, this is just a quick example to
+	    prove the aforementioned point.</para>
 	</listitem>
       </itemizedlist>
 
       <para>If any of the non-labeling policies are to be used,
 	then the <option>multilabel</option> option would never
-	be required.  These include the <literal>seeotheruids</literal>,
-	<literal>portacl</literal> and <literal>partition</literal>
-	policies.</para>
+	be required.  These include the
+	<literal>seeotheruids</literal>, <literal>portacl</literal>
+	and <literal>partition</literal> policies.</para>
 
       <para>It should also be noted that using
 	<option>multilabel</option> with a partition and establishing
@@ -766,10 +781,11 @@ test: biba/high</screen>
   <sect1 id="mac-planning">
     <title>Planning the Security Configuration</title>
 
-    <para>Whenever a new technology is implemented, a planning phase is
-      always a good idea.  During the planning stages, an administrator
-      should in general look at the <quote>big picture</quote>, trying
-      to keep in view at least the following:</para>
+    <para>Whenever a new technology is implemented, a planning phase
+      is always a good idea.  During the planning stages, an
+      administrator should in general look at the <quote>big
+	picture</quote>, trying to keep in view at least the
+      following:</para>
 
     <itemizedlist>
       <listitem>
@@ -781,7 +797,8 @@ test: biba/high</screen>
       </listitem>
     </itemizedlist>
 
-    <para>For <acronym>MAC</acronym> installations, these include:</para>
+    <para>For <acronym>MAC</acronym> installations, these
+      include:</para>
 
     <itemizedlist>
       <listitem>
@@ -802,15 +819,16 @@ test: biba/high</screen>
     </itemizedlist>
 
     <para>It is always possible to reconfigure and change the
-      system resources and security settings, it is quite often very inconvenient to
-      search through the system and fix existing files and user
-      accounts.  Planning helps to ensure a trouble-free and efficient
-      trusted system implementation.  A trial run of the trusted system,
-      including the configuration, is often vital and definitely
-      beneficial <emphasis>before</emphasis> a <acronym>MAC</acronym>
-      implementation is used on production systems.  The idea of just
-      letting loose on a system
-      with <acronym>MAC</acronym> is like setting up for failure.</para>
+      system resources and security settings, it is quite often very
+      inconvenient to search through the system and fix existing
+      files and user accounts.  Planning helps to ensure a
+      trouble-free and efficient trusted system implementation.  A
+      trial run of the trusted system, including the configuration,
+      is often vital and definitely beneficial
+      <emphasis>before</emphasis> a <acronym>MAC</acronym>
+      implementation is used on production systems.  The idea of
+      just letting loose on a system with <acronym>MAC</acronym> is
+      like setting up for failure.</para>
 
     <para>Different environments may have explicit needs and
       requirements.  Establishing an in depth and complete security
@@ -841,11 +859,11 @@ test: biba/high</screen>
       be a consideration of this chapter.  Some modules support
       the use of labeling, which is controlling access by enforcing
       a label such as <quote>this is allowed and this is not</quote>.
-      A label configuration file may control how files may be accessed,
-      network communication can be exchanged, and more.  The previous
-      section showed how the <option>multilabel</option> flag could
-      be set on file systems to enable per-file or per-partition
-      access control.</para>
+      A label configuration file may control how files may be
+      accessed, network communication can be exchanged, and more.
+      The previous section showed how the <option>multilabel</option>
+      flag could be set on file systems to enable per-file or
+      per-partition access control.</para>
 
     <para>A single label configuration would enforce only one label
       across the system, that is why the <command>tunefs</command>
@@ -893,8 +911,8 @@ test: biba/high</screen>
 	  To exempt specific groups from this policy, use the
 	  <literal>security.mac.seeotheruids.specificgid=<replaceable>XXX</replaceable></literal>
 	  <command>sysctl</command> tunable.  In the above example,
-	  the <replaceable>XXX</replaceable> should be replaced with the
-	  numeric group ID to be exempted.</para>
+	  the <replaceable>XXX</replaceable> should be replaced with
+	  the numeric group ID to be exempted.</para>
       </listitem>
 
       <listitem>
@@ -912,8 +930,8 @@ test: biba/high</screen>
     <title>The MAC bsdextended Module</title>
 
     <indexterm>
-    <primary>MAC</primary>
-      <secondary>File System Firewall Policy</secondary>
+      <primary>MAC</primary>
+	<secondary>File System Firewall Policy</secondary>
     </indexterm>
     <para>Module name: <filename>mac_bsdextended.ko</filename></para>
 
@@ -926,21 +944,21 @@ test: biba/high</screen>
     <para>The &man.mac.bsdextended.4; module enforces the file system
       firewall.  This module's policy provides an extension to the
       standard file system permissions model, permitting an
-      administrator to create a firewall-like ruleset to protect files,
-      utilities, and directories in the file system hierarchy.  When
-      access to a file system object is attempted, the list of rules
-      is iterated until either a matching rule is located or the end
-      is reached.  This behavior may be changed by the use of a
-      &man.sysctl.8; parameter,
+      administrator to create a firewall-like ruleset to protect
+      files, utilities, and directories in the file system hierarchy.
+      When access to a file system object is attempted, the list of
+      rules is iterated until either a matching rule is located or
+      the end is reached.  This behavior may be changed by the use
+      of a &man.sysctl.8; parameter,
       security.mac.bsdextended.firstmatch_enabled.  Similar to
-      other firewall modules in &os;, a file containing access control
-      rules can be created and read by the system at boot time using
-      an &man.rc.conf.5; variable.</para>
-
-    <para>The rule list may be entered using a utility, &man.ugidfw.8;,
-      that has a syntax similar to that of &man.ipfw.8;.  More tools
-      can be written by using the functions in the
-      &man.libugidfw.3; library.</para>
+      other firewall modules in &os;, a file containing access
+      control rules can be created and read by the system at boot
+      time using an &man.rc.conf.5; variable.</para>
+
+    <para>The rule list may be entered using a utility,
+      &man.ugidfw.8;, that has a syntax similar to that of
+      &man.ipfw.8;.  More tools can be written by using the functions
+      in the &man.libugidfw.3; library.</para>
 
     <para>Extreme caution should be taken when working with this
       module; incorrect use could block access to certain parts of
@@ -949,9 +967,9 @@ test: biba/high</screen>
     <sect2>
       <title>Examples</title>
 
-      <para>After the &man.mac.bsdextended.4; module has
-	been loaded, the following command may be used to list the
-	current rule configuration:</para>
+      <para>After the &man.mac.bsdextended.4; module has been loaded,
+	the following command may be used to list the current rule
+	configuration:</para>
 
       <screen>&prompt.root; <userinput>ugidfw list</userinput>
 0 slots, 0 rules</screen>
@@ -973,17 +991,19 @@ test: biba/high</screen>
 &prompt.root; <userinput>ugidfw set 3 subject uid <replaceable>user1</replaceable> object gid <replaceable>user2</replaceable> mode n</userinput></screen>
 
       <para>This will block any and all access, including directory
-	listings, to <username><replaceable>user2</replaceable></username>'s home
+	listings, to
+	<username><replaceable>user2</replaceable></username>'s home
 	directory from the username <username>user1</username>.</para>
 
       <para>In place of <username>user1</username>, the
-	<option>not uid <replaceable>user2</replaceable></option> could
-	be passed.  This will enforce the same access restrictions
-	above for all users in place of just one user.</para>
+	<option>not uid <replaceable>user2</replaceable></option>
+	could be passed.  This will enforce the same access
+	restrictions above for all users in place of just one
+	user.</para>
 
       <note>
 	<para>The <username>root</username> user will be unaffected
-	    by these changes.</para>
+	  by these changes.</para>
       </note>
 
       <para>This should provide a general idea of how the
@@ -1007,11 +1027,11 @@ test: biba/high</screen>
 
     <para>Boot option: <literal>mac_ifoff_load="YES"</literal></para>
 
-    <para>The &man.mac.ifoff.4; module exists solely to disable network
-      interfaces on the fly and keep network interfaces from being
-      brought up during the initial system boot.  It does not require
-      any labels to be set up on the system, nor does it have a
-      dependency on other <acronym>MAC</acronym> modules.</para>
+    <para>The &man.mac.ifoff.4; module exists solely to disable
+      network interfaces on the fly and keep network interfaces from
+      being brought up during the initial system boot.  It does not
+      require any labels to be set up on the system, nor does it have
+      a dependency on other <acronym>MAC</acronym> modules.</para>
 
     <para>Most of the control is done through the
       <command>sysctl</command> tunables listed below.</para>
@@ -1024,9 +1044,9 @@ test: biba/high</screen>
       </listitem>
 
       <listitem>
-	<para><literal>security.mac.ifoff.bpfrecv_enabled</literal> will
-	  enable/disable all traffic on the Berkeley Packet Filter
-	  interface (&man.bpf.4;)</para>
+	<para><literal>security.mac.ifoff.bpfrecv_enabled</literal>
+	  will enable/disable all traffic on the Berkeley Packet
+	  Filter interface (&man.bpf.4;)</para>
       </listitem>
 
       <listitem>
@@ -1039,9 +1059,9 @@ test: biba/high</screen>
       monitoring in an environment where network traffic should not
       be permitted during the boot sequence.  Another suggested use
       would be to write a script which uses
-      <filename role="package">security/aide</filename> to automatically
-      block network traffic if it finds new or altered files in
-      protected directories.</para>
+      <filename role="package">security/aide</filename> to
+      automatically block network traffic if it finds new or altered
+      files in protected directories.</para>
   </sect1>
 
   <sect1 id="mac-portacl">
@@ -1055,7 +1075,8 @@ test: biba/high</screen>
     <para>Kernel configuration line:
       <literal>MAC_PORTACL</literal></para>
 
-    <para>Boot option: <literal>mac_portacl_load="YES"</literal></para>
+    <para>Boot option:
+      <literal>mac_portacl_load="YES"</literal></para>
 
     <para>The &man.mac.portacl.4; module is used to limit binding to
       local <acronym>TCP</acronym> and <acronym>UDP</acronym> ports
@@ -1075,14 +1096,14 @@ test: biba/high</screen>
       </listitem>
 
       <listitem>
-	<para><literal>security.mac.portacl.port_high</literal> will set
-	  the highest port number that &man.mac.portacl.4;
+	<para><literal>security.mac.portacl.port_high</literal> will
+	  set the highest port number that &man.mac.portacl.4;
 	  will enable protection for.</para>
       </listitem>
 
       <listitem>
-	<para><literal>security.mac.portacl.suser_exempt</literal> will,
-	  when set to a non-zero value, exempt the
+	<para><literal>security.mac.portacl.suser_exempt</literal>
+	  will, when set to a non-zero value, exempt the
 	  <username>root</username> user from this policy.</para>
       </listitem>
 
@@ -1102,27 +1123,28 @@ test: biba/high</screen>
       <literal>uid</literal> or <literal>gid</literal> and used to
       interpret the <parameter>id</parameter> parameter as either a
       user id or group id, respectively.  The
-      <parameter>protocol</parameter> parameter is used to determine if
-      the rule should apply to <acronym>TCP</acronym> or
+      <parameter>protocol</parameter> parameter is used to determine
+      if the rule should apply to <acronym>TCP</acronym> or
       <acronym>UDP</acronym> by setting the parameter to
       <literal>tcp</literal> or <literal>udp</literal>.  The final
-      <parameter>port</parameter> parameter is the port number to allow
-      the specified user or group to bind to.</para>
+      <parameter>port</parameter> parameter is the port number to
+      allow the specified user or group to bind to.</para>
 
     <note>
       <para>Since the ruleset is interpreted directly by the kernel
-	only numeric values can be used for the user ID, group ID, and
-	port parameters.  Names cannot be used for users, groups, or
-	services.</para>
+	only numeric values can be used for the user ID, group ID,
+	and port parameters.  Names cannot be used for users, groups,
+	or services.</para>
     </note>
 
     <para>By default, on &unix;-like systems, ports below 1024
       can only be used by/bound to privileged processes,
       i.e., those run as <username>root</username>.  For
       &man.mac.portacl.4; to allow non-privileged processes to bind
-      to ports below 1024 this standard &unix; restriction has to be
-      disabled.  This can be accomplished by setting the &man.sysctl.8;
-      variables <literal>net.inet.ip.portrange.reservedlow</literal> and
+      to ports below 1024 this standard &unix; restriction has to
+      be disabled.  This can be accomplished by setting the
+      &man.sysctl.8; variables
+      <literal>net.inet.ip.portrange.reservedlow</literal> and
       <literal>net.inet.ip.portrange.reservedhigh</literal>
       to zero.</para>
 
@@ -1162,7 +1184,7 @@ test: biba/high</screen>
       <screen>&prompt.root; <userinput>sysctl security.mac.portacl.rules=uid:1001:tcp:110,uid:1001:tcp:995</userinput></screen>
 
       <para>Permit the user with the <acronym>UID</acronym> of
-	1001 to	bind to the <acronym>TCP</acronym> ports 110
+	1001 to bind to the <acronym>TCP</acronym> ports 110
 	(<quote>pop3</quote>) and 995 (<quote>pop3s</quote>).
 	This will permit this user to start a server that accepts
 	connections on ports 110 and 995.</para>
@@ -1208,8 +1230,8 @@ test: biba/high</screen>
 
     <para>When this policy is enabled, users will only be permitted
       to see their processes, and any others within their partition,
-      but will not be permitted to work with
-      utilities outside the scope of this partition.  For instance, a user in the
+      but will not be permitted to work with utilities outside the
+      scope of this partition.  For instance, a user in the
       <literal>insecure</literal> class above will not be permitted
       to access the <command>top</command> command as well as many
       other commands that must spawn a process.</para>
@@ -1252,9 +1274,9 @@ test: biba/high</screen>
 
       <note>
 	<para>The following policies support integer settings
-	  in place of the three default labels offered.  These options,
-	  including their limitations, are further explained in
-	  the module manual pages.</para>
+	  in place of the three default labels offered.  These
+	  options, including their limitations, are further explained
+	  in the module manual pages.</para>
       </note>
     </sect2>
   </sect1>
@@ -1295,10 +1317,10 @@ test: biba/high</screen>
 	<para>The <literal>mls/low</literal> label contains a low
 	  configuration which permits it to be dominated by all other
 	  objects.  Anything labeled with <literal>mls/low</literal>
-	  will have a low clearance level and not be permitted to access
-	  information of a higher level.  In addition, this label will
-	  prevent objects of a higher clearance level from writing or
-	  passing information on to them.</para>
+	  will have a low clearance level and not be permitted to
+	  access information of a higher level.  In addition, this
+	  label will prevent objects of a higher clearance level from
+	  writing or passing information on to them.</para>
       </listitem>
 
       <listitem>
@@ -1308,11 +1330,11 @@ test: biba/high</screen>
       </listitem>
 
       <listitem>
-	<para>The <literal>mls/high</literal> label is the highest level
-	  of clearance possible.  Objects assigned this label will

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

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 14:25: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 [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 196F3195;
 Wed, 30 Jan 2013 14:25:00 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0ABA9D2D;
 Wed, 30 Jan 2013 14:25:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UEP0qp064604;
 Wed, 30 Jan 2013 14:25:00 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UEOxx2064598;
 Wed, 30 Jan 2013 14:24:59 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201301301424.r0UEOxx2064598@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 30 Jan 2013 14:24:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40820 - head/en_US.ISO8859-1/books/handbook/kernelconfig
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 30 Jan 2013 14:25:00 -0000

Author: dru
Date: Wed Jan 30 14:24:59 2013
New Revision: 40820
URL: http://svnweb.freebsd.org/changeset/doc/40820

Log:
  White space fix only. Translators can ignore.
  
  Approved by: bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Wed Jan 30 14:22:19 2013	(r40819)
+++ head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Wed Jan 30 14:24:59 2013	(r40820)
@@ -35,11 +35,12 @@
       <secondary>building a custom kernel</secondary>
     </indexterm>
 
-    <para>The kernel is the core of the &os; operating system.  It is
-      responsible for managing memory, enforcing security controls,
-      networking, disk access, and much more.  While more and more of &os;
-      becomes dynamically configurable it is still occasionally necessary to
-      reconfigure and recompile your kernel.</para>
+    <para>The kernel is the core of the &os; operating system.  It
+      is responsible for managing memory, enforcing security controls,
+      networking, disk access, and much more.  While more and more
+      of &os; becomes dynamically configurable it is still
+      occasionally necessary to reconfigure and recompile your
+      kernel.</para>
 
     <para>After reading this chapter, you will know:</para>
 
@@ -49,13 +50,13 @@
       </listitem>
 
       <listitem>
-	<para>How to write a kernel configuration file, or alter an existing
-	  configuration file.</para>
+	<para>How to write a kernel configuration file, or alter an
+	  existing configuration file.</para>
       </listitem>
 
       <listitem>
-	<para>How to use the kernel configuration file to create and build a
-	  new kernel.</para>
+	<para>How to use the kernel configuration file to create and
+	  build a new kernel.</para>
       </listitem>
 
       <listitem>
@@ -67,19 +68,20 @@
       </listitem>
     </itemizedlist>
 
-    <para>All of the commands listed within this chapter by way of example
-      should be executed as <username>root</username> in order to
-      succeed.</para>
+    <para>All of the commands listed within this chapter by way of
+      example should be executed as <username>root</username> in
+      order to succeed.</para>
   </sect1>
 
   <sect1 id="kernelconfig-custom-kernel">
     <title>Why Build a Custom Kernel?</title>
 
     <para>Traditionally, &os; has had what is called a
-      <quote>monolithic</quote> kernel.  This means that the kernel was one
-      large program, supported a fixed list of devices, and if you wanted to
-      change the kernel's behavior then you had to compile a new kernel, and
-      then reboot your computer with the new kernel.</para>
+      <quote>monolithic</quote> kernel.  This means that the kernel
+      was one large program, supported a fixed list of devices, and
+      if you wanted to change the kernel's behavior then you had to
+      compile a new kernel, and then reboot your computer with the
+      new kernel.</para>
 
     <para>Today, &os; is rapidly moving to a model where much of the
       kernel's functionality is contained in modules which can be
@@ -90,41 +92,43 @@
       necessary when the kernel was originally compiled.  This is
       known as a modular kernel.</para>
 
-    <para>Despite this, it is still necessary to carry out some static kernel
-      configuration.  In some cases this is because the functionality is so
-      tied to the kernel that it can not be made dynamically loadable.  In
-      others it may simply be because no one has yet taken the time to write a
-      dynamic loadable kernel module for that functionality.</para>
+    <para>Despite this, it is still necessary to carry out some
+      static kernel configuration.  In some cases this is because
+      the functionality is so tied to the kernel that it can not be
+      made dynamically loadable.  In others it may simply be because
+      no one has yet taken the time to write a dynamic loadable kernel
+      module for that functionality.</para>
 
-    <para>Building a custom kernel is one of the most important rites of
-      passage for advanced BSD users.  This process, while
+    <para>Building a custom kernel is one of the most important rites
+      of passage for advanced BSD users.  This process, while
       time consuming, will provide many benefits to your &os; system.
-      Unlike the <filename>GENERIC</filename> kernel, which must support a
-      wide range of hardware, a custom kernel only contains support for
-      <emphasis>your</emphasis> PC's hardware.  This has a number of
-      benefits, such as:</para>
+      Unlike the <filename>GENERIC</filename> kernel, which must
+      support a wide range of hardware, a custom kernel only contains
+      support for <emphasis>your</emphasis> PC's hardware.  This has
+      a number of benefits, such as:</para>
 
     <itemizedlist>
       <listitem>
-	<para>Faster boot time.  Since the kernel will only probe the
-	  hardware you have on your system, the time it takes your system to
-	  boot can decrease dramatically.</para>
+	<para>Faster boot time.  Since the kernel will only probe
+	  the hardware you have on your system, the time it takes
+	  your system to boot can decrease dramatically.</para>
       </listitem>
 
       <listitem>
-	<para>Lower memory usage.  A custom kernel often uses less memory
-	  than the <filename>GENERIC</filename> kernel by omitting unused
-	  features and device drivers.  This is important because the kernel
-	  code remains resident in physical memory at all times, preventing
-	  that memory from being used by applications.
-	  For this reason, a custom kernel is especially useful
-	  on a system with a small amount of RAM.</para>
+	<para>Lower memory usage.  A custom kernel often uses less
+	  memory than the <filename>GENERIC</filename> kernel by
+	  omitting unused features and device drivers.  This is
+	  important because the kernel code remains resident in
+	  physical memory at all times, preventing that memory from
+	  being used by applications.  For this reason, a custom
+	  kernel is especially useful on a system with a small amount
+	  of RAM.</para>
       </listitem>
 
       <listitem>
-	<para>Additional hardware support.  A custom kernel allows you to
-	  add in support for devices which are not
-	  present in the <filename>GENERIC</filename> kernel, such as
+	<para>Additional hardware support.  A custom kernel allows
+	  you to add in support for devices which are not present
+	  in the <filename>GENERIC</filename> kernel, such as
 	  sound cards.</para>
       </listitem>
     </itemizedlist>
@@ -142,11 +146,11 @@
     </sect1info>
     <title>Finding the System Hardware</title>
 
-    <para>Before venturing into kernel configuration, it would be wise
-      to get an inventory of the machine's hardware.  In cases where
-      &os; is not the primary operating system, the inventory list may
-      easily be created by viewing the current operating system
-      configuration.  For example, &microsoft;'s
+    <para>Before venturing into kernel configuration, it would be
+      wise to get an inventory of the machine's hardware.  In cases
+      where &os; is not the primary operating system, the inventory
+      list may easily be created by viewing the current operating
+      system configuration.  For example, &microsoft;'s
       <application>Device Manager</application> normally contains
       important information about installed devices.  The
       <application>Device Manager</application> is located in the
@@ -162,10 +166,11 @@
     <para>If another operating system does not exist on the machine,
       the administrator must find this information out manually.  One
       method is using the &man.dmesg.8; utility and the &man.man.1;
-      commands.  Most device drivers on &os; have a manual page, listing
-      supported hardware, and during the boot probe, found hardware
-      will be listed.  For example, the following lines indicate that
-      the <devicename>psm</devicename> driver found a mouse:</para>
+      commands.  Most device drivers on &os; have a manual page,
+      listing supported hardware, and during the boot probe, found
+      hardware will be listed.  For example, the following lines
+      indicate that the <devicename>psm</devicename> driver found
+      a mouse:</para>
 
     <programlisting>psm0: &lt;PS/2 Mouse&gt; irq 12 on atkbdc0
 psm0: [GIANT-LOCKED]
@@ -194,8 +199,8 @@ psm0: model Generic PS/2 mouse, device I
       <command>pciconf <option>-lv</option></command> shows that the
       <devicename>ath</devicename> driver located a wireless Ethernet
       device.  Using
-      <command>man <replaceable>ath</replaceable></command> will return
-      the &man.ath.4; manual page.</para>
+      <command>man <replaceable>ath</replaceable></command> will
+      return the &man.ath.4; manual page.</para>
 
     <para>The <option>-k</option> flag, when passed to &man.man.1;
       can also be used to provide useful information.  From the
@@ -209,12 +214,13 @@ psm0: model Generic PS/2 mouse, device I
     <programlisting>ath(4)                   - Atheros IEEE 802.11 wireless network driver
 ath_hal(4)               - Atheros Hardware Access Layer (HAL)</programlisting>
 
-    <para>Armed with a hardware inventory list, the process of building
-      a custom kernel should appear less daunting.</para>
+    <para>Armed with a hardware inventory list, the process of
+      building a custom kernel should appear less daunting.</para>
   </sect1>
 
   <sect1 id="kernelconfig-modules">
     <title>Kernel Drivers, Subsystems, and Modules</title>
+
     <indexterm>
       <primary>kernel</primary>
       <secondary>drivers / modules / subsystems</secondary>
@@ -238,30 +244,33 @@ following line in &man.loader.conf.5;:
 
     if_ath_load="YES"</programlisting>
 
-    <para>As instructed, adding the <literal>if_ath_load="YES"</literal>
-      line to the <filename>/boot/loader.conf</filename> file will
+    <para>As instructed, adding the
+      <literal>if_ath_load="YES"</literal> line to the
+      <filename>/boot/loader.conf</filename> file will
       enable loading this module dynamically at boot time.</para>
 
-    <para>In some cases; however, there is no associated module.  This
-      is mostly true for certain subsystems and very important drivers,
-      for instance, the fast file system (<acronym>FFS</acronym>) is a
-      required option in the kernel.  As is network support (INET).
-      Unfortunately the only way to tell if a driver is required is to
-      check for the module itself.</para>
+    <para>In some cases; however, there is no associated module.
+      This is mostly true for certain subsystems and very important
+      drivers, for instance, the fast file system
+      (<acronym>FFS</acronym>) is a required option in the kernel.
+      As is network support (INET).  Unfortunately the only way to
+      tell if a driver is required is to check for the module
+      itself.</para>
 
     <warning>
       <para>It is easy to remove support for a
-        device or option and end up with a broken kernel.  For example, if
-        the &man.ata.4; driver is removed from the kernel configuration
-        file, a system using <acronym>ATA</acronym> disk drivers may
-        not boot without the module added to
-        <filename>loader.conf</filename>.  When in doubt, check for
-        the module and then just leave support in the kernel.</para>
+	device or option and end up with a broken kernel.  For
+	example, if the &man.ata.4; driver is removed from the kernel
+	configuration file, a system using <acronym>ATA</acronym>
+	disk drivers may not boot without the module added to
+	<filename>loader.conf</filename>.  When in doubt, check for
+	the module and then just leave support in the kernel.</para>
     </warning>
   </sect1>
 
   <sect1 id="kernelconfig-building">
     <title>Building and Installing a Custom Kernel</title>
+
     <indexterm>
       <primary>kernel</primary>
       <secondary>building / installing</secondary>
@@ -272,36 +281,38 @@ following line in &man.loader.conf.5;:
 	to build the kernel.</para>
     </note>
 
-    <para>First, let us take a quick tour of the kernel build directory.
-      All directories mentioned will be relative to the main
-      <filename>/usr/src/sys</filename> directory, which is also
-      accessible through the path name <filename>/sys</filename>.  There are a
-      number of subdirectories here representing different parts of the
-      kernel, but the most important for our purposes are
-      <filename><replaceable>arch</replaceable>/conf</filename>, where you
-      will edit your custom kernel configuration, and
-      <filename>compile</filename>, which is the staging area where your
-      kernel will be built.  <replaceable>arch</replaceable> represents
-      one of <filename>i386</filename>,
+    <para>First, let us take a quick tour of the kernel build
+      directory.  All directories mentioned will be relative to the
+      main <filename>/usr/src/sys</filename> directory, which is
+      also accessible through the path name <filename>/sys</filename>.
+      There are a number of subdirectories here representing different
+      parts of the kernel, but the most important for our purposes
+      are <filename><replaceable>arch</replaceable>/conf</filename>,
+      where you will edit your custom kernel configuration, and
+      <filename>compile</filename>, which is the staging area where
+      your kernel will be built.  <replaceable>arch</replaceable>
+      represents one of <filename>i386</filename>,
       <filename>amd64</filename>, <filename>ia64</filename>,
-      <filename>powerpc</filename>, <filename>sparc64</filename>, or
-      <filename>pc98</filename> (an alternative development branch of PC
-      hardware, popular in Japan).  Everything inside a particular
-      architecture's directory deals with that architecture only; the rest
-      of the code is machine independent code common to all platforms to which
-      &os; could potentially be ported.  Notice the logical organization of the
-      directory structure, with each supported device, file system, and
-      option in its own subdirectory.</para>
-
-    <para>The examples in this chapter assume that you are using the i386
-      architecture.  If your system has a different architecture you need
-      to change the path names accordingly.</para>
+      <filename>powerpc</filename>, <filename>sparc64</filename>,
+      or <filename>pc98</filename> (an alternative development branch
+      of PC hardware, popular in Japan).  Everything inside a
+      particular architecture's directory deals with that architecture
+      only; the rest of the code is machine independent code common
+      to all platforms to which &os; could potentially be ported.
+      Notice the logical organization of the directory structure,
+      with each supported device, file system, and option in its
+      own subdirectory.</para>
+
+    <para>The examples in this chapter assume that you are using
+      the i386 architecture.  If your system has a different
+      architecture you need to change the path names
+      accordingly.</para>
 
     <note>
       <para>If the directory <filename>/usr/src/</filename> does not
-	exist on your system (or if it is empty), then the sources have
-	not been installed.  The easiest way to install the full source
-	is to use &man.csup.1; as described in <xref
+	exist on your system (or if it is empty), then the sources
+	have not been installed.  The easiest way to install the full
+	source is to use &man.csup.1; as described in <xref
 	linkend="synching"/>.  You should also create a symlink to
 	<filename class="directory">/usr/src/sys/</filename>:</para>
 
@@ -309,30 +320,34 @@ following line in &man.loader.conf.5;:
     </note>
 
     <para>Next, change to the
-      <filename><replaceable>arch</replaceable>/conf</filename> directory
-      and copy the <filename>GENERIC</filename> configuration file to the
-      name you want to give your kernel.  For example:</para>
+      <filename><replaceable>arch</replaceable>/conf</filename>
+      directory and copy the <filename>GENERIC</filename>
+      configuration file to the name you want to give your kernel.
+      For example:</para>
 
     <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>i386</replaceable>/conf</userinput>
 &prompt.root; <userinput>cp GENERIC <replaceable>MYKERNEL</replaceable></userinput></screen>
 
-    <para>Traditionally, this name is in all capital letters and, if you
-      are maintaining multiple &os; machines with different hardware,
-      it is a good idea to name it after your machine's hostname.  We will
-      call it <filename><replaceable>MYKERNEL</replaceable></filename> for the
-      purpose of this example.</para>
+    <para>Traditionally, this name is in all capital letters and,
+      if you are maintaining multiple &os; machines with different
+      hardware, it is a good idea to name it after your machine's
+      hostname.  We will call it
+      <filename><replaceable>MYKERNEL</replaceable></filename> for
+      the purpose of this example.</para>
 
     <tip>
       <para>Storing your kernel configuration file directly under
 	<filename>/usr/src</filename> can be a bad idea.  If you are
 	experiencing problems it can be tempting to just delete
-	<filename>/usr/src</filename> and start again.  After doing this,
-	it usually only takes a few seconds for
+	<filename>/usr/src</filename> and start again.  After doing
+	this, it usually only takes a few seconds for
 	you to realize that you have deleted your custom kernel
-	configuration file.  Also, do not edit <filename>GENERIC</filename>
-	directly, as it may get overwritten the next time you
-	<link linkend="updating-upgrading">update your source tree</link>, and
-	your kernel modifications will be lost.</para>
+	configuration file.  Also, do not edit
+	<filename>GENERIC</filename> directly, as it may get
+	overwritten the next time you
+	<link linkend="updating-upgrading">update your source
+	  tree</link>,
+	and your kernel modifications will be lost.</para>
 
       <para>You might want to keep your kernel configuration file
 	elsewhere, and then create a symbolic link to the file in
@@ -347,37 +362,40 @@ following line in &man.loader.conf.5;:
 &prompt.root; <userinput>ln -s /root/kernels/<replaceable>MYKERNEL</replaceable></userinput></screen>
     </tip>
 
-    <para>Now, edit <filename><replaceable>MYKERNEL</replaceable></filename>
-      with your favorite text editor.  If you are just starting out, the only
-      editor available will probably be <application>vi</application>, which
-      is too complex to explain here, but is covered well in many books in
-      the <link linkend="bibliography">bibliography</link>.  However, &os; does
-      offer an easier editor called <application>ee</application> which, if
-      you are a beginner, should be your editor of choice.  Feel free to
-      change the comment lines at the top to reflect your configuration or
-      the changes you have made to differentiate it from
-      <filename>GENERIC</filename>.</para>
+    <para>Now, edit
+      <filename><replaceable>MYKERNEL</replaceable></filename>
+      with your favorite text editor.  If you are just starting out,
+      the only editor available will probably be
+      <application>vi</application>, which is too complex to explain
+      here, but is covered well in many books in the <link
+	linkend="bibliography">bibliography</link>.  However, &os;
+      does offer an easier editor called <application>ee</application>
+      which, if you are a beginner, should be your editor of choice.
+      Feel free to change the comment lines at the top to reflect
+      your configuration or the changes you have made to differentiate
+      it from <filename>GENERIC</filename>.</para>
     <indexterm><primary>SunOS</primary></indexterm>
 
     <para>If you have built a kernel under &sunos; or some other BSD
-      operating system, much of this file will be very familiar to you.
-      If you are coming from some other operating system such as DOS, on
-      the other hand, the <filename>GENERIC</filename> configuration file
-      might seem overwhelming to you, so follow the descriptions in the
+      operating system, much of this file will be very familiar to
+      you.  If you are coming from some other operating system such
+      as DOS, on the other hand, the <filename>GENERIC</filename>
+      configuration file might seem overwhelming to you, so follow
+      the descriptions in the
       <link linkend="kernelconfig-config">Configuration File</link>
       section slowly and carefully.</para>
 
     <note>
       <para>If you <link
-        linkend="updating-upgrading">sync your source tree</link> with the
-        latest sources of the &os; project,
-        be sure to always check the file
-        <filename>/usr/src/UPDATING</filename> before you perform any update
-        steps.  This file describes any important issues or areas
-        requiring special attention within the updated source code.
-        <filename>/usr/src/UPDATING</filename> always matches
-        your version of the &os; source, and is therefore more up to date
-        with new information than this handbook.</para>
+	  linkend="updating-upgrading">sync your source tree</link>
+	with the latest sources of the &os; project, be sure to always
+	check the file <filename>/usr/src/UPDATING</filename> before
+	you perform any update steps.  This file describes any
+	important issues or areas requiring special attention within
+	the updated source code.
+	<filename>/usr/src/UPDATING</filename> always matches
+	your version of the &os; source, and is therefore more up
+	to date with new information than this handbook.</para>
     </note>
 
     <para>You must now compile the source code for the kernel.</para>
@@ -386,13 +404,13 @@ following line in &man.loader.conf.5;:
       <title>Building a Kernel</title>
 
       <note>
-	<para>It is required to have the full &os; source tree installed
-	  to build the kernel.</para>
+	<para>It is required to have the full &os; source tree
+	  installed to build the kernel.</para>
       </note>
 
       <step>
 	<para>Change to the <filename
-	  class="directory">/usr/src</filename> directory:</para>
+	    class="directory">/usr/src</filename> directory:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/src</userinput></screen>
       </step>
@@ -412,10 +430,11 @@ following line in &man.loader.conf.5;:
 
     <tip>
       <para>By default, when you build a custom kernel,
-	<emphasis>all</emphasis> kernel modules will be rebuilt as well.
-	If you want to update a kernel faster or to build only custom
-	modules, you should edit <filename>/etc/make.conf</filename>
-	before starting to build the kernel:</para>
+	<emphasis>all</emphasis> kernel modules will be rebuilt as
+	well.  If you want to update a kernel faster or to build only
+	custom modules, you should edit
+	<filename>/etc/make.conf</filename> before starting to build
+	the kernel:</para>
 
       <programlisting>MODULES_OVERRIDE = linux acpi sound/sound sound/driver/ds1 ntfs</programlisting>
 
@@ -424,10 +443,10 @@ following line in &man.loader.conf.5;:
 
       <programlisting>WITHOUT_MODULES = linux acpi sound ntfs</programlisting>
 
-      <para>This variable sets up a list of top level modules to exclude
-	from the build process.  For other variables which you may find useful
-	in the process of building kernel, refer to &man.make.conf.5;
-	manual page.</para>
+      <para>This variable sets up a list of top level modules to
+	exclude from the build process.  For other variables which
+	you may find useful in the process of building kernel, refer
+	to &man.make.conf.5; manual page.</para>
     </tip>
 
     <indexterm>
@@ -435,24 +454,27 @@ following line in &man.loader.conf.5;:
     </indexterm>
 
     <para>The new kernel will be copied to the <filename
-        class="directory">/boot/kernel</filename> directory as
-      <filename>/boot/kernel/kernel</filename> and the old kernel will be moved
-      to <filename>/boot/kernel.old/kernel</filename>.  Now, shutdown the
-      system and reboot to use your new kernel.  If something goes wrong, there
-      are some <link linkend="kernelconfig-trouble">troubleshooting</link>
-      instructions at the end of this chapter that you may find useful.  Be
-      sure to read the section which explains how to recover in case your new
-      kernel <link linkend="kernelconfig-noboot">does not boot</link>.</para>
+	class="directory">/boot/kernel</filename> directory as
+      <filename>/boot/kernel/kernel</filename> and the old kernel
+      will be moved to <filename>/boot/kernel.old/kernel</filename>.
+      Now, shutdown the system and reboot to use your new kernel.
+      If something goes wrong, there are some <link
+	linkend="kernelconfig-trouble">troubleshooting</link>
+      instructions at the end of this chapter that you may find
+      useful.  Be sure to read the section which explains how to
+      recover in case your new kernel <link
+	linkend="kernelconfig-noboot">does not boot</link>.</para>
 
     <note>
       <para>Other files relating to the boot process, such as the boot
 	&man.loader.8; and configuration are stored in
 	<filename>/boot</filename>.  Third party or custom modules
-	can be placed in <filename class="directory">/boot/kernel</filename>,
-	although users should be aware that keeping modules in sync with the
-	compiled kernel is very important.  Modules not intended
-	to run with the compiled kernel may result in instability
-	or incorrectness.</para>
+	can be placed in <filename
+	  class="directory">/boot/kernel</filename>,
+	although users should be aware that keeping modules in sync
+	with the compiled kernel is very important.  Modules not
+	intended to run with the compiled kernel may result in
+	instability or incorrectness.</para>
     </note>
   </sect1>
 
@@ -467,6 +489,7 @@ following line in &man.loader.conf.5;:
       </authorgroup>
     </sect1info>
     <title>The Configuration File</title>
+
     <indexterm>
       <primary>kernel</primary>
       <secondary>NOTES</secondary>
@@ -484,19 +507,21 @@ following line in &man.loader.conf.5;:
       ignored.  The following sections describe each keyword, in
       the order they are listed in <filename>GENERIC</filename>.
       <anchor
-      id="kernelconfig-options"/> For an exhaustive list of architecture
-      dependent options and devices, see the <filename>NOTES</filename>
-      file in the same directory as the <filename>GENERIC</filename> file. For
-      architecture independent options, see
+      id="kernelconfig-options"/> For an exhaustive list of
+      architecture dependent options and devices, see the
+      <filename>NOTES</filename> file in the same directory as the
+      <filename>GENERIC</filename> file.  For architecture independent
+      options, see
       <filename>/usr/src/sys/conf/NOTES</filename>.</para>
 
     <para>An <literal>include</literal> directive is
       available for use in configuration files.  This allows another
-      configuration file to be logically included in the current one, making
-      it easy to maintain small changes relative to an existing file.  For
-      example, if you require a <filename>GENERIC</filename> kernel with
-      only a small number of additional options or drivers, this allows you
-      to maintain only a delta with respect to GENERIC:</para>
+      configuration file to be logically included in the current
+      one, making it easy to maintain small changes relative to an
+      existing file.  For example, if you require a
+      <filename>GENERIC</filename> kernel with only a small number
+      of additional options or drivers, this allows you to maintain
+      only a delta with respect to GENERIC:</para>
 
     <programlisting>include GENERIC
 ident MYKERNEL
@@ -504,19 +529,19 @@ ident MYKERNEL
 options         IPFIREWALL
 options         DUMMYNET
 options         IPFIREWALL_DEFAULT_TO_ACCEPT
-options         IPDIVERT
-</programlisting>
+options         IPDIVERT</programlisting>
 
-    <para>Many administrators will find that this model offers significant
-      benefits over the historic writing of configuration files from scratch:
-      the local configuration file will express only local differences from
-      a <filename>GENERIC</filename> kernel and as upgrades are performed,
-      new features added to <filename>GENERIC</filename> will be added to the
-      local kernel unless specifically prevented using
-      <literal>nooptions</literal> or <literal>nodevice</literal>.  The
-      remainder of this chapter addresses the contents of a typical
-      configuration file and the role various options and devices
-      play.</para>
+    <para>Many administrators will find that this model offers
+      significant benefits over the historic writing of configuration
+      files from scratch: the local configuration file will express
+      only local differences from a <filename>GENERIC</filename>
+      kernel and as upgrades are performed, new features added to
+      <filename>GENERIC</filename> will be added to the local kernel
+      unless specifically prevented using
+      <literal>nooptions</literal> or <literal>nodevice</literal>.
+      The remainder of this chapter addresses the contents of a
+      typical configuration file and the role various options and
+      devices play.</para>
 
     <note>
       <para>To build a file which contains all available options,
@@ -531,9 +556,10 @@ options         IPDIVERT
       <secondary>configuration file</secondary>
     </indexterm>
 
-    <para>The following is an example of the <filename>GENERIC</filename>
-      kernel configuration file with various additional comments where needed
-      for clarity.  This example should match your copy in
+    <para>The following is an example of the
+      <filename>GENERIC</filename> kernel configuration file with
+      various additional comments where needed for clarity.  This
+      example should match your copy in
       <filename>/usr/src/sys/<replaceable>i386</replaceable>/conf/GENERIC</filename>
       fairly closely.</para>
 
@@ -559,13 +585,13 @@ cpu          I586_CPU
 cpu          I686_CPU</programlisting>
 
     <para>The above option specifies the type of CPU you have in your
-      system.  You may have multiple instances of the CPU line (if, for
-      example, you are not sure whether you should use
+      system.  You may have multiple instances of the CPU line (if,
+      for example, you are not sure whether you should use
       <literal>I586_CPU</literal> or <literal>I686_CPU</literal>),
       but for a custom kernel it is best to specify only the CPU
-      you have.  If you are unsure of your CPU type, you can check the
-      <filename>/var/run/dmesg.boot</filename> file to view your boot
-      messages.</para>
+      you have.  If you are unsure of your CPU type, you can check
+      the <filename>/var/run/dmesg.boot</filename> file to view your
+      boot messages.</para>
 
     <indexterm>
       <primary>kernel options</primary>
@@ -576,12 +602,13 @@ cpu          I686_CPU</programlisting>
 
     <para>This is the identification of the kernel.  You should change
       this to whatever you named your kernel,
-      i.e., <literal><replaceable>MYKERNEL</replaceable></literal> if you have
-      followed the instructions of the previous examples.  The value you put
-      in the <literal>ident</literal> string will print when you boot up the
-      kernel, so it is useful to give the new kernel a different name if you
-      want to keep it separate from your usual kernel (e.g., you want to
-      build an experimental kernel).</para>
+      i.e., <literal><replaceable>MYKERNEL</replaceable></literal>
+      if you have followed the instructions of the previous examples.
+      The value you put in the <literal>ident</literal> string will
+      print when you boot up the kernel, so it is useful to give the
+      new kernel a different name if you want to keep it separate
+      from your usual kernel (e.g., you want to build an experimental
+      kernel).</para>
 
     <programlisting>#To statically compile in device wiring instead of /boot/device.hints
 #hints          "GENERIC.hints"         # Default places to look for devices.</programlisting>
@@ -613,14 +640,15 @@ cpu          I686_CPU</programlisting>
 
     <para>Allows threads that are in the kernel to be preempted
       by higher priority threads.  It helps with interactivity and
-      allows interrupt threads to run sooner rather than waiting.</para>
+      allows interrupt threads to run sooner rather than
+      waiting.</para>
 
     <programlisting>options          INET              # InterNETworking</programlisting>
 
-    <para>Networking support.  Leave this in, even if you do not plan to
-      be connected to a network.  Most programs require at least loopback
-      networking (i.e., making network connections within your PC), so
-      this is essentially mandatory.</para>
+    <para>Networking support.  Leave this in, even if you do not
+      plan to be connected to a network.  Most programs require at
+      least loopback networking (i.e., making network connections
+      within your PC), so this is essentially mandatory.</para>
 
     <programlisting>options          INET6             # IPv6 communications protocols</programlisting>
 
@@ -628,18 +656,18 @@ cpu          I686_CPU</programlisting>
 
     <programlisting>options          FFS               # Berkeley Fast Filesystem</programlisting>
 
-    <para>This is the basic hard drive file system.  Leave it in if you
-      boot from the hard disk.</para>
+    <para>This is the basic hard drive file system.  Leave it in if
+      you boot from the hard disk.</para>
 
     <programlisting>options          SOFTUPDATES       # Enable FFS Soft Updates support</programlisting>
 
     <para>This option enables Soft Updates in the kernel, this will
       help speed up write access on the disks.  Even when this
       functionality is provided by the kernel, it must be turned on
-      for specific disks.  Review the output from &man.mount.8; to see
-      if Soft Updates is enabled for your system disks.  If you do not
-      see the <literal>soft-updates</literal> option then you will
-      need to activate it using the &man.tunefs.8; (for existing
+      for specific disks.  Review the output from &man.mount.8; to
+      see if Soft Updates is enabled for your system disks.  If you
+      do not see the <literal>soft-updates</literal> option then you
+      will need to activate it using the &man.tunefs.8; (for existing
       file systems) or &man.newfs.8; (for new file systems)
       commands.</para>
 
@@ -647,12 +675,13 @@ cpu          I686_CPU</programlisting>
 
     <para>This option enables kernel support
       for access control lists.  This relies on the use of extended
-      attributes and <acronym>UFS2</acronym>, and the feature is described
-      in detail in <xref linkend="fs-acl"/>.  <acronym>ACL</acronym>s are
-      enabled by default and should not be
-      disabled in the kernel if they have been used previously on a file
-      system, as this will remove the access control lists, changing the
-      way files are protected in unpredictable ways.</para>
+      attributes and <acronym>UFS2</acronym>, and the feature is
+      described in detail in <xref linkend="fs-acl"/>.
+      <acronym>ACL</acronym>s are enabled by default and should not
+      be disabled in the kernel if they have been used previously
+      on a file system, as this will remove the access control lists,
+      changing the way files are protected in unpredictable
+      ways.</para>
 
     <programlisting>options          UFS_DIRHASH       # Improve performance on big directories</programlisting>
 
@@ -680,9 +709,9 @@ cpu          I686_CPU</programlisting>
 options          NFSSERVER         # Network Filesystem Server
 options          NFS_ROOT          # NFS usable as /, requires NFSCLIENT</programlisting>
 
-    <para>The network file system.  Unless you plan to mount partitions
-      from a &unix; file server over TCP/IP, you can comment these
-      out.</para>
+    <para>The network file system.  Unless you plan to mount
+      partitions from a &unix; file server over TCP/IP, you can
+      comment these out.</para>
 
     <indexterm>
       <primary>kernel options</primary>
@@ -690,10 +719,11 @@ options          NFS_ROOT          # NFS
     </indexterm>
     <programlisting>options          MSDOSFS           # MSDOS Filesystem</programlisting>
 
-    <para>The &ms-dos; file system.  Unless you plan to mount a DOS formatted
-      hard drive partition at boot time, you can safely comment this out.
-      It will be automatically loaded the first time you mount a DOS
-      partition, as described above.  Also, the excellent
+    <para>The &ms-dos; file system.  Unless you plan to mount a DOS
+      formatted hard drive partition at boot time, you can safely
+      comment this out.  It will be automatically loaded the first
+      time you mount a DOS partition, as described above.  Also,
+      the excellent
       <filename role="package">emulators/mtools</filename> software
       allows you to access DOS floppies without having to mount and
       unmount them (and does not require <literal>MSDOSFS</literal> at
@@ -701,10 +731,11 @@ options          NFS_ROOT          # NFS
 
     <programlisting>options          CD9660            # ISO 9660 Filesystem</programlisting>
 
-    <para>The ISO 9660 file system for CDROMs.  Comment it out if you do
-      not have a CDROM drive or only mount data CDs occasionally (since it
-      will be dynamically loaded the first time you mount a data CD).
-      Audio CDs do not need this file system.</para>
+    <para>The ISO 9660 file system for CDROMs.  Comment it out if
+      you do not have a CDROM drive or only mount data CDs
+      occasionally (since it will be dynamically loaded the first
+      time you mount a data CD).  Audio CDs do not need this file
+      system.</para>
 
     <programlisting>options          PROCFS            # Process filesystem (requires PSEUDOFS)</programlisting>
 
@@ -719,8 +750,8 @@ options          NFS_ROOT          # NFS
 
     <programlisting>options          PSEUDOFS          # Pseudo-filesystem framework</programlisting>
 
-      <para>Kernels making use of <literal>PROCFS</literal> must also
-        include support for <literal>PSEUDOFS</literal>.</para>
+      <para>Kernels making use of <literal>PROCFS</literal> must
+	also include support for <literal>PSEUDOFS</literal>.</para>
 
     <programlisting>options          GEOM_PART_GPT     # GUID Partition Tables.</programlisting>
 
@@ -732,8 +763,8 @@ options          NFS_ROOT          # NFS
 
     <programlisting>options          COMPAT_43         # Compatible with BSD 4.3 [KEEP THIS!]</programlisting>
 
-    <para>Compatibility with 4.3BSD.  Leave this in; some programs will
-      act strangely if you comment this out.</para>
+    <para>Compatibility with 4.3BSD.  Leave this in; some programs
+      will act strangely if you comment this out.</para>
 
     <programlisting>options          COMPAT_FREEBSD4   # Compatible with &os;4</programlisting>
 
@@ -742,34 +773,35 @@ options          NFS_ROOT          # NFS
       that use older system call interfaces.  It is recommended that
       this option be used on all &i386; systems that may
       run older applications; platforms that gained support only in
-      5.X, such as ia64 and &sparc64;, do not require this option.</para>
+      5.X, such as ia64 and &sparc64;, do not require this
+      option.</para>
 
     <programlisting>options          COMPAT_FREEBSD5   # Compatible with &os;5</programlisting>
 
     <para>This option is required to
-      support applications compiled on &os;&nbsp;5.X versions that use
-      &os;&nbsp;5.X system call interfaces.</para>
+      support applications compiled on &os;&nbsp;5.X versions that
+      use &os;&nbsp;5.X system call interfaces.</para>
 
     <programlisting>options          COMPAT_FREEBSD6   # Compatible with &os;6</programlisting>
 
     <para>This option is required to
-      support applications compiled on &os;&nbsp;6.X versions that use
-      &os;&nbsp;6.X system call interfaces.</para>
+      support applications compiled on &os;&nbsp;6.X versions that
+      use &os;&nbsp;6.X system call interfaces.</para>
 
     <programlisting>options          COMPAT_FREEBSD7   # Compatible with &os;7</programlisting>
 
     <para>This option is required on &os;&nbsp;8 and above to
-      support applications compiled on &os;&nbsp;7.X versions that use
-      &os;&nbsp;7.X system call interfaces.</para>
+      support applications compiled on &os;&nbsp;7.X versions that
+      use &os;&nbsp;7.X system call interfaces.</para>
 
     <programlisting>options          SCSI_DELAY=5000  # Delay (in ms) before probing SCSI</programlisting>
 
     <para>This causes the kernel to pause for 5 seconds before probing
-      each SCSI device in your system.  If you only have IDE hard drives,
-      you can ignore this, otherwise you can try to lower this
-      number, to speed up booting.  Of course, if
-      you do this and &os; has trouble recognizing your SCSI devices,
-      you will have to raise it again.</para>
+      each SCSI device in your system.  If you only have IDE hard
+      drives, you can ignore this, otherwise you can try to lower
+      this number, to speed up booting.  Of course, if you do this
+      and &os; has trouble recognizing your SCSI devices, you will
+      have to raise it again.</para>
 
     <programlisting>options          KTRACE            # ktrace(1) support</programlisting>
 
@@ -778,11 +810,11 @@ options          NFS_ROOT          # NFS
 
     <programlisting>options          SYSVSHM           # SYSV-style shared memory</programlisting>
 
-    <para>This option provides for System&nbsp;V shared memory.  The most
-      common use of this is the XSHM extension in X, which many
-      graphics-intensive programs will automatically take advantage of for
-      extra speed.  If you use X, you will definitely want to include
-      this.</para>
+    <para>This option provides for System&nbsp;V shared memory.
+      The most common use of this is the XSHM extension in X, which
+      many graphics-intensive programs will automatically take
+      advantage of for extra speed.  If you use X, you will definitely
+      want to include this.</para>
 
     <programlisting>options          SYSVMSG           # SYSV-style message queues</programlisting>
 
@@ -791,12 +823,13 @@ options          NFS_ROOT          # NFS
 
     <programlisting>options          SYSVSEM           # SYSV-style semaphores</programlisting>
 
-    <para>Support for System&nbsp;V semaphores.  Less commonly used but only
-      adds a few hundred bytes to the kernel.</para>
+    <para>Support for System&nbsp;V semaphores.  Less commonly used
+      but only adds a few hundred bytes to the kernel.</para>
 
     <note>
-      <para>The <option>-p</option> option of the &man.ipcs.1; command will
-	list any processes using each of these System&nbsp;V facilities.</para>
+      <para>The <option>-p</option> option of the &man.ipcs.1;
+	command will list any processes using each of these
+	System&nbsp;V facilities.</para>
     </note>
 
     <programlisting>options 	     _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions</programlisting>
@@ -807,30 +840,32 @@ options          NFS_ROOT          # NFS
 
     <programlisting>options          KBD_INSTALL_CDEV  # install a CDEV entry in /dev</programlisting>
 
-    <para>This option is required to allow the creation of keyboard device
-      nodes in <filename>/dev</filename>.</para>
+    <para>This option is required to allow the creation of keyboard
+      device nodes in <filename>/dev</filename>.</para>
 
     <programlisting>options          ADAPTIVE_GIANT    # Giant mutex is adaptive.</programlisting>
 
-    <para>Giant is the name of a mutual exclusion mechanism (a sleep mutex)
-      that protects a large set of kernel resources.  Today, this is an
-      unacceptable performance bottleneck which is actively being replaced
-      with locks that protect individual resources.  The
-      <literal>ADAPTIVE_GIANT</literal> option causes Giant to be included
-      in the set of mutexes adaptively spun on.  That is, when a thread
-      wants to lock the Giant mutex, but it is already locked by a thread
-      on another CPU, the first thread will keep running and wait for the
-      lock to be released.  Normally, the thread would instead go back to
-      sleep and wait for its next chance to run.  If you are not sure,
-      leave this in.</para>
+    <para>Giant is the name of a mutual exclusion mechanism (a
+      sleep mutex)that protects a large set of kernel resources.
+      Today, this is an unacceptable performance bottleneck which
+      is actively being replaced with locks that protect individual
+      resources.  The <literal>ADAPTIVE_GIANT</literal> option causes
+      Giant to be included in the set of mutexes adaptively spun on.
+      That is, when a thread wants to lock the Giant mutex, but it
+      is already locked by a thread on another CPU, the first thread
+      will keep running and wait for the lock to be released.
+      Normally, the thread would instead go back to sleep and wait
+      for its next chance to run.  If you are not sure, leave this
+      in.</para>
 
     <note>
-      <para>Note that on &os; 8.0-RELEASE and later versions, all mutexes are
-	adaptive by default, unless explicitly set to non-adaptive by
-	compiling with the <literal>NO_ADAPTIVE_MUTEXES</literal> option.  As
-	a result, Giant is adaptive by default now, and the
-	<literal>ADAPTIVE_GIANT</literal> option has been removed from the
-	kernel configuration.</para>
+      <para>Note that on &os; 8.0-RELEASE and later versions, all
+	mutexes are adaptive by default, unless explicitly set to
+	non-adaptive by compiling with the
+	<literal>NO_ADAPTIVE_MUTEXES</literal> option.  As a result,
+	Giant is adaptive by default now, and the
+	<literal>ADAPTIVE_GIANT</literal> option has been removed
+	from the kernel configuration.</para>
     </note>
 
     <indexterm>
@@ -839,10 +874,11 @@ options          NFS_ROOT          # NFS
     </indexterm>
     <programlisting>device          apic               # I/O APIC</programlisting>
 
-    <para>The apic device enables the use of the I/O APIC for interrupt
-      delivery.  The apic device can be used in both UP and SMP kernels, but
-      is required for SMP kernels.  Add <literal>options SMP</literal> to
-      include support for multiple processors.</para>
+    <para>The apic device enables the use of the I/O APIC for
+      interrupt delivery.  The apic device can be used in both UP
+      and SMP kernels, but is required for SMP kernels.  Add
+      <literal>options SMP</literal> to include support for multiple
+      processors.</para>
 
     <note>
       <para>The apic device exists only on the i386 architecture, this
@@ -853,8 +889,8 @@ options          NFS_ROOT          # NFS
     <programlisting>device          eisa</programlisting>
 
     <para>Include this if you have an EISA motherboard.  This enables
-      auto-detection and configuration support for all devices on the EISA
-      bus.</para>
+      auto-detection and configuration support for all devices on
+      the EISA bus.</para>
 
     <programlisting>device          pci</programlisting>
 
@@ -870,35 +906,35 @@ device          fdc</programlisting>
     <programlisting># ATA and ATAPI devices
 device          ata</programlisting>
 
-    <para>This driver supports all ATA and ATAPI devices.  You only need
-      one <literal>device ata</literal> line for the kernel to detect all
-      PCI ATA/ATAPI devices on modern machines.</para>
+    <para>This driver supports all ATA and ATAPI devices.  You only
+      need one <literal>device ata</literal> line for the kernel to
+      detect all PCI ATA/ATAPI devices on modern machines.</para>
 
     <programlisting>device          atadisk                 # ATA disk drives</programlisting>
 
-    <para>This is needed along with <literal>device ata</literal> for
-      ATA disk drives.</para>
+    <para>This is needed along with <literal>device ata</literal>
+      for ATA disk drives.</para>
 
     <programlisting>device          ataraid                 # ATA RAID drives</programlisting>
 
-    <para>This is needed along with <literal>device ata</literal> for ATA
-      RAID drives.</para>
+    <para>This is needed along with <literal>device ata</literal>
+      for ATA RAID drives.</para>
 
     <programlisting><anchor id="kernelconfig-atapi"/>
 device          atapicd                 # ATAPI CDROM drives</programlisting>
 
-    <para>This is needed along with <literal>device ata</literal> for
-      ATAPI CDROM drives.</para>
+    <para>This is needed along with <literal>device ata</literal>
+      for ATAPI CDROM drives.</para>
 
     <programlisting>device          atapifd                 # ATAPI floppy drives</programlisting>
 
-    <para>This is needed along with <literal>device ata</literal> for
-      ATAPI floppy drives.</para>
+    <para>This is needed along with <literal>device ata</literal>
+      for ATAPI floppy drives.</para>
 
     <programlisting>device          atapist                 # ATAPI tape drives</programlisting>
 
-    <para>This is needed along with <literal>device ata</literal> for
-      ATAPI tape drives.</para>
+    <para>This is needed along with <literal>device ata</literal>
+      for ATAPI tape drives.</para>
 
     <programlisting>options         ATA_STATIC_ID           # Static device numbering</programlisting>
 
@@ -945,8 +981,9 @@ device          cd         # CD
 device          pass       # Passthrough device (direct SCSI access)
 device          ses        # SCSI Environmental Services (and SAF-TE)</programlisting>
 
-    <para>SCSI peripherals.  Again, comment out any you do not have, or if
-      you have only IDE hardware, you can remove them completely.</para>
+    <para>SCSI peripherals.  Again, comment out any you do not have,
+      or if you have only IDE hardware, you can remove them
+      completely.</para>
 
     <note>
       <para>The USB &man.umass.4; driver and a few other drivers use
@@ -977,24 +1014,24 @@ device          mlx        # Mylex DAC96
 device          pst        # Promise Supertrak SX6000
 device          twe        # 3ware ATA RAID</programlisting>
 
-    <para>Supported RAID controllers.  If you do not have any of these,
-      you can comment them out or remove them.</para>
+    <para>Supported RAID controllers.  If you do not have any of
+      these, you can comment them out or remove them.</para>
 
     <programlisting># atkbdc0 controls both the keyboard and the PS/2 mouse
 device          atkbdc     # AT keyboard controller</programlisting>

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

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 14:36:57 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])
 by hub.freebsd.org (Postfix) with ESMTP id 101EB518;
 Wed, 30 Jan 2013 14:36:57 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D94B3DAD;
 Wed, 30 Jan 2013 14:36:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UEauUP067793;
 Wed, 30 Jan 2013 14:36:56 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UEaumF067790;
 Wed, 30 Jan 2013 14:36:56 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201301301436.r0UEaumF067790@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Wed, 30 Jan 2013 14:36:56 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40821 - in head/nl_NL.ISO8859-1/books/handbook:
 kernelconfig mac
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, 30 Jan 2013 14:36:57 -0000

Author: rene
Date: Wed Jan 30 14:36:55 2013
New Revision: 40821
URL: http://svnweb.freebsd.org/changeset/doc/40821

Log:
  MFen:
  - kernelconfig r39631 -> r40820 (SRCID bump + igor fix)
  - mac r40187 -> r40819 (SRCID bump)

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

Modified: head/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Wed Jan 30 14:24:59 2013	(r40820)
+++ head/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Wed Jan 30 14:36:55 2013	(r40821)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
-     %SRCID%	39631
+     %SRCID%	40820
 -->
 
 <chapter id="kernelconfig">
@@ -336,9 +336,9 @@ ath_hal(4)               - Atheros Hardw
 	<emphasis>niet</emphasis> aanwezig is op een systeem (of als het leeg
 	is), dan is de broncode niet geïnstalleerd.  De eenvoudigste
 	manier om de volledige broncode te installeren is &man.csup.1; te
-	gebruiken zoals beschreven in <xref linkend="synching"/>.  U dient tevens
-	een symbolische link naar <filename>/usr/src/sys/</filename> aan te
-	maken:</para>
+	gebruiken zoals beschreven in <xref linkend="synching"/>.  U dient
+	tevens een symbolische link naar <filename>/usr/src/sys/</filename>
+	aan te maken:</para>
 
       <screen>&prompt.root; <userinput>ln -s /usr/src/sys /sys</userinput></screen>
     </note>

Modified: head/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml	Wed Jan 30 14:24:59 2013	(r40820)
+++ head/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml	Wed Jan 30 14:36:55 2013	(r40821)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/mac/chapter.xml
-     %SRCID%	40187
+     %SRCID%	40819
 -->
 
 <chapter id="mac">

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 14:39:04 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])
 by hub.freebsd.org (Postfix) with ESMTP id E63185D4;
 Wed, 30 Jan 2013 14:39:04 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CCF64DC7;
 Wed, 30 Jan 2013 14:39:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UEd45r068103;
 Wed, 30 Jan 2013 14:39:04 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UEd4ZH068102;
 Wed, 30 Jan 2013 14:39:04 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201301301439.r0UEd4ZH068102@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 30 Jan 2013 14:39:04 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40822 - head/en_US.ISO8859-1/books/handbook/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 30 Jan 2013 14:39:05 -0000

Author: dru
Date: Wed Jan 30 14:39:04 2013
New Revision: 40822
URL: http://svnweb.freebsd.org/changeset/doc/40822

Log:
  This patch addresses the following:
  
  - fixes missing &os; entities
  - fixes most redundancy--this required general rewording and
    tightening
  - more general tightening and rewording to remove most instances of
   "you"
  - a few title fixes
  - imake section was removed as this is a ports maintainer issue
    which should not be an end-user problem
  - reword incorrect usage of pkg_install (this comes with pkgng, not
    traditional system)
  
  Approved by:  bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Wed Jan 30 14:36:55 2013	(r40821)
+++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Wed Jan 30 14:39:04 2013	(r40822)
@@ -13,46 +13,43 @@
 
     <indexterm><primary>ports</primary></indexterm>
     <indexterm><primary>packages</primary></indexterm>
-    <para>FreeBSD is bundled with a rich collection of system tools as
+    <para>&os; is bundled with a rich collection of system tools as
       part of the base system.  However, there is only so much one can
       do before needing to install an additional third-party
-      application to get real work done.  FreeBSD provides two
-      complementary technologies for installing third-party software
-      on your system: the FreeBSD Ports Collection (for installing
-      from source), and packages (for installing from pre-built
-      binaries).  Either method may be used to install the newest
-      version of your favorite applications from local media or
-      straight off the network.</para>
+      application to get real work done.  &os; provides two
+      complementary technologies for installing third-party software:
+      the &os; Ports Collection (for installing from source), and
+      packages (for installing from pre-built binaries).  Either
+      method may be used to install software from local media or
+      from the network.</para>
 
-    <para>After reading this chapter, you will know:</para>
+    <para>After reading this chapter, you will know how to:</para>
 
     <itemizedlist>
       <listitem>
-	<para>How to install third-party binary software
-	  packages.</para>
+	<para>Install third-party binary software packages.</para>
       </listitem>
 
       <listitem>
-	<para>How to build third-party software from source by using
-	  the ports collection.</para>
+	<para>Build third-party software from source by using the
+	  Ports Collection.</para>
       </listitem>
 
       <listitem>
-	<para>How to remove previously installed packages or
-	  ports.</para>
+	<para>Remove previously installed packages or ports.</para>
       </listitem>
 
       <listitem>
-	<para>How to override the default values that the ports
-	  collection uses.</para>
+	<para>Override the default values used by the Ports
+	  Collection.</para>
       </listitem>
 
       <listitem>
-	<para>How to find the appropriate software package.</para>
+	<para>Find the appropriate software package.</para>
       </listitem>
 
       <listitem>
-	<para>How to upgrade your applications.</para>
+	<para>Upgrade installed software.</para>
       </listitem>
     </itemizedlist>
   </sect1>
@@ -60,9 +57,8 @@
   <sect1 id="ports-overview">
     <title>Overview of Software Installation</title>
 
-    <para>If you have used a &unix; system before you will know that
-      the typical procedure for installing third-party software goes
-      something like this:</para>
+    <para>The typical steps for installing third-party software on a
+      &unix; system include:</para>
 
     <procedure>
       <step>
@@ -77,11 +73,10 @@
       </step>
 
       <step>
-	<para>Locate the documentation (perhaps an
-	  <filename>INSTALL</filename> or <filename>README</filename>
-	  file, or some files in a <filename>doc/</filename>
-	  subdirectory) and read up on how to install the
-	  software.</para>
+	<para>Locate the documentation in
+	  <filename>INSTALL</filename>, <filename>README</filename>
+	  or some file in a <filename>doc/</filename> subdirectory and
+	  read up on how to install the software.</para>
       </step>
 
       <step>
@@ -96,59 +91,40 @@
       </step>
     </procedure>
 
-    <para>And that is only if everything goes well.  If you are
-      installing a software package that was not deliberately ported
-      to FreeBSD you may even have to go in and edit the code to make
-      it work properly.</para>
-
-    <para>Should you want to, you can continue to install software the
-      <quote>traditional</quote> way with FreeBSD.  However, FreeBSD
-      provides two technologies which can save you a lot of effort:
-      packages and ports.  At the time of writing, over &os.numports;
-      third-party applications have been made available in this
-      way.</para>
-
-    <para>For any given application, the FreeBSD package for that
-      application is a single file which you must download.  The
-      package contains pre-compiled copies of all the commands for the
-      application, as well as any configuration files or
-      documentation.  A downloaded package file can be manipulated
-      with FreeBSD package management commands, such as
-      &man.pkg.add.1;, &man.pkg.delete.1;, &man.pkg.info.1;, and so
-      on.  Installing a new application can be carried out with a
-      single command.</para>
-
-    <para>A FreeBSD port for an application is a collection of files
-      designed to automate the process of compiling an application
-      from source code.</para>
-
-    <para>Remember that there are a number of steps you would normally
-      carry out if you compiled a program yourself (downloading,
-      unpacking, patching, compiling, installing).  The files that
-      make up a port contain all the necessary information to allow
-      the system to do this for you.  You run a handful of simple
-      commands and the source code for the application is
-      automatically downloaded, extracted, patched, compiled, and
-      installed for you.</para>
-
-    <para>In fact, the ports system can also be used to generate
-      packages which can later be manipulated with
-      <command>pkg_add</command> and the other package management
-      commands that will be introduced shortly.</para>
+    <para>If you are installing a software package that was not
+      deliberately ported to &os; you may even have to go in and edit
+      the code to make it work properly.</para>
+
+    <para>&os; provides two technologies which perform these steps for
+      you.  At the time of writing, over &os.numports; third-party
+      applications are available.</para>
+
+    <para>A &os; package contains pre-compiled copies of all the
+      commands for an application, as well as any configuration files
+      and documentation.  A package can be manipulated with &os;
+      package management commands, such as &man.pkg.add.1;,
+      &man.pkg.delete.1;, and &man.pkg.info.1;.</para>
+
+    <para>A &os; port is a collection of files designed to automate
+      the process of compiling an application from source code.  The
+      files that comprise a port contain all the necessary information
+      to automatically download, extract, patch, compile, and install
+      the application.</para>
+
+    <para>The ports system can also be used to generate packages which
+      can be manipulated with the &os; package management
+      commands.</para>
 
     <para>Both packages and ports understand
-      <emphasis>dependencies</emphasis>.  Suppose you want to install
-      an application that depends on a specific library being
-      installed.  Both the application and the library have been made
-      available as FreeBSD ports and packages.  If you use the
-      <command>pkg_add</command> command or the ports system to add
-      the application, both will notice that the library has not been
-      installed, and automatically install the library first.</para>
-
-    <para>Given that the two technologies are quite similar, you might
-      be wondering why FreeBSD bothers with both.  Packages and ports
-      both have their own strengths, and which one you use will depend
-      on your own preference.</para>
+      <emphasis>dependencies</emphasis>. If &man.pkg.add.1; or the
+      Ports Collection is used to install an application and a
+      dependent library is not already installed, the library will
+      automatically be installaed first.</para>
+
+    <para>While the two technologies are quite similar, packages and
+      ports each have their own strengths.  Select the technology that
+      meets your requirements for installing a particular
+      application.</para>
 
     <itemizedlist>
       <title>Package Benefits</title>
@@ -160,17 +136,17 @@
       </listitem>
 
       <listitem>
-	<para>Packages do not require any additional compilation.  For
-	  large applications, such as
+	<para>Packages do not require compilation time.  For large
+	  applications, such as
 	  <application>Mozilla</application>,
 	  <application>KDE</application>, or
 	  <application>GNOME</application> this can be important,
-	  particularly if you are on a slow system.</para>
+	  on a slow system.</para>
       </listitem>
 
       <listitem>
 	<para>Packages do not require any understanding of the process
-	  involved in compiling software on FreeBSD.</para>
+	  involved in compiling software on &os;.</para>
       </listitem>
     </itemizedlist>
 
@@ -179,105 +155,89 @@
 
       <listitem>
 	<para>Packages are normally compiled with conservative
-	  options, because they have to run on the maximum number of
-	  systems.  By installing from the port, you can tweak the
-	  compilation options to (for example) generate code that is
-	  specific to a Pentium 4 or Athlon processor.</para>
+	  options because they have to run on the maximum number of
+	  systems.  By compiling from the port, one can change the
+	  compilation options.</para>
       </listitem>
 
       <listitem>
 	<para>Some applications have compile-time options relating to
-	  what they can and cannot do.  For example,
+	  which features are installed.  For example,
 	  <application>Apache</application> can be configured with a
-	  wide variety of different built-in options.  By building
-	  from the port you do not have to accept the default options,
-	  and can set them yourself.</para>
+	  wide variety of different built-in options.</para>
 
 	<para>In some cases, multiple packages will exist for the same
 	  application to specify certain settings.  For example,
 	  <application>Ghostscript</application> is available as a
 	  <filename>ghostscript</filename> package and a
 	  <filename>ghostscript-nox11</filename> package, depending on
-	  whether or not you have installed an X11 server.  This sort
-	  of rough tweaking is possible with packages, but rapidly
-	  becomes impossible if an application has more than one or
-	  two different compile-time options.</para>
+	  whether or not <application>Xorg</application> is installed.
+	  Creating multiple packages rapidly becomes impossible if an
+	  application has more than one or two different compile-time
+	  options.</para>
       </listitem>
 
       <listitem>
-	<para>The licensing conditions of some software distributions
-	  forbid binary distribution.  They must be distributed as
-	  source code.</para>
+	<para>The licensing conditions of some software forbid binary
+	  distribution.  These must be distributed as source code
+	  which must be compiled by the end-user.</para>
       </listitem>
 
       <listitem>
-	<para>Some people do not trust binary distributions.  At least
-	  with source code, you can (in theory) read through it and
-	  look for potential problems yourself.</para>
+	<para>Some people do not trust binary distributions or prefer
+	  to read through source code in order to look for potential
+	  problems.</para>
       </listitem>
 
       <listitem>
 	<para>If you have local patches, you will need the source in
 	  order to apply them.</para>
       </listitem>
-
-      <listitem>
-	<para>Some people like having code around, so they can read it
-	  if they get bored, hack it, borrow from it (license
-	  permitting, of course), and so on.</para>
-      </listitem>
     </itemizedlist>
 
     <para>To keep track of updated ports, subscribe to the
       &a.ports; and the &a.ports-bugs;.</para>
 
     <warning>
-      <para>Before installing any application, you should check <ulink
+      <para>Before installing any application, check <ulink
 	  url="http://vuxml.freebsd.org/"></ulink> for security issues
-	related to your application.</para>
-
-      <para>You can also install
-	<filename role="package">ports-mgmt/portaudit</filename>
-	which will automatically check all installed applications for
-	known vulnerabilities; a check will be also performed before
-	any port build.  Meanwhile, you can use the command
-	<command>portaudit -F -a</command> after you have installed
-	some packages.</para>
+	related to the application or install  <filename
+	  role="package">ports-mgmt/portaudit</filename>. Once
+	installed, type <command>portaudit -F -a</command> to check
+	all installed applications for known vulnerabilities</para>
     </warning>
 
-    <para>The remainder of this chapter will explain how to use
-      packages and ports to install and manage third-party software on
-      FreeBSD.</para>
+    <para>The remainder of this chapter explains how to use packages
+      and ports to install and manage third-party software on
+      &os;.</para>
   </sect1>
 
   <sect1 id="ports-finding-applications">
-    <title>Finding Your Application</title>
+    <title>Finding Software</title>
 
-    <para>Before you can install any applications you need to know
-      what you want, and what the application is called.</para>
-
-    <para>FreeBSD's list of available applications is growing all the
-      time.  Fortunately, there are a number of ways to find what you
-      want:</para>
+    <para>&os;'s list of available applications is growing all the
+      time.  There are a number of ways to find software to
+      install:</para>
 
     <itemizedlist>
       <listitem>
-	<para>The FreeBSD web site maintains an up-to-date searchable
+	<para>The &os; web site maintains an up-to-date searchable
 	  list of all the available applications, at <ulink
 	    url="&url.base;/ports/index.html">http://www.FreeBSD.org/ports/</ulink>.
-	  The ports are divided into categories, and you may either
-	  search for an application by name (if you know it), or see
-	  all the applications available in a category.</para>
+	  The ports can be searched by application name or by
+	  software category.</para>
       </listitem>
 
       <listitem>
 	<indexterm><primary>FreshPorts</primary></indexterm>
 
-	<para>Dan Langille maintains FreshPorts, at <ulink
-	    url="http://www.FreshPorts.org/"></ulink>.  FreshPorts
-	  tracks changes to the applications in the ports tree as they
-	  happen, allows you to <quote>watch</quote> one or more
-	  ports, and can send you email when they are updated.</para>
+	<para>Dan Langille maintains <ulink
+	    url="http://www.FreshPorts.org/">FreshPorts</ulink> which
+	  provides a comprehensive search utility and also tracks
+	  changes to the applications in the Ports Collection.
+	  Registered users can create a customized watch list in order
+	  to receive an automated email when their watched ports are
+	  updated.</para>
       </listitem>
 
       <listitem>
@@ -286,32 +246,21 @@
 	<para>If you do not know the name of the application you want,
 	  try using a site like Freecode (<ulink
 	    url="http://www.freecode.com/"></ulink>) to find an
-	  application, then check back at the FreeBSD site to see if
+	  application, then check back at the &os; site to see if
 	  the application has been ported yet.</para>
       </listitem>
 
       <listitem>
-	<para>If you know the exact name of the port, but just need to
-	  find out which category it is in, you can use the
-	  &man.whereis.1; command.  Simply type
+	<para>To find out which category a port is in, type
 	  <command>whereis <replaceable>file</replaceable></command>,
-	  where <replaceable>file</replaceable> is the program you
-	  want to install.  If it is found on your system, you will be
-	  told where it is, as follows:</para>
+	  where <replaceable>file</replaceable> is the program to be
+	  installed:</para>
 
 	<screen>&prompt.root; <userinput>whereis lsof</userinput>
 lsof: /usr/ports/sysutils/lsof</screen>
 
-	<para>This tells us that <command>lsof</command> (a system
-	  utility) can be found in the
-	  <filename>/usr/ports/sysutils/lsof</filename>
-	  directory.</para>
-      </listitem>
-
-      <listitem>
-	<para>Additionally, you can use a simple &man.echo.1;
-	  statement to find where a port exists in the ports tree.
-	  For example:</para>
+	<para>Alternately, a &man.echo.1; statement can be
+	  used:</para>
 
 	<screen>&prompt.root; <userinput>echo /usr/ports/*/*lsof*</userinput>
 /usr/ports/sysutils/lsof</screen>
@@ -323,15 +272,15 @@ lsof: /usr/ports/sysutils/lsof</screen>
       </listitem>
 
       <listitem>
-	<para>Yet another way to find a particular port is by using
-	  the Ports Collection's built-in search mechanism.  To use
-	  the search feature, you will need to be in the
-	  <filename>/usr/ports</filename> directory.  Once in that
-	  directory, run <command>make <maketarget>search</maketarget>
-	  name=<replaceable>program-name</replaceable></command> where
-	  <replaceable>program-name</replaceable> is the name of the
-	  program you want to find.  For example, if you were looking
-	  for <command>lsof</command>:</para>
+	<para>Another way to find software is by using the Ports
+	  Collection's built-in search mechanism.  To use
+	    the search feature, <application>cd</application> to
+	  <filename>/usr/ports</filename> then run <command>make
+	    <maketarget>search</maketarget>
+	    name=<replaceable>program-name</replaceable></command>
+	  where <replaceable>program-name</replaceable> is the name of
+	  the software.  For example,to search for
+	  <command>lsof</command>:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/ports</userinput>
 &prompt.root; <userinput>make search name=lsof</userinput>
@@ -343,18 +292,11 @@ Index:  sysutils
 B-deps:
 R-deps: </screen>
 
-	<para>The part of the output you want to pay particular
-	  attention to is the <quote>Path:</quote> line, since that
-	  tells you where to find the port.  The other information
-	  provided is not needed in order to install the port, so it
-	  will not be covered here.</para>
-
-	<para>Alternatively, there is another search feature from
-	  ports that achieves the same purpose but with less noise,
-	  the <command>quicksearch</command> feature.  This feature
-	  accepts the same parameter as the <command>search</command>
-	  feature.  For example, searching for <command>lsof</command>
-	  would return:</para>
+	<para>The <quote>Path:</quote> line indicates where to find
+	  the port.</para>
+
+	<para>To receive less information, use the
+	  <command>quicksearch</command> feature:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/ports</userinput>
 &prompt.root; <userinput>make quicksearch name=lsof</userinput>
@@ -362,19 +304,18 @@ Port:   lsof-4.87.a,7
 Path:   /usr/ports/sysutils/lsof
 Info:   Lists information about open files (similar to fstat(1))</screen>
 
-	<para>For more in-depth searching you can also use
+	<para>For more in-depth searching, use
 	  <command>make <maketarget>search</maketarget>
 	  key=<replaceable>string</replaceable></command> or
 	  <command>make <maketarget>quicksearch</maketarget>
 	  key=<replaceable>string</replaceable></command>, where
 	  <replaceable>string</replaceable> is some text to search
-	  for.  This searches port names, comments, descriptions and
-	  dependencies and can be used to find ports which relate to a
-	  particular subject if you do not know the name of the
-	  program you are looking for.</para>
+	  for.  The text can be comments, descriptions or dependencies
+	  in order to find ports which relate to a particular subject
+	  when the name of the program is unknown.</para>
 
-	<para>In both of these cases (<maketarget>search</maketarget>
-	  and <maketarget>quicksearch</maketarget>), the search string
+	<para>When using (<maketarget>search</maketarget> and
+	  <maketarget>quicksearch</maketarget>), the search string
 	  is case-insensitive.  Searching for <quote>LSOF</quote> will
 	  yield the same results as searching for
 	  <quote>lsof</quote>.</para>
@@ -394,10 +335,10 @@ Info:   Lists information about open fil
     <!-- 30 Mar 2001 -->
     </sect1info>
 
-    <title>Using the Packages System</title>
+    <title>Using Binary Packages</title>
 
     <para>There are several different tools used to manage packages on
-      FreeBSD:</para>
+      &os;:</para>
 
     <itemizedlist>
       <listitem>
@@ -424,9 +365,8 @@ Info:   Lists information about open fil
       <indexterm>
 	<primary><command>pkg_add</command></primary>
       </indexterm>
-      <para>You can use the &man.pkg.add.1; utility to install a
-	FreeBSD software package from a local file or from a server on
-	the network.</para>
+      <para>Use &man.pkg.add.1; to install a &os; binary package from
+	a local file or from a server on the network.</para>
 
       <example>
 	<title>Downloading a Package Manually and Installing It
@@ -457,26 +397,22 @@ local: lsof-4.56.4.tgz remote: lsof-4.56
 &prompt.root; <userinput>pkg_add <replaceable>lsof-4.56.4.tgz</replaceable></userinput></screen>
       </example>
 
-      <para>If you do not have a source of local packages (such as a
-	FreeBSD CD-ROM set) then it will probably be easier to use the
-	<option>-r</option> option to &man.pkg.add.1;.  This will
-	cause the utility to automatically determine the correct
-	object format and release and then fetch and install the
-	package from an FTP site.</para>
+      <para>If you do not have a source of local packages, such as a
+	&os; CD-ROM set, include <option>-r</option> with
+	&man.pkg.add.1;.  This automatically determines the correct
+	object format and release, and then fetches and installs the
+	package from an FTP site without any further user
+	intervention.</para>
 
       <indexterm>
 	<primary><command>pkg_add</command></primary>
       </indexterm>
       <screen>&prompt.root; <userinput>pkg_add -r <replaceable>lsof</replaceable></userinput></screen>
 
-      <para>The example above would download the correct package and
-	add it without any further user intervention.  If you want to
-	specify an alternative &os; Packages Mirror, instead of the
-	main distribution site, you have to set the
-	<envar>PACKAGESITE</envar> environment variable accordingly,
-	to override the default settings.  &man.pkg.add.1; uses
-	&man.fetch.3; to download the files, which honors various
-	environment variables, including
+      <para>To specify an alternative &os; FTP mirror, specify the
+	mirror in the <envar>PACKAGESITE</envar> environment variable.
+	&man.pkg.add.1; uses &man.fetch.3; to download files, which
+	uses various environment variables, including
 	<envar>FTP_PASSIVE_MODE</envar>, <envar>FTP_PROXY</envar>, and
 	<envar>FTP_PASSWORD</envar>.  You may need to set one or more
 	of these if you are behind a firewall, or need to use an
@@ -484,41 +420,32 @@ local: lsof-4.56.4.tgz remote: lsof-4.56
 	Note that in the example above <literal>lsof</literal> is used
 	instead of <literal>lsof-4.56.4</literal>.  When the remote
 	fetching feature is used, the version number of the package
-	must be removed.  &man.pkg.add.1; will automatically fetch the
-	latest version of the application.</para>
+	must be removed.</para>
 
       <note>
-	<para>&man.pkg.add.1; will download the latest version of
-	  your application if you are using &os.current; or
-	  &os.stable;.  If you run a -RELEASE version, it will grab
-	  the version of the package that was built with your
+	<para>&man.pkg.add.1; will automatically download the latest
+	  version of the application if you are using &os.current; or
+	  &os.stable;.  If you run a -RELEASE version, it instead
+	  installs the version of the package that was built with that
 	  release.  It is possible to change this behavior by
-	  overriding <envar>PACKAGESITE</envar>.
-	  For example, if you run a &os;&nbsp;8.1-RELEASE
-	  system, by default &man.pkg.add.1; will try to fetch
-	  packages from
+	  overriding <envar>PACKAGESITE</envar>.  For example, on a
+	  &os;&nbsp;8.1-RELEASE system, by default &man.pkg.add.1;
+	  will try to fetch packages from
 	  <literal>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-8.1-release/Latest/</literal>.
-	  If you want to force &man.pkg.add.1; to download
-	  &os;&nbsp;8-STABLE packages, set <envar>PACKAGESITE</envar>
-	  to
+	  To force &man.pkg.add.1; to download &os;&nbsp;8-STABLE
+	  packages, set <envar>PACKAGESITE</envar> to
 	  <literal>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-8-stable/Latest/</literal>.</para>
       </note>
 
       <para>Package files are distributed in <filename>.tgz</filename>
-	and <filename>.tbz</filename> formats.  You can find them at
-	<ulink
+	and <filename>.tbz</filename> formats.  Packages are
+	available from <ulink
 	url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/"></ulink>,
-	or on the FreeBSD CD-ROM distribution.  Every CD on the
-	FreeBSD 4-CD set (and the PowerPak, etc.) contains packages in
-	the <filename>/packages</filename> directory.  The layout of
-	the packages is similar to that of the
-	<filename>/usr/ports</filename> tree.  Each category has its
-	own directory, and every package can be found within the
-	<filename>All</filename> directory.</para>
-
-      <para>The directory structure of the package system matches the
-	ports layout; they work with each other to form the entire
-	package/port system.</para>
+	or the <filename>/packages</filename> directory of the &os;
+	DVD distribution.  The layout of the packages is similar to
+	that of the <filename>/usr/ports</filename> tree.  Each
+	category has its own directory, and every package can be found
+	within the <filename>All</filename> directory.</para>
     </sect2>
 
     <sect2>
@@ -529,8 +456,8 @@ local: lsof-4.56.4.tgz remote: lsof-4.56
 	<secondary>managing</secondary>
       </indexterm>
 
-      <para>&man.pkg.info.1; is a utility that lists and describes
-	the various packages installed.</para>
+      <para>&man.pkg.info.1; can be used to list and describe
+	installed packages:</para>
 
       <indexterm>
 	<primary><command>pkg_info</command></primary>
@@ -541,9 +468,9 @@ colordiff-1.0.13    A tool to colorize d
 docbook-1.2         Meta-port for the different versions of the DocBook DTD
 ...</screen>
 
-      <para>&man.pkg.version.1; is a utility that summarizes the
-	versions of all installed packages.  It compares the package
-	version to the current version found in the ports tree.</para>
+      <para>&man.pkg.version.1; summarizes the versions of all
+	installed packages and compares the package version to the
+	current version found in the ports tree.</para>
 
       <indexterm>
 	<primary><command>pkg_version</command></primary>
@@ -576,22 +503,22 @@ docbook                     =
 	    <row>
 	      <entry>&lt;</entry>
 	      <entry>The installed version is older than the one
-		available in the ports tree.</entry>
+		available in the local ports tree.</entry>
 	    </row>
 
 	    <row>
 	      <entry>&gt;</entry><entry>The installed version is newer
-		than the one found in the local ports tree.  (The
-		local ports tree is probably out of
-		date.)</entry>
+		than the one found in the local ports tree, meaning
+		that the local ports tree is probably out of
+		date.</entry>
 	    </row>
 
 	    <row>
 	      <entry>?</entry>
 	      <entry>The installed package cannot be found in the
-		ports index.  (This can happen, for instance, if an
-		installed port is removed from the Ports Collection or
-		renamed.)</entry>
+		ports index.  This can happen when an installed port
+		is removed from the Ports Collection or is
+		renamed.</entry>
 	    </row>
 
 	    <row>
@@ -625,18 +552,17 @@ docbook                     =
 	<secondary>deleting</secondary>
       </indexterm>
 
-      <para>To remove a previously installed software package, use the
-	&man.pkg.delete.1; utility.</para>
+      <para>To remove a previously installed software package, use
+	&man.pkg.delete.1;:</para>
 
       <screen>&prompt.root; <userinput>pkg_delete <replaceable>xchat-1.7.1</replaceable></userinput></screen>
 
       <para>Note that &man.pkg.delete.1; requires the full package
 	name and number; the above command would not work if
 	<replaceable>xchat</replaceable> was given instead of
-	<replaceable>xchat-1.7.1</replaceable>.  It is, however, easy
-	to use &man.pkg.version.1; to find the version of the
-	installed package.  You could instead simply use a
-	wildcard:</para>
+	<replaceable>xchat-1.7.1</replaceable>.  Use
+	&man.pkg.version.1; to find the version of the
+	installed package, or use a wildcard:</para>
 
       <screen>&prompt.root; <userinput>pkg_delete <replaceable>xchat\*</replaceable></userinput></screen>
 
@@ -647,10 +573,9 @@ docbook                     =
     <sect2>
       <title>Miscellaneous</title>
 
-      <para>All package information is stored within the
-	<filename>/var/db/pkg</filename> directory.  The installed
-	file list and descriptions of each package can be found within
-	files in this directory.</para>
+      <para>All package information, including the file list and
+	descriptions of each installed package is stored within the
+	<filename>/var/db/pkg</filename> directory.</para>
     </sect2>
   </sect1>
 
@@ -659,11 +584,10 @@ docbook                     =
       Management</title>
 
     <para><application>pkgng</application> is an improved replacement
-      for the traditional &os; <application>pkg_install</application>
-      package management tools, offering many features that make
-      dealing with binary packages faster and easier.  The first
-      release of <application>pkgng</application> was in August,
-      2012.</para>
+      for the traditional &os; package management tools, offering
+      many features that make dealing with binary packages faster and
+      easier.  The first release of <application>pkgng</application>
+      was in August, 2012.</para>
 
     <para><application>pkgng</application> is not a replacement for
       port management tools like <filename
@@ -777,7 +701,7 @@ docbook                     =
       <screen>&prompt.root; <userinput>man pkg-install</userinput></screen>
 
       <sect3 id="pkgng-pkg-info">
-	<title>Obtaining Information about Installed Packages with
+	<title>Obtaining Information About Installed Packages with
 	  <application>pkgng</application></title>
 
 	<para>Information about the packages installed on a system can
@@ -939,10 +863,10 @@ Deinstalling ca_root_nss-3.13.5... done<
 	<title>Backing Up the <application>pkgng</application> Package
 	  Database</title>
 
-	<para>Unlike the <application>pkg_install</application>
-	  package management system, <application>pkgng</application>
-	  includes its own package database backup mechanism.  To
-	  manually back up the package database contents, run:</para>
+	<para>Unlike the traditional package management system,
+	  <application>pkgng</application> includes its own package
+	  database backup mechanism.  To manually back up the package
+	  database contents, run:</para>
 
 	<screen>&prompt.root; <userinput>pkg backup -d <replaceable>pkgng.db</replaceable></userinput></screen>
 
@@ -1048,11 +972,10 @@ Deinstalling ca_root_nss-3.13.5... done<
   <sect1 id="ports-using">
     <title>Using the Ports Collection</title>
 
-    <para>The following sections provide basic instructions on using
-      the Ports Collection to install or remove programs from your
-      system.  The detailed description of available
-      <command>make</command> targets and environment variables is
-      available in &man.ports.7;.</para>
+    <para>This section provides basic instructions on using the Ports
+      Collection to install or remove software.  The detailed
+      description of available <command>make</command> targets and
+      environment variables is available in &man.ports.7;.</para>
 
     <warning>
       <para>As of mid 2012, the &os; Ports Project has migrated
@@ -1072,7 +995,7 @@ Deinstalling ca_root_nss-3.13.5... done<
       <para>The Ports Collection is a set of
 	<filename>Makefiles</filename>, patches, and description files
 	stored in <filename>/usr/ports</filename>.  This set of files
-	is used for building and installing applications on &os;.  The
+	is used to compile and install applications on &os;.  The
 	instructions below show several methods of obtaining the Ports
 	Collection if it was not installed during initial &os;
 	setup.</para>
@@ -1312,75 +1235,57 @@ Deinstalling ca_root_nss-3.13.5... done<
 	<secondary>installing</secondary>
       </indexterm>
 
-      <para>The first thing that should be explained when it comes to
-	the Ports Collection is what is actually meant by a
-	<quote>skeleton</quote>.  In a nutshell, a port skeleton is a
-	minimal set of files that tell your FreeBSD system how to
-	cleanly compile and install a program.  Each port skeleton
+      <para>A port skeleton is a set of files that tell &os; system
+	how to compile and install a program.  Each port skeleton
 	includes:</para>
 
       <itemizedlist>
 	<listitem>
-	  <para>A <filename>Makefile</filename>.  The
-	    <filename>Makefile</filename> contains various statements
-	    that specify how the application should be compiled and
-	    where it should be installed on your system.</para>
+	  <para><filename>Makefile</filename>:  The
+	    <filename>Makefile</filename> contains statements that
+	    specify how the application should be compiled and where
+	    its components should be installed.</para>
 	</listitem>
 
 	<listitem>
-	  <para>A <filename>distinfo</filename> file.  This file
-	    contains information about the files that must be
-	    downloaded to build the port, and their checksums
-	    (using &man.sha256.1;), to
-	    verify that files have not been corrupted during the
-	    download.</para>
+	  <para><filename>distinfo</filename>:  This file contains
+	    information about the files that must be downloaded to
+	    build the port, and their checksums (using
+	    &man.sha256.1;), to verify that files have not been
+	    corrupted during the download.</para>
 	</listitem>
 
 	<listitem>
-	  <para>A <filename>files</filename> directory.  This
-	    directory contains patches to make the program compile and
-	    install on your FreeBSD system.  Patches are basically
-	    small files that specify changes to particular files.
-	    They are in plain text format, and basically say
-	    <quote>Remove line 10</quote> or <quote>Change line 26 to
-	    this ...</quote>.  Patches are also known as
-	    <quote>diffs</quote> because they are generated by the
-	    &man.diff.1; program.</para>
-
-	  <para>This directory may also contain other files used to
-	    build the port.</para>
+	  <para><filename>files/</filename>:  This directory contains
+	    any patches needed for the program to compile and install
+	    on &os;.  This directory may also contain other files used
+	    to build the port.</para>
 	</listitem>
 
 	<listitem>
-	  <para>A <filename>pkg-descr</filename> file.  This is a more
-	    detailed, often multiple-line, description of the
-	    program.</para>
+	  <para><filename>pkg-descr</filename>: This file provides a
+	    more detailed description of the program.</para>
 	</listitem>
 
 	<listitem>
-	  <para>A <filename>pkg-plist</filename> file.  This is a list
+	  <para><filename>pkg-plist</filename>:  This is a list
 	    of all the files that will be installed by the port.  It
 	    also tells the ports system what files to remove upon
 	    deinstallation.</para>
 	</listitem>
       </itemizedlist>
 
-      <para>Some ports have other files, such as
+      <para>Some ports include other files, such as
 	<filename>pkg-message</filename>.  The ports system uses these
 	files to handle special situations.  If you want more details
-	on these files, and on ports in general, check out the
-	<ulink url="&url.books.porters-handbook;/index.html">FreeBSD
+	on these files, and on ports in general, refer to the
+	<ulink url="&url.books.porters-handbook;/index.html">&os;
 	  Porter's Handbook</ulink>.</para>
 
-      <para>The port includes instructions on how to build source
-	code, but does not include the actual source code.  You can
-	get the source code from a CD-ROM or from the Internet.
-	Source code is distributed in whatever manner the software
-	author desires.  Frequently this is a tarred and gzipped file,
-	but it might be compressed with some other tool or even
-	uncompressed.  The program source code, whatever form it comes
-	in, is called a <quote>distfile</quote>.  The two methods for
-	installing a &os; port are described below.</para>
+      <para>The port does not include the actual source code, also
+	known as a <quote>distfile</quote>. Source code is distributed
+	in whatever manner the software author desires.  The two
+	methods for installing a &os; port are described below.</para>
 
       <note>
 	<para>You must be logged in as <username>root</username> to
@@ -1388,39 +1293,32 @@ Deinstalling ca_root_nss-3.13.5... done<
       </note>
 
       <warning>
-	<para>Before installing any port, you should be sure to have
-	  an up-to-date Ports Collection and you should check
-	  <ulink url="http://vuxml.freebsd.org/"></ulink> for security
-	  issues related to your port.</para>
-
-	<para>A security vulnerabilities check can be automatically
-	  done by <application>portaudit</application> before any new
-	  application installation.  This tool can be found in the
-	  Ports Collection (<filename
-	  role="package">ports-mgmt/portaudit</filename>).  Consider
-	  running <command>portaudit -F</command> before installing a
-	  new port, to fetch the current vulnerabilities database.  A
-	  security audit and an update of the database will be
-	  performed during the daily security system check.  For more
-	  information read the &man.portaudit.1; and &man.periodic.8;
-	  manual pages.</para>
+	<para>Before compiling any port, be sure to have an
+	  up-to-date Ports Collection and check <ulink
+	    url="http://vuxml.freebsd.org/"></ulink> for security
+	  issues related to your port.  If <filename
+	    role="package">ports-mgmt/portaudit</filename>) is
+	  installed, run <command>portaudit -F</command> before
+	  installing a new port, to fetch the current vulnerabilities
+	  database.  A security audit and an update of the database
+	  will be performed during the daily security system check.
+	  For more information read the &man.portaudit.1; and
+	  &man.periodic.8; manual pages.</para>
       </warning>
 
-      <para>The Ports Collection makes an assumption that you have a
-	working Internet connection.  If you do not, you will need to
-	put a copy of the distfile into
-	<filename>/usr/ports/distfiles</filename> manually.</para>
+      <para>Using the Ports Collection assumes a working Internet
+	connection.  Otherwise, manually obtain and place a copy of
+	the distfile into
+	<filename>/usr/ports/distfiles</filename>.</para>
 
-      <para>To begin, change to the directory for the port you want
-	to install:</para>
+      <para>To begin, change to the directory of the port to
+	be installed:</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/sysutils/lsof</userinput></screen>
 
-      <para>Once inside the <filename>lsof</filename> directory, you
-	will see the port skeleton.  The next step is to compile, or
-	<quote>build</quote>, the port.  This is done by simply
-	typing <command>make</command> at the prompt.  Once you have
-	done so, you should see something like this:</para>
+      <para>To compile, or <quote>build</quote>, the port, type
+	<command>make</command> at the prompt.  You should see
+	messages similar to the ones in this example:</para>
 
       <screen>&prompt.root; <userinput>make</userinput>
 &gt;&gt; lsof_4.57D.freebsd.tar.gz doesn't seem to exist in /usr/ports/distfiles/.
@@ -1442,11 +1340,9 @@ Deinstalling ca_root_nss-3.13.5... done<
 ...
 &prompt.root;</screen>
 
-      <para>Notice that once the compile is complete you are
-	returned to your prompt.  The next step is to install the
-	port.  In order to install it, you simply need to tack one
-	word onto the <command>make</command> command, and that word
-	is <maketarget>install</maketarget>:</para>
+      <para>Once the compile is complete, you are returned to the
+	prompt.  The next step is to install the port using
+	<maketarget>make install</maketarget>:</para>
 
       <screen>&prompt.root; <userinput>make install</userinput>
 ===&gt;  Installing for lsof-4.57
@@ -1461,18 +1357,18 @@ Deinstalling ca_root_nss-3.13.5... done<
       increased privileges.
 &prompt.root;</screen>
 
-      <para>Once you are returned to your prompt, you should be able
-	to run the application you just installed.  Since
-	<command>lsof</command> is a program that runs with
-	increased privileges, a security warning is shown.  During
-	the building and installation of ports, you should take heed
-	of any other warnings that may appear.</para>
+      <para>Once you are returned to the prompt, you should be able
+	to run the installed application.  Since
+	<command>lsof</command> is a program that runs with increased
+	privileges, a security warning is shown.  During the building
+	and installation of ports, take heed of any other warnings
+	that may appear.</para>
 
       <para>It is a good idea to delete the working subdirectory,
 	which contains all the temporary files used during
-	compilation.  Not only does it consume valuable disk space,
-	but it would also cause problems later when upgrading to the
-	newer version of the port.</para>
+	compilation.  Doing so saves disk space and minimizes the
+	chance of problems later when upgrading to the newer version
+	of the port.</para>
 
       <screen>&prompt.root; <userinput>make clean</userinput>
 ===&gt;  Cleaning for lsof-4.57
@@ -1489,13 +1385,12 @@ Deinstalling ca_root_nss-3.13.5... done<
       </note>
 
       <note>
-	<para>When installing a port, using only
+	<para>Using only
 	  <command>make <maketarget>install</maketarget></command>
-	  from the beginning means there will potentially be many
+	  means there will potentially be many
 	  waiting periods between user interaction as the default
-	  behaviour is to prompt the user for options.  When there are
-	  many dependencies, this sometimes makes building a single
-	  port a huge hassle.  To avoid this, first run <command>make
+	  behaviour is to prompt the user for options.  To avoid this
+	  when there are many dependencies, first run <command>make
 	    <maketarget>config-recursive</maketarget></command> to do
 	  the configuration in one batch.  Then run <command>make
 	    <maketarget>install [clean]</maketarget></command>
@@ -1519,32 +1414,30 @@ Deinstalling ca_root_nss-3.13.5... done<
 	  available in the directories listed in the
 	  <envar>PATH</envar> environment variable, to speed up lookup
 	  operations for the executable file of these commands.  If
-	  you are using one of these shells, you might have to use the
-	  <command>rehash</command> command after installing a port,
-	  before the newly installed commands can be used.  This
-	  command will work for shells like <command>tcsh</command>.
-	  Use the <command>hash -r</command> command for shells like
-	  <command>sh</command>.  Look at the documentation for your
-	  shell for more information.</para>
+	  you are using <command>tcsh</command>, you might have to
+	  type <command>rehash</command> so that a newly installed
+	  command can be used without specifying its full path.  Use
+	  <command>hash -r</command> instead for the
+	  <command>sh</command> shell.  Refer to the documentation for
+	  the shell for more information.</para>
       </note>
 
-      <para>Some third-party DVD-ROM products such as the FreeBSD
-	Toolkit from the
-	<ulink url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>
-	contain distfiles.  They can be used with the Ports
-	Collection.  Mount the DVD-ROM on <filename>/cdrom</filename>.
-	If you use a different mount point, set
-	<makevar>CD_MOUNTPTS</makevar> make variable.  The needed
-	distfiles will be automatically used if they are present on
-	the disk.</para>
+      <para>Some third-party DVD products such as the &os;
+	Toolkit from the <ulink url="http://www.freebsdmall.com/">&os;
+	  Mall</ulink> contain distfiles.  They can be used with the
+	Ports Collection.  Mount the DVD on
+	<filename>/cdrom</filename>.  If you use a different mount
+	point, set <makevar>CD_MOUNTPTS</makevar> make variable.  The
+	needed distfiles will be automatically used if they are
+	present on the disk.</para>

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

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 14:47:40 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])
 by hub.freebsd.org (Postfix) with ESMTP id 6445588C;
 Wed, 30 Jan 2013 14:47:40 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 55CCFE40;
 Wed, 30 Jan 2013 14:47:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UEledO070931;
 Wed, 30 Jan 2013 14:47:40 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UEleB2070930;
 Wed, 30 Jan 2013 14:47:40 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201301301447.r0UEleB2070930@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 30 Jan 2013 14:47:40 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40823 - head/en_US.ISO8859-1/books/handbook/mac
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, 30 Jan 2013 14:47:40 -0000

Author: gjb
Date: Wed Jan 30 14:47:39 2013
New Revision: 40823
URL: http://svnweb.freebsd.org/changeset/doc/40823

Log:
  Fix build.

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

Modified: head/en_US.ISO8859-1/books/handbook/mac/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/mac/chapter.xml	Wed Jan 30 14:39:04 2013	(r40822)
+++ head/en_US.ISO8859-1/books/handbook/mac/chapter.xml	Wed Jan 30 14:47:39 2013	(r40823)
@@ -468,7 +468,7 @@
 	&man.chmod.1; and &man.chown.8; commands.  In some cases this
 	error may be a <errorname>Permission denied</errorname> and
 	is usually obtained when the label is being set or modified
-	on an object which is restricted.<footnote>Other conditions
+	on an object which is restricted.<footnote><para>Other conditions
 	  may produce different failures.  For instance, the file may
 	  not be owned by the user attempting to relabel the object,
 	  the object may not exist or may be read only.  A mandatory
@@ -478,7 +478,7 @@
 	  example: a user running at low integrity tries to change the
 	  label of a high integrity file.  Or perhaps a user running
 	  at low integrity tries to change the label of a low
-	  integrity file to a high integrity label.</footnote>  The
+	  integrity file to a high integrity label.</para></footnote>  The
 	system administrator may use the following commands to
 	overcome this:</para>
 

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 14:50:59 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])
 by hub.freebsd.org (Postfix) with ESMTP id 787DC940;
 Wed, 30 Jan 2013 14:50:59 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6A344E74;
 Wed, 30 Jan 2013 14:50:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UEoxDa072889;
 Wed, 30 Jan 2013 14:50:59 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UEoxa3072878;
 Wed, 30 Jan 2013 14:50:59 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201301301450.r0UEoxa3072878@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 30 Jan 2013 14:50:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40824 - head/en_US.ISO8859-1/books/handbook/mirrors
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 30 Jan 2013 14:50:59 -0000

Author: gjb
Date: Wed Jan 30 14:50:58 2013
New Revision: 40824
URL: http://svnweb.freebsd.org/changeset/doc/40824

Log:
  Correct svn checkout URL for ports.
  
  Submitted by:	freebsd!nagilum%org (private email)

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

Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml	Wed Jan 30 14:47:39 2013	(r40823)
+++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml	Wed Jan 30 14:50:58 2013	(r40824)
@@ -669,7 +669,7 @@
 	present but was not created by <command>svn</command>,
 	remember to rename or delete it before the checkout.</para>
 
-      <screen>&prompt.root; <userinput>svn checkout https://svn0.us-west.FreeBSD.org/head/ports /usr/ports</userinput></screen>
+      <screen>&prompt.root; <userinput>svn checkout https://svn0.us-west.FreeBSD.org/ports/head /usr/ports</userinput></screen>
 
       <para>Because the initial checkout has to download the full
 	branch of the remote repository, it can take a while.  Please

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 15:23: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])
 by hub.freebsd.org (Postfix) with ESMTP id 220466A1;
 Wed, 30 Jan 2013 15:23:00 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0603C96;
 Wed, 30 Jan 2013 15:23:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UFMxMa082842;
 Wed, 30 Jan 2013 15:22:59 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UFMx6X082841;
 Wed, 30 Jan 2013 15:22:59 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201301301522.r0UFMx6X082841@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Wed, 30 Jan 2013 15:22:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40825 - head/share/pgpkeys
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 30 Jan 2013 15:23:00 -0000

Author: glebius (src committer)
Date: Wed Jan 30 15:22:59 2013
New Revision: 40825
URL: http://svnweb.freebsd.org/changeset/doc/40825

Log:
  Put my new key, since the current one expires this year.

Modified:
  head/share/pgpkeys/glebius.key

Modified: head/share/pgpkeys/glebius.key
==============================================================================
--- head/share/pgpkeys/glebius.key	Wed Jan 30 14:50:58 2013	(r40824)
+++ head/share/pgpkeys/glebius.key	Wed Jan 30 15:22:59 2013	(r40825)
@@ -1,98 +1,50 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh glebius 1949DC80;
+sh addkey.sh glebius 6C7E5E82;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   1024D/1949DC80 2003-08-25
-      Key fingerprint = 872C E14A 2F03 A3E8 D882  026E 5DE4 D7FE 1949 DC80
+pub   2048D/6C7E5E82 2013-01-30 [expires: 2023-08-25]
+      Key fingerprint = 6E06 7260 B83D CF2C A93C  566F 5185 0968 6C7E 5E82
 uid                  Gleb Smirnoff <glebius@FreeBSD.org>
-uid                  Gleb Smirnoff <glebius@cell.sick.ru>
-uid                  Gleb Smirnoff <glebius@bestcom.ru>
-uid                  Gleb Smirnoff <glebius@rambler-co.ru>
-uid                  Gleb Smirnoff <glebius@freebsd.org>
-uid                  Gleb Smirnoff <glebius@freebsd.int.ru>
-sub   1024g/A05118BD 2003-08-25
+sub   2048g/11E89DCE 2013-01-30 [expires: 2023-08-25]
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQGiBD9J8QsRBACUyUv4bahsxZl2FID6EMQWhx0jTm3USIrxLV/Gc2z6k2gpFPtO
-V6qVzHSVV8uaIRGf+7Yh+uJINWeMJpmljvB2bjr4kSJcIKPA9O6QwlCS2eCEKLRw
-pLz5T7NAE3+unm+jI+cTEF6E+oBJX1AoRDdxxfbrwKwHDs4GVnvw59sWCwCg5gc0
-QfYCexqGbOx7s+xjcXRxitMD/1ueSCsb2RLvV9hZzwsFOV3p6lahZPyC/TZaL+5D
-5xwQnEvU7VXFhgd+G/XcQ7RwNLYkNVK4yhSoKK1WT36zs16/1elfqXWmslJpquIE
-OL5AEeVapZMrY6Q6/W8YzsydZGvt+t4vQmswlHurUW5kt1KrCNw0HcalN49Z89bC
-DMLOA/9JNuDx7FwK9IotF+HStr10OQP8pFuQWdFJp1x1+Pj6EzZgP73997uyQKx9
-mVHCWmKRR6vbhGvczoPbZtJH15XBmxhkKL8lXUSTkmCM5uOj++lSIGExIyfF4WY/
-pq5u2zx+n5iDUPwGEQ7pYKg1imEUztdlbtQL/JHFaRNE2uZETrQjR2xlYiBTbWly
-bm9mZiA8Z2xlYml1c0BGcmVlQlNELm9yZz6IYQQTEQIAIQIbAwYLCQgHAwIDFQID
-AxYCAQIeAQIXgAUCQ6PhZwIZAQAKCRBd5Nf+GUncgGV9AJ0X9u5RVsjPEDqcbPW1
-v9m6L8Q1awCeN9KlEFA98q410EuJ4p+jMagRF06IRgQQEQIABgUCQ6NFQAAKCRDs
-8OkLLBcgg0NtAJ9C9g0IiwqcovPX8OxitOfNBKr0/ACeK5tVzTjtD7CPT2Te5Lyf
-PRrrI76IRgQQEQIABgUCQ6O9hgAKCRCvItzveM4QX6Y5AJ4kuc0XU3IVheKTg4xW
-t6tHMfonUgCeN7ZI83DTxTfMcwD33nB1zzCckE6IXgQTEQIAHgUCQZH1iwIbAwYL
-CQgHAwIDFQIDAxYCAQIeAQIXgAAKCRBd5Nf+GUncgBajAKDbr8m2RKDOHst7XIq9
-E2NQhrtJYgCeMjfzpd91CuIC+PvwBHT0ZIonfH6IRgQQEQIABgUCQ6MnVAAKCRBN
-yUvYtx9gXT3uAKDlVBFtR0zYcr0fdINqd6b+ODLleQCfdTdeGLPZ00pKhHcY2gkQ
-WxgLN3CIRgQQEQIABgUCQ6Z13QAKCRBEbQwwjJFkKP60AJwMLagg2dbRBFmL91Lq
-7gMAZxGIBwCgvVmdmtCF0ylHW/+2vWQjhyWQQZOIRgQQEQIABgUCQ6Z6KgAKCRBE
-idDtZ5uBGfiRAJ9Dwj+nR2yCDvxQDZZWtfFghEGalACfb+HwuhwJY4W7UT/mSOkP
-gi4UBmW0JEdsZWIgU21pcm5vZmYgPGdsZWJpdXNAY2VsbC5zaWNrLnJ1PoheBBMR
-AgAeBQJAWvJaAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEF3k1/4ZSdyAjkoA
-oJ5ea7eNHe4vharPD78tvFGINan6AKCc1hQkVgHHBdR34MUr0A5DoqtufohGBBAR
-AgAGBQJDo72OAAoJEK8i3O94zhBfAt0An2aVzRpj8MBKY2KpRg1F7vVH0DXRAJsF
-cLlvUKbwmvtLfKGh1404feJY4YhGBBMRAgAGBQJA9O+8AAoJEOzw6QssFyCDpm4A
-oKCLUgrLqtoOQnTZ2jo3oPTVaUWUAJ0TY4St9fqkzj2H6bmS5W7XN8EP+IhGBBAR
-AgAGBQJDo9qbAAoJEIXUUEVraRsDHdAAnjsiwoMw44Eub0p9wvvSBQ5WAM1nAJ45
-F4vuy6gvEfPng4xwbP+sCsbreYhGBBARAgAGBQJDoydbAAoJEE3JS9i3H2BdseUA
-oId88tVAMkRBmfOOrcu8vm0KQvnBAJ4iZxkQ+bDX9bAdpzQCSdG67VfTCohGBBAR
-AgAGBQJDo0CRAAoJEEKxk3zIVQ9MrVgAoImcVrxzUswMYPbksKQhrzsnQ97mAKCH
-EDAK6j1Axj7R8RAG0mZCN5/fhohGBBARAgAGBQJDpnXfAAoJEERtDDCMkWQoIeAA
-oKZPAIAIOpgUovspAgkiUU/Ua9U9AJ9LI35CcROscoeQjXDABe6huL/aMLQiR2xl
-YiBTbWlybm9mZiA8Z2xlYml1c0BiZXN0Y29tLnJ1PohbBBMRAgAbBQI/SfELBgsJ
-CAcDAgMVAgMDFgIBAh4BAheAAAoJEF3k1/4ZSdyAQ4wAn19jlTy/RWdg/IgWKWwi
-l92sEwCJAKCQf469ekDrV4+eaymvdQM1L6C7zIhGBBMRAgAGBQJAva1mAAoJEOzw
-6QssFyCDUWUAnicFUWTy8f2WXoC7syzLcGg+tIjYAKC92GZTmBwRkXQznOSxjMKK
-2itlu4hGBBARAgAGBQJDoydbAAoJEE3JS9i3H2Bdtx0AoIYk/JVyc9014s2W0oIi
-bIvxej44AJ47/sn4X6fxkk1txEqlVrVs+exZTIhGBBARAgAGBQJDo0CSAAoJEEKx
-k3zIVQ9MI24An2SXKlaCgunwPJCaxJ+8BzDlF9reAJ9t5xRmP/wW/C5b+h4+I42C
-WbB3/IhGBBARAgAGBQJDpnXfAAoJEERtDDCMkWQo45sAoICPZ2Ri5oKwiAjDaMLQ
-9Lj04GcMAKDUTGDadWWVzaLZYrMjzm/J25nDDLQlR2xlYiBTbWlybm9mZiA8Z2xl
-Yml1c0ByYW1ibGVyLWNvLnJ1PoheBBMRAgAeBQJBkfVmAhsDBgsJCAcDAgMVAgMD
-FgIBAh4BAheAAAoJEF3k1/4ZSdyARMkAoJFGLvMlavwswwN9yYwsMGziPz1WAKDU
-1P4aVnRFTtSbYLoY5w6WXkLrH4hGBBARAgAGBQJDo0VDAAoJEOzw6QssFyCDCqAA
-mgIGi9xU3k22UCNWG3Zjr8IbSrzXAJ9nLy69HxBnI4xPL3ILe+89rIqfYIhGBBAR
-AgAGBQJDoydbAAoJEE3JS9i3H2BdyvsAoJmuBspiBZZpVXSfHMcDg2FW0tCWAKDl
-B89Ie4J8fhN6CrN/B5vPORcUsYhGBBARAgAGBQJDpnXfAAoJEERtDDCMkWQoHbMA
-niIWmZv1IbFMfyb0ndvFvFeVZ8fsAJ4rPKRN+jOB/lDK1bNjynHHX4+F57QjR2xl
-YiBTbWlybm9mZiA8Z2xlYml1c0BmcmVlYnNkLm9yZz6IRgQQEQIABgUCQ6MnWwAK
-CRBNyUvYtx9gXXc+AJ0X91Ts2ljW5yDy57Ruvfz9sGahPwCfVg6KTHU4wstwvjvp
-T2yj0vUXer2IXgQTEQIAHgUCQPQ+HAIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAK
-CRBd5Nf+GUncgJPGAJwOvaGydsrBZN4rSUfF2hqkkxjs2gCgoHcmbWJeJyLauhqF
-mVJKDetjjXuIRgQQEQIABgUCQ6PaoQAKCRCF1FBFa2kbAxrPAJwP9olZAbPB+1ts
-I4aPR6YGoRVfSQCdFwRSbPGCKApOR8N5b0JTUM3YpKCIRgQQEQIABgUCQ6O9jgAK
-CRCvItzveM4QX0zmAKCRfSo7dn+i+dxE3D0+oYWbpXI31gCgjCLObLKX6ZwqjNPw
-Gk8zlL+tvfKIRgQTEQIABgUCQPTvvAAKCRDs8OkLLBcgg5Z5AJ0Xj0lcwfZaHtPM
-TM1JE0wCDdAIqQCfb9QnwNCxEr8YDm5Pl8jLSAEiRIaIRgQQEQIABgUCQ6NAkgAK
-CRBCsZN8yFUPTAiRAJ0SzL9vooMSHAZT/oTLdaFjBE6eSACgmfpIxb/mowK47pt/
-6fIKDQip4oCIRgQQEQIABgUCQ6Z13wAKCRBEbQwwjJFkKCzvAJ0eRuYgFjTDCESS
-WrVF40q5pgGYkQCeJzo4ME7343Kx1qZgHcLp3vtbAsS0JkdsZWIgU21pcm5vZmYg
-PGdsZWJpdXNAZnJlZWJzZC5pbnQucnU+iEYEEBECAAYFAkOjJ1sACgkQTclL2Lcf
-YF1QQACeIdkowF59NeomERMsof4r0bBYKK0An0JLvDq2qZX52MPrE70GB+lQf6xE
-iF4EExECAB4FAkD0PnYCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQXeTX/hlJ
-3IBnHgCfakd4r4KTQPcsXoTjUmdu0ACRIbcAoLxwGA4grxJt5m5icZHttw+L9InH
-iEYEExECAAYFAkD077oACgkQ7PDpCywXIINDKACgksXrxU8Y5nSO4kUvp9MdzPvV
-qxAAoLJm3mqmv/JD2ivoaGtUTjPF8hiQiEYEEBECAAYFAkOjQIAACgkQQrGTfMhV
-D0xQIACgl+zgTpoAgnNhv+3RtzDJ7lUSB38AmwSHia3NXEcpC3UC8DwQfmmOugm0
-iEYEEBECAAYFAkOmdd8ACgkQRG0MMIyRZChu2wCgsiuqKHtAz2IUvz+g15tMyVsm
-21kAoPRIOV2CBf93Vx/n2zYDBJS9S6MKuQENBD9J8SEQBAC9eRKLwb0YDhMAzaCx
-U4dSMuKCX0feG8T947PwVDTiCL4TUccqEmuV0jnvs8HR1O3KJ0sz9tIPFS/rIEQI
-TN80rE3mznJJJRqaNfoFYsloUfiwpI056fwEe7/zpPR3N45q3t5QpvOTHE3V4T67
-Q+yiJOzu621VkFsqrXUQ1xejSwADBQQAlRwT36KGswvQEQdGxGJ69i3OC6bE0q1h
-xqJOuGJlqEkcQiwWx92ePYuShzox8jaFFBCnNvsha3j6ArGSZakx0LXW1p1G/Pvl
-FLu1P4npZJKvFwh3WVooaV1cUsdE68HU0k5bAxvBgMJ/wWp/OQcurnhWeV0H1gmh
-dBwhppjd5ESIRgQYEQIABgUCP0nxIQAKCRBd5Nf+GUncgEglAKCjiJSCDTn4IOoO
-7JGkyCRerJup1QCcCec4su8W7fondrpubUDLX6B7Z5A=
-=buTJ
+mQMuBFEJEjsRCACPZlXm85H4IyUgAJeLYYuEIFnPfrwk8VklH9zqaRYtIdd+Mm8t
+GoUQeESq6e6ZcTkYcsBwpvSASnqTCJZNCZTovGtDjJgJIWCglUi1l4y9VMhcjlO7
+9DcAtzY7mmBy4j/DcMQgMZqs70XZi1z/fJTmHyFrMmHJO0aPpX5Nhi/lPyIqBGSg
+mdypdW/Ni1GlSQbdC+kqiRshynoNM3dqZqtJlNT9OMieIhcjnjPWX7jxXmKQdauz
+XN0fe+OjyJDuBGMGNYzj0X8RnQoFojc3w336l4u1sbYck/gKrzPTVy0j/zo3mFrb
+DjHQ48Bm3Kb2U3NPy4Bay2nLJyVNUA+yo2pDAQCr1Qk15XOwHF8tQemWUeWMSWqR
+zc2nUWHV6bteCu1wWQf8Cm0VhQUJSFoD5M9SxSoW1jJZmhgUMie/VFgWLYSf/Jt3
+lee5N7SZPkOJEI4xtgzXq9h7IusdUTGQ0TTeIbwjfcCEx4k8JKTRmS1X0VPWhLa5
+zyxUCuMPp7H5woAEan6Uf98hq9Btn1f+/7y07UPVGoxTNLYbPxCYIlyluEtU84po
+q2ObWJpjUWZ6egV99kML1nWBwqBG6MmcLQVXbNj69dL8/He60fu07pLNSShTEZ4x
+1gNKv0CWqmYFZ82rMejorODsqC3GbVD8oyAf5tP3M737Jwwbvm8G+dhZsNz1etvQ
+o2DhZqAhVd2zfeFEYkcZVq6ccn0HQuLtZ10weQ3+lggAhV/dWrVgY4enzHP+5rjn
+lVx/jrtk7cYC5EL5yD9+KqR7Qk5uQzb49AuqshnX0BCBdHohSwNQB6sYWPEPE/Pu
+f6yv/sylBJowUTyk/HzFyVed+GhqMkmkvCAlby+4x3XyTeMs6SQ/VjSeSrxUW/GB
+ikVKSoJJ/VZHCW9/EkgFTft4JjQvOdDct6EJWpZGXs8IQ9xUp1ZXzgMjOJDrqksS
+rsvzjxC9LEZ2SSomnBK1SePmP40OhXArCzzQJPqCDjb75M7N3AGPtpPCAzYxHWqf
+mkqkyAL3pLTi9MidLHOTA0RHSL3o0Bg4hkb8aoWT/zMFCJbpZeBVwj2XVJJyZFs6
+urQjR2xlYiBTbWlybm9mZiA8Z2xlYml1c0BGcmVlQlNELm9yZz6IgwQTEQgAKwIb
+AwUJE9+MgAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAlEJMqgCGQEACgkQUYUJ
+aGx+XoJEjAD/WR1FV3zTAIUh7WODpusveyFoD8yyj4+9SYpKyzOIYTkA/100uUkS
+Kljaq5ZQbi4HG14d1sVUlQfbkkk9IBXTT5aTuQINBFEJEjsQCADAd9dNiSLBOry0
+Zsefo3+SroPM4OREGxvoXfwb5vnsYybFSpL7Pw4G+nXxejetNZCBOuZVQcYXmZ2t
+Yw+mqjVWdw4z8YWq08arZmQQnReDnrxWx+o0dw6lr9cnUp6rlIb0+u8TVOn2n3aH
+0OhitsiNtF6AwkdikOy2LV+1fC/QVeC4LvZCv9ou4cDl5cHzYLHC5PAbInOR/h4s
+Kw0jLSdpu7SLKgW1fA6lFz1v9KjoM5wrXaBQafTzMHNPQk/soEt8weAwSx7AwZdV
+KBVL0Q4a3MVASR/aS4s6s3LI6BRyPUGUvTUD4HxO+9Fpjisl/uuEPfLx3vUyQGG9
+ecXLexYbAAMGB/9pOX8i5v0C7SkKfuChtEM24c6tr+Ax4X6+p4HIiMjRkLMG1Wtt
+IEf/71gwyfVfQpsTPJ1T+Nxz1OlRSsW7Kt/TQu1nXXN663/hwRFBYGfzC1y0jXEE
+isgKk8a6bWM/Mext1KkMiOqcMoXA7DfO7SSUQ0ll6+fgspCmlcQ0Vrtac35bhncT
+ITwr3ByZk2gZ3EyWcKvMQydGX04+9nJRWScbSrCNxS125+0fUGrOEw/DgZWVx0pl
+LiPlRQS26yFjsgFIXZ89nhyP04uNa4LAdwg1cAnM7Uu4la5I/RAyc49MPhRsYx7X
+spXMbphDiAd4g93YY8ET9gIIf8X5tmCAE7VJiGcEGBEIAA8FAlEJEjsCGwwFCRPf
+jIAACgkQUYUJaGx+XoIYOgD/YCabXZzzgRnhKzjzRN74aJcNvFHTceBXCnGtkzW/
+BfgA/1U9GK6yEjClcH/7BzF5D6f3arBmw5Embx8C0y/ToekH
+=EioC
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 18:05:13 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])
 by hub.freebsd.org (Postfix) with ESMTP id 245321F9;
 Wed, 30 Jan 2013 18:05:13 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F2F84C2D;
 Wed, 30 Jan 2013 18:05:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UI5CF3033130;
 Wed, 30 Jan 2013 18:05:12 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UI5C3C033128;
 Wed, 30 Jan 2013 18:05:12 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201301301805.r0UI5C3C033128@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 30 Jan 2013 18:05:12 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40829 - head/ja_JP.eucJP/books/handbook/mirrors
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 30 Jan 2013 18:05:13 -0000

Author: ryusuke
Date: Wed Jan 30 18:05:12 2013
New Revision: 40829
URL: http://svnweb.freebsd.org/changeset/doc/40829

Log:
  - Merge the following from the English version:
  
  	r40795 -> r40824	head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml	Wed Jan 30 16:36:59 2013	(r40828)
+++ head/ja_JP.eucJP/books/handbook/mirrors/chapter.xml	Wed Jan 30 18:05:12 2013	(r40829)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40795
+     Original revision: r40824
      $FreeBSD$
 -->
 
@@ -674,7 +674,7 @@
 	¤½¤ì¤¬ <command>svn</command> ¤Ë¤è¤Ã¤ÆÀ¸À®¤µ¤ì¤¿¤â¤Î¤Ç¤Ê¤±¤ì¤Ð¡¢
 	¥Á¥§¥Ã¥¯¥¢¥¦¥È¤¹¤ëÁ°¤Ë¡¢Ì¾Á°¤òÊѹ¹¤¹¤ë¤«ºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>svn checkout https://svn0.us-west.FreeBSD.org/head/ports /usr/ports</userinput></screen>
+      <screen>&prompt.root; <userinput>svn checkout https://svn0.us-west.FreeBSD.org/ports/head /usr/ports</userinput></screen>
 
       <para>½é¤á¤Æ¥Á¥§¥Ã¥¯¥¢¥¦¥È¤¹¤ëºÝ¤Ë¤Ï¡¢
 	¥ê¥â¡¼¥È¥ê¥Ý¥¸¥È¥ê¤Î¤¹¤Ù¤Æ¤Î¥Ö¥é¥ó¥Á¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Î¤Ç»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹¡£

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 19:20:58 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])
 by hub.freebsd.org (Postfix) with ESMTP id 6AFABCC7;
 Wed, 30 Jan 2013 19:20:58 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 436EAFA6;
 Wed, 30 Jan 2013 19:20:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UJKwCd057855;
 Wed, 30 Jan 2013 19:20:58 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UJKv7j057852;
 Wed, 30 Jan 2013 19:20:57 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201301301920.r0UJKv7j057852@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 30 Jan 2013 19:20:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40833 - in head/en_US.ISO8859-1/books/handbook:
 advanced-networking config kernelconfig
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 30 Jan 2013 19:20:58 -0000

Author: wblock
Date: Wed Jan 30 19:20:57 2013
New Revision: 40833
URL: http://svnweb.freebsd.org/changeset/doc/40833

Log:
  Remove mention of plip0, the parallel-port network device.  As Diane
  Bruce succintly explains it: "PLIP is obsolescent, blah blah blah."

Modified:
  head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
  head/en_US.ISO8859-1/books/handbook/config/chapter.xml
  head/en_US.ISO8859-1/books/handbook/kernelconfig/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 Jan 30 19:12:36 2013	(r40832)
+++ head/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Wed Jan 30 19:20:57 2013	(r40833)
@@ -45,10 +45,6 @@
       </listitem>
 
       <listitem>
-	<para>How to connect two computers via PLIP.</para>
-      </listitem>
-
-      <listitem>
 	<para>How to set up IPv6 on a FreeBSD machine.</para>
       </listitem>
 
@@ -5420,231 +5416,6 @@ redirect_port tcp 192.168.0.3:80 80</pro
     </sect2>
   </sect1>
 
-  <sect1 id="network-plip">
-    <title>Parallel Line IP (PLIP)</title>
-
-    <indexterm><primary>PLIP</primary></indexterm>
-    <indexterm>
-      <primary>Parallel Line IP</primary>
-      <see>PLIP</see>
-    </indexterm>
-
-    <para>PLIP lets us run TCP/IP between parallel ports.  It is
-      useful on machines without network cards, or to install on
-      laptops.  In this section, we will discuss:</para>
-
-    <itemizedlist>
-      <listitem>
-	<para>Creating a parallel (laplink) cable.</para>
-      </listitem>
-
-      <listitem>
-	<para>Connecting two computers with PLIP.</para>
-      </listitem>
-    </itemizedlist>
-
-    <sect2 id="network-create-parallel-cable">
-      <title>Creating a Parallel Cable</title>
-
-      <para>You can purchase a parallel cable at most computer supply
-	stores.  If you cannot do that, or you just want to know how
-	it is done, the following table shows how to make one out of a
-	normal parallel printer cable.</para>
-
-      <table frame="none">
-	<title>Wiring a Parallel Cable for Networking</title>
-
-	<tgroup cols="5">
-	  <thead>
-	    <row>
-	      <entry>A-name</entry>
-	      <entry>A-End</entry>
-	      <entry>B-End</entry>
-	      <entry>Descr.</entry>
-	      <entry>Post/Bit</entry>
-	    </row>
-	  </thead>
-
-	  <tbody>
-	    <row>
-	      <entry><literallayout>DATA0
--ERROR</literallayout></entry>
-
-	      <entry><literallayout>2
-
-15</literallayout></entry>
-
-	      <entry><literallayout>15
-
-2</literallayout></entry>
-
-	      <entry>Data</entry>
-
-	      <entry><literallayout>0/0x01
-1/0x08</literallayout></entry>
-	    </row>
-
-	    <row>
-	      <entry><literallayout>DATA1
-+SLCT</literallayout></entry>
-
-	      <entry><literallayout>3
-13</literallayout></entry>
-
-	      <entry><literallayout>13
-3</literallayout></entry>
-
-	      <entry>Data</entry>
-
-	      <entry><literallayout>0/0x02
-1/0x10</literallayout></entry>
-	    </row>
-
-	    <row>
-	      <entry><literallayout>DATA2
-+PE</literallayout></entry>
-
-	      <entry><literallayout>4
-12</literallayout></entry>
-
-	      <entry><literallayout>12
-4</literallayout></entry>
-
-	      <entry>Data</entry>
-
-	      <entry><literallayout>0/0x04
-1/0x20</literallayout></entry>
-	    </row>
-
-	    <row>
-	      <entry><literallayout>DATA3
--ACK</literallayout></entry>
-
-	      <entry><literallayout>5
-10</literallayout></entry>
-
-	      <entry><literallayout>10
-5</literallayout></entry>
-
-	      <entry>Strobe</entry>
-
-	      <entry><literallayout>0/0x08
-1/0x40</literallayout></entry>
-	    </row>
-
-	    <row>
-	      <entry><literallayout>DATA4
-BUSY</literallayout></entry>
-
-	      <entry><literallayout>6
-11</literallayout></entry>
-
-	      <entry><literallayout>11
-6</literallayout></entry>
-
-	      <entry>Data</entry>
-
-	      <entry><literallayout>0/0x10
-1/0x80</literallayout></entry>
-	    </row>
-
-	    <row>
-	      <entry>GND</entry>
-	      <entry>18-25</entry>
-	      <entry>18-25</entry>
-	      <entry>GND</entry>
-	      <entry>-</entry>
-	    </row>
-	  </tbody>
-	</tgroup>
-      </table>
-    </sect2>
-
-    <sect2 id="network-plip-setup">
-      <title>Setting Up PLIP</title>
-
-      <para>First, you have to get a laplink cable.  Then, confirm
-	that both computers have a kernel with &man.lpt.4; driver
-	support:</para>
-
-      <screen>&prompt.root; <userinput>grep lp /var/run/dmesg.boot</userinput>
-lpt0: &lt;Printer&gt; on ppbus0
-lpt0: Interrupt-driven port</screen>
-
-      <para>The parallel port must be an interrupt driven port, you
-	should have lines similar to the following in your in the
-	<filename>/boot/device.hints</filename> file:</para>
-
-      <programlisting>hint.ppc.0.at="isa"
-hint.ppc.0.irq="7"</programlisting>
-
-      <para>Then check if the kernel configuration file has a
-	<literal>device plip</literal> line or if the
-	<filename>plip.ko</filename> kernel module is loaded.  In both
-	cases the parallel networking interface should appear when you
-	use the &man.ifconfig.8; command to display it:</para>
-
-      <screen>&prompt.root; <userinput>ifconfig plip0</userinput>
-plip0: flags=8810&lt;POINTOPOINT,SIMPLEX,MULTICAST&gt; mtu 1500</screen>
-
-      <para>Plug the laplink cable into the parallel interface on
-	both computers.</para>
-
-      <para>Configure the network interface parameters on both sites
-	as <username>root</username>.  For example, if you want to
-	connect the host <hostid>host1</hostid> with another machine
-	<hostid>host2</hostid>:</para>
-
-      <programlisting>                 host1 &lt;-----&gt; host2
-IP Address    10.0.0.1      10.0.0.2</programlisting>
-
-      <para>Configure the interface on <hostid>host1</hostid> by
-	doing:</para>
-
-      <screen>&prompt.root; <userinput>ifconfig plip0 10.0.0.1 10.0.0.2</userinput></screen>
-
-      <para>Configure the interface on <hostid>host2</hostid> by
-	doing:</para>
-
-      <screen>&prompt.root; <userinput>ifconfig plip0 10.0.0.2 10.0.0.1</userinput></screen>
-
-      <para>You now should have a working connection.  Please read the
-	manual pages &man.lp.4; and &man.lpt.4; for more
-	details.</para>
-
-      <para>You should also add both hosts to
-	<filename>/etc/hosts</filename>:</para>
-
-      <programlisting>127.0.0.1               localhost.my.domain localhost
-10.0.0.1                host1.my.domain host1
-10.0.0.2                host2.my.domain host2</programlisting>
-
-      <para>To confirm the connection works, go to each host and ping
-	the other.  For example, on <hostid>host1</hostid>:</para>
-
-      <screen>&prompt.root; <userinput>ifconfig plip0</userinput>
-plip0: flags=8851&lt;UP,POINTOPOINT,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
-        inet 10.0.0.1 --&gt; 10.0.0.2 netmask 0xff000000
-&prompt.root; <userinput>netstat -r</userinput>
-Routing tables
-
-Internet:
-Destination        Gateway          Flags     Refs     Use      Netif Expire
-host2              host1            UH          0       0       plip0
-&prompt.root; <userinput>ping -c 4 host2</userinput>
-PING host2 (10.0.0.2): 56 data bytes
-64 bytes from 10.0.0.2: icmp_seq=0 ttl=255 time=2.774 ms
-64 bytes from 10.0.0.2: icmp_seq=1 ttl=255 time=2.530 ms
-64 bytes from 10.0.0.2: icmp_seq=2 ttl=255 time=2.556 ms
-64 bytes from 10.0.0.2: icmp_seq=3 ttl=255 time=2.714 ms
-
---- host2 ping statistics ---
-4 packets transmitted, 4 packets received, 0% packet loss
-round-trip min/avg/max/stddev = 2.530/2.643/2.774/0.103 ms</screen>
-
-    </sect2>
-  </sect1>
-
   <sect1 id="network-ipv6">
     <sect1info>
       <authorgroup>

Modified: head/en_US.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/config/chapter.xml	Wed Jan 30 19:12:36 2013	(r40832)
+++ head/en_US.ISO8859-1/books/handbook/config/chapter.xml	Wed Jan 30 19:20:57 2013	(r40833)
@@ -1060,7 +1060,6 @@ dc1: flags=8802&lt;UP,BROADCAST,RUNNING,
         inet 10.0.0.1 netmask 0xffffff00 broadcast 10.0.0.255
         media: Ethernet 10baseT/UTP
         status: no carrier
-plip0: flags=8810&lt;POINTOPOINT,SIMPLEX,MULTICAST&gt; metric 0 mtu 1500
 lo0: flags=8049&lt;UP,LOOPBACK,RUNNING,MULTICAST&gt; metric 0 mtu 16384
         options=3&lt;RXCSUM,TXCSUM&gt;
         inet6 fe80::1%lo0 prefixlen 64 scopeid 0x4
@@ -1083,12 +1082,6 @@ lo0: flags=8049&lt;UP,LOOPBACK,RUNNING,M
 	</listitem>
 
 	<listitem>
-	  <para><devicename>plip0</devicename>: The parallel port
-	    interface (if a parallel port is present on the
-	    machine)</para>
-	</listitem>
-
-	<listitem>
 	  <para><devicename>lo0</devicename>: The loopback
 	    device</para>
 	</listitem>

Modified: head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Wed Jan 30 19:12:36 2013	(r40832)
+++ head/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Wed Jan 30 19:20:57 2013	(r40833)
@@ -1164,11 +1164,6 @@ device          ppc</programlisting>
 	printer support.</para>
     </note>
 
-    <programlisting>device          plip       # TCP/IP over parallel</programlisting>
-
-    <para>This is the driver for the parallel network
-      interface.</para>
-
     <programlisting>device          ppi        # Parallel port interface device</programlisting>
 
     <para>The general-purpose I/O (<quote>geek port</quote>) +

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 21:17:47 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])
 by hub.freebsd.org (Postfix) with ESMTP id 1E8DD26E;
 Wed, 30 Jan 2013 21:17:47 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 110B9762;
 Wed, 30 Jan 2013 21:17:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0ULHklY092926;
 Wed, 30 Jan 2013 21:17:46 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0ULHkjr092925;
 Wed, 30 Jan 2013 21:17:46 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201301302117.r0ULHkjr092925@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 30 Jan 2013 21:17:46 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40836 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 30 Jan 2013 21:17:47 -0000

Author: eadler
Date: Wed Jan 30 21:17:46 2013
New Revision: 40836
URL: http://svnweb.freebsd.org/changeset/doc/40836

Log:
  As a follow to r40833 up to burn the plip FAQ with fire.
  
  Discussed with:	db
  Discussed with:	imp
  Approved by:	bcr (mentor, implicit)
  
     ("     )  )'     ,'
   .; )  ' (( (" )    ;(,
   _"., ,._'_.,)_(..,( . )

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Wed Jan 30 20:17:43 2013	(r40835)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Wed Jan 30 21:17:46 2013	(r40836)
@@ -5820,19 +5820,6 @@ Key F15        A        A        Menu Wo
       </qandaentry>
 
       <qandaentry>
-	<question id="parallel-connect">
-	  <para>How do I connect two &os; systems over a parallel line
-	    using PLIP?</para>
-	</question>
-
-	<answer>
-	  <para>Please see the <ulink
-	      url="&url.books.handbook;/network-plip.html">PLIP section</ulink>
-	    of the Handbook.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="ethernet-aliases">
 	  <para>How can I set up Ethernet aliases?</para>
 	</question>

From owner-svn-doc-head@FreeBSD.ORG  Wed Jan 30 21:59:25 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])
 by hub.freebsd.org (Postfix) with ESMTP id DE6872F2;
 Wed, 30 Jan 2013 21:59:25 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CEC70965;
 Wed, 30 Jan 2013 21:59:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0ULxPUM005257;
 Wed, 30 Jan 2013 21:59:25 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0ULxPrF005255;
 Wed, 30 Jan 2013 21:59:25 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201301302159.r0ULxPrF005255@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 30 Jan 2013 21:59:25 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40837 - in head/en_US.ISO8859-1/books/arch-handbook: isa
 pci
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, 30 Jan 2013 21:59:25 -0000

Author: wblock
Date: Wed Jan 30 21:59:25 2013
New Revision: 40837
URL: http://svnweb.freebsd.org/changeset/doc/40837

Log:
  Replace "{ 0, 0 }" with "DEVMETHOD_END" in isa and pci sample drivers.
  
  Submitted by:	sbz

Modified:
  head/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
  head/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml

Modified: head/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml	Wed Jan 30 21:17:46 2013	(r40836)
+++ head/en_US.ISO8859-1/books/arch-handbook/isa/chapter.xml	Wed Jan 30 21:59:25 2013	(r40837)
@@ -146,7 +146,7 @@
         DEVMETHOD(device_suspend,   xxx_isa_suspend),
         DEVMETHOD(device_resume,    xxx_isa_resume),
 
-	{ 0, 0 }
+	DEVMETHOD_END
     };
 
     static driver_t xxx_isa_driver = {

Modified: head/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml	Wed Jan 30 21:17:46 2013	(r40836)
+++ head/en_US.ISO8859-1/books/arch-handbook/pci/chapter.xml	Wed Jan 30 21:59:25 2013	(r40837)
@@ -37,7 +37,7 @@
 #include &lt;sys/conf.h&gt;		/* cdevsw struct */
 #include &lt;sys/uio.h&gt;		/* uio struct */
 #include &lt;sys/malloc.h&gt;
-#include &lt;sys/bus.h&gt;		/* structs, prototypes for pci bus stuff */
+#include &lt;sys/bus.h&gt;		/* structs, prototypes for pci bus stuff and DEVMETHOD macros! */
 
 #include &lt;machine/bus.h&gt;
 #include &lt;sys/rman.h&gt;
@@ -221,7 +221,7 @@ static device_method_t mypci_methods[] =
 	DEVMETHOD(device_suspend,	mypci_suspend),
 	DEVMETHOD(device_resume,	mypci_resume),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t mypci_devclass;

From owner-svn-doc-head@FreeBSD.ORG  Thu Jan 31 03:49:58 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])
 by hub.freebsd.org (Postfix) with ESMTP id DFCD511B;
 Thu, 31 Jan 2013 03:49:58 +0000 (UTC) (envelope-from kaduk@mit.edu)
Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU
 [18.9.25.14]) by mx1.freebsd.org (Postfix) with ESMTP id 454B37FB;
 Thu, 31 Jan 2013 03:49:57 +0000 (UTC)
X-AuditID: 1209190e-b7f266d0000008cb-d5-5109e9df7c53
Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])
 by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP id
 8C.41.02251.FD9E9015; Wed, 30 Jan 2013 22:49:51 -0500 (EST)
Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
 by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id r0V3npe4008456;
 Wed, 30 Jan 2013 22:49:51 -0500
Received: from multics.mit.edu (SYSTEM-LOW-SIPB.MIT.EDU [18.187.2.37])
 (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU)
 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id r0V3nmad012197
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
 Wed, 30 Jan 2013 22:49:50 -0500 (EST)
Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308)
 id r0V3nl61026982; Wed, 30 Jan 2013 22:49:47 -0500 (EST)
Date: Wed, 30 Jan 2013 22:49:47 -0500 (EST)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Eitan Adler <eadler@freebsd.org>
Subject: Re: svn commit: r40807 - head/en_US.ISO8859-1/htdocs
In-Reply-To: <201301292324.r0TNOdit094312@svn.freebsd.org>
Message-ID: <alpine.GSO.1.10.1301292239300.9389@multics.mit.edu>
References: <201301292324.r0TNOdit094312@svn.freebsd.org>
User-Agent: Alpine 1.10 (GSO 962 2008-03-14)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrAIsWRmVeSWpSXmKPExsUixG6nonv/JWegwaS9HBY/Ph5istj1dw6z
 xY1F+5ksdvf3MjuweMz4NJ8lgDGKyyYlNSezLLVI3y6BK6Nlxn3WgkcuFacP/mZsYFxo1sXI
 ySEhYCJx8vh6VghbTOLCvfVsILaQwD5GiVMbgWq4gOwNjBLNcxazQzgnmCQendvCCOE0MEqc
 vnsMqJ2Dg0VAW+LgLR+QbjYBFYmZbzaCTRIBsr/v/8kEYjMLREnsWdoItk1YwFZi+qo97CCt
 nAJWEu9mmYOEeQUcJC5N+csIcYSlxJ1Hz8FaRQV0JFbvn8ICUSMocXLmExaIkZYS/9b+Yp3A
 KDgLSWoWktQCRqZVjLIpuVW6uYmZOcWpybrFyYl5ealFusZ6uZkleqkppZsYQQHLKcm3g/Hr
 QaVDjAIcjEo8vBfsOAOFWBPLiitzDzFKcjApifKmXgUK8SXlp1RmJBZnxBeV5qQWH2KU4GBW
 EuFtvgiU401JrKxKLcqHSUlzsCiJ815JuekvJJCeWJKanZpakFoEk5Xh4FCS4N3zAqhRsCg1
 PbUiLTOnBCHNxMEJMpwHaPhnkBre4oLE3OLMdIj8KUZFKXGIZgGQREZpHlwvLKG8YhQHekWY
 9w5IFQ8wGcF1vwIazAQ02KiNHWRwSSJCSqqBUf52Pfsttf0yczq93lolWYms9+o5XF26NiWr
 v0dNzPplS8sLxZI3adETeA4/+ltlN9tO6eYe/9vM3NbtX5dPsHse//HtlUcqE3wdOCcKH4yr
 f36kZq9jwaaYqC5GGwHjmuvLG+XFt/G8nd8vLugsbfZE4bjxuVUHZLWXpOlvO/KnIPt8vfJ7
 JZbijERDLeai4kQArva/KQMDAAA=
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
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, 31 Jan 2013 03:49:59 -0000

Sorry this didn't come sooner; the latest draft with inline patch is still 
in my inbox waiting to be replied to.

On Tue, 29 Jan 2013, Eitan Adler wrote:

> Author: eadler
> Date: Tue Jan 29 23:24:39 2013
> New Revision: 40807
> URL: http://svnweb.freebsd.org/changeset/doc/40807
>
> Log:
>  Update and modernize the features.xml page
>
>  Translators take note: this is a full rewrite.  Starting with old
>  content will likely not be helpful.

I will trim large blocks of removed text from the quoted portion.

>  Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com>
>  Submitted by:	Isaac (.ike) Levy <ike@blackskyresearch.net>
>  Reviewed by:	-doc
>  Approved by:	bcr (mentor)
>
> Modified:
>  head/en_US.ISO8859-1/htdocs/features.xml
>
> Modified: head/en_US.ISO8859-1/htdocs/features.xml
> ==============================================================================
> --- head/en_US.ISO8859-1/htdocs/features.xml	Tue Jan 29 22:37:44 2013	(r40806)
> +++ head/en_US.ISO8859-1/htdocs/features.xml	Tue Jan 29 23:24:39 2013	(r40807)
> @@ -13,222 +13,120 @@
>
>     <body class="navinclude.about">
>
> -    <h1>FreeBSD offers many advanced features.</h1>
> +    <h1>&os; offers many unique features.</h1>
>
> +      <p>No matter what the application, you want your system's
> +	resources performing at their full potential.  &os;'s focus
> +	on performance, networking, and storage, combined with easy
> +	system administration and excellent documentation to allow

"easy system administration" feels like it lacks proper parallelism here; 
"its ease of system administration" is probably better.

> +	you to do what you want.</p>
>
>     <h2>A complete operating system based on 4.4BSD.</h2>
>
> +      <p>&os;'s distinguished roots derive from the <b>BSD</b>
> +	software releases from the Computer Systems Research Group at
> +	the University of California, Berkeley.  Over fifteen years of

FreeBSD 2.0 was 1995, no?  That would be seventeen years, which is not as 
round a number, I guess.

> +	work have been put into enhancing &os;, adding
> +	industry-leading scalability, network performance, management
> +	tools, file systems, and security features.  As a result,
> +	&os; may be found across the Internet, in the operating system
> +	of core router products, running root name servers, hosting
> +	major web sites, and as the foundation for widely used desktop
> +	operating systems.  This is only possible because of the
> +	diverse and world-wide membership of the
> +	volunteer &os; Project.</p>
> +
> +      <p><b>&os;&nbsp;9.0</b>, brings many new features
> +	and performance enhancements with a special focus on desktop
> +	support and security features.</p>
>
>       <ul>
> +	<li><b>Capsicum Capability Mode</b>:
> +	  Capsicum is a set of features for sandboxing support, using
> +	  a capability model in which the capabilities are file
> +	  descriptors.  Two new kernel options CAPABILITIES and
> +	  CAPABILITY_MODE have been added to the GENERIC kernel.</li>
> +
> +	<li><b>Hhook</b>:  (Helper Hook) and khelp(9) (Kernel Helpers)
> +	  KPIs have been implemented.  These are a kind of superset of
> +	  pfil(9) framework for more general use in the kernel.  The

This sentence's grammar is pretty lousy.  "kind of" should arguably 
removed, and there are other issues.

It's really too bad that we don't get entities for man pages, here (or do 
we?).  Hyperlinks would be handy.

> +	  hhook(9) KPI provides a way for kernel subsystems to export
> +	  hook points that khelp(9) modules can hook to provide
> +	  enhanced or new functionality to the kernel.  The khelp(9)
> +	  KPI provides a framework for managing khelp(9) modules,
> +	  which indirectly use the hhook(9) KPI to register their hook
> +	  functions with hook points of interest within the kernel.
> +	  These allow a structured way to dynamically extend the
> +	  kernel at runtime in an ABI preserving manner.</li>
> +	<li><b>Accounting API:</b> has been implemented.  It can keep
> +	  per-process, per-jail, and per-loginclass resource

login class takes a space (or a hyphen), at least in login.1.

> +	  accounting information.  Note that this is not built nor

I believe that "neither ... nor" is the more conventional usage.

> +	  installed by default.  To build and install them, specify

"this" (above) and "them" are inconsistent.

> +	  options RACCT in the kernel configuration file and rebuild

<tt class="LITERAL">?

> +	  the base system as described in the FreeBSD Handbook</li>

Could link to a more specific page...

> +
> +	<li><b>Resource-limiting API:</b> has been implemented.
> +	  It works in conjunction with the RACCT resource accounting
> +	  implementation and takes user-configurable actions based on
> +	  the set of rules it maintains and the current resource
> +	  usage.  The rctl(8) utility has been added to manage the
> +	  rules in userland.  Note that this is not built nor

"neither" again.

> +	  installed by default.</li>
> +
> +	<li><b>Usb:</b> subsystem now supports USB packet filter.

Not a complete sentence.

> +	  This allows to capture packets which go through each USB

"allows to capture" is very awkward.  "allows capturing" or similar?

> +	  host controller.  The implementation is almost based on
> +	  bpf(4) code.  The userland program usbdump(8) has been

This sentence does not realy convey any useful information.
Grabbing at straws, I think the intent is "The architecture of the packet 
filter is similar to that of bpf(4)."

> +	  added.</li>
> +
> +	<li><b>Infiniband support:</b>, OFED (OpenFabrics Enterprise
> +	  Distribution) version 1.5.3 has been imported into the
> +	  base system.</li>
> +	<li><b>TCP/IP network:</b> stack now supports the mod_cc(9)
> +	  pluggable congestion control framework.  This allows TCP

Not a complete sentence.

> +	  congestion control algorithms to be implemented as
> +	  dynamically loadable kernel modules.  The following kernel
> +	  modules are available cc_chd(4) for the CAIA-Hamilton-Delay

Some punctuation is neede before the list, most likely a colon.

> +	  algorithm, cc_cubic(4) for the CUBIC algorithm, cc_hd(4)
> +	  for the Hamilton-Delay algorithm, cc_htcp(4) for the H-TCP
> +	  algorithm, cc_newreno(4) for the NewReno algorithm, and
> +	  cc_vegas(4) for the Vegas algorithm.  The default algorithm
> +	  can be set by a new sysctl(8) variable
> +	  net.  inet.  tcp.  cc.  algorithm.</li>

Something seems horribly wrong with the formatting of this MIB entry.

> +
> +	<li><b>SU+J:</b> &os; Fast File System now supports soft
> +	updates with journaling.  It introduces an intent log into a

That's "FreeBSD's FFS" (possessive).

> +	softupdates-enabled file system which eliminates the need for
> +	background fsck(8) even on unclean shutdowns.</li>
>       </ul>
>
> +      <p><b>&os;&nbsp;8.x</b> brings many new

Whitespace looks funky here?

> +	features and performance enhancements.  With special focus on
> +	a new USB stack, &os;-8.x shipped with experimental support
> +	for NFSv4.  As well as a new TTY layer.  Which improves

Not a complete sentence.

> +	scalability and resources handling in SMP enabled systems.</p>

Nor this.

>
>       <ul>
> +	<li><b>Netisr framework:</b> has been reimplemented for
> +	  parallel threading support.  This is a kernel network

(Nor this.  The document seems to switch what format it uses for list 
entries midway through, it seems.)

> +	  dispatch interface which allows device drivers (and other
> +	  packet sources) to direct packets to protocols for directly
> +	  dispatched or deferred processing.  The new implementation
> +	  supports up to one netisr thread per CPU, and several
> +	  benchmarks on SMP machines show substantial performance
> +	  improvement over the previous version.</li>
> +
> +	<li><b>Linux emulation:</b> layer has been updated to version
> +	  2.  6.  16 and the default Linux infrastructure port is now

Looks like someone got too enthusiastic about french spacing at the end of 
sentences...

> +	  emulators/linux_base-f10 (Fedora 10)</li>

Markup for the port name?

> +	<li><b>Network Virtualization:</b> Container named vimage has

What does "container named vimage" mean?

> +	  been implemented, extending the FreeBSD kernel to maintain
> +	  multiple independent instances of networking state.
> +	  vimage facilities can be used independently to create fully

Sentence starts with a lowercase letter.

-Ben

> +	  virtualized network topologies, and jail(8) can directly
> +	  take advantage of a fully virtualized network stack.</li>
>       </ul>

From owner-svn-doc-head@FreeBSD.ORG  Thu Jan 31 03:54: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])
 by hub.freebsd.org (Postfix) with ESMTP id 2ADAC3F3
 for <svn-doc-head@freebsd.org>; Thu, 31 Jan 2013 03:54:53 +0000 (UTC)
 (envelope-from imp@bsdimp.com)
Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com
 [209.85.160.50]) by mx1.freebsd.org (Postfix) with ESMTP id EFDC2855
 for <svn-doc-head@freebsd.org>; Thu, 31 Jan 2013 03:54:52 +0000 (UTC)
Received: by mail-pb0-f50.google.com with SMTP id ro8so1376775pbb.9
 for <svn-doc-head@freebsd.org>; Wed, 30 Jan 2013 19:54:46 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=x-received:sender:subject:mime-version:content-type:from
 :in-reply-to:date:cc:content-transfer-encoding:message-id:references
 :to:x-mailer:x-gm-message-state;
 bh=p3OFqO4gSb5ckYt29p0rfYLWx1xuZOi7zLbcA1SrIPI=;
 b=KaWjkK3OZmi3tD6BfUg6DYqWTrdU4c9b4TTCgVwEHW44EQouZmfhNxtcIw8s89z6Vi
 cwql4ZnbPShYOu0LxtH5xuu1biUfdgQkj4nkiUV+uIGBgWlbE4AJz5mYi8ZcSs1EP04x
 JajI0qrmsXewpPxQeGcXXotqfhRs+MJagiXzDIx4lwXdmiAA3//3PsudKJWac8qu3Njy
 /LosayR5X4mZdOUtSXflBOQR5lRq5h0t/T/Z5Yhwm7YIYq9+Dj5npplD81udUCtY9LRU
 18J9qryxvfyU8ZSYFpJSV8M8MDxsSP60csfHgFIOeJtQg9cbTC+BYyMD0FTCBZJJ0Do7
 qX+Q==
X-Received: by 10.68.132.34 with SMTP id or2mr18358808pbb.133.1359604486275;
 Wed, 30 Jan 2013 19:54:46 -0800 (PST)
Received: from [10.0.0.53] (50-78-194-198-static.hfc.comcastbusiness.net.
 [50.78.194.198])
 by mx.google.com with ESMTPS id qh4sm3598611pbb.9.2013.01.30.19.54.44
 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
 Wed, 30 Jan 2013 19:54:45 -0800 (PST)
Sender: Warner Losh <wlosh@bsdimp.com>
Subject: Re: svn commit: r40807 - head/en_US.ISO8859-1/htdocs
Mime-Version: 1.0 (Apple Message framework v1085)
Content-Type: text/plain; charset=us-ascii
From: Warner Losh <imp@bsdimp.com>
In-Reply-To: <alpine.GSO.1.10.1301292239300.9389@multics.mit.edu>
Date: Wed, 30 Jan 2013 20:54:43 -0700
Content-Transfer-Encoding: quoted-printable
Message-Id: <CA4B6C93-1CC0-49AB-9BC5-9AAD76848B0B@bsdimp.com>
References: <201301292324.r0TNOdit094312@svn.freebsd.org>
 <alpine.GSO.1.10.1301292239300.9389@multics.mit.edu>
To: Benjamin Kaduk <kaduk@MIT.EDU>
X-Mailer: Apple Mail (2.1085)
X-Gm-Message-State: ALoCoQk+KCtuqmdx+43ze0BFd7GJ2nv+9bqdCO5k5Q3sn7TQ4sUy8gm+5ibpac+QAvLRuLXDCl1E
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org, Eitan Adler <eadler@freebsd.org>
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, 31 Jan 2013 03:54:53 -0000


On Jan 30, 2013, at 8:49 PM, Benjamin Kaduk wrote:

> Sorry this didn't come sooner; the latest draft with inline patch is =
still in my inbox waiting to be replied to.
>=20
> On Tue, 29 Jan 2013, Eitan Adler wrote:
>=20
>> Author: eadler
>> Date: Tue Jan 29 23:24:39 2013
>> New Revision: 40807
>> URL: http://svnweb.freebsd.org/changeset/doc/40807
>>=20
>> Log:
>> Update and modernize the features.xml page
>>=20
>> Translators take note: this is a full rewrite.  Starting with old
>> content will likely not be helpful.
>=20
> I will trim large blocks of removed text from the quoted portion.
>=20
>> Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com>
>> Submitted by:	Isaac (.ike) Levy <ike@blackskyresearch.net>
>> Reviewed by:	-doc
>> Approved by:	bcr (mentor)
>>=20
>> Modified:
>> head/en_US.ISO8859-1/htdocs/features.xml
>>=20
>> Modified: head/en_US.ISO8859-1/htdocs/features.xml
>> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
>> --- head/en_US.ISO8859-1/htdocs/features.xml	Tue Jan 29 22:37:44 2013	=
(r40806)
>> +++ head/en_US.ISO8859-1/htdocs/features.xml	Tue Jan 29 23:24:39 2013	=
(r40807)
>> @@ -13,222 +13,120 @@
>>=20
>>    <body class=3D"navinclude.about">
>>=20
>> -    <h1>FreeBSD offers many advanced features.</h1>
>> +    <h1>&os; offers many unique features.</h1>
>>=20
>> +      <p>No matter what the application, you want your system's
>> +	resources performing at their full potential.  &os;'s focus
>> +	on performance, networking, and storage, combined with easy
>> +	system administration and excellent documentation to allow
>=20
> "easy system administration" feels like it lacks proper parallelism =
here; "its ease of system administration" is probably better.
>=20
>> +	you to do what you want.</p>
>>=20
>>    <h2>A complete operating system based on 4.4BSD.</h2>
>>=20
>> +      <p>&os;'s distinguished roots derive from the <b>BSD</b>
>> +	software releases from the Computer Systems Research Group at
>> +	the University of California, Berkeley.  Over fifteen years of
>=20
> FreeBSD 2.0 was 1995, no?  That would be seventeen years, which is not =
as round a number, I guess.

FreeBSD 1.0 was in 1993. So over twenty years have been put into =
improving it.... =20

>> +	work have been put into enhancing &os;, adding
>> +	industry-leading scalability, network performance, management
>> +	tools, file systems, and security features.  As a result,
>> +	&os; may be found across the Internet, in the operating system
>> +	of core router products, running root name servers, hosting
>> +	major web sites, and as the foundation for widely used desktop
>> +	operating systems.  This is only possible because of the
>> +	diverse and world-wide membership of the
>> +	volunteer &os; Project.</p>
>> +
>> +      <p><b>&os;&nbsp;9.0</b>, brings many new features
>> +	and performance enhancements with a special focus on desktop
>> +	support and security features.</p>
>>=20
>>      <ul>
>> +	<li><b>Capsicum Capability Mode</b>:
>> +	  Capsicum is a set of features for sandboxing support, using
>> +	  a capability model in which the capabilities are file
>> +	  descriptors.  Two new kernel options CAPABILITIES and
>> +	  CAPABILITY_MODE have been added to the GENERIC kernel.</li>
>> +
>> +	<li><b>Hhook</b>:  (Helper Hook) and khelp(9) (Kernel Helpers)
>> +	  KPIs have been implemented.  These are a kind of superset of
>> +	  pfil(9) framework for more general use in the kernel.  The
>=20
> This sentence's grammar is pretty lousy.  "kind of" should arguably =
removed, and there are other issues.
>=20
> It's really too bad that we don't get entities for man pages, here (or =
do we?).  Hyperlinks would be handy.
>=20
>> +	  hhook(9) KPI provides a way for kernel subsystems to export
>> +	  hook points that khelp(9) modules can hook to provide
>> +	  enhanced or new functionality to the kernel.  The khelp(9)
>> +	  KPI provides a framework for managing khelp(9) modules,
>> +	  which indirectly use the hhook(9) KPI to register their hook
>> +	  functions with hook points of interest within the kernel.
>> +	  These allow a structured way to dynamically extend the
>> +	  kernel at runtime in an ABI preserving manner.</li>
>> +	<li><b>Accounting API:</b> has been implemented.  It can keep
>> +	  per-process, per-jail, and per-loginclass resource
>=20
> login class takes a space (or a hyphen), at least in login.1.
>=20
>> +	  accounting information.  Note that this is not built nor
>=20
> I believe that "neither ... nor" is the more conventional usage.
>=20
>> +	  installed by default.  To build and install them, specify
>=20
> "this" (above) and "them" are inconsistent.
>=20
>> +	  options RACCT in the kernel configuration file and rebuild
>=20
> <tt class=3D"LITERAL">?
>=20
>> +	  the base system as described in the FreeBSD Handbook</li>
>=20
> Could link to a more specific page...
>=20
>> +
>> +	<li><b>Resource-limiting API:</b> has been implemented.
>> +	  It works in conjunction with the RACCT resource accounting
>> +	  implementation and takes user-configurable actions based on
>> +	  the set of rules it maintains and the current resource
>> +	  usage.  The rctl(8) utility has been added to manage the
>> +	  rules in userland.  Note that this is not built nor
>=20
> "neither" again.
>=20
>> +	  installed by default.</li>
>> +
>> +	<li><b>Usb:</b> subsystem now supports USB packet filter.
>=20
> Not a complete sentence.
>=20
>> +	  This allows to capture packets which go through each USB
>=20
> "allows to capture" is very awkward.  "allows capturing" or similar?
>=20
>> +	  host controller.  The implementation is almost based on
>> +	  bpf(4) code.  The userland program usbdump(8) has been
>=20
> This sentence does not realy convey any useful information.
> Grabbing at straws, I think the intent is "The architecture of the =
packet filter is similar to that of bpf(4)."
>=20
>> +	  added.</li>
>> +
>> +	<li><b>Infiniband support:</b>, OFED (OpenFabrics Enterprise
>> +	  Distribution) version 1.5.3 has been imported into the
>> +	  base system.</li>
>> +	<li><b>TCP/IP network:</b> stack now supports the mod_cc(9)
>> +	  pluggable congestion control framework.  This allows TCP
>=20
> Not a complete sentence.
>=20
>> +	  congestion control algorithms to be implemented as
>> +	  dynamically loadable kernel modules.  The following kernel
>> +	  modules are available cc_chd(4) for the CAIA-Hamilton-Delay
>=20
> Some punctuation is neede before the list, most likely a colon.
>=20
>> +	  algorithm, cc_cubic(4) for the CUBIC algorithm, cc_hd(4)
>> +	  for the Hamilton-Delay algorithm, cc_htcp(4) for the H-TCP
>> +	  algorithm, cc_newreno(4) for the NewReno algorithm, and
>> +	  cc_vegas(4) for the Vegas algorithm.  The default algorithm
>> +	  can be set by a new sysctl(8) variable
>> +	  net.  inet.  tcp.  cc.  algorithm.</li>
>=20
> Something seems horribly wrong with the formatting of this MIB entry.
>=20
>> +
>> +	<li><b>SU+J:</b> &os; Fast File System now supports soft
>> +	updates with journaling.  It introduces an intent log into a
>=20
> That's "FreeBSD's FFS" (possessive).
>=20
>> +	softupdates-enabled file system which eliminates the need for
>> +	background fsck(8) even on unclean shutdowns.</li>
>>      </ul>
>>=20
>> +      <p><b>&os;&nbsp;8.x</b> brings many new
>=20
> Whitespace looks funky here?
>=20
>> +	features and performance enhancements.  With special focus on
>> +	a new USB stack, &os;-8.x shipped with experimental support
>> +	for NFSv4.  As well as a new TTY layer.  Which improves
>=20
> Not a complete sentence.
>=20
>> +	scalability and resources handling in SMP enabled systems.</p>
>=20
> Nor this.
>=20
>>=20
>>      <ul>
>> +	<li><b>Netisr framework:</b> has been reimplemented for
>> +	  parallel threading support.  This is a kernel network
>=20
> (Nor this.  The document seems to switch what format it uses for list =
entries midway through, it seems.)
>=20
>> +	  dispatch interface which allows device drivers (and other
>> +	  packet sources) to direct packets to protocols for directly
>> +	  dispatched or deferred processing.  The new implementation
>> +	  supports up to one netisr thread per CPU, and several
>> +	  benchmarks on SMP machines show substantial performance
>> +	  improvement over the previous version.</li>
>> +
>> +	<li><b>Linux emulation:</b> layer has been updated to version
>> +	  2.  6.  16 and the default Linux infrastructure port is now
>=20
> Looks like someone got too enthusiastic about french spacing at the =
end of sentences...
>=20
>> +	  emulators/linux_base-f10 (Fedora 10)</li>
>=20
> Markup for the port name?
>=20
>> +	<li><b>Network Virtualization:</b> Container named vimage has
>=20
> What does "container named vimage" mean?
>=20
>> +	  been implemented, extending the FreeBSD kernel to maintain
>> +	  multiple independent instances of networking state.
>> +	  vimage facilities can be used independently to create fully
>=20
> Sentence starts with a lowercase letter.
>=20
> -Ben
>=20
>> +	  virtualized network topologies, and jail(8) can directly
>> +	  take advantage of a fully virtualized network stack.</li>
>>      </ul>


From owner-svn-doc-head@FreeBSD.ORG  Thu Jan 31 04:24:59 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])
 by hub.freebsd.org (Postfix) with ESMTP id 69E4B85B;
 Thu, 31 Jan 2013 04:24:59 +0000 (UTC)
 (envelope-from wblock@wonkity.com)
Received: from wonkity.com (wonkity.com [67.158.26.137])
 by mx1.freebsd.org (Postfix) with ESMTP id 8445B964;
 Thu, 31 Jan 2013 04:24:58 +0000 (UTC)
Received: from wonkity.com (localhost [127.0.0.1])
 by wonkity.com (8.14.6/8.14.6) with ESMTP id r0V4Ov1s044051;
 Wed, 30 Jan 2013 21:24:57 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Received: from localhost (wblock@localhost)
 by wonkity.com (8.14.6/8.14.6/Submit) with ESMTP id r0V4OvE5044048;
 Wed, 30 Jan 2013 21:24:57 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Date: Wed, 30 Jan 2013 21:24:57 -0700 (MST)
From: Warren Block <wblock@wonkity.com>
To: Benjamin Kaduk <kaduk@MIT.EDU>
Subject: Re: svn commit: r40807 - head/en_US.ISO8859-1/htdocs
In-Reply-To: <alpine.GSO.1.10.1301292239300.9389@multics.mit.edu>
Message-ID: <alpine.BSF.2.00.1301302109430.44011@wonkity.com>
References: <201301292324.r0TNOdit094312@svn.freebsd.org>
 <alpine.GSO.1.10.1301292239300.9389@multics.mit.edu>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7
 (wonkity.com [127.0.0.1]); Wed, 30 Jan 2013 21:24:57 -0700 (MST)
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org, Eitan Adler <eadler@freebsd.org>
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, 31 Jan 2013 04:24:59 -0000

On Wed, 30 Jan 2013, Benjamin Kaduk wrote:

>> +      <p>No matter what the application, you want your system's
>> +	resources performing at their full potential.  &os;'s focus
>> +	on performance, networking, and storage, combined with easy
>> +	system administration and excellent documentation to allow
>
> "easy system administration" feels like it lacks proper parallelism here; 
> "its ease of system administration" is probably better.

The "its" is not necessary.  And "combined" is wrong for "to allow".

Incidentally, I personally dislike the "you want" at the start of this 
paragraph.  Docs or people are free to advise me, but should not be 
telling me what I want.  Since I am not feeling smart enough to avoid 
this, what the heck:

<p>No matter what the application, an operating system should take 
advantage of every resource available.  &os;'s focus on performance, 
networking, and storage combines with ease of system administration and 
comprehensive documentation to realize the full potential of any 
computer.</p>

From owner-svn-doc-head@FreeBSD.ORG  Thu Jan 31 05:04:04 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])
 by hub.freebsd.org (Postfix) with ESMTP id 4F862F3B
 for <svn-doc-head@freebsd.org>; Thu, 31 Jan 2013 05:04:04 +0000 (UTC)
 (envelope-from lists@eitanadler.com)
Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com
 [209.85.128.178]) by mx1.freebsd.org (Postfix) with ESMTP id DE854A9D
 for <svn-doc-head@freebsd.org>; Thu, 31 Jan 2013 05:04:03 +0000 (UTC)
Received: by mail-ve0-f178.google.com with SMTP id db10so1697573veb.23
 for <svn-doc-head@freebsd.org>; Wed, 30 Jan 2013 21:03:56 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=eitanadler.com; s=0xdeadbeef;
 h=x-received:mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type;
 bh=UvVNKMS94eSjK3duvQ6EiAW+gSZNMsR6EGZrIsWHvIQ=;
 b=XgbJQV+Tw6zNXvxX0H6q3hHE/L4rDmP6BGRvNSnk4WgqKHlCOrU+mzo2VIeq2ySAYw
 9AdzbHZU4jy7/9Jk9Ej3xB/Y6ZuWgwgGCZIEgQ/d9yI3SIW2D5HTUh/dADwsNqabdLAy
 4fOiKxoK1GZUXh8JUVj6Ek+gJCyEqEsm8j7RU=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=x-received:mime-version:sender:in-reply-to:references:from:date
 :x-google-sender-auth:message-id:subject:to:cc:content-type
 :x-gm-message-state;
 bh=UvVNKMS94eSjK3duvQ6EiAW+gSZNMsR6EGZrIsWHvIQ=;
 b=UYm8c7bm6G5qcGdkvlEhdWM4Nhu4keUomUZkPUuBdpuuUkkroT2ZR/DBchdxkUOvzQ
 vtvLcTvR4NkCqIU0MReeTUWf21O1ChUTtcr0bhQo/fgVKNGayLB6q4hMyTuc+iTaAc94
 4mrxl4k/7Vq6sa8ew6wHZ9XRf+kYUEyKVSFFPqniUGSzpIiIXsUeFoxr1ccOtqorwjnQ
 v+K7/DNnLGuN45TDBCFgeG32bFQmEHlep5ls6eVOj1vGTXCzom0AxoXN6/chyKjhB0eK
 oQlSAmt842yp31JWMBQr7rXZehRTJLz43U5XPl0MK5YLSRLXtZeQxMqnsSjVe536dXuL
 MJ/A==
X-Received: by 10.58.6.177 with SMTP id c17mr2721123vea.60.1359608636708; Wed,
 30 Jan 2013 21:03:56 -0800 (PST)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.220.195.70 with HTTP; Wed, 30 Jan 2013 21:03:26 -0800 (PST)
In-Reply-To: <alpine.GSO.1.10.1301292239300.9389@multics.mit.edu>
References: <201301292324.r0TNOdit094312@svn.freebsd.org>
 <alpine.GSO.1.10.1301292239300.9389@multics.mit.edu>
From: Eitan Adler <eadler@freebsd.org>
Date: Thu, 31 Jan 2013 00:03:26 -0500
X-Google-Sender-Auth: wMbDmyGz77YV-lPigJcqPjueqp8
Message-ID: <CAF6rxg=aCJDi_YSLUw9R64YhZYZrhXcxkqwdcw=W68CBtr8DXw@mail.gmail.com>
Subject: Re: svn commit: r40807 - head/en_US.ISO8859-1/htdocs
To: Benjamin Kaduk <kaduk@mit.edu>
Content-Type: text/plain; charset=UTF-8
X-Gm-Message-State: ALoCoQlMmNFhHlFXzQdl5lFQ+yubky0fIgEbU+5/3cDCZz5yaHsNGccK5sUK/NofBXb5asds97Xu
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
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, 31 Jan 2013 05:04:04 -0000

On 30 January 2013 22:49, Benjamin Kaduk <kaduk@mit.edu> wrote:
> Sorry this didn't come sooner; the latest draft with inline patch is still
> in my inbox waiting to be replied to.


Many thanks for this feedback.  Unfortunately, I barely have enough
time for any existing promised I've made and doubt I will get to fix
these issues for some weeks (or longer!)
I should be the one fixing my own work, but if you are able please
just commit the fixes you mentioned.


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

From owner-svn-doc-head@FreeBSD.ORG  Thu Jan 31 14:50:25 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])
 by hub.freebsd.org (Postfix) with ESMTP id 32455121;
 Thu, 31 Jan 2013 14:50:25 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 24997B02;
 Thu, 31 Jan 2013 14:50:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0VEoPOm012281;
 Thu, 31 Jan 2013 14:50:25 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0VEoO6c012280;
 Thu, 31 Jan 2013 14:50:24 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201301311450.r0VEoO6c012280@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 31 Jan 2013 14:50:24 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40844 - head/en_US.ISO8859-1/books/handbook/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 31 Jan 2013 14:50:25 -0000

Author: dru
Date: Thu Jan 31 14:50:24 2013
New Revision: 40844
URL: http://svnweb.freebsd.org/changeset/doc/40844

Log:
  Revert incorrect use of &os; and delete 2 extraneous spaces
  
  Approved by:  hrs (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Thu Jan 31 11:02:23 2013	(r40843)
+++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Thu Jan 31 14:50:24 2013	(r40844)
@@ -1882,7 +1882,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/
 	  or read the <filename>Makefile</filename> to find the
 	  maintainer's email address.  Remember to include the name
 	  and version of the port (send the
-	  <literal>&dollar;&os;:</literal> line from the
+	  <literal>&dollar;FreeBSD:</literal> line from the
 	  <filename>Makefile</filename>) and the output leading up to
 	  the error when you email the maintainer.</para>
 
@@ -1918,7 +1918,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/
       </listitem>
 
       <listitem>
-	<para>  Use &man.pkg.add.1; program to instead install the
+	<para>Use &man.pkg.add.1; program to instead install the
 	  package.</para>
       </listitem>
     </orderedlist>

From owner-svn-doc-head@FreeBSD.ORG  Thu Jan 31 14:54:58 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])
 by hub.freebsd.org (Postfix) with ESMTP id 3310C30F;
 Thu, 31 Jan 2013 14:54:58 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0CF7DB50;
 Thu, 31 Jan 2013 14:54:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0VEsv2k013040;
 Thu, 31 Jan 2013 14:54:57 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0VEsvO5013039;
 Thu, 31 Jan 2013 14:54:57 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201301311454.r0VEsvO5013039@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Thu, 31 Jan 2013 14:54:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40845 - head/en_US.ISO8859-1/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 31 Jan 2013 14:54:58 -0000

Author: rene
Date: Thu Jan 31 14:54:57 2013
New Revision: 40845
URL: http://svnweb.freebsd.org/changeset/doc/40845

Log:
  Mention more servers, desktop environments, and toolchains
  in the application overview.
  
  PR:		www/172694 (based on)
  Submitted by:	Chris Petrik
  Approved by:	gjb (mentor)

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

Modified: head/en_US.ISO8859-1/htdocs/applications.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/applications.xml	Thu Jan 31 14:50:24 2013	(r40844)
+++ head/en_US.ISO8859-1/htdocs/applications.xml	Thu Jan 31 14:54:57 2013	(r40845)
@@ -53,8 +53,10 @@
 	<li><b>Internet services. </b>Many Internet Service Providers (ISPs)
 	  find FreeBSD ideal, running WWW, Usenet news, FTP, Email, and other
 	  services.  Ready-to-run software like the <a
+	    href="http://nginx.org">nginx</a> or <a
 	    href="http://www.apache.org/">Apache</a> web server or the
 	  <a href="http://proftpd.org/">ProFTPD</a>
+	  or <a href="http://security.appspot.com/vsftpd.html">vsftpd</a>
 	  FTP&nbsp;server make it easy to set up a business or
 	  community-centered ISP.  Of course, with FreeBSD's unbeatable <a
 	    href="&base;/internet.html">networking</a>, your users will enjoy
@@ -68,9 +70,12 @@
 	  and the industry standard
 	  <a href="http://www.opengroup.org/motif/">Motif</a>&reg; and
 	  <a href="http://www.opengl.org/">OpenGL</a>&reg;
-	  libraries are supported.  Both the <a
+	  libraries are supported.  The <a
+	    href="http://xfce.org/">Xfce</a> and <a
+	    href="http://lxde.org/">LXDE</a> products provide a desktop
+	  environment.  The <a
 	    href="http://www.kde.org">KDE</a> and <a
-	    href="http://www.gnome.org">GNOME</a> desktop environments
+	    href="http://www.gnome.org">GNOME</a> desktop environments also
 	  enjoy full support and provide office suite functionality, with
 	  further good functionality available in the <a
 	    href="https://www.libreoffice.org/">LibreOffice</a>, <a
@@ -84,6 +89,8 @@
 
 	<li><b>Software development.</b> A suite of development tools comes
 	  with FreeBSD, including the GNU C/C++ compiler and debugger.
+	  The LLVM-based clang suite is also provided and will eventually
+	  replace the GNU suite.
 	  &java; and Tcl/Tk development are also
 	  possible for example, and more esoteric programming
 	  languages like Icon work just fine, too.  And FreeBSD's shared

From owner-svn-doc-head@FreeBSD.ORG  Thu Jan 31 14:56:28 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])
 by hub.freebsd.org (Postfix) with ESMTP id 0C88537D;
 Thu, 31 Jan 2013 14:56:28 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F21F8B61;
 Thu, 31 Jan 2013 14:56:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0VEuR11013300;
 Thu, 31 Jan 2013 14:56:27 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0VEuR6E013296;
 Thu, 31 Jan 2013 14:56:27 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201301311456.r0VEuR6E013296@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Thu, 31 Jan 2013 14:56:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40846 - in head/nl_NL.ISO8859-1/books/handbook:
 advanced-networking config kernelconfig mac
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, 31 Jan 2013 14:56:28 -0000

Author: rene
Date: Thu Jan 31 14:56:26 2013
New Revision: 40846
URL: http://svnweb.freebsd.org/changeset/doc/40846

Log:
  MFen the Dutch Handbook:
  - advanced-networking r40601 -> r40833
  - config r39914 -> r40833
  - kernelconfig r40820 -> r40833
  - mac r40819 -> r40823 (SRCID bump only, fix was already present)

Modified:
  head/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/config/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml

Modified: head/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Thu Jan 31 14:54:57 2013	(r40845)
+++ head/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Thu Jan 31 14:56:26 2013	(r40846)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%  en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
-     %SRCID%   40601
+     %SRCID%   40833
 -->
 
 <chapter id="advanced-networking">
@@ -58,10 +58,6 @@
       </listitem>
 
       <listitem>
-	<para>Hoe twee computers via PLIP met elkaar te verbinden.</para>
-      </listitem>
-
-      <listitem>
 	<para>Hoe IPv6 op een &os;-machine te installeren.</para>
       </listitem>
 
@@ -1281,7 +1277,7 @@ ifconfig_wlan0="DHCP"</programlisting>
 	    <para>Op dit moment kan de draadloze interface geactiveerd
 	      worden:</para>
 
-	    <screen>&prompt.root; <userinput>/etc/rc.d/netif start</userinput></screen>
+	    <screen>&prompt.root; <userinput>service netif start</userinput></screen>
 
 	    <para>Wanneer de interface draait, kan
 	      <command>ifconfig</command> gebruikt worden om de status
@@ -1405,7 +1401,7 @@ ifconfig_wlan0="WPA DHCP"</programlistin
 
 	    <para>Hierna kan de interface geactiveerd worden:</para>
 
-	    <screen>&prompt.root; <userinput><filename>/etc/rc.d/netif</filename> start</userinput>
+	    <screen>&prompt.root; <userinput><filename>service netif</filename> start</userinput>
 Starting wpa_supplicant.
 DHCPDISCOVER on wlan0 to 255.255.255.255 port 67 interval 5
 DHCPDISCOVER on wlan0 to 255.255.255.255 port 67 interval 6
@@ -1595,10 +1591,9 @@ wlan0: flags=8843&lt;UP,BROADCAST,RUNNIN
 	    <programlisting>wlans_ath0="wlan0"
 ifconfig_wlan0="WPA DHCP"</programlisting>
 
-	    <para>De volgende stap is het activeren van de interface met
-	      behulp van de faciliteit <filename>rc.c</filename>:</para>
+	    <para>De volgende stap is het activeren van de interface:</para>
 
-	    <screen>&prompt.root; <userinput>/etc/rc.d/netif start</userinput>
+	    <screen>&prompt.root; <userinput>service netif start</userinput>
 Starting wpa_supplicant.
 DHCPREQUEST on wlan0 to 255.255.255.255 port 67
 DHCPREQUEST on wlan0 to 255.255.255.255 port 67
@@ -1688,7 +1683,7 @@ ifconfig_ath0="WPA DHCP"</programlisting
 
 	    <para>De volgende stap is het activeren van de interface:</para>
 
-	    <screen>&prompt.root; <userinput>/etc/rc.d/netif start</userinput>
+	    <screen>&prompt.root; <userinput>service netif start</userinput>
 Starting wpa_supplicant.
 DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 7
 DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 15
@@ -1801,7 +1796,7 @@ ifconfig_wlan0="WPA DHCP"</programlistin
 
 	    <para>Hierna kan de interface worden geactiveerd:</para>
 
-	    <screen>&prompt.root; <userinput>/etc/rc.d/netif start</userinput>
+	    <screen>&prompt.root; <userinput>service netif start</userinput>
 Starting wpa_supplicant.
 DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 7
 DHCPREQUEST on wlan0 to 255.255.255.255 port 67 interval 15
@@ -2174,7 +2169,7 @@ wpa_pairwise=CCMP TKIP <co id="co-ap-wpa
 	  <para>De volgende stap is het starten van
 	    <application>hostapd</application>:</para>
 
-	  <screen>&prompt.root <userinput>/etc/rc.d/hostapd forcestart</userinput></screen>
+	  <screen>&prompt.root; <userinput>service hostapd forcestart</userinput></screen>
 
 	  <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable></userinput>
   wlan0: flags=8843&lt;UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST&gt; mtu 2290
@@ -2425,14 +2420,14 @@ ubt0: Interface 0 endpoints: interrupt=0
 ubt0: Interface 1 (alt.config 5) endpoints: isoc-in=0x83, isoc-out=0x3,
       wMaxPacketSize=49, nframes=6, buffer size=294</screen>
 
-      <para>Het script <filename>/etc/rc.d/bluetooth</filename> wordt
+      <para>&man.service.8; wordt
 	gebruikt om de Bluetooth-stack te starten en te stoppen.  Het is
 	een goed idee om de stack te stoppen voordat het apparaat wordt
 	losgekoppeld, maar het is (gewoonlijk) niet fataal.  Tijdens het
 	starten van de stack verschijnt er uitvoer vergelijkbaar met de
 	onderstaande:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/bluetooth start ubt0</userinput>
+      <screen>&prompt.root; <userinput>service bluetooth start ubt0</userinput>
 BD_ADDR: 00:02:72:00:d4:1a
 Features: 0xff 0xff 0xf 00 00 00 00 00
 &lt;3-Slot&gt; &lt;5-Slot&gt; &lt;Encryption&gt; &lt;Slot offset&gt;
@@ -2807,7 +2802,7 @@ Bluetooth Profile Descriptor List:
       <para>Het daemon <application>sdpd</application> kan worden
 	gestart met:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/sdpd start</userinput></screen>
+      <screen>&prompt.root; <userinput>service sdpd start</userinput></screen>
 
       <para>De plaatselijke servertoepassing die Bluetooth-diensten wil
 	aanbieden aan verre cliënten zal de dienst registreren bij
@@ -4357,7 +4352,7 @@ margaux:ha=0123456789ab:tc=.def100</prog
 	      <filename>/etc/rc.conf</filename> aanwezig te zijn voor de
 	      juiste werking van deze opdracht:</para>
 
-	    <screen>&prompt.root; <userinput>/etc/rc.d/inetd restart</userinput></screen>
+	    <screen>&prompt.root; <userinput>service inetd restart</userinput></screen>
 	  </step>
 	</procedure>
 
@@ -4399,7 +4394,7 @@ margaux:ha=0123456789ab:tc=.def100</prog
 	      waarschijnlijk gewenst om in plaats hiervan opnieuw op te
 	      starten.</para>
 
-	    <screen>&prompt.root; <userinput>/etc/rc.d/mountd restart</userinput></screen>
+	    <screen>&prompt.root; <userinput>service mountd restart</userinput></screen>
 	  </step>
 	</procedure>
       </sect3>
@@ -4642,7 +4637,7 @@ cd /usr/src/etc; make distribution</prog
 	<step>
 	  <para>Herstart de NFS-server:</para>
 
-	  <screen>&prompt.root; <userinput>/etc/rc.d/nfsd restart</userinput></screen>
+	  <screen>&prompt.root; <userinput>service nfsd restart</userinput></screen>
 	</step>
 
 	<step>
@@ -4660,7 +4655,7 @@ cd /usr/src/etc; make distribution</prog
 	<step>
 	  <para>Herstart inetd:</para>
 
-	  <screen>&prompt.root; <userinput>/etc/rc.d/inetd restart</userinput></screen>
+	  <screen>&prompt.root; <userinput>service inetd restart</userinput></screen>
 	</step>
 
 	<step>
@@ -5639,238 +5634,6 @@ redirect_port tcpc 192.168.0.3:80 80</pr
     </sect2>
   </sect1>
 
-  <sect1 id="network-plip">
-    <title>Parallel Line IP (PLIP)</title>
-
-    <indexterm><primary>PLIP</primary></indexterm>
-
-    <indexterm>
-      <primary>Parallel Line IP</primary>
-
-      <see>PLIP</see>
-    </indexterm>
-
-    <para>PLIP maakt het mogelijk om TCP/IP tussen parallelle poorten te
-      draaien.  Het is nuttig op machines zonder netwerkkaarten, of om
-      op laptops te installeren.  In deze sectie wordt besproken:</para>
-
-    <itemizedlist>
-      <listitem>
-	<para>Het maken van een parallelle (laplink) kabel.</para>
-      </listitem>
-
-      <listitem>
-	<para>Twee computers met PLIP verbinden.</para>
-      </listitem>
-    </itemizedlist>
-
-    <sect2 id="network-create-parallel-cable">
-      <title>Een parallelle kabel maken</title>
-
-      <para>Een parallelle is te koop in de meeste computerwinkels.
-	Wanneer dit niet mogelijk is, of indien de het gewenst is om te
-	weten hoe ze worden gemaakt, laat de volgende tabel zien hoe ze
-	met een gewone parallelle printerkabel gemaakt kunnen
-	worden.</para>
-
-      <table frame="none">
-	<title>Een parallelle kabel voor netwerken bedraden</title>
-
-	<tgroup cols="5">
-	  <thead>
-	    <row>
-	      <entry>A-naam</entry>
-
-	      <entry>A-einde</entry>
-
-	      <entry>B-einde</entry>
-
-	      <entry>Beschrijving</entry>
-
-	      <entry>Post/Bit</entry>
-	    </row>
-	  </thead>
-
-	  <tbody>
-	    <row>
-	      <entry><literallayout>DATA0
--ERROR</literallayout></entry>
-
-	      <entry><literallayout>2
-15</literallayout></entry>
-
-	      <entry><literallayout>15
-2</literallayout></entry>
-
-	      <entry>Gegevens</entry>
-
-	      <entry><literallayout>0/0x01
-1/0x08</literallayout></entry>
-	    </row>
-
-	    <row>
-	      <entry><literallayout>DATA1
-+SLCT</literallayout></entry>
-
-	      <entry><literallayout>3
-13</literallayout></entry>
-
-	      <entry><literallayout>13
-3</literallayout></entry>
-
-	      <entry>Gegevens</entry>
-
-	      <entry><literallayout>0/0x02
-1/0x10</literallayout></entry>
-	    </row>
-
-	    <row>
-	      <entry><literallayout>DATA2
-+PE</literallayout></entry>
-
-	      <entry><literallayout>4
-12</literallayout></entry>
-
-	      <entry><literallayout>12
-4</literallayout></entry>
-
-	      <entry>Gegevens</entry>
-
-	      <entry><literallayout>0/0x04
-1/0x20</literallayout></entry>
-	    </row>
-
-	    <row>
-	      <entry><literallayout>DATA3
--ACK</literallayout></entry>
-
-	      <entry><literallayout>5
-10</literallayout></entry>
-
-	      <entry><literallayout>10
-5</literallayout></entry>
-
-	      <entry>Strobe</entry>
-
-	      <entry><literallayout>0/0x08
-1/0x40</literallayout></entry>
-	    </row>
-
-	    <row>
-	      <entry><literallayout>DATA4
-BUSY</literallayout></entry>
-
-	      <entry><literallayout>6
-11</literallayout></entry>
-
-	      <entry><literallayout>11
-6</literallayout></entry>
-
-	      <entry>Gegevens</entry>
-
-	      <entry><literallayout>0/0x10
-1/0x80</literallayout></entry>
-	    </row>
-
-	    <row>
-	      <entry>GND</entry>
-
-	      <entry>18-25</entry>
-
-	      <entry>18-25</entry>
-
-	      <entry>GND</entry>
-
-	      <entry>-</entry>
-	    </row>
-	  </tbody>
-	</tgroup>
-      </table>
-    </sect2>
-
-    <sect2 id="network-plip-setup">
-      <title>PLIP opzetten</title>
-
-      <para>Als eerste dient er een laplink-kabel aanwezig te zijn.
-	Controleer vervolgens dat beide computers een kernel hebben met
-	ondersteuning voor het stuurprogramma &man.lpt.4;:</para>
-
-      <screen>&prompt.root; <userinput>grep lp /var/run/dmesg.boot</userinput>
-lpt0: &lt;Printer&gt; on ppbus0
-lpt0: Interrupt-driven port</screen>
-
-      <para>De parallelle poort dient een interrupt-gestuurde poort te
-	zijn, regels zoals de volgende dienen in het bestand
-	<filename>/boot/device.hints</filename> aanwezig te zijn:</para>
-
-      <programlisting>hint.ppc0.at="isa"
-hint.ppc0.irq="7"</programlisting>
-
-      <para>Controleer vervolgens dat het kernelinstellingenbestand een
-	regel <literal>device plip</literal> bevat of dat de
-	kernelmodule <filename>plip.ko</filename> is geladen.  In beide
-	gevallen dienen de parallelle netwerkinterfaces te verschijnen
-	wanneer het commando &man.ifconfig.8; gebruikt wordt om het weer
-	te geven:</para>
-
-      <screen>&prompt.root; <userinput>ifconfig plip0</userinput>
-plip0: flags=8810&lt;POINTOPOINT,SIMPLEX,MULTICAST&gt; mtu 1500</screen>
-
-      <para>Steek de laplink-kabel in de parallelle interface op beide
-	computers.</para>
-
-      <para>Stel als <username>root</username> op beide sites de
-	parameters voor de netwerkinterface in.  Bijvoorbeeld, indien
-	het gewenst is om host <hostid>host1</hostid> met een andere
-	machine <hostid>host2</hostid> te verbinden:</para>
-
-      <programlisting>                 host1 &lt;-----&gt; host2
-IP Address    10.0.0.1      10.0.0.2</programlisting>
-
-      <para>Stel de interface op <hostid>host1</hostid> in met:</para>
-
-      <screen>&prompt.root; <userinput>ifconfig plip0 10.0.0.1 10.0.0.2</userinput></screen>
-
-      <para>Stel de interface op <hostid>host2</hostid> in met:</para>
-
-      <screen>&prompt.root; <userinput>ifconfig plip0 10.0.0.2 10.0.0.1</userinput></screen>
-
-      <para>Er dient nu een werkende verbinding te zijn.  Lees voor meer
-	details de hulppagina's &man.lp.4; en &man.lpt.4;.</para>
-
-      <para>Ook dienen beide hosts aan <filename>/etc/hosts</filename>
-	toegevoegd te worden:</para>
-
-      <programlisting>127.0.0.1               localhost.mijn.domein localhost
-10.0.0.1                host1.mijn.domein host1
-10.0.0.2                host2.mijn.domein host2</programlisting>
-
-      <para>Ga naar elke host en ping de andere om te bevestigen dat de
-	verbinding werkt.  Bijvoorbeeld, op
-	<hostid>host1</hostid>:</para>
-
-      <screen>&prompt.root; <userinput>ifconfig plip0</userinput>
-plip0: flags=8851&lt;UP,POINTOPOINT,RUNNING,SIMPLEX,MULTICAST&gt; mtu 1500
-        inet 10.0.0.1 --&gt; 10.0.0.2 netmask 0xff000000
-&prompt.root; <userinput>netstat -r</userinput>
-Routing tables
-
-Internet:
-Destination        Gateway          Flags     Refs     Use      Netif Expire
-host2              host1            UH          0       0       plip0
-&prompt.root; <userinput>ping -c 4 host2</userinput>
-PING host2 (10.0.0.2): 56 data bytes
-64 bytes from 10.0.0.2: icmp_seq=0 ttl=255 time=2.774 ms
-64 bytes from 10.0.0.2: icmp_seq=1 ttl=255 time=2.530 ms
-64 bytes from 10.0.0.2: icmp_seq=2 ttl=255 time=2.556 ms
-64 bytes from 10.0.0.2: icmp_seq=3 ttl=255 time=2.714 ms
-
---- host2 ping statistics ---
-4 packets transmitted, 4 packets received, 0% packet loss
-round-trip min/avg/max/stddev = 2.530/2.643/2.774/0.103 ms</screen>
-    </sect2>
-  </sect1>
-
   <sect1 id="network-ipv6">
     <sect1info>
       <authorgroup>

Modified: head/nl_NL.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/config/chapter.xml	Thu Jan 31 14:54:57 2013	(r40845)
+++ head/nl_NL.ISO8859-1/books/handbook/config/chapter.xml	Thu Jan 31 14:56:26 2013	(r40846)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/config/chapter.xml
-     %SRCID%	39914
+     %SRCID%	40833
 -->
 
 <chapter id="config-tuning">
@@ -705,7 +705,7 @@ HOME=/var/log
       <filename>/usr/local/etc/rc.d</filename>.  &man.sshd.8; kan
       bijvoorbeeld als volgt herstart worden:</para>
 
-    <screen>&prompt.root; <userinput>/etc/rc.d/sshd restart</userinput></screen>
+    <screen>&prompt.root; <userinput>service restart</userinput></screen>
 
     <para>Deze procedure is vrijwel gelijk voor andere diensten.
       Uiteraard worden diensten meestal automatisch tijdens het
@@ -737,14 +737,14 @@ HOME=/var/log
       de instellingen in <filename>/etc/rc.conf</filename>, voldoet het
       volgende commando:</para>
 
-    <screen>&prompt.root; <userinput>/etc/rc.d/sshd onerestart</userinput></screen>
+    <screen>&prompt.root; <userinput>service sshd onerestart</userinput></screen>
 
     <para>Het is eenvoudig te controleren of een dienst is ingeschakeld
       is in <filename>/etc/rc.conf</filename> door het bijpassende
       <filename>rc.d</filename>-script uit te voeren met de optie
       <option>rcvar</option>.  Voor <command>sshd</command>:</para>
 
-    <screen>&prompt.root; <userinput>/etc/rc.d/sshd rcvar</userinput>
+    <screen>&prompt.root; <userinput>service sshd rcvar</userinput>
 # sshd
 $sshd_enable=YES</screen>
 
@@ -758,7 +758,7 @@ $sshd_enable=YES</screen>
       stellen of een dienst gestart is.  Om bijvoorbeeld te controleren
       of <command>sshd</command> gestart is:</para>
 
-    <screen>&prompt.root; <userinput>/etc/rc.d/sshd status</userinput>
+    <screen>&prompt.root; <userinput>service sshd status</userinput>
 sshd is running as pid 433.</screen>
 
     <para>In sommige gevallen is het ook mogelijk om een dienst te
@@ -1091,7 +1091,6 @@ dc1: flags=8802&lt;UP,BROADCAST,RUNNING,
         inet 10.0.0.1 netmask 0xffffff00 broadcast 10.0.0.255
         media: Ethernet 10baseT/UTP
         status: no carrier
-plip0: flags=8810&lt;POINTOPOINT,SIMPLEX,MULTICAST&gt; metric 0 mtu 1500
 lo0: flags=8049&lt;UP,LOOPBACK,RUNNING,MULTICAST&gt; metric 0 mtu 16384
         options=3&lt;RXCSUM,TXCSUM&gt;
         inet6 fe80::1%lo0 prefixlen 64 scopeid 0x4
@@ -1113,11 +1112,6 @@ lo0: flags=8049&lt;UP,LOOPBACK,RUNNING,M
 	</listitem>
 
 	<listitem>
-	  <para><devicename>plip0</devicename>: De parallele poort-interface
-	    (mits er een parallele poort aanwezig is op de machine)</para>
-	</listitem>
-
-	<listitem>
 	  <para><devicename>lo0</devicename>: het
 	    loopback-apparaat;</para>
 	</listitem>
@@ -1245,14 +1239,14 @@ ifconfig_dc1="inet 10.0.0.1 netmask 255.
 	foutmeldingen.  Als alternatief kan ook het netwerk systeem
 	herstart worden:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/netif restart</userinput></screen>
+      <screen>&prompt.root; <userinput>service netif restart</userinput></screen>
 
       <note>
 	<para>Als er ook een default gateway ingesteld is in het
 	  <filename>/etc/rc.conf</filename> bestand, moet ook onderstaand
 	  command worden gegeven:</para>
 
-	<screen>&prompt.root; <userinput>/etc/rc.d/routing restart</userinput></screen>
+	<screen>&prompt.root; <userinput>service routing restart</userinput></screen>
       </note>
 
       <para>Zodra het netwerk systeem is herstart, moeten de netwerk

Modified: head/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Thu Jan 31 14:54:57 2013	(r40845)
+++ head/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Thu Jan 31 14:56:26 2013	(r40846)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
-     %SRCID%	40820
+     %SRCID%	40833
 -->
 
 <chapter id="kernelconfig">
@@ -1229,11 +1229,6 @@ device    ppc</programlisting>
 	ondersteuning voor parallelle printers aan te zetten.</para>
     </note>
 
-    <programlisting>device    plip      # TCP/IP over parallel</programlisting>
-
-    <para>Dit is het stuurprogramma voor de parallelle
-      netwerkinterface.</para>
-
     <programlisting>device    ppi       # Parallelle poort interface apparaat</programlisting>
 
     <para>De algemene I/O (<quote>geek-poort</quote>) + IEEE1284 I/O.</para>

Modified: head/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml	Thu Jan 31 14:54:57 2013	(r40845)
+++ head/nl_NL.ISO8859-1/books/handbook/mac/chapter.xml	Thu Jan 31 14:56:26 2013	(r40846)
@@ -5,7 +5,7 @@
      $FreeBSD$
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/mac/chapter.xml
-     %SRCID%	40819
+     %SRCID%	40823
 -->
 
 <chapter id="mac">

From owner-svn-doc-head@FreeBSD.ORG  Fri Feb  1 14:20:41 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])
 by hub.freebsd.org (Postfix) with ESMTP id 5B1A6529;
 Fri,  1 Feb 2013 14:20:41 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1D79397B;
 Fri,  1 Feb 2013 14:20:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r11EKewN038875;
 Fri, 1 Feb 2013 14:20:41 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r11EKedk038874;
 Fri, 1 Feb 2013 14:20:40 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201302011420.r11EKedk038874@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 1 Feb 2013 14:20:40 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40854 - head/ja_JP.eucJP/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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: Fri, 01 Feb 2013 14:20:41 -0000

Author: ryusuke
Date: Fri Feb  1 14:20:40 2013
New Revision: 40854
URL: http://svnweb.freebsd.org/changeset/doc/40854

Log:
  - Merge the following from the English version:
  
  	r40446 -> r40845	head/ja_JP.eucJP/htdocs/applications.xml

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

Modified: head/ja_JP.eucJP/htdocs/applications.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/applications.xml	Fri Feb  1 13:21:13 2013	(r40853)
+++ head/ja_JP.eucJP/htdocs/applications.xml	Fri Feb  1 14:20:40 2013	(r40854)
@@ -4,7 +4,7 @@
 <!ENTITY title "FreeBSD ¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.35 -->
+<!-- Original revision: r40845 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
@@ -51,9 +51,11 @@
       <li><b>¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥µ¡¼¥Ó¥¹¡£</b>
 	¿¤¯¤Î¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À (ISP) ¤Ï¡¢
 	FreeBSD ¤¬ WWW, Usenet news, FTP, Email
-	¾¤Î¥µ¡¼¥Ó¥¹¤òÆ°¤«¤¹ÍýÁÛŪ¤Ê´Ä¶­¤Ç¤¢¤ë¤È¹Í¤¨¤Æ¤¤¤Þ¤¹¡£
+	¾¤Î¥µ¡¼¥Ó¥¹¤òÆ°¤«¤¹ÍýÁÛŪ¤Ê´Ä¶­¤Ç¤¢¤ë¤È¹Í¤¨¤Æ¤¤¤Þ¤¹¡£<a
+	  href="http://nginx.org">nginx</a> ¤Þ¤¿¤Ï
 	<a href="http://www.apache.org/">Apache</a>
-	¥¦¥§¥Ö¥µ¡¼¥Ð¤ä <a href="http://proftpd.org/">ProFTPD</a>
+	¥¦¥§¥Ö¥µ¡¼¥Ð¤ä <a href="http://proftpd.org/">ProFTPD</a> ¤Þ¤¿¤Ï
+	<a href="http://security.appspot.com/vsftpd.html">vsftpd</a>
 	FTP ¥µ¡¼¥Ð¤Ê¤É¨¼Â¹Ô²Äǽ¤Ê¥½¥Õ¥È¥¦¥§¥¢¤Ë¤è¤ê¡¢
 	¶È̳ÍѤä¼Ò²ñ´ðÈפȤ·¤Æ¤Î ISP ¤òÍưפ˽àÈ÷¤Ç¤­¤Þ¤¹¡£
 	¤â¤Á¤í¤ó¡¢FreeBSD ¤Î´è¶¯¤Ê<a href="&base;/internet.html">¥Í¥Ã¥È¥ï¡¼¥¯</a>¤Ë¤è¤ê¡¢
@@ -69,7 +71,9 @@
 	¤Þ¤¿¡¢¶È³¦É¸½à¤Ç¤¢¤ë
 	<a href="http://www.opengroup.org/motif/">Motif</a>&reg; ¤ä
 	<a href="http://www.opengl.org/">OpenGL</a>&reg;
-	¥é¥¤¥Ö¥é¥ê¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
+	¥é¥¤¥Ö¥é¥ê¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£<a
+	  href="http://xfce.org/">Xfce</a> ¤ª¤è¤Ó <a
+	  href="http://lxde.org/">LXDE</a> ¤Ï¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤òÄ󶡤·¤Þ¤¹¡£
 	<a href="http://www.kde.org">KDE</a> ¤ä
 	<a href="http://www.gnome.org">GNOME</a> ¥Ç¥¹¥¯¥È¥Ã¥×´Ä¶­¤Ë´°Á´¤ËÂбþ¤·¡¢
 	¥ª¥Õ¥£¥¹¥¹¥£¡¼¥È¤Îµ¡Ç½¤òÄ󶡤·¤Þ¤¹¡£
@@ -90,6 +94,7 @@
       <li><b>¥½¥Õ¥È¥¦¥§¥¢³«È¯¡£</b>
 	FreeBSD ¤Ë¤Ï³«È¯¥Ä¡¼¥ë°ì¼°¤¬ÍÑ°Õ¤µ¤ì¤Æ¤ª¤ê¡¢
 	GNU C/C++ ¥³¥ó¥Ñ¥¤¥é¡¢¥Ç¥Ð¥Ã¥¬¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
+	LLVM ¥Ù¡¼¥¹¤Î clang ¤â´Þ¤Þ¤ì¤Æ¤ª¤ê¡¢¾­ÍèŪ¤Ë¤Ï GNU ¥¹¥¤¡¼¥È¤òÃÖ¤­´¹¤¨¤ëͽÄê¤Ç¤¹¡£
 	&java; ¤ä Tcl/Tk ¤â¤Þ¤¿³«È¯²Äǽ¤Ç¡¢
 	Icon ¤Î¤è¤¦¤Ë¤è¤ê¿¼±ó¤Ê¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤â²÷Ŭ¤ËÆ°¤­¤Þ¤¹¡£
 	¤½¤·¤Æ¡¢FreeBSD ¤Î¶¦Í­¥é¥¤¥Ö¥é¥ê¤Ï¾ï¤ËºîÀ®¤È»ÈÍѤòÍưפˤ·¤Æ¤¤¤Þ¤¹¡£

From owner-svn-doc-head@FreeBSD.ORG  Fri Feb  1 15:57: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 [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0EDBE858;
 Fri,  1 Feb 2013 15:57:21 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DDD1BEDA;
 Fri,  1 Feb 2013 15:57:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r11FvKZo071183;
 Fri, 1 Feb 2013 15:57:20 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r11FvKFR071182;
 Fri, 1 Feb 2013 15:57:20 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201302011557.r11FvKFR071182@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Fri, 1 Feb 2013 15:57:20 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40855 - head/en_US.ISO8859-1/books/handbook/ports
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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: Fri, 01 Feb 2013 15:57:21 -0000

Author: dru
Date: Fri Feb  1 15:57:20 2013
New Revision: 40855
URL: http://svnweb.freebsd.org/changeset/doc/40855

Log:
  Fix grammo noticed by wblock.
  
  Approved by: gjb (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Fri Feb  1 14:20:40 2013	(r40854)
+++ head/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Fri Feb  1 15:57:20 2013	(r40855)
@@ -1918,7 +1918,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/
       </listitem>
 
       <listitem>
-	<para>Use &man.pkg.add.1; program to instead install the
+	<para>Use &man.pkg.add.1; to instead install the
 	  package.</para>
       </listitem>
     </orderedlist>

From owner-svn-doc-head@FreeBSD.ORG  Fri Feb  1 17:03:42 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])
 by hub.freebsd.org (Postfix) with ESMTP id 8689DC9B;
 Fri,  1 Feb 2013 17:03:42 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6CFB01FC;
 Fri,  1 Feb 2013 17:03:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r11H3g8P091847;
 Fri, 1 Feb 2013 17:03:42 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r11H3gc6091846;
 Fri, 1 Feb 2013 17:03:42 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201302011703.r11H3gc6091846@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Fri, 1 Feb 2013 17:03:42 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40856 - 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: Fri, 01 Feb 2013 17:03:42 -0000

Author: dru
Date: Fri Feb  1 17:03:41 2013
New Revision: 40856
URL: http://svnweb.freebsd.org/changeset/doc/40856

Log:
  This patch addresses the following:
  
  - replaces FreeBSD with &os;
  
  - rewording to address "you", redundancy, poor grammar, and verbosity
  
  - the console/login prompt was updated to amd64
  
  Approved by:  bcr (mentor)

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	Fri Feb  1 15:57:20 2013	(r40855)
+++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Fri Feb  1 17:03:41 2013	(r40856)
@@ -22,24 +22,22 @@
   <sect1 id="basics-synopsis">
     <title>Synopsis</title>
 
-    <para>The following chapter will cover the basic commands and
-      functionality of the FreeBSD operating system.  Much of this
-      material is relevant for any &unix;-like operating system.  Feel
-      free to skim over this chapter if you are familiar with the
-      material.  If you are new to FreeBSD, then you will definitely
-      want to read through this chapter carefully.</para>
+    <para>This chapter covers the basic commands and functionality of
+      the &os; operating system.  Much of this material is relevant
+      for any &unix;-like operating system.  New &os; users are
+      encouraged to read through this chapter carefully.</para>
 
     <para>After reading this chapter, you will know:</para>
 
     <itemizedlist>
       <listitem>
 	<para>How to use the <quote>virtual consoles</quote> of
-	  FreeBSD.</para>
+	  &os;.</para>
       </listitem>
 
       <listitem>
-	<para>How &unix; file permissions work along with
-	  understanding file flags in &os;.</para>
+	<para>How &unix; file permissions and &os; file flags
+	  work.</para>
       </listitem>
 
       <listitem>
@@ -87,186 +85,128 @@
     <indexterm><primary>virtual consoles</primary></indexterm>
     <indexterm><primary>terminals</primary></indexterm>
 
-    <para>FreeBSD can be used in various ways.  One of them is typing
+    <para>&os; can be used in various ways.  One of them is typing
       commands to a text terminal.  A lot of the flexibility and power
       of a &unix; operating system is readily available at your hands
-      when using FreeBSD this way.  This section describes what
+      when using &os; this way.  This section describes what
       <quote>terminals</quote> and <quote>consoles</quote> are, and
-      how you can use them in FreeBSD.</para>
+      how you can use them in &os;.</para>
 
     <sect2 id="consoles-intro">
       <title>The Console</title>
 
       <indexterm><primary>console</primary></indexterm>
 
-      <para>If you have not configured FreeBSD to automatically start
-	a graphical environment during startup, the system will
-	present you with a login prompt after it boots, right after
-	the startup scripts finish running.  You will see something
-	similar to:</para>
-
-      <screen>Additional ABI support:.
-Local package initialization:.
-Additional TCP options:.
-
-Fri Sep 20 13:01:06 EEST 2002
+      <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>
 
-FreeBSD/i386 (pc3.example.org) (ttyv0)
+      <screen>FreeBSD/amd64 (pc3.example.org) (ttyv0)
 
 login:</screen>
 
-      <para>The messages might be a bit different on your system, but
-	you will see something similar.  The last two lines are what
-	we are interested in right now.  The second last line
-	reads:</para>
-
-      <programlisting>FreeBSD/i386 (pc3.example.org) (ttyv0)</programlisting>
-
-      <para>This line contains some bits of information about the
-	system you have just booted.  You are looking at a
-	<quote>FreeBSD</quote> console, running on an Intel or
-	compatible processor of the x86 architecture<footnote>
-	  <para>This is what <literal>i386</literal> means.  Note that
-	    even if you are not running FreeBSD on an Intel 386 CPU,
-	    this is going to be <literal>i386</literal>.  It is not
-	    the type of your processor, but the processor
-	    <quote>architecture</quote> that is shown here.</para>
-	  </footnote>.  The name of this machine (every &unix; machine
-	has a name) is <hostid>pc3.example.org</hostid>, and you are
-	now looking at its system console&mdash;the
-	<devicename>ttyv0</devicename> terminal.</para>
-
-      <para>Finally, the last line is always:</para>
-
-      <programlisting>login:</programlisting>
-
-      <para>This is the part where you are supposed to type in your
-	<quote>username</quote> to log into FreeBSD.  The next section
-	describes how you can do this.</para>
+      <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>
+
+      <para>The second line is the login prompt.  The next section
+	describes how to log into &os; at this prompt.</para>
     </sect2>
 
     <sect2 id="consoles-login">
-      <title>Logging into FreeBSD</title>
+      <title>Logging into &os;</title>
 
-      <para>FreeBSD is a multiuser, multiprocessing system.  This is
+      <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 FreeBSD (and all the
+	<quote>user</quote> from the rest.  In &os; (and all the
 	&unix;-like operating systems), this is accomplished by
 	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>).  FreeBSD will ask
+	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>Right after FreeBSD boots and finishes running its startup
-	scripts<footnote>
-	  <para>Startup scripts are programs that are run
-	    automatically by FreeBSD when booting.  Their main
-	    function is to set things up for everything else to run,
-	    and start any services that you have configured to run in
-	    the background doing useful things.</para>
-	  </footnote>, it will present you with a prompt and ask for a
-	valid username:</para>
+      <para>When a &os; system boots, startup scripts are
+	automatically executed in order to prepare the system and to
+	start any services which have been configured to start at
+	system boot.  Once the system finishes running its startup
+	scripts, it will present a login prompt:</para>
 
       <screen>login:</screen>
 
-      <para>For the sake of this example, let us assume that your
-	username is <username>john</username>.  Type
-	<literal>john</literal> at this prompt and press
-	<keycap>Enter</keycap>.  You should then be presented with a
-	prompt to enter a <quote>password</quote>:</para>
-
-      <screen>login: <userinput>john</userinput>
-Password:</screen>
-
-      <para>Type in <username>john</username>'s password now, and
-	press <keycap>Enter</keycap>.  The password is
-	<emphasis>not echoed!</emphasis> You need not worry about this
-	right now.  Suffice it to say that it is done for security
+      <para>Type the username that was configured during <link
+	  linkend="bsdinstall-addusers">system installation</link> 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
 	reasons.</para>
 
-      <para>If you have typed your password correctly, you should by
-	now be logged into FreeBSD and ready to try out all the
+      <para>Once the correct password is input, the message of
+	the day (<acronym>MOTD</acronym>) will be displayed followed
+	by a command prompt (a <literal>#</literal>,
+	<literal>$</literal>, or <literal>%</literal> character).  You
+	are now logged into the &os; console and ready to try the
 	available commands.</para>
-
-      <para>You should see the <acronym>MOTD</acronym> or message of
-	the day followed by a command prompt (a <literal>#</literal>,
-	<literal>$</literal>, or <literal>%</literal> character).
-	This indicates you have successfully logged into
-	FreeBSD.</para>
     </sect2>
 
     <sect2 id="consoles-virtual">
-      <title>Multiple Consoles</title>
+      <title>Virtual Consoles</title>
 
-      <para>Running &unix; commands in one console is fine, but
-	FreeBSD can run many programs at once.  Having one console
-	where commands can be typed would be a bit of a waste when an
-	operating system like FreeBSD can run dozens of programs at
-	the same time.  This is where <quote>virtual consoles</quote>
-	can be very helpful.</para>
-
-      <para>FreeBSD can be configured to present you with many
-	different virtual consoles.  You can switch from one of them
-	to any other virtual console by pressing a couple of keys on
-	your keyboard.  Each console has its own different output
-	channel, and FreeBSD takes care of properly redirecting
-	keyboard input and monitor output as you switch from one
-	virtual console to the next.</para>
-
-      <para>Special key combinations have been reserved by FreeBSD for
-	switching consoles<footnote>
-	  <para>A fairly technical and accurate description of all the
-	    details of the FreeBSD console and keyboard drivers can be
-	    found in the manual pages of &man.syscons.4;,
-	    &man.atkbd.4;, &man.vidcontrol.1; and &man.kbdcontrol.1;.
-	    We will not expand on the details here, but the interested
-	    reader can always consult the manual pages for a more
-	    detailed and thorough explanation of how things
-	    work.</para>
-	  </footnote>.  You can use
+      <para>&os; can be configured to provide many virtual consoles
+	for inputting commands.  Each virtual console has its own
+	login prompt and output channel, and &os; takes care of
+	properly redirecting keyboard input and monitor output as you
+	switch between virtual consoles.</para>
+
+      <para>Special key combinations have been reserved by &os; for
+	switching consoles.<footnote>
+	  <para>Refer to &man.syscons.4;, &man.atkbd.4;,
+	    &man.vidcontrol.1; and &man.kbdcontrol.1; for a more
+	    technical description of the &os; console and its keyboard
+	    drivers.</para></footnote>.  Use
 	<keycombo><keycap>Alt</keycap><keycap>F1</keycap></keycombo>,
 	<keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo>,
 	through
 	<keycombo><keycap>Alt</keycap><keycap>F8</keycap></keycombo>
-	to switch to a different virtual console in FreeBSD.</para>
+	to switch to a different virtual console in &os;.</para>
 
-      <para>As you are switching from one console to the next, FreeBSD
-	takes care of saving and restoring the screen output.  The
-	result is an <quote>illusion</quote> of having multiple
-	<quote>virtual</quote> screens and keyboards that you can use
-	to type commands for FreeBSD to run.  The programs that you
-	launch on one virtual console do not stop running when that
-	console is not visible.  They continue running when you have
-	switched to a different virtual console.</para>
+      <para>When switching from one console to the next, &os; takes
+	care of saving and restoring the screen output.  The result is
+	an <quote>illusion</quote> of having multiple
+	<quote>virtual</quote> screens and keyboards that can be used
+	to type commands for &os; to run.  The programs that are
+	launched in one virtual console do not stop running when that
+	console is not visible because the user has switched to a
+	different virtual console.</para>
     </sect2>
 
     <sect2 id="consoles-ttys">
       <title>The <filename>/etc/ttys</filename> File</title>
 
-      <para>The default configuration of FreeBSD will start up with
-	eight virtual consoles.  This is not a hardwired setting
-	though, and you can easily customize your installation to boot
-	with more or fewer virtual consoles.  The number and settings
-	of the virtual consoles are configured in the
-	<filename>/etc/ttys</filename> file.</para>
-
-      <para>You can use the <filename>/etc/ttys</filename> file to
-	configure the virtual consoles of FreeBSD.  Each uncommented
-	line in this file (lines that do not start with a
-	<literal>#</literal> character) contains settings for a single
-	terminal or virtual console.  The default version of this file
-	that ships with FreeBSD configures nine virtual consoles, and
-	enables eight of them.  They are the lines that start with
-	<literal>ttyv</literal>:</para>
+      <para>By default, &os; is configured to start eight virtual
+	consoles.  The configuration can be customized to start
+	more or fewer virtual consoles.  To change the number of and
+	the settings of the virtual consoles, edit
+	<filename>/etc/ttys</filename>.</para>
+
+      <para>Each uncommented line in <filename>/etc/ttys</filename>
+	(lines that do not start with a <literal>#</literal>
+	character) contains settings for a single terminal or virtual
+	console.  The default version configures nine virtual
+	consoles, and enables eight of them.  They are the lines that
+	start with <literal>ttyv</literal>:</para>
 
-      <programlisting># name  getty                           type    status          comments
+      <programlisting># name    getty                         type  status comments
 #
 ttyv0   "/usr/libexec/getty Pc"         cons25  on  secure
 # Virtual terminals
@@ -280,73 +220,69 @@ ttyv7   "/usr/libexec/getty Pc"         
 ttyv8   "/usr/X11R6/bin/xdm -nodaemon"  xterm   off secure</programlisting>
 
       <para>For a detailed description of every column in this file
-	and all the options you can use to set things up for the
-	virtual consoles, consult the &man.ttys.5; manual page.</para>
+	and the available options for the virtual consoles, refer to
+	&man.ttys.5;.</para>
     </sect2>
 
     <sect2 id="consoles-singleuser">
       <title>Single User Mode Console</title>
 
-      <para>A detailed description of what
-	<quote>single user mode</quote> is can be found in
-	<xref linkend="boot-singleuser"/>.  It is worth noting that
-	there is only one console when you are running FreeBSD in
-	single user mode.  There are no virtual consoles available.
-	The settings of the single user mode console can also be found
-	in the <filename>/etc/ttys</filename> file.  Look for the line
-	that starts with <literal>console</literal>:</para>
+      <para>A detailed description of <quote>single user mode</quote>
+	can be found <link linkend="boot-singleuser">here</link>.
+	There is only one console when &os; is in single user mode as
+	no other virtual consoles are available in this mode.  The
+	settings for single user mode are found in this section of
+	<filename>/etc/ttys</filename>:</para>
 
-      <programlisting># name  getty                           type    status          comments
+      <programlisting># name  getty                           type  status  comments
 #
 # If console is marked "insecure", then init will ask for the root password
 # when going to single-user mode.
-console none                            unknown off secure</programlisting>
+console none                            unknown  off  secure</programlisting>
 
       <note>
 	<para>As the comments above the <literal>console</literal>
-	  line indicate, you can edit this line and change
-	  <literal>secure</literal> to <literal>insecure</literal>.
-	  If you do that, when FreeBSD boots into single user mode, it
-	  will still ask for the <username>root</username>
-	  password.</para>
+	  line indicate, editing <literal>secure</literal> to
+	  <literal>insecure</literal> will prompt for the
+	  <username>root</username> password when booting into single
+	  user mode.  The default setting enters single user mode
+	  without prompting for a password.</para>
 
-	<para><emphasis>Be careful when changing this to
+	<para><emphasis>Be careful when changing this setting to
 	    <literal>insecure</literal></emphasis>.  If you ever
 	  forget the <username>root</username> password, booting into
-	  single user mode is a bit involved.  It is still possible,
-	  but it might be a bit hard for someone who is not very
-	  comfortable with the FreeBSD booting process and the
-	  programs involved.</para>
+	  single user mode is still possible, but may be difficult for
+	  someone who is not comfortable with the &os; booting
+	  process.</para>
       </note>
     </sect2>
 
     <sect2 id="consoles-vidcontrol">
       <title>Changing Console Video Modes</title>
 
-      <para>The FreeBSD console default video mode may be adjusted to
-	1024x768, 1280x1024, or any other size supported by your
+      <para>The &os; console default video mode may be adjusted to
+	1024x768, 1280x1024, or any other size supported by the
 	graphics chip and monitor.  To use a different video mode
 	load the <literal>VESA</literal> module:</para>
 
       <screen>&prompt.root; <userinput>kldload vesa</userinput></screen>
 
-      <para>Then determine what video modes are supported
-	by your hardware by using &man.vidcontrol.1;.  To
-	get a list of supported video modes issue the
-	following:</para>
+      <para>To determine which video modes are supported by the
+	hardware, use &man.vidcontrol.1;.  To get a list of supported
+	video modes issue the following:</para>
 
       <screen>&prompt.root; <userinput>vidcontrol -i mode</userinput></screen>
 
-      <para>The output of this command is a list of video modes that
-	are supported by your hardware.  You can then choose to use a
-	new video mode by passing it to &man.vidcontrol.1; in a
-	<username>root</username> console:</para>
+      <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>
 
       <screen>&prompt.root; <userinput>vidcontrol MODE_279</userinput></screen>
 
       <para>If the new video mode is acceptable, it can be permanently
-	set on boot by setting it in the
-	<filename>/etc/rc.conf</filename> file:</para>
+	set on boot by adding it to
+	<filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>allscreens_flags="MODE_279"</programlisting>
     </sect2>
@@ -357,13 +293,13 @@ console none                            
 
     <indexterm><primary>UNIX</primary></indexterm>
 
-    <para>FreeBSD, being a direct descendant of BSD &unix;, is based
+    <para>&os;, being a direct descendant of BSD &unix;, is based
       on several key &unix; concepts.  The first and most pronounced
-      is that FreeBSD is a multi-user operating system.  The system
-      can handle several users all working simultaneously on
-      completely unrelated tasks.  The system is responsible for
-      properly sharing and managing requests for hardware devices,
-      peripherals, memory, and CPU time fairly to each user.</para>
+      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
+      CPU time fairly to each user.</para>
 
     <para>Because the system is capable of supporting multiple users,
       everything the system manages has a set of permissions governing
@@ -443,69 +379,59 @@ console none                            
     </indexterm>
     <indexterm><primary>directories</primary></indexterm>
 
-    <para>You can use the <option>-l</option> command line
-      argument to &man.ls.1; to view a long directory listing that
-      includes a column with information about a file's permissions
-      for the owner, group, and everyone else.  For example, a
-      <command>ls -l</command> in an arbitrary directory may
-      show:</para>
+    <para>Use the <option>-l</option> argument to &man.ls.1; to view a
+      long directory listing that includes a column of information
+      about a file's permissions for the owner, group, and everyone
+      else.  For example, a <command>ls -l</command> in an arbitrary
+      directory may show:</para>
 
     <screen>&prompt.user; <userinput>ls -l</userinput>
 total 530
 -rw-r--r--  1 root  wheel     512 Sep  5 12:31 myfile
 -rw-r--r--  1 root  wheel     512 Sep  5 12:31 otherfile
--rw-r--r--  1 root  wheel    7680 Sep  5 12:31 email.txt
-...</screen>
+-rw-r--r--  1 root  wheel    7680 Sep  5 12:31 email.txt</screen>
 
-    <para>Here is how the first column of <command>ls -l</command> is
-      broken up:</para>
-
-    <screen>-rw-r--r--</screen>
-
-    <para>The first (leftmost) character tells if this file is a
-      regular file, a directory, a special character device, a socket,
-      or any other special pseudo-file device.  In this case, the
-      <literal>-</literal> indicates a regular file.  The next three
-      characters, <literal>rw-</literal> in this example, give the
-      permissions for the owner of the file.  The next three
-      characters, <literal>r--</literal>, give the permissions for the
-      group that the file belongs to.  The final three characters,
-      <literal>r--</literal>, give the permissions for the rest of the
-      world.  A dash means that the permission is turned off.  In the
-      case of this file, the permissions are set so the owner can read
-      and write to the file, the group can read the file, and the rest
-      of the world can only read the file.  According to the table
-      above, the permissions for this file would be
-      <literal>644</literal>, where each digit represents the three
-      parts of the file's permission.</para>
-
-    <para>This is all well and good, but how does the system control
-      permissions on devices? FreeBSD actually treats most hardware
-      devices as a file that programs can open, read, and write data
-      to just like any other file.  These special device files are
-      stored on the <filename>/dev</filename> directory.</para>
+    <para>The first (leftmost) character in the first column indicates
+      whether this file is a regular file, a directory, a special
+      character device, a socket, or any other special pseudo-file
+      device.  In this example, the <literal>-</literal> indicates a
+      regular file.  The next three characters, <literal>rw-</literal>
+      in this example, give the permissions for the owner of the file.
+      The next three characters, <literal>r--</literal>, give the
+      permissions for the group that the file belongs to.  The final
+      three characters, <literal>r--</literal>, give the permissions
+      for the rest of the world.  A dash means that the permission is
+      turned off.  In this example, the permissions are set so the
+      owner can read and write to the file, the group can read the
+      file, and the rest of the world can only read the file.
+      According to the table above, the permissions for this file
+      would be <literal>644</literal>, where each digit represents the
+      three parts of the file's permission.</para>
+
+    <para>How does the system control permissions on devices? &os;
+      treats most hardware devices as a file that programs can open,
+      read, and write data to.  These special device files are
+      stored in <filename class="directory">/dev/</filename>.</para>
 
     <para>Directories are also treated as files.  They have read,
       write, and execute permissions.  The executable bit for a
       directory has a slightly different meaning than that of files.
-      When a directory is marked executable, it means it can be
-      traversed into, that is, it is possible to <quote>cd</quote>
-      (change directory) into it.  This also means that within the
-      directory it is possible to access files whose names are known
-      (subject, of course, to the permissions on the files
-      themselves).</para>
-
-    <para>In particular, in order to perform a directory listing, read
-      permission must be set on the directory, whilst to delete a file
-      that one knows the name of, it is necessary to have write
+      When a directory is marked executable, it means it is possible
+      to change into that directory using
+      <application>cd</application>.  This also means that it is
+      possible to access the files within that directory, subject to
+      the permissions on the files themselves.</para>
+
+    <para>In order to perform a directory listing, the read permission
+      must be set on the directory.  In order to delete a file that
+      one knows the name of, it is necessary to have write
       <emphasis>and</emphasis> execute permissions to the directory
       containing the file.</para>
 
     <para>There are more permission bits, but they are primarily used
       in special circumstances such as setuid binaries and sticky
-      directories.  If you want more information on file permissions
-      and how to set them, be sure to look at the &man.chmod.1; manual
-      page.</para>
+      directories.  For more information on file permissions and how
+      to set them, refer to &man.chmod.1;.</para>
 
     <sect2>
       <sect2info>
@@ -525,11 +451,11 @@ total 530
 	<secondary>symbolic</secondary>
       </indexterm>
 
-      <para>Symbolic permissions, sometimes referred to as symbolic
-	expressions, use characters in place of octal values to assign
-	permissions to files or directories.  Symbolic expressions use
-	the syntax of (who) (action) (permissions), where the
-	following values are available:</para>
+      <para>Symbolic permissions use characters instead of octal
+	values to assign permissions to files or directories.
+	Symbolic permissions use the syntax of (who) (action)
+	(permissions), where the following values are
+	available:</para>
 
       <informaltable frame="none" pgwide="1">
 	<tgroup cols="3">
@@ -617,18 +543,18 @@ total 530
 	</tgroup>
       </informaltable>
 
-      <para>These values are used with the &man.chmod.1; command
-	just like before, but with letters.  For an example, you could
-	use the following command to block other users from accessing
+      <para>These values are used with &man.chmod.1;, but with
+	letters instead of numbers.  For example, the following
+	command would block other users from accessing
 	<replaceable>FILE</replaceable>:</para>
 
       <screen>&prompt.user; <userinput>chmod go= FILE</userinput></screen>
 
       <para>A comma separated list can be provided when more than one
-	set of changes to a file must be made.  For example the
-	following command will remove the group and
+	set of changes to a file must be made.  For example, the
+	following command removes the group and
 	<quote>world</quote> write permission on
-	<replaceable>FILE</replaceable>, then it adds the execute
+	<replaceable>FILE</replaceable>, and adds the execute
 	permissions for everyone:</para>
 
       <screen>&prompt.user; <userinput>chmod go-w,a+x <replaceable>FILE</replaceable></userinput></screen>
@@ -653,43 +579,37 @@ total 530
 
       <title>&os; File Flags</title>
 
-      <para>In addition to file permissions discussed previously, &os;
-	supports the use of <quote>file flags.</quote> These flags add
-	an additional level of security and control over files, but
-	not directories.</para>
-
-      <para>These file flags add an additional level of control over
-	files, helping to ensure that in some cases not even the
-	<username>root</username> can remove or alter files.</para>
-
-      <para>File flags are altered by using the &man.chflags.1;
-	utility, using a simple interface.  For example, to enable the
-	system undeletable flag on the file
+      <para>In addition to file permissions, &os; supports the use of
+	<quote>file flags</quote>.  These flags add an additional
+	level of security and control over files, but not
+	directories.  With file flags, even
+	<username>root</username> can be prevented from removing or
+	altering files.</para>
+
+      <para>File flags are modified using &man.chflags.1;.  For
+	example, to enable the system undeletable flag on the file
 	<filename>file1</filename>, issue the following
 	command:</para>
 
       <screen>&prompt.root; <userinput>chflags sunlink <filename>file1</filename></userinput></screen>
 
-      <para>And to disable the system undeletable flag,
-	issue the previous command with <quote>no</quote> in
-	front of the <option>sunlink</option>.  Observe:</para>
+      <para>To disable the system undeletable flag, put a
+	<quote>no</quote> in front of the
+	<option>sunlink</option>:</para>
 
       <screen>&prompt.root; <userinput>chflags nosunlink <filename>file1</filename></userinput></screen>
 
-      <para>To view the flags of this file, use the &man.ls.1; command
-	with the <option>-lo</option> flags:</para>
+      <para>To view the flags of a file, use <option>-lo</option> with
+	&man.ls.1;:</para>
 
       <screen>&prompt.root; <userinput>ls -lo <filename>file1</filename></userinput></screen>
 
-      <para>The output should look like the following:</para>
-
       <programlisting>-rw-r--r--  1 trhodes  trhodes  sunlnk 0 Mar  1 05:54 file1</programlisting>
 
-      <para>Several flags may only added or removed to files by the
+      <para>Several file flags may only added or removed by the
 	<username>root</username> user.  In other cases, the file
-	owner may set these flags.  It is recommended that
-	administrators read over the &man.chflags.1; and
-	&man.chflags.2; manual pages for more information.</para>
+	owner may set its file flags.  Refer to &man.chflags.1; and
+	&man.chflags.2; for more information.</para>
     </sect2>
 
     <sect2>
@@ -709,56 +629,54 @@ total 530
       <para>Other than the permissions already discussed, there are
 	three other specific settings that all administrators should
 	know about.  They are the <literal>setuid</literal>,
-	<literal>setgid</literal> and <literal>sticky</literal>
+	<literal>setgid</literal>, and <literal>sticky</literal>
 	permissions.</para>
 
       <para>These settings are important for some &unix; operations
 	as they provide functionality not normally granted to normal
 	users.  To understand them, the difference between the real
-	user ID and effective user ID must also be noted.</para>
+	user ID and effective user ID must be noted.</para>
 
       <para>The real user ID is the <acronym>UID</acronym> who owns
 	or starts the process.  The effective <acronym>UID</acronym>
-	is the user ID the process runs as.  As an example, the
-	&man.passwd.1; utility runs with the real user ID as the
-	user changing their password; however, to manipulate the
-	password database, it runs as the effective ID of the
-	<username>root</username> user.  This is what allows normal
-	users to change their passwords without seeing a
+	is the user ID the process runs as.  As an example,
+	&man.passwd.1; runs with the real user ID when a user changes
+	their password.  However, in order to update the password
+	database, the command runs as the effective ID of the
+	<username>root</username> user.  This allows users to change
+	their passwords without seeing a
 	<errorname>Permission Denied</errorname> error.</para>
 
-      <note>
-	<para>The <literal>nosuid</literal> &man.mount.8; option will
-	  cause these binaries to silently fail.  That is, they will
-	  fail to execute without ever alerting the user.  That option
-	  is also not completely reliable as a
-	  <literal>nosuid</literal> wrapper may be able to circumvent
-	  it; according to the &man.mount.8; manual page.</para>
-      </note>
-
       <para>The setuid permission may be set by prefixing a permission
 	set with the number four (4) as shown in the following
 	example:</para>
 
       <screen>&prompt.root; <userinput>chmod 4755 suidexample.sh</userinput></screen>
 
-      <para>The permissions on the
+      <para>The permissions on
 	<filename><replaceable>suidexample.sh</replaceable></filename>
-	file should now look like the following:</para>
+	now look like the following:</para>
 
       <programlisting>-rwsr-xr-x   1 trhodes  trhodes    63 Aug 29 06:36 suidexample.sh</programlisting>
 
-      <para>It should be noticeable from this example that an
-	<literal>s</literal> is now part of the permission set
-	designated for the file owner, replacing the executable
-	bit.  This allows utilities which need elevated permissions,
-	such as <command>passwd</command>.</para>
+      <para>Note that a <literal>s</literal> is now part of the
+	permission set designated for the file owner, replacing the
+	executable bit.  This allows utilities which need elevated
+	permissions, such as <command>passwd</command>.</para>
+
+      <note>
+	<para>The <literal>nosuid</literal> &man.mount.8; option will
+	  cause such binaries to silently fail without alerting
+	  the user.  That option is not completely reliable as a
+	  <literal>nosuid</literal> wrapper may be able to circumvent
+	  it.</para>
+      </note>
 
       <para>To view this in real time, open two terminals.  On
 	one, start the <command>passwd</command> process as a normal
 	user.  While it waits for a new password, check the process
-	table and look at the user information of the
-	<command>passwd</command> command.</para>
+	table and look at the user information for
+	<command>passwd</command>:</para>
 
       <para>In terminal A:</para>
 
@@ -779,17 +697,17 @@ root     5211  0.0  0.2  3620  1724   2 
       <para>The <literal>setgid</literal> permission performs the
 	same function as the <literal>setuid</literal> permission;
 	except that it alters the group settings.  When an application
-	or utility is ran with this setting, it will be granted the
-	permissions based on the group that owns the file, not
-	the user who started the process.</para>
+	or utility executes with this setting, it will be granted the
+	permissions based on the group that owns the file, not the
+	user who started the process.</para>
 
       <para>To set the <literal>setgid</literal> permission on a
-	file, provide the <command>chmod</command> command with a
-	leading two (2) as in the following example:</para>
+	file, provide <command>chmod</command> with a leading two
+	(2):</para>
 
       <screen>&prompt.root; <userinput>chmod 2755 sgidexample.sh</userinput></screen>
 
-      <para>The new setting may be viewed as before, notice the
+      <para>In the following listing, notice that the
 	<literal>s</literal> is now in the field designated for the
 	group permission settings:</para>
 
@@ -803,33 +721,29 @@ root     5211  0.0  0.2  3620  1724   2 
 	  &man.setuid.2; system calls.</para>
       </note>
 
-      <para>The first two special permission bits we discussed
-	(the <literal>setuid</literal> and <literal>setgid</literal>
-	permission bits) may lower system security, by allowing for
-	elevated permissions.  There is a third special permission bit
-	that can strengthen the security of a system: the
-	<literal>sticky bit</literal>.</para>
-
-      <para>The <literal>sticky bit</literal>, when set on a
-	directory, allows file deletion only by the file owner.  This
-	permission set is useful to prevent file deletion in public
-	directories, such as
-	<filename class="directory">/tmp</filename>, by users who do
-	not own the file.  To utilize this permission, prefix the
-	permission with a one (1).  For example:</para>
+      <para>The <literal>setuid</literal> and
+	<literal>setgid</literal> permission bits may lower system
+	security, by allowing for elevated permissions.  The third
+	special permission, the <literal>sticky bit</literal>, can
+	strengthen the security of a system.</para>
+
+      <para>When the <literal>sticky bit</literal> is set on a
+	directory, it allows file deletion only by the file owner.
+	This is useful to prevent file deletion in public directories,
+	such as <filename class="directory">/tmp</filename>, by users
+	who do not own the file.  To utilize this permission, prefix
+	the permission set with a one (1):</para>
 
       <screen>&prompt.root; <userinput>chmod 1777 /tmp</userinput></screen>
 
-      <para>Now, it is possible to see the effect by using the
-	<command>ls</command> command:</para>
+      <para>The <literal>sticky bit</literal> permission will display
+	as a <literal>t</literal> at the very end of the permission
+	set:</para>
 
       <screen>&prompt.root; <userinput>ls -al / | grep tmp</userinput></screen>
 
       <screen>drwxrwxrwt  10 root  wheel         512 Aug 31 01:49 tmp</screen>
 
-      <para>The <literal>sticky bit</literal> permission is
-	distinguishable from the <literal>t</literal> at the very
-	end of the set.</para>
     </sect2>
   </sect1>
 
@@ -838,35 +752,35 @@ root     5211  0.0  0.2  3620  1724   2 
 
     <indexterm><primary>directory hierarchy</primary></indexterm>
 
-    <para>The FreeBSD directory hierarchy is fundamental to obtaining
+    <para>The &os; directory hierarchy is fundamental to obtaining
       an overall understanding of the system.  The most important
-      concept to grasp is that of the root directory,
-      <quote>/</quote>.  This directory is the first one mounted at
-      boot time and it contains the base system necessary to prepare
-      the operating system for multi-user operation.  The root
-      directory also contains mount points for other file systems that
-      are mounted during the transition to multi-user
-      operation.</para>
+      directory is root or, <quote>/</quote>.  This directory is the
+      first one mounted at boot time and it contains the base system
+      necessary to prepare the operating system for multi-user
+      operation.  The root directory also contains mount points for
+      other file systems that are mounted during the transition to
+      multi-user operation.</para>
 
     <para>A mount point is a directory where additional file systems
       can be grafted onto a parent file system (usually the root file
-      system).  This is further described in
-      <xref linkend="disk-organization"/>.  Standard mount points
-      include <filename>/usr</filename>, <filename>/var</filename>,
-      <filename>/tmp</filename>, <filename>/mnt</filename>, and
-      <filename>/cdrom</filename>.  These directories are usually
-      referenced to entries in the file
-      <filename>/etc/fstab</filename>.
-      <filename>/etc/fstab</filename> is a table of various file
-      systems and mount points for reference by the system.  Most of
-      the file systems in <filename>/etc/fstab</filename> are mounted
-      automatically at boot time from the script &man.rc.8; unless
-      they contain the <option>noauto</option> option.  Details can be
-      found in <xref linkend="disks-fstab"/>.</para>
+      system).  This is further described in <xref
+	linkend="disk-organization"/>.  Standard mount points
+      include <filename class="directory">/usr/</filename>,
+      <filename class="directory">/var/</filename>,
+      <filename class="directory">/tmp/</filename>,
+      <filename class="directory">/mnt/</filename>, and
+      <filename class="directory">/cdrom/</filename>.  These
+      directories are usually referenced to entries in
+      <filename>/etc/fstab</filename>.  This file is a table of
+      various file systems and mount points and is read by the system.
+      Most of the file systems in <filename>/etc/fstab</filename> are
+      mounted automatically at boot time from the script &man.rc.8;
+      unless their entry includes <option>noauto</option>.  Details
+      can be found in <xref linkend="disks-fstab"/>.</para>
 
     <para>A complete description of the file system hierarchy is
-      available in &man.hier.7;.  For now, a brief overview of the
-      most common directories will suffice.</para>
+      available in &man.hier.7;.  The following table provides a brief
+      overview of the most common directories.</para>
 
     <para>
       <informaltable frame="none" pgwide="1">
@@ -900,14 +814,15 @@ root     5211  0.0  0.2  3620  1724   2 
 	    <row>
 	      <entry><filename
 		  class="directory">/boot/defaults/</filename></entry>
-	      <entry>Default bootstrapping configuration files; see
-		&man.loader.conf.5;.</entry>
+	      <entry>Default boot configuration files.  Refer to
+		&man.loader.conf.5; for details.</entry>
 	    </row>
 
 	    <row>
 	      <entry><filename
 		  class="directory">/dev/</filename></entry>
-	      <entry>Device nodes; see &man.intro.4;.</entry>
+	      <entry>Device nodes.  Refer to &man.intro.4; for
+		details.</entry>
 	    </row>
 
 	    <row>
@@ -919,8 +834,8 @@ root     5211  0.0  0.2  3620  1724   2 
 	    <row>
 	      <entry><filename
 		  class="directory">/etc/defaults/</filename></entry>
-	      <entry>Default system configuration files; see
-		&man.rc.8;.</entry>
+	      <entry>Default system configuration files.  Refer to
+		&man.rc.8; for details.</entry>
 	    </row>
 
 	    <row>
@@ -933,22 +848,23 @@ root     5211  0.0  0.2  3620  1724   2 
 	    <row>
 	      <entry><filename
 		  class="directory">/etc/namedb/</filename></entry>
-	      <entry><command>named</command> configuration files; see
-		&man.named.8;.</entry>
+	      <entry><command>named</command> configuration files.
+		Refer to &man.named.8; for details.</entry>
 	    </row>
 
 	    <row>
 	      <entry><filename
 		  class="directory">/etc/periodic/</filename></entry>
-	      <entry>Scripts that are run daily, weekly, and monthly,
-		via &man.cron.8;; see &man.periodic.8;.</entry>
+	      <entry>Scripts that run daily, weekly, and monthly,
+		via &man.cron.8;.  Refer to &man.periodic.8; for
+		details.</entry>
 	    </row>
 
 	    <row>
 	      <entry><filename
 		  class="directory">/etc/ppp/</filename></entry>
-	      <entry><command>ppp</command> configuration files; see
-		&man.ppp.8;.</entry>
+	      <entry><command>ppp</command> configuration files as
+		described in &man.ppp.8;.</entry>
 	    </row>
 
 	    <row>
@@ -961,15 +877,15 @@ root     5211  0.0  0.2  3620  1724   2 
 	    <row>
 	      <entry><filename
 		  class="directory">/proc/</filename></entry>
-	      <entry>Process file system; see &man.procfs.5;,
-		&man.mount.procfs.8;.</entry>
+	      <entry>Process file system.  Refer to &man.procfs.5;,
+		&man.mount.procfs.8; for details.</entry>
 	    </row>
 
 	    <row>
 	      <entry><filename
 		  class="directory">/rescue/</filename></entry>
 	      <entry>Statically linked programs for emergency
-		recovery; see &man.rescue.8;.</entry>
+		recovery as described in &man.rescue.8;.</entry>
 	    </row>
 
 	    <row>
@@ -990,15 +906,14 @@ root     5211  0.0  0.2  3620  1724   2 
 	    <row>
 	      <entry><filename
 		  class="directory">/tmp/</filename></entry>
-	      <entry>Temporary files.  The contents of
-		<filename class="directory">/tmp</filename> are
-		usually NOT preserved across a system reboot.  A
-		memory-based file system is often mounted at
-		<filename class="directory">/tmp</filename>.  This can
-		be automated using the tmpmfs-related variables of
-		&man.rc.conf.5; (or with an entry in
-		<filename>/etc/fstab</filename>; see
-		&man.mdmfs.8;).</entry>
+	      <entry>Temporary files which are usually
+		<emphasis>not</emphasis> preserved across a system
+		reboot.  A memory-based file system is often mounted
+		at <filename class="directory">/tmp</filename>.  This
+		can be automated using the tmpmfs-related variables of
+		&man.rc.conf.5; or with an entry in
+		<filename>/etc/fstab</filename>; refer to
+		&man.mdmfs.8; for details.</entry>
 	    </row>
 
 	    <row>
@@ -1037,15 +952,15 @@ root     5211  0.0  0.2  3620  1724   2 
 	    <row>
 	      <entry><filename
 		  class="directory">/usr/libexec/</filename></entry>
-	      <entry>System daemons &amp; system utilities (executed
-		by other programs).</entry>
+	      <entry>System daemons and system utilities executed
+		by other programs.</entry>
 	    </row>
 
 	    <row>
 	      <entry><filename
 		  class="directory">/usr/local/</filename></entry>
-	      <entry>Local executables, libraries, etc.  Also used as
-		the default destination for the FreeBSD ports
+	      <entry>Local executables and libraries.  Also used as
+		the default destination for the &os; ports
 		framework.  Within <filename>/usr/local</filename>,
 		the general layout sketched out by &man.hier.7; for
 		<filename>/usr</filename> should be used.  Exceptions
@@ -1067,14 +982,14 @@ root     5211  0.0  0.2  3620  1724   2 
 	    <row>
 	      <entry><filename
 		  class="directory">/usr/ports/</filename></entry>
-	      <entry>The FreeBSD Ports Collection (optional).</entry>
+	      <entry>The &os; Ports Collection (optional).</entry>
 	    </row>
 
 	    <row>
 	      <entry><filename
 		  class="directory">/usr/sbin/</filename></entry>
-	      <entry>System daemons &amp; system utilities (executed
-		by users).</entry>
+	      <entry>System daemons and system utilities executed
+		by users.</entry>
 	    </row>
 
 	    <row>
@@ -1091,22 +1006,15 @@ root     5211  0.0  0.2  3620  1724   2 
 
 	    <row>
 	      <entry><filename
-		  class="directory">/usr/X11R6/</filename></entry>
-	      <entry>X11R6 distribution executables, libraries, etc
-		(optional).</entry>
-	    </row>
-
-	    <row>
-	      <entry><filename
 		  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 of
-		&man.rc.conf.5; (or with an entry in
-		<filename>/etc/fstab</filename>; see

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

From owner-svn-doc-head@FreeBSD.ORG  Sat Feb  2 00:42:42 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])
 by hub.freebsd.org (Postfix) with ESMTP id 05C32711;
 Sat,  2 Feb 2013 00:42:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6A1E4841;
 Sat,  2 Feb 2013 00:42:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r120getO030034;
 Sat, 2 Feb 2013 00:42:40 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r120gewh030033;
 Sat, 2 Feb 2013 00:42:40 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201302020042.r120gewh030033@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 2 Feb 2013 00:42:40 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40864 - 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: Sat, 02 Feb 2013 00:42:42 -0000

Author: gjb
Date: Sat Feb  2 00:42:40 2013
New Revision: 40864
URL: http://svnweb.freebsd.org/changeset/doc/40864

Log:
  Link to rwatson's article: A Decade of OS Access-control Extensibility

Modified:
  head/share/xml/press.xml

Modified: head/share/xml/press.xml
==============================================================================
--- head/share/xml/press.xml	Fri Feb  1 19:51:58 2013	(r40863)
+++ head/share/xml/press.xml	Sat Feb  2 00:42:40 2013	(r40864)
@@ -12,6 +12,25 @@
     </cvs:keyword>
 
   <year>
+    <name>2013</name>
+
+    <month>
+      <name>1</name>
+
+      <story>
+	<name>A Decade of OS Access-control Extensibility</name>
+	<url>https://queue.acm.org/detail.cfm?id=2430732</url>
+	<site-name>ACM Queue</site-name>
+	<site-url>https://queue.acm.org/</site-url>
+	<date>18 January 2013</date>
+	<author>Robert N. M. Watson</author>
+	<p>To discuss operating system security is to marvel at the
+	  diversity of deployed access-control models.</p>
+      </story>
+    </month>
+  </year>
+
+  <year>
     <name>2012</name>
 
     <month>

From owner-svn-doc-head@FreeBSD.ORG  Sat Feb  2 05:14: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])
 by hub.freebsd.org (Postfix) with ESMTP id B5F86544;
 Sat,  2 Feb 2013 05:14:06 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A4537FAA;
 Sat,  2 Feb 2013 05:14:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r125E64E012049;
 Sat, 2 Feb 2013 05:14:06 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r125E6Tj012048;
 Sat, 2 Feb 2013 05:14:06 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201302020514.r125E6Tj012048@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 2 Feb 2013 05:14:06 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40865 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 02 Feb 2013 05:14:06 -0000

Author: eadler
Date: Sat Feb  2 05:14:06 2013
New Revision: 40865
URL: http://svnweb.freebsd.org/changeset/doc/40865

Log:
  Finish removing plip documentation from the FAQ not noticed before.
  
  Approved by:	bcr (mentor, implicit)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sat Feb  2 00:42:40 2013	(r40864)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sat Feb  2 05:14:06 2013	(r40865)
@@ -1360,20 +1360,6 @@
       </qandaentry>
 
       <qandaentry>
-	<question id="install-PLIP">
-	  <para>Can I install on my laptop over PLIP (Parallel Line
-	    IP)?</para>
-	</question>
-
-	<answer>
-	  <para>Yes.  Use a standard Laplink cable.  If necessary, you
-	    can check out the <ulink
-	      url="&url.books.handbook;/network-plip.html">PLIP section of the Handbook</ulink>
-	    for details on parallel port networking.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="need-complete-sources">
 	  <para>Do I need to install the source?</para>
 	</question>

From owner-svn-doc-head@FreeBSD.ORG  Sat Feb  2 05:25: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])
 by hub.freebsd.org (Postfix) with ESMTP id 850F4609;
 Sat,  2 Feb 2013 05:25:18 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 71E5DFDF;
 Sat,  2 Feb 2013 05:25:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r125PIp2015089;
 Sat, 2 Feb 2013 05:25:18 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r125PI9O015088;
 Sat, 2 Feb 2013 05:25:18 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201302020525.r125PI9O015088@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 2 Feb 2013 05:25:18 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40866 - head/en_US.ISO8859-1/books/faq
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.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, 02 Feb 2013 05:25:18 -0000

Author: eadler
Date: Sat Feb  2 05:25:17 2013
New Revision: 40866
URL: http://svnweb.freebsd.org/changeset/doc/40866

Log:
  According to the manufacturer MouseSystems mice are not intended to
  function until the year 19821
  
  Approved by:	bcr (mentor, implicit)

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

Modified: head/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- head/en_US.ISO8859-1/books/faq/book.xml	Sat Feb  2 05:14:06 2013	(r40865)
+++ head/en_US.ISO8859-1/books/faq/book.xml	Sat Feb  2 05:25:17 2013	(r40866)
@@ -5514,37 +5514,6 @@ UserConfig&gt; <userinput>quit</userinpu
       </qandaentry>
 
       <qandaentry>
-	<question id="ps2-mousesystems">
-	  <para>Why does my PS/2 mouse from MouseSystems not
-	    work?</para>
-	</question>
-
-	<answer>
-	  <para>There have been some reports that certain model of PS/2
-	    mouse from MouseSystems works only if it is put into the
-	    <quote>high resolution</quote> mode.  Otherwise, the mouse
-	    cursor may jump to the upper-left corner of the screen every
-	    so often.</para>
-
-	  <para>Specify the flags <literal>0x04</literal> to the PS/2
-	    mouse driver to put the mouse into the high resolution mode.
-	    Enter <emphasis>UserConfig</emphasis> by giving the
-	    <option>-c</option> option at the boot prompt:</para>
-
-	  <screen>boot: <userinput>-c</userinput></screen>
-
-	  <para>Then, in the <emphasis>UserConfig</emphasis> command
-	    line, type:</para>
-
-	  <screen>UserConfig&gt; <userinput>flags psm0 0x04</userinput>
-UserConfig&gt; <userinput>quit</userinput></screen>
-
-	  <para>See the previous section for another possible cause of
-	    mouse problems.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="mouse-button-reverse">
 	  <para>How do I reverse the mouse buttons?</para>
 	</question>

From owner-svn-doc-head@FreeBSD.ORG  Sat Feb  2 08:47: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
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D6ADEB3A;
 Sat,  2 Feb 2013 08:47:53 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C8F2D6A7;
 Sat,  2 Feb 2013 08:47:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r128lrVt074185;
 Sat, 2 Feb 2013 08:47:53 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r128lrGp074183;
 Sat, 2 Feb 2013 08:47:53 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201302020847.r128lrGp074183@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 2 Feb 2013 08:47:53 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40867 - head/ja_JP.eucJP/books/handbook/kernelconfig
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 02 Feb 2013 08:47:53 -0000

Author: ryusuke
Date: Sat Feb  2 08:47:53 2013
New Revision: 40867
URL: http://svnweb.freebsd.org/changeset/doc/40867

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

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

Modified: head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml	Sat Feb  2 05:25:17 2013	(r40866)
+++ head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml	Sat Feb  2 08:47:53 2013	(r40867)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r39097
+     Original revision: r40833
      $FreeBSD$
 -->
 
@@ -1158,10 +1158,6 @@ device          ppc</programlisting>
       <para>¾å¤Î 3 ¤Ä¤Ï¤¹¤Ù¤Æ¥Ñ¥é¥ì¥ë¥×¥ê¥ó¥¿¤òÍøÍѲÄǽ¤Ë¤¹¤ë¤¿¤á¤ËɬÍפǤ¹¡£</para>
     </note>
 
-    <programlisting>device          plip       # TCP/IP over parallel</programlisting>
-
-    <para>¥Ñ¥é¥ì¥ë¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¿¥Õ¥§¡¼¥¹ÍѤΥɥ饤¥Ð¤Ç¤¹¡£</para>
-
     <programlisting>device          ppi        # Parallel port interface device</programlisting>
 
     <para>ÈÆÍÑI/O (<quote>geek port</quote>) + IEEE1284 I/O ¤Ç¤¹¡£</para>

From owner-svn-doc-head@FreeBSD.ORG  Sat Feb  2 09:05:05 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])
 by hub.freebsd.org (Postfix) with ESMTP id 671ECD39;
 Sat,  2 Feb 2013 09:05:05 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5406871F;
 Sat,  2 Feb 2013 09:05:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r12955x4079823;
 Sat, 2 Feb 2013 09:05:05 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r12955tH079822;
 Sat, 2 Feb 2013 09:05:05 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201302020905.r12955tH079822@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 2 Feb 2013 09:05:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40868 - head/ja_JP.eucJP/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 02 Feb 2013 09:05:05 -0000

Author: ryusuke
Date: Sat Feb  2 09:05:04 2013
New Revision: 40868
URL: http://svnweb.freebsd.org/changeset/doc/40868

Log:
  - Merge the following from the English version:
  
  	r37214 -> r40794	head/ja_JP.eucJP/htdocs/relnotes.xml

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

Modified: head/ja_JP.eucJP/htdocs/relnotes.xml
==============================================================================
--- head/ja_JP.eucJP/htdocs/relnotes.xml	Sat Feb  2 08:47:53 2013	(r40867)
+++ head/ja_JP.eucJP/htdocs/relnotes.xml	Sat Feb  2 09:05:04 2013	(r40868)
@@ -4,7 +4,7 @@
 <!ENTITY title "¥ê¥ê¡¼¥¹Ê¸½ñ">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: 1.23 -->
+<!-- Original revision: r40794 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
@@ -78,7 +78,19 @@
 
       <li><a href="&enbase;/relnotes/CURRENT/errata/index.html">Errata (Àµ¸íɽ)</a></li>
     </ul>
+    <!--
+    <h3>FreeBSD 9-STABLE ¥ê¥ê¡¼¥¹Ê¸½ñ</h3>
 
+    <ul>
+      <li><a href="&enbase;/relnotes/9-STABLE/readme/index.html">README</a></li>
+
+      <li><a href="&enbase;/relnotes/9-STABLE/relnotes/index.html">¥ê¥ê¡¼¥¹¥Î¡¼¥È</a></li>
+
+      <li><a href="&enbase;/relnotes/9-STABLE/hardware/index.html">¥Ï¡¼¥É¥¦¥§¥¢¥ê¥¹¥È</a></li>
+
+      <li><a href="&enbase;/relnotes/9-STABLE/errata/index.html">Errata (Àµ¸íɽ)</a></li>
+    </ul>
+    -->
     <h3>FreeBSD 8-STABLE ¥ê¥ê¡¼¥¹Ê¸½ñ</h3>
 
     <ul>

From owner-svn-doc-head@FreeBSD.ORG  Sat Feb  2 13: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])
 by hub.freebsd.org (Postfix) with ESMTP id 921FC14D;
 Sat,  2 Feb 2013 13:00:08 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 83BF0FEA;
 Sat,  2 Feb 2013 13:00:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r12D08lN049861;
 Sat, 2 Feb 2013 13:00:08 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r12D08As049860;
 Sat, 2 Feb 2013 13:00:08 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201302021300.r12D08As049860@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Sat, 2 Feb 2013 13:00:08 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40870 - head/ja_JP.eucJP/books/handbook/cutting-edge
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 02 Feb 2013 13:00:08 -0000

Author: ryusuke
Date: Sat Feb  2 13:00:07 2013
New Revision: 40870
URL: http://svnweb.freebsd.org/changeset/doc/40870

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

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

Modified: head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Sat Feb  2 09:24:31 2013	(r40869)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Sat Feb  2 13:00:07 2013	(r40870)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40795
+     Original revision: r40809
      $FreeBSD$
 -->
 
@@ -165,7 +165,7 @@
     </note>
 
     <para>¤â¤· <command>crontab</command> ¤ÎÃæ¤Ë
-      <command>freebsd-update</command> ¤Îµ¡Ç½¤¬´Þ¤Þ¤ì¤Æ¤¤¤¿¤é¡¢
+      &man.freebsd-update.8; ¤Îµ¡Ç½¤¬´Þ¤Þ¤ì¤Æ¤¤¤¿¤é¡¢
       °Ê²¼¤Îºî¶È¤ò¹Ô¤¦¤Þ¤Ç¤Ï̵¸ú¤Ë¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£</para>
 
     <sect2 id="freebsdupdate-config-file">
@@ -426,7 +426,7 @@ MergeChanges /etc/ /var/named/etc/</prog
 		¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	      <screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>env DESTDIR=/boot/GENERIC make kernel __MAKE_CONF=/dev/null</userinput>
+&prompt.root; <userinput>env DESTDIR=/boot/GENERIC make kernel __MAKE_CONF=/dev/null SRCCONF=/dev/null</userinput>
 &prompt.root; <userinput>mv /boot/GENERIC/boot/kernel/* /boot/GENERIC</userinput>
 &prompt.root; <userinput>rm -rf /boot/GENERIC/boot</userinput></screen>
 
@@ -473,7 +473,7 @@ MergeChanges /etc/ /var/named/etc/</prog
 		¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	      <screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>make kernel __MAKE_CONF=/dev/null</userinput></screen>
+&prompt.root; <userinput>make kernel __MAKE_CONF=/dev/null SRCCONF=/dev/null</userinput></screen>
 
 	      <para><command>freebsd-update</command> ¤Ï¡¢¤³¤Î¥«¡¼¥Í¥ë¤ò
 		<filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤È¤·¤Æ°·¤¤¤Þ¤¹¡£
@@ -902,7 +902,7 @@ Fetching 133 new ports or files... done.
 	western US ¥ß¥é¡¼¤«¤é HTTPS
 	¥×¥í¥È¥³¥ë¤òÍѤ¤¤Æ¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>svn checkout <literal>https://svn0.us-west.FreeBSD.org/doc/head</literal> /usr/doc</userinput></screen>
+      <screen>&prompt.root; <userinput>svn checkout <replaceable>https://svn0.us-west.FreeBSD.org</replaceable>/doc/head /usr/doc</userinput></screen>
 
       <para>ÍøÍѲÄǽ¤Ê <link
 	  linkend="svn-mirrors">Subversion ¥ß¥é¡¼¥µ¥¤¥È</link>
@@ -1005,6 +1005,11 @@ Fetching 133 new ports or files... done.
 
       <screen>&prompt.root; <userinput>cd /usr/doc</userinput>
 &prompt.root; <userinput>make FORMATS='html html-split' install clean</userinput></screen>
+
+      <para>¥É¥­¥å¥á¥ó¥È¤òÊÔ½¸¤·¤¿¤ê¡¢ÄûÀµ¤·¤¿¤â¤Î¤òÄó½Ð¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	<ulink
+	  url="&url.books.fdp-primer;">¿·¤·¤¤¹×¸¥¼Ô¤Î¤¿¤á¤Î FreeBSD
+	¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥ÈÆþÌç</ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
     </sect2>
 
     <sect2 id="doc-ports">
@@ -2172,24 +2177,39 @@ Fetching 133 new ports or files... done.
         <primary><filename>make.conf</filename></primary>
       </indexterm>
 
-      <para>¤Þ¤º¡¢<filename>/usr/share/examples/etc/make.conf</filename> ¤È
-	<filename>/etc/make.conf</filename> ¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£
-	ºÇ½é¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤ÎÄêµÁ
-	(¿¤¯¤Î¤â¤Î¤Ï¥³¥á¥ó¥È¥¢¥¦¥È¤µ¤ì¤Æ¤¤¤Þ¤¹) ¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-	¤³¤ì¤é¤òÀßÄꤷ¤Æ¥½¡¼¥¹¤«¤é¥·¥¹¥Æ¥à¤òºÆ¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢
-	ÊÑ¿ô¤ÎÄêµÁ¤ò <filename>/etc/make.conf</filename> ¤ËÉÕ¤±²Ã¤¨¤Æ¤¯¤À¤µ¤¤¡£
-	<filename>/etc/make.conf</filename> ¤ËÄɲ䵤줿ÀßÄê¤Ï¡¢
-	<command>make</command>	¤ò¼Â¹Ô¤¹¤ë¤È¤­¤Ë¾ï¤ËŬÍѤµ¤ì¤ë¤Î¤Ç¡¢
-	¥·¥¹¥Æ¥à¤ËɬÍפÊÀßÄê¤ò½ñ¤¤¤Æ¤ª¤¯¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£</para>
-
-      <para>ɸ½àŪ¤Ê¥æ¡¼¥¶¤Ê¤é¡¢
-        <filename>/usr/share/examples/etc/make.conf</filename> ¤Î
-	<makevar>NO_PROFILE</makevar> ¹Ô¤ò
-	<filename>/etc/make.conf</filename> ¤Ë¥³¥Ô¡¼¤·¡¢
-	¥³¥á¥ó¥È¤ò¤Ï¤º¤¹¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£</para>
+      <para>&man.make.1; ¤Î¥ª¥×¥·¥ç¥ó¤ÎÀâÌÀ¤Ï¡¢&man.make.conf.5; ¤ä
+	<filename>/usr/share/examples/etc/make.conf</filename> ¤Ë¤¢¤ê¤Þ¤¹¡£
+	¤³¤ì¤é¤ÎÀßÄê¤ò <filename>/etc/make.conf</filename> ¤ËÄɲ䷤ơ¢
+	&man.make.1; ¤Î¼Â¹Ô¤ä¥×¥í¥°¥é¥à¤Î¹½ÃÛÊýË¡¤òÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
+	¤¢¤ëÀßÄê¤òÊѹ¹¤·¤¿¤³¤È¤Ë¤è¤ê¡¢±Æ¶Á¤¬¹­¤¤ÈϰϤˤª¤è¤Ó¡¢
+	¶Ã¤¯¤Ù¤­·ë²Ì¤ò¤â¤¿¤é¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
+	ξÊý¤Î¥Õ¥¡¥¤¥ë¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¥³¥á¥ó¥È¤òÆɤळ¤È¤È¡¢
+	¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¤Ï¡¢¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤È°ÂÁ´À­¤Î´ÑÅÀ¤«¤éÁª¤Ð¤ì¤Æ¤¤¤ë¤³¤È¤ò³Ð¤¨¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <para><filename>/etc/make.conf</filename> ¤ÇÀßÄꤵ¤ì¤¿¥ª¥×¥·¥ç¥ó¤Ï¡¢
+	&man.make.1; ¤¬»È¤ï¤ì¤ëºÝ¤Ë¤Ï¾ï¤ËÍ­¸ú¤È¤Ê¤ê¤Þ¤¹¡£
+	Ports Collection ¤«¤é¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë»þ¡¢
+	¥æ¡¼¥¶¤¬½ñ¤¤¤¿ C ¥×¥í¥°¥é¥à¤ä &os;
+	¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤½¤Î¤â¤Î¤ò¹½ÃÛ¤¹¤ëºÝ¤Ë±Æ¶Á¤òµÚ¤Ü¤·¤Þ¤¹¡£</para>
+    </sect2>
+
+    <sect2 id="src-conf">
+      <title><filename>/etc/src.conf</filename> ¤ò³Îǧ¤¹¤ë</title>
+
+      <indexterm>
+	<primary><filename>src.conf</filename></primary>
+      </indexterm>
 
-      <para><makevar>NOPORTDOCS</makevar> ¤Ê¤É¡¢Â¾¤ÎÄêµÁ¤Ë¤Ä¤¤¤Æ¤â¡¢
-        ¥³¥á¥ó¥È¤ò³°¤¹É¬Íפ¬¤¢¤ë¤«¤É¤¦¤«Ä´¤Ù¤Æ¤ª¤­¤Þ¤·¤ç¤¦¡£</para>
+      <para><filename>/etc/src.conf</filename> ¤Ï¡¢
+	¥½¡¼¥¹¥³¡¼¥É¤òÍѤ¤¤¿¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¹½ÃۤˤĤ¤¤Æ¥³¥ó¥È¥í¡¼¥ë¤·¤Þ¤¹¡£
+	<filename>/etc/make.conf</filename> ¤È¤Ï°Û¤Ê¤ê¡¢
+	<filename>/etc/src.conf</filename> ¤Ë½ñ¤«¤ì¤¿ÀßÄê¤Ï¡¢
+	&os; ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤½¤Î¤â¤Î¤ò¹½ÃÛ¤¹¤ë¤È¤­¤Ë¤Î¤ß±Æ¶Á¤·¤Þ¤¹¡£
+	¤³¤Î¥Õ¥¡¥¤¥ë¤ÇÀßÄê²Äǽ¤Ê¿¤¯¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	&man.src.conf.5; ¤Ëµ­½Ò¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+	°ì¸«¤·¤¿¤È¤³¤í̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤ë¡¢
+	»È¤ï¤ì¤Æ¤¤¤Ê¤¤¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤ä¥Ó¥ë¥É¥ª¥×¥·¥ç¥ó¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
+	¤È¤­¤É¤­Í½´ü¤·¤Ê¤«¤Ã¤¿¤ê¡¢¤ï¤º¤«¤Ê±Æ¶Á¤òÍ¿¤¨¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£</para>
     </sect2>
 
     <sect2 id="updating-etc">
@@ -3009,13 +3029,13 @@ Script done, &hellip;</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm><primary>signal 11</primary></indexterm>
-
 	    <para>signal 11 (¤â¤·¤¯¤Ï¾¤Î¥·¥°¥Ê¥ëÈÖ¹æ) ¤Î¥¨¥é¡¼¤¬¤¿¤¯¤µ¤ó½Ð¤Æ
 	      ¥³¥ó¥Ñ¥¤¥ë¤¬¼ºÇÔ¤·¤Þ¤¹¡£²¿¤¬µ¯¤³¤Ã¤Æ¤¤¤ë¤ó¤Ç¤·¤ç¤¦¤«?</para>
 	  </question>
 
 	  <answer>
+	    <indexterm><primary>signal 11</primary></indexterm>
+
 	    <para>¤³¤ì¤ÏÄ̾¥Ï¡¼¥É¥¦¥§¥¢¤ËÌäÂ꤬¤¢¤ë¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
               ¥·¥¹¥Æ¥à¤ÎºÆ¹½Ãۤϡ¢¥Ï¡¼¥É¥¦¥§¥¢¤ËÂФ¹¤ëÉé²ÙÂѵ׻¤ò¹Ô¤Ê¤¦¤¿¤á¤Î
               Í­¸ú¤Ê¼êÃʤΰì¤Ä¤Ç¡¢¥á¥â¥ê¤Ë´Ø·¸¤¹¤ëÌäÂ꤬¤è¤¯Êó¹ð¤µ¤ì¤Þ¤¹¡£

From owner-svn-doc-head@FreeBSD.ORG  Sat Feb  2 22:49:04 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])
 by hub.freebsd.org (Postfix) with ESMTP id 322E1687;
 Sat,  2 Feb 2013 22:49:04 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0C2B39CC;
 Sat,  2 Feb 2013 22:49:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r12Mn395027612;
 Sat, 2 Feb 2013 22:49:03 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r12Mn3XH027611;
 Sat, 2 Feb 2013 22:49:03 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201302022249.r12Mn3XH027611@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Sat, 2 Feb 2013 22:49:03 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40872 - head/en_US.ISO8859-1/books/handbook/mirrors
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 02 Feb 2013 22:49:04 -0000

Author: wblock
Date: Sat Feb  2 22:49:03 2013
New Revision: 40872
URL: http://svnweb.freebsd.org/changeset/doc/40872

Log:
  Add information on preferred protocols and HTTPS fingerprint verification
  to the Subversion Mirror Sites section.
  
  Reviewed by:	simon (slightly earlier version)

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

Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml	Sat Feb  2 14:52:15 2013	(r40871)
+++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml	Sat Feb  2 22:49:03 2013	(r40872)
@@ -669,7 +669,7 @@
 	present but was not created by <command>svn</command>,
 	remember to rename or delete it before the checkout.</para>
 
-      <screen>&prompt.root; <userinput>svn checkout https://svn0.us-west.FreeBSD.org/ports/head /usr/ports</userinput></screen>
+      <screen>&prompt.root; <userinput>svn checkout <replaceable>https://svn0.us-west.FreeBSD.org</replaceable>/ports/head /usr/ports</userinput></screen>
 
       <para>Because the initial checkout has to download the full
 	branch of the remote repository, it can take a while.  Please
@@ -716,7 +716,7 @@
   </sect1>
 
   <sect1 id="svn-mirrors">
-    <title><application>Subversion</application> Sites</title>
+    <title><application>Subversion</application> Mirror Sites</title>
 
     <indexterm>
       <primary>Subversion Repository</primary>
@@ -791,6 +791,42 @@
 	</tbody>
       </tgroup>
     </informaltable>
+
+    <para><acronym>HTTPS</acronym> is the preferred protocol,
+      providing protection against another computer pretending to be
+      the &os; mirror (commonly known as a <quote>man in the
+	middle</quote> attack) or otherwise trying to send bad content
+      to the end user.</para>
+
+    <para>On the first connection to an <acronym>HTTPS</acronym>
+      mirror, the user will be asked to verify the server
+      <emphasis>fingerprint</emphasis>:</para>
+
+    <screen>Error validating server certificate for 'https://svn0.us-west.freebsd.org:443':
+ - The certificate is not issued by a trusted authority. Use the
+   fingerprint to validate the certificate manually!
+Certificate information:
+ - Hostname: svnmir.ysv.FreeBSD.org
+ - Valid: from Fri, 24 Aug 2012 22:04:04 GMT until Sat, 24 Aug 2013 22:04:04 GMT
+ - Issuer: clusteradm, FreeBSD.org, CA, US
+ - Fingerprint: 79:35:8f:ca:6d:34:d9:30:44:d1:00:af:33:4d:e6:11:44:4d:15:ec
+(R)eject, accept (t)emporarily or accept (p)ermanently?</screen>
+
+    <para>Compare the fingerprint shown to those listed in the table
+      above.  If the fingerprint matches, the server security
+      certificate can be accepted temporarily or permanently.  A
+      temporary certificate will expire after a single session with
+      the server, and the verification step will be repeated on the
+      next connection.  Accepting the certificate permanently will
+      store the authentication credentials in
+      <filename role="directory">~/.subversion/auth/</filename> and
+      the user will not be asked to verify the fingerprint again until
+      the certificate expires.</para>
+
+    <para>If <acronym>HTTPS</acronym> cannot be used due to firewall
+      or other problems, <literal>SVN</literal> is the next choice,
+      with slightly faster transfers.  When neither can be used, use
+      <acronym>HTTP</acronym>.</para>
   </sect1>
 
   <sect1 id="cvsup">

From owner-svn-doc-head@FreeBSD.ORG  Sat Feb  2 22:53: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
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1AC63883;
 Sat,  2 Feb 2013 22:53:03 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 030869EC;
 Sat,  2 Feb 2013 22:53:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r12Mr2wm029760;
 Sat, 2 Feb 2013 22:53:02 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r12Mr2dU029759;
 Sat, 2 Feb 2013 22:53:02 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201302022253.r12Mr2dU029759@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Sat, 2 Feb 2013 22:53:02 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40873 - head/en_US.ISO8859-1/books/handbook/mirrors
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 02 Feb 2013 22:53:03 -0000

Author: wblock
Date: Sat Feb  2 22:53:02 2013
New Revision: 40873
URL: http://svnweb.freebsd.org/changeset/doc/40873

Log:
  Wrap another instance of HTTPS in <acronym> tags.

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

Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml	Sat Feb  2 22:49:03 2013	(r40872)
+++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml	Sat Feb  2 22:53:02 2013	(r40873)
@@ -662,7 +662,7 @@
       </itemizedlist>
 
       <para>This example checks out the Ports Collection from the
-	western US repository using the HTTPS protocol, placing the
+	western US repository using the <acronym>HTTPS</acronym> protocol, placing the
 	local working copy in
 	<filename class="directory">/usr/ports</filename>.  If
 	<filename class="directory">/usr/ports</filename> is already

From owner-svn-doc-head@FreeBSD.ORG  Sat Feb  2 23:22:37 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])
 by hub.freebsd.org (Postfix) with ESMTP id E981621D;
 Sat,  2 Feb 2013 23:22:37 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DC18DAB2;
 Sat,  2 Feb 2013 23:22:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r12NMbt2039271;
 Sat, 2 Feb 2013 23:22:37 GMT (envelope-from wblock@svn.freebsd.org)
Received: (from wblock@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r12NMblt039270;
 Sat, 2 Feb 2013 23:22:37 GMT (envelope-from wblock@svn.freebsd.org)
Message-Id: <201302022322.r12NMblt039270@svn.freebsd.org>
From: Warren Block <wblock@FreeBSD.org>
Date: Sat, 2 Feb 2013 23:22:37 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40874 - head/en_US.ISO8859-1/books/handbook/mirrors
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-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, 02 Feb 2013 23:22:38 -0000

Author: wblock
Date: Sat Feb  2 23:22:37 2013
New Revision: 40874
URL: http://svnweb.freebsd.org/changeset/doc/40874

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

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

Modified: head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml	Sat Feb  2 22:53:02 2013	(r40873)
+++ head/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml	Sat Feb  2 23:22:37 2013	(r40874)
@@ -662,8 +662,8 @@
       </itemizedlist>
 
       <para>This example checks out the Ports Collection from the
-	western US repository using the <acronym>HTTPS</acronym> protocol, placing the
-	local working copy in
+	western US repository using the <acronym>HTTPS</acronym>
+	protocol, placing the local working copy in
 	<filename class="directory">/usr/ports</filename>.  If
 	<filename class="directory">/usr/ports</filename> is already
 	present but was not created by <command>svn</command>,
@@ -707,10 +707,10 @@
 
       <para>For other information about using
 	<application>Subversion</application>, please see the
-	<quote>Subversion Book</quote>, titled <ulink
-	  url="http://svnbook.red-bean.com/">Version Control with
-	Subversion</ulink>, or the <ulink
-	  url="http://subversion.apache.org/docs/">Subversion
+	<quote>Subversion Book</quote>, titled
+	<ulink url="http://svnbook.red-bean.com/">Version Control with
+	  Subversion</ulink>, or the
+	<ulink url="http://subversion.apache.org/docs/">Subversion
 	  Documentation</ulink>.</para>
     </sect2>
   </sect1>