From owner-svn-doc-all@FreeBSD.ORG  Sun Oct 20 16:44:59 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 459781B7;
 Sun, 20 Oct 2013 16:44:59 +0000 (UTC) (envelope-from pgj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 323C72226;
 Sun, 20 Oct 2013 16:44:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9KGixUd031427;
 Sun, 20 Oct 2013 16:44:59 GMT (envelope-from pgj@svn.freebsd.org)
Received: (from pgj@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9KGixm3031426;
 Sun, 20 Oct 2013 16:44:59 GMT (envelope-from pgj@svn.freebsd.org)
Message-Id: <201310201644.r9KGixm3031426@svn.freebsd.org>
From: Gabor Pali <pgj@FreeBSD.org>
Date: Sun, 20 Oct 2013 16:44:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43010 - head/en_US.ISO8859-1/htdocs/news/status
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Oct 2013 16:44:59 -0000

Author: pgj
Date: Sun Oct 20 16:44:58 2013
New Revision: 43010
URL: http://svnweb.freebsd.org/changeset/doc/43010

Log:
  - Add introduction for the 2013Q3 report, we are good to go now
  
  Submitted by:	theraven

Modified:
  head/en_US.ISO8859-1/htdocs/news/status/report-2013-07-2013-09.xml

Modified: head/en_US.ISO8859-1/htdocs/news/status/report-2013-07-2013-09.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/report-2013-07-2013-09.xml	Sat Oct 19 16:52:39 2013	(r43009)
+++ head/en_US.ISO8859-1/htdocs/news/status/report-2013-07-2013-09.xml	Sun Oct 20 16:44:58 2013	(r43010)
@@ -15,7 +15,21 @@
       September 2013.  This is the third of four reports planned for
       2013.</p>
 
-    <!-- XXX: introduction goes here -->
+    <p>We have had another very active three months in the &os; world,
+      including two Developer Summits (BSDCam and EuroBSDcon) that will be
+      covered in separate status reports.  &os; continues to push hard
+      on security, with improvements to both the performance and
+      reliability of the random number generation, and more
+      compartmentalisation in programs in the base system.  For
+      developers, there is work on a new modern debugger.  There is also
+      a significant amount of of modernization in the support for
+      Objective-C and Ada via ports, making &os; a first-rate platform
+      for developing in either language, in addition to the existing
+      C++11 and C11 support already present in the base system.  Server
+      users will be pleased to see improvements in the iSCSI stack and
+      scalability allowing over a million I/O operations per second on
+      commodify hardware, while desktop users will see improvements in X
+      support for new GPUs and for possible X replacements.</p>
 
     <p>Thanks to all the reporters for the excellent work!  This report
       contains 30 entries and we hope you enjoy reading it.</p>

From owner-svn-doc-all@FreeBSD.ORG  Sun Oct 20 21:02:34 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 11722C9C;
 Sun, 20 Oct 2013 21:02:34 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F2C562F91;
 Sun, 20 Oct 2013 21:02:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9KL2XRG070944;
 Sun, 20 Oct 2013 21:02:33 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9KL2XZK070943;
 Sun, 20 Oct 2013 21:02:33 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201310202102.r9KL2XZK070943@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 20 Oct 2013 21:02:33 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43011 - head/en_US.ISO8859-1/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Oct 2013 21:02:34 -0000

Author: gjb
Date: Sun Oct 20 21:02:33 2013
New Revision: 43011
URL: http://svnweb.freebsd.org/changeset/doc/43011

Log:
  Add a '5XX' page, to be used for 'Service Unavailble' messages during
  maintenance windows when needed.

Added:
  head/en_US.ISO8859-1/htdocs/5xx.xml   (contents, props changed)

Added: head/en_US.ISO8859-1/htdocs/5xx.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/en_US.ISO8859-1/htdocs/5xx.xml	Sun Oct 20 21:02:33 2013	(r43011)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
+"http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [
+<!ENTITY title "Page not found.">
+]>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>&title;</title>
+
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
+
+    <base href="/" />
+  </head>
+
+  <body class="navinclude.about">
+    <h2>Service Unavailable</h2>
+
+    <p>The requested site is currently unavailable.</p>
+
+    <p>Please try your request again later, use one of the links in
+      the navigation menu, or the search box at the top of the
+      page.</p>
+  </body>
+</html>

From owner-svn-doc-all@FreeBSD.ORG  Sun Oct 20 21:04:34 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 98A7FE49;
 Sun, 20 Oct 2013 21:04:34 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 84C342FA7;
 Sun, 20 Oct 2013 21:04:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9KL4Y5H071633;
 Sun, 20 Oct 2013 21:04:34 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9KL4YNl071632;
 Sun, 20 Oct 2013 21:04:34 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201310202104.r9KL4YNl071632@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 20 Oct 2013 21:04:34 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43012 - head/en_US.ISO8859-1/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Oct 2013 21:04:34 -0000

Author: gjb
Date: Sun Oct 20 21:04:34 2013
New Revision: 43012
URL: http://svnweb.freebsd.org/changeset/doc/43012

Log:
  Hook the 5xx.xml page to the build.

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

Modified: head/en_US.ISO8859-1/htdocs/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/Makefile	Sun Oct 20 21:02:33 2013	(r43011)
+++ head/en_US.ISO8859-1/htdocs/Makefile	Sun Oct 20 21:04:34 2013	(r43012)
@@ -25,6 +25,7 @@ DOCS+= send-pr.xml
 DOCS+= support.xml
 DOCS+= where.xml
 DOCS+= 4xx.xml
+DOCS+= 5xx.xml
 
 XMLDOCS=	index:xsl:${XML_NEWS_NEWS}:
 DEPENDSET.index=transtable mirrors news press events \

From owner-svn-doc-all@FreeBSD.ORG  Sun Oct 20 21:15:08 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 52612576;
 Sun, 20 Oct 2013 21:15:08 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3F8AC2078;
 Sun, 20 Oct 2013 21:15:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9KLF8VL077425;
 Sun, 20 Oct 2013 21:15:08 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9KLF8PB077424;
 Sun, 20 Oct 2013 21:15:08 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201310202115.r9KLF8PB077424@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 20 Oct 2013 21:15:08 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43013 - head/en_US.ISO8859-1/htdocs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Oct 2013 21:15:08 -0000

Author: gjb
Date: Sun Oct 20 21:15:07 2013
New Revision: 43013
URL: http://svnweb.freebsd.org/changeset/doc/43013

Log:
  Fix page title.

Modified:
  head/en_US.ISO8859-1/htdocs/5xx.xml

Modified: head/en_US.ISO8859-1/htdocs/5xx.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/5xx.xml	Sun Oct 20 21:04:34 2013	(r43012)
+++ head/en_US.ISO8859-1/htdocs/5xx.xml	Sun Oct 20 21:15:07 2013	(r43013)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [
-<!ENTITY title "Page not found.">
+<!ENTITY title "Service Unavailable">
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">

From owner-svn-doc-all@FreeBSD.ORG  Sun Oct 20 21:59:37 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 35BD35F7;
 Sun, 20 Oct 2013 21:59:37 +0000 (UTC) (envelope-from pgj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 22AFA235E;
 Sun, 20 Oct 2013 21:59:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9KLxb8w000190;
 Sun, 20 Oct 2013 21:59:37 GMT (envelope-from pgj@svn.freebsd.org)
Received: (from pgj@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9KLxawl000188;
 Sun, 20 Oct 2013 21:59:36 GMT (envelope-from pgj@svn.freebsd.org)
Message-Id: <201310202159.r9KLxawl000188@svn.freebsd.org>
From: Gabor Pali <pgj@FreeBSD.org>
Date: Sun, 20 Oct 2013 21:59:36 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43014 - in head: en_US.ISO8859-1/htdocs/news/status
 share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Oct 2013 21:59:37 -0000

Author: pgj
Date: Sun Oct 20 21:59:36 2013
New Revision: 43014
URL: http://svnweb.freebsd.org/changeset/doc/43014

Log:
  - Publish the 2013Q3 status report

Modified:
  head/en_US.ISO8859-1/htdocs/news/status/status.xml
  head/share/xml/news.xml

Modified: head/en_US.ISO8859-1/htdocs/news/status/status.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/status.xml	Sun Oct 20 21:15:07 2013	(r43013)
+++ head/en_US.ISO8859-1/htdocs/news/status/status.xml	Sun Oct 20 21:59:36 2013	(r43014)
@@ -13,8 +13,8 @@
 
     <body class="navinclude.about">
 
-  <h2>Next Quarterly Status Report submissions (July - September) due: October
-    7th, 2013</h2>
+  <h2>Next Quarterly Status Report submissions (October &mdash;
+    December) due: January 14th, 2014</h2>
 
   <p>Use the <a href="http://www.FreeBSD.org/cgi/monthly.cgi">xml
       generator</a> or download and edit the <a href="report-sample.xml">
@@ -55,6 +55,8 @@
   <h2>2013</h2>
 
   <ul>
+    <li><a href="report-2013-07-2013-09.html">July, 2013 -
+      September, 2013</a></li>
     <li><a href="report-2013-04-2013-06.html">April, 2013 -
       June, 2013</a></li>
     <li><a href="report-2013-05-devsummit.html">BSDCan 2013 Developer

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Sun Oct 20 21:15:07 2013	(r43013)
+++ head/share/xml/news.xml	Sun Oct 20 21:59:36 2013	(r43014)
@@ -34,6 +34,18 @@
       <name>10</name>
 
       <day>
+	<name>20</name>
+
+	<event>
+	  <title>July-September, 2013 Status Report</title>
+
+	    <p>The <a
+		href="&enbase;/news/status/report-2013-07-2013-09.html">July-September, 2013 Status Report</a>
+	      is now available with 30 entries.</p>
+	</event>
+      </day>
+
+      <day>
 	<name>14</name>
 
 	<event>

From owner-svn-doc-all@FreeBSD.ORG  Mon Oct 21 13:51:40 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id C7C41DB9;
 Mon, 21 Oct 2013 13:51:40 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B523329BE;
 Mon, 21 Oct 2013 13:51:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9LDpe3e018142;
 Mon, 21 Oct 2013 13:51:40 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9LDpeMv018140;
 Mon, 21 Oct 2013 13:51:40 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201310211351.r9LDpeMv018140@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Mon, 21 Oct 2013 13:51:40 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43015 - head/ja_JP.eucJP/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Oct 2013 13:51:40 -0000

Author: ryusuke
Date: Mon Oct 21 13:51:40 2013
New Revision: 43015
URL: http://svnweb.freebsd.org/changeset/doc/43015

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

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

Modified: head/ja_JP.eucJP/share/xml/news.xml
==============================================================================
--- head/ja_JP.eucJP/share/xml/news.xml	Sun Oct 20 21:59:36 2013	(r43014)
+++ head/ja_JP.eucJP/share/xml/news.xml	Mon Oct 21 13:51:40 2013	(r43015)
@@ -20,7 +20,7 @@
      the contents of <title> will be preferred over <p>.
 
      $FreeBSD$
-     Original revision: r42963
+     Original revision: r43014
 -->
 <news>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -34,6 +34,19 @@
       <name>10</name>
 
       <day>
+	<name>20</name>
+
+	<event>
+	  <title>³«È¯¿ÊĽ¥ì¥Ý¡¼¥È (2013 ǯ 7 ·î - 9 ·î) ¸ø³«</title>
+
+	    <p><a
+		href="&enbase;/news/status/report-2013-07-2013-09.html">2013
+	      ǯ 7 ·î¤«¤é 9 ·î¤Î³«È¯¿ÊĽ¥ì¥Ý¡¼¥È</a> (30 ¥¨¥ó¥È¥ê)
+	      ¤¬¸ø³«¤µ¤ì¤Þ¤·¤¿¡£</p>
+	</event>
+      </day>
+
+      <day>
 	<name>14</name>
 
 	<event>

From owner-svn-doc-all@FreeBSD.ORG  Mon Oct 21 17:46:03 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 84726260;
 Mon, 21 Oct 2013 17:46:03 +0000 (UTC) (envelope-from pgj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 717662902;
 Mon, 21 Oct 2013 17:46:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9LHk33J045393;
 Mon, 21 Oct 2013 17:46:03 GMT (envelope-from pgj@svn.freebsd.org)
Received: (from pgj@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9LHk3sL045392;
 Mon, 21 Oct 2013 17:46:03 GMT (envelope-from pgj@svn.freebsd.org)
Message-Id: <201310211746.r9LHk3sL045392@svn.freebsd.org>
From: Gabor Pali <pgj@FreeBSD.org>
Date: Mon, 21 Oct 2013 17:46:03 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43016 - head/en_US.ISO8859-1/htdocs/news/status
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Oct 2013 17:46:03 -0000

Author: pgj
Date: Mon Oct 21 17:46:02 2013
New Revision: 43016
URL: http://svnweb.freebsd.org/changeset/doc/43016

Log:
  - Fix a typo in the 2013Q3 report
  
  Submitted by:	pluknet

Modified:
  head/en_US.ISO8859-1/htdocs/news/status/report-2013-07-2013-09.xml

Modified: head/en_US.ISO8859-1/htdocs/news/status/report-2013-07-2013-09.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/report-2013-07-2013-09.xml	Mon Oct 21 13:51:40 2013	(r43015)
+++ head/en_US.ISO8859-1/htdocs/news/status/report-2013-07-2013-09.xml	Mon Oct 21 17:46:02 2013	(r43016)
@@ -28,7 +28,7 @@
       C++11 and C11 support already present in the base system.  Server
       users will be pleased to see improvements in the iSCSI stack and
       scalability allowing over a million I/O operations per second on
-      commodify hardware, while desktop users will see improvements in X
+      commodity hardware, while desktop users will see improvements in X
       support for new GPUs and for possible X replacements.</p>
 
     <p>Thanks to all the reporters for the excellent work!  This report

From owner-svn-doc-all@FreeBSD.ORG  Mon Oct 21 22:20:55 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 047A7E34;
 Mon, 21 Oct 2013 22:20:55 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D563C2AF1;
 Mon, 21 Oct 2013 22:20:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9LMKsPQ096923;
 Mon, 21 Oct 2013 22:20:54 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9LMKsln096922;
 Mon, 21 Oct 2013 22:20:54 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310212220.r9LMKsln096922@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Mon, 21 Oct 2013 22:20:54 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43017 -
 head/en_US.ISO8859-1/books/handbook/network-servers
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Oct 2013 22:20:55 -0000

Author: dru
Date: Mon Oct 21 22:20:54 2013
New Revision: 43017
URL: http://svnweb.freebsd.org/changeset/doc/43017

Log:
  Some tightening in the DNS, HTTP, and FTP sections.
  
  The DNS and HTTP sections still need a good go-through.
  
  Clarify the introductions to these sections.
  
  Fix some acronyms along the way.
  
  To be followed by a white-space fix.

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

Modified: head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Mon Oct 21 17:46:02 2013	(r43016)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Mon Oct 21 22:20:54 2013	(r43017)
@@ -3006,58 +3006,33 @@ dhcpd_ifaces="dc0"</programlisting>
     -->
     <title>Domain Name System (<acronym>DNS</acronym>)</title>
 
-    <sect2>
-      <title>Overview</title>
-
       <indexterm><primary>BIND</primary></indexterm>
 
-      <para>&os; utilizes, by default, a version of BIND (Berkeley
-	Internet Name Domain), which is the most common implementation
-	of the <acronym>DNS</acronym> protocol.
-	<acronym>DNS</acronym> is the protocol through which names are
-	mapped to <acronym>IP</acronym> addresses, and vice versa.
-	For example, a query for
-	<hostid role="fqdn">www.FreeBSD.org</hostid> will receive a
-	reply with the <acronym>IP</acronym> address of The &os;
-	Project's web server, whereas, a query for
-	<hostid role="fqdn">ftp.FreeBSD.org</hostid> will return the
-	<acronym>IP</acronym> address of the corresponding
-	<acronym>FTP</acronym> machine.  Likewise, the opposite can
-	happen.  A query for an <acronym>IP</acronym> address can
-	resolve its hostname.  It is not necessary to run a name
+      <para>Domain Name System (<acronym>DNS</acronym>) is the protocol through which domain names are
+	mapped to <acronym>IP</acronym> addresses, and vice versa.  By default, &os; installs the Berkeley
+	Internet Name Domain (<acronym>BIND</acronym>), which is the most common implementation
+	of the <acronym>DNS</acronym> protocol.  The &os; version provides enhanced security features, a new file
+	system layout, and automated &man.chroot.8;
+	configuration.  BIND is maintained by the
+	<ulink url="https://www.isc.org/">isc.org</ulink>.
+	It is not necessary to run a name
 	server to perform <acronym>DNS</acronym> lookups on a
 	system.</para>
 
-      <para>&os; currently comes with <acronym>BIND</acronym>9
-	<acronym>DNS</acronym> server software by default.  Our
-	installation provides enhanced security features, a new file
-	system layout and automated &man.chroot.8;
-	configuration.</para>
-
       <indexterm><primary>DNS</primary></indexterm>
       <para><acronym>DNS</acronym> is coordinated across the Internet
 	through a somewhat complex system of authoritative root, Top
 	Level Domain (<acronym>TLD</acronym>), and other smaller-scale
-	name servers which host and cache individual domain
-	information.</para>
-
-      <para>Currently, BIND is maintained by the
-	Internet Systems Consortium
-	<ulink url="https://www.isc.org/"></ulink>.</para>
-    </sect2>
-
-    <sect2>
-      <title>Terminology</title>
-
-      <para>To understand this document, some terms related to
-	<acronym>DNS</acronym> must be understood.</para>
+	name servers, which host and cache individual domain
+	information.  Table 28.4 describes some of the terms associated with <acronym>DNS</acronym>:</para>
 
       <indexterm><primary>resolver</primary></indexterm>
       <indexterm><primary>reverse
 	  <acronym>DNS</acronym></primary></indexterm>
       <indexterm><primary>root zone</primary></indexterm>
 
-      <informaltable frame="none" pgwide="1">
+      <table frame="none" pgwide="1">
+	<title><acronym>DNS</acronym> Terminology</title>
 	<tgroup cols="2">
 	  <colspec colwidth="1*"/>
 	  <colspec colwidth="3*"/>
@@ -3117,7 +3092,7 @@ dhcpd_ifaces="dc0"</programlisting>
 	    </row>
 	  </tbody>
 	</tgroup>
-      </informaltable>
+      </table>
 
       <indexterm>
 	<primary>zones</primary>
@@ -3159,7 +3134,6 @@ dhcpd_ifaces="dc0"</programlisting>
 	of a hostname is much like a file system: the
 	<filename class="directory">/dev</filename> directory falls
 	within the root, and so on.</para>
-    </sect2>
 
     <sect2>
       <title>Reasons to Run a Name Server</title>
@@ -4431,56 +4405,45 @@ $include Kexample.com.+005+nnnnn.ZSK.key
       <secondary>setting up</secondary></indexterm>
     <indexterm><primary>Apache</primary></indexterm>
 
-    <para>&os; is used to run some of the busiest web sites in the
-      world.  The majority of web servers on the Internet are using
-      the <application>Apache HTTP Server</application>.
-      <application>Apache</application> software packages should be
-      included on the &os; installation media.  If
-      <application>Apache</application> was not installed while
-      installing &os;, then it can be installed from the
-      <filename role="package">www/apache22</filename> port.</para>
-
-    <para>Once <application>Apache</application> has been installed
-      successfully, it must be configured.</para>
-
-    <note>
-      <para>This section covers version 2.2.X of the
-	<application>Apache HTTP Server</application> as that is the
-	most widely used version for &os;.  For more detailed
-	information beyond the scope of this document about
-	<application>Apache</application>&nbsp;2.X, please see
-	<ulink url="http://httpd.apache.org/"></ulink>.</para>
-    </note>
+    <para>The open source
+      <application>Apache HTTP Server</application> is the most widely
+      used web server.  &os; does not install this web server by default,
+      but it can be installed from the
+      <filename role="package">www/apache24</filename> package or port.</para>
+
+    <para>This section summarizes how to configure and start version 2.<replaceable>x</replaceable> of the
+	<application>Apache HTTP Server</application>, the
+	most widely used version, on &os;.  For more detailed
+	information about
+	<application>Apache</application>&nbsp;2.X and its configuration directives, refer to
+	<ulink url="http://httpd.apache.org/">httpd.apache.org</ulink>.</para>
 
     <sect2>
-      <title>Configuration</title>
+      <title>Configuring and Starting Apache</title>
 
       <indexterm><primary>Apache</primary>
 	<secondary>configuration file</secondary></indexterm>
 
-      <para>The main <application>Apache HTTP Server</application>
+      <para>In &os;, the main <application>Apache HTTP Server</application>
 	configuration file is installed as
-	<filename>/usr/local/etc/apache22/httpd.conf</filename> on
-	&os;.  This file is a typical &unix; text configuration file
-	with comment lines beginning with the <literal>#</literal>
-	character.  A comprehensive description of all possible
-	configuration options is outside the scope of this book, so
-	only the most frequently modified directives will be described
-	here.</para>
+	<filename>/usr/local/etc/apache2<replaceable>x</replaceable>/httpd.conf</filename>.
+	This ASCII text file begins
+	comment lines with the <literal>#</literal>.  The
+	most frequently modified directives are:</para>
 
       <variablelist>
 	<varlistentry>
 	  <term><literal>ServerRoot "/usr/local"</literal></term>
 
 	  <listitem>
-	    <para>This specifies the default directory hierarchy for
+	    <para>Specifies the default directory hierarchy for
 	      the <application>Apache</application> installation.
 	      Binaries are stored in the
 	      <filename class="directory">bin</filename> and
 	      <filename class="directory">sbin</filename>
 	      subdirectories of the server root, and configuration
 	      files are stored in <filename
-		class="directory">etc/apache</filename>.</para>
+		class="directory">etc/apache2<replaceable>x</replaceable></filename>.</para>
 	  </listitem>
 	</varlistentry>
 
@@ -4488,8 +4451,7 @@ $include Kexample.com.+005+nnnnn.ZSK.key
 	  <term><literal>ServerAdmin you@your.address</literal></term>
 
 	  <listitem>
-	    <para>The address to which problems with the server should
-	      be emailed.  This address also appears on some
+	    <para>The email address to receive problems with the server.  This address also appears on some
 	      server-generated pages, such as error documents.</para>
 	  </listitem>
 	</varlistentry>
@@ -4498,21 +4460,20 @@ $include Kexample.com.+005+nnnnn.ZSK.key
 	  <term><literal>ServerName www.example.com</literal></term>
 
 	  <listitem>
-	    <para><literal>ServerName</literal> allows an
+	    <para>Allows an
 	      administrator to set a host name which is sent back to
-	      clients for the server.  This is useful if the host is
-	      different than the one that it is configured with (i.e.,
-	      use <hostid>www</hostid> instead of the host's real
-	      name).</para>
+	      clients for the server.  For example,
+	      <hostid>www</hostid> can be used instead of the actual host
+	      name.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term><literal>DocumentRoot
-	    "/usr/local/www/apache22/data"</literal></term>
+	    "/usr/local/www/apache2<replaceable>x</replaceable>/data"</literal></term>
 
 	  <listitem>
-	    <para><literal>DocumentRoot</literal>: The directory
+	    <para>The directory
 	      where documents will be served from.  By default, all
 	      requests are taken from this directory, but symbolic
 	      links and aliases may be used to point to other
@@ -4525,18 +4486,14 @@ $include Kexample.com.+005+nnnnn.ZSK.key
 	<application>Apache</application> configuration file before
 	making changes.  When the configuration of
 	<application>Apache</application>, is complete, save the
-	file and verify the configuration using &man.apachectl.8;.
-	To do this, issue <command>apachectl configtest</command>
-	which should return <literal>Syntax OK</literal>.</para>
-    </sect2>
-
-    <sect2>
-      <title>Running <application>Apache</application></title>
+	file and verify the configuration using apachectl(8).
+	Running <command>apachectl configtest</command>
+	should return <literal>Syntax OK</literal>.</para>
 
       <indexterm><primary>Apache</primary>
 	<secondary>starting or stopping</secondary></indexterm>
 
-      <para>The <filename role="package">www/apache22</filename> port
+      <para>The <filename role="package">www/apache24</filename> port
 	installs an &man.rc.8; script to aid in starting, stopping,
 	and restarting <application>Apache</application>, which can be
 	found in <filename
@@ -4546,13 +4503,13 @@ $include Kexample.com.+005+nnnnn.ZSK.key
 	startup, add the following line to
 	<filename>/etc/rc.conf</filename>:</para>
 
-      <programlisting>apache22_enable="YES"</programlisting>
+      <programlisting>apache24_enable="YES"</programlisting>
 
       <para>If <application>Apache</application> should be started
 	with non-default options, the following line may be added to
-	<filename>/etc/rc.conf</filename>:</para>
+	<filename>/etc/rc.conf</filename> to specify the needed flags:</para>
 
-      <programlisting>apache22_flags=""</programlisting>
+      <programlisting>apache24_flags=""</programlisting>
 
       <para>The <application>Apache</application> configuration can be
 	tested for errors after making subsequent
@@ -4561,7 +4518,7 @@ $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>service apache22 configtest</userinput></screen>
+      <screen>&prompt.root; <userinput>service apache24 configtest</userinput></screen>
 
       <note>
 	<para>It is important to note that the
@@ -4571,11 +4528,10 @@ $include Kexample.com.+005+nnnnn.ZSK.key
       </note>
 
       <para>If <application>Apache</application> does not report
-	configuration errors, the
-	<application>Apache</application>&nbsp;<command>httpd</command>
-	can be started with &man.service.8;:</para>
+	configuration errors, start <command>httpd</command>
+	with &man.service.8;:</para>
 
-      <screen>&prompt.root; <userinput>service apache22 start</userinput></screen>
+      <screen>&prompt.root; <userinput>service apache24 start</userinput></screen>
 
       <para>The <command>httpd</command> service can be tested by
 	entering <literal>http://<hostid
@@ -4585,7 +4541,7 @@ $include Kexample.com.+005+nnnnn.ZSK.key
 	domain name of the machine running <command>httpd</command>,
 	if it is not the local machine.  The default web page that is
 	displayed is
-	<filename>/usr/local/www/apache22/data/index.html</filename>.</para>
+	<filename>/usr/local/www/apache24/data/index.html</filename>.</para>
     </sect2>
 
     <sect2>
@@ -4915,128 +4871,107 @@ DocumentRoot /www/someotherdomain.tld
       </authorgroup>
     </sect1info>
     -->
-    <title>File Transfer Protocol (FTP)</title>
+    <title>File Transfer Protocol (<acronym>FTP</acronym>)</title>
 
-    <indexterm><primary>FTP servers</primary></indexterm>
+    <indexterm><primary><acronym>FTP</acronym> servers</primary></indexterm>
 
-    <para>The File Transfer Protocol (FTP) provides users with a
+    <para>The File Transfer Protocol (<acronym>FTP</acronym>) provides users with a
       simple way to transfer files to and from an
-      <acronym role="File Transfer Protocol">FTP</acronym> server.
-      &os; includes <acronym
-	role="File Transfer Protocol">FTP</acronym> server
-      software, <application>ftpd</application>, in the base system.
-      This makes setting up and administering an
-      <acronym role="File Transfer Protocol">FTP</acronym> server on
-      &os; very straightforward.</para>
+      <acronym>FTP</acronym> server.
+      &os; includes <acronym>FTP</acronym> server
+      software, <application>ftpd</application>, in the base system.</para>
+      
+      <para>&os; provides several configuration files for controlling access
+	to the <acronym>FTP</acronym> server. This section summarizes
+	these files.  Refer to &man.ftpd.8; for more details about the
+	built-in <acronym>FTP</acronym> server.</para>
 
-    <sect2>
-      <title>Configuration</title>
+      <sect2>
+	<title>Configuration</title>
 
       <para>The most important configuration step is deciding which
-	accounts will be allowed access to the FTP server.  A normal
-	&os; system has a number of system accounts used for various
-	daemons, but unknown users should not be allowed to log in
-	with these accounts.  The <filename>/etc/ftpusers</filename>
-	file is a list of users disallowed any FTP access.  By
-	default, it includes the aforementioned system accounts, but
-	it is possible to add specific users here that should not be
-	allowed access to FTP.</para>
+	accounts will be allowed access to the <acronym>FTP</acronym> server.  A
+	&os; system has a number of system accounts which
+	should not be allowed <acronym>FTP</acronym> access.
+	The list of users disallowed any <acronym>FTP</acronym> access
+	can be found in <filename>/etc/ftpusers</filename>.
+	By
+	default, it includes system accounts.  Additional
+	users that should not be
+	allowed access to <acronym>FTP</acronym> can be added.</para>
 
       <para>In some cases it may be desirable to restrict the access
 	of some users without preventing them completely from using
-	FTP.  This can be accomplished with the
-	<filename>/etc/ftpchroot</filename> file.  This file lists
-	users and groups subject to FTP access restrictions.  Refer to
-	&man.ftpchroot.5; for more details.</para>
+	<acronym>FTP</acronym>.  This can be accomplished be creating
+	<filename>/etc/ftpchroot</filename> as described in &man.ftpchroot.5;.  This file lists
+	users and groups subject to <acronym>FTP</acronym> access restrictions.</para>
 
       <indexterm>
-	<primary>FTP</primary>
+	<primary><acronym>FTP</acronym></primary>
 	<secondary>anonymous</secondary>
       </indexterm>
 
-      <para>To enable anonymous FTP access to the server, create a
+      <para>To enable anonymous <acronym>FTP</acronym> access to the server, create a
 	user named <username>ftp</username> on the &os; system.  Users
-	will then be able to log on to the FTP server with a username
-	of <username>ftp</username> or <username>anonymous</username>
-	and with any password (by convention an email address for the
-	user should be used as the password).  The FTP server will
+	will then be able to log on to the <acronym>FTP</acronym> server with a username
+	of <username>ftp</username> or <username>anonymous</username>.  When prompted for the password,
+	any input will be accepted, but by convention, an email address
+	should be used as the password.  The <acronym>FTP</acronym> server will
 	call &man.chroot.2; when an anonymous user logs in, to
 	restrict access to only the home directory of the
 	<username>ftp</username> user.</para>
 
-      <para>There are two text files that specify welcome messages to
-	be displayed to FTP clients.  The contents of the file
+      <para>There are two text files that can be created to specify welcome messages to
+	be displayed to <acronym>FTP</acronym> clients.  The contents of
 	<filename>/etc/ftpwelcome</filename> will be displayed to
 	users before they reach the login prompt.  After a successful
-	login, the contents of the file
+	login, the contents of
 	<filename>/etc/ftpmotd</filename> will be displayed.  Note
 	that the path to this file is relative to the login
-	environment, so the file <filename>~ftp/etc/ftpmotd</filename>
+	environment, so the contents of <filename>~ftp/etc/ftpmotd</filename>
 	would be displayed for anonymous users.</para>
 
-      <para>Once the FTP server has been configured properly, it must
-	be enabled in <filename>/etc/inetd.conf</filename>.  All that
-	is required here is to remove the comment symbol
-	<quote>#</quote> from in front of the existing
-	<application>ftpd</application> line :</para>
-
-      <programlisting>ftp	stream	tcp	nowait	root	/usr/libexec/ftpd	ftpd -l</programlisting>
-
-      <para>As explained in <xref linkend="network-inetd-reread"/>,
-	the <application>inetd</application> configuration must be
-	reloaded after this configuration file is changed.  Please
-	refer to <xref linkend="network-inetd-settings"/> for details
-	on enabling <application>inetd</application> on the
-	system.</para>
-
-      <para>Alternatively, <application>ftpd</application> can also be
-	started as a stand-alone server.  In this case, it is
-	sufficient to set the appropriate variable in
-	<filename>/etc/rc.conf</filename>:</para>
+      <para>Once the <acronym>FTP</acronym> server has been configured, set the appropriate variable in
+	<filename>/etc/rc.conf</filename> to start the service during boot:</para>
 
       <programlisting>ftpd_enable="YES"</programlisting>
 
-      <para>After setting the above variable, the stand-alone server
-	will be started at the next reboot, or it can be started
-	manually by executing the following command as
-	<username>root</username>:</para>
+      <para>To start the service now:</para>
 
       <screen>&prompt.root; <userinput>service ftpd start</userinput></screen>
 
-      <para>Log on to the FTP server by typing:</para>
+      <para>Test the connection to the <acronym>FTP</acronym> server by typing:</para>
 
       <screen>&prompt.user; <userinput>ftp localhost</userinput></screen>
-    </sect2>
-
-    <sect2>
-      <title>Maintaining</title>
 
       <indexterm><primary>syslog</primary></indexterm>
       <indexterm><primary>log files</primary>
-	<secondary>FTP</secondary></indexterm>
+	<secondary><acronym>FTP</acronym></secondary></indexterm>
 
       <para>The <application>ftpd</application> daemon uses
 	&man.syslog.3; to log messages.  By default, the system log
-	daemon will put messages related to FTP in the
-	<filename>/var/log/xferlog</filename> file.  The location of
-	the FTP log can be modified by changing the following line in
+	daemon will write messages related to <acronym>FTP</acronym> in
+	<filename>/var/log/xferlog</filename>.  The location of
+	the <acronym>FTP</acronym> log can be modified by changing the following line in
 	<filename>/etc/syslog.conf</filename>:</para>
 
       <programlisting>ftp.info      /var/log/xferlog</programlisting>
 
       <indexterm>
-	<primary>FTP</primary>
+	<primary><acronym>FTP</acronym></primary>
 	<secondary>anonymous</secondary>
       </indexterm>
 
+      <note>
       <para>Be aware of the potential problems involved with running
-	an anonymous FTP server.  In particular, think twice about
+	an anonymous <acronym>FTP</acronym> server.  In particular, think twice about
 	allowing anonymous users to upload files.  It may turn out
-	that the FTP site becomes a forum for the trade of unlicensed
-	commercial software or worse.  If anonymous FTP uploads are
+	that the <acronym>FTP</acronym> site becomes a forum for the trade of unlicensed
+	commercial software or worse.  If anonymous <acronym>FTP</acronym> uploads are
 	required, then verify the permissions so that these files can
 	not be read by other anonymous users until they have been
 	reviewed by an administrator.</para>
+      </note>
     </sect2>
   </sect1>
 

From owner-svn-doc-all@FreeBSD.ORG  Mon Oct 21 22:51:20 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 196F3C97;
 Mon, 21 Oct 2013 22:51:20 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 05C6B2CEB;
 Mon, 21 Oct 2013 22:51:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9LMpJR9013240;
 Mon, 21 Oct 2013 22:51:19 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9LMpJ5I013239;
 Mon, 21 Oct 2013 22:51:19 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310212251.r9LMpJ5I013239@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Mon, 21 Oct 2013 22:51:19 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43018 -
 head/en_US.ISO8859-1/books/handbook/network-servers
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Oct 2013 22:51:20 -0000

Author: dru
Date: Mon Oct 21 22:51:19 2013
New Revision: 43018
URL: http://svnweb.freebsd.org/changeset/doc/43018

Log:
  White space fix only. Translators can ignore.

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

Modified: head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Mon Oct 21 22:20:54 2013	(r43017)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Mon Oct 21 22:51:19 2013	(r43018)
@@ -3006,134 +3006,136 @@ dhcpd_ifaces="dc0"</programlisting>
     -->
     <title>Domain Name System (<acronym>DNS</acronym>)</title>
 
-      <indexterm><primary>BIND</primary></indexterm>
+    <indexterm><primary>BIND</primary></indexterm>
 
-      <para>Domain Name System (<acronym>DNS</acronym>) is the protocol through which domain names are
-	mapped to <acronym>IP</acronym> addresses, and vice versa.  By default, &os; installs the Berkeley
-	Internet Name Domain (<acronym>BIND</acronym>), which is the most common implementation
-	of the <acronym>DNS</acronym> protocol.  The &os; version provides enhanced security features, a new file
-	system layout, and automated &man.chroot.8;
-	configuration.  BIND is maintained by the
-	<ulink url="https://www.isc.org/">isc.org</ulink>.
-	It is not necessary to run a name
-	server to perform <acronym>DNS</acronym> lookups on a
-	system.</para>
-
-      <indexterm><primary>DNS</primary></indexterm>
-      <para><acronym>DNS</acronym> is coordinated across the Internet
-	through a somewhat complex system of authoritative root, Top
-	Level Domain (<acronym>TLD</acronym>), and other smaller-scale
-	name servers, which host and cache individual domain
-	information.  Table 28.4 describes some of the terms associated with <acronym>DNS</acronym>:</para>
-
-      <indexterm><primary>resolver</primary></indexterm>
-      <indexterm><primary>reverse
-	  <acronym>DNS</acronym></primary></indexterm>
-      <indexterm><primary>root zone</primary></indexterm>
+    <para>Domain Name System (<acronym>DNS</acronym>) is the protocol
+      through which domain names are mapped to <acronym>IP</acronym>
+      addresses, and vice versa.  By default, &os; installs the
+      Berkeley Internet Name Domain (<acronym>BIND</acronym>), which
+      is the most common implementation of the <acronym>DNS</acronym>
+      protocol.  The &os; version provides enhanced security features,
+      a new file system layout, and automated &man.chroot.8;
+      configuration.  BIND is maintained by the <ulink
+	url="https://www.isc.org/">isc.org</ulink>.  It is not
+      necessary to run a name server to perform <acronym>DNS</acronym>
+      lookups on a system.</para>
+
+    <indexterm><primary>DNS</primary></indexterm>
+    <para><acronym>DNS</acronym> is coordinated across the Internet
+      through a somewhat complex system of authoritative root, Top
+      Level Domain (<acronym>TLD</acronym>), and other smaller-scale
+      name servers, which host and cache individual domain
+      information.  Table 28.4 describes some of the terms associated
+      with <acronym>DNS</acronym>:</para>
+
+    <indexterm><primary>resolver</primary></indexterm>
+    <indexterm><primary>reverse
+      <acronym>DNS</acronym></primary></indexterm>
+    <indexterm><primary>root zone</primary></indexterm>
+
+    <table frame="none" pgwide="1">
+      <title><acronym>DNS</acronym> Terminology</title>
+
+      <tgroup cols="2">
+	<colspec colwidth="1*"/>
+	<colspec colwidth="3*"/>
+
+	<thead>
+	  <row>
+	    <entry>Term</entry>
+	    <entry>Definition</entry>
+	  </row>
+	</thead>
+
+	<tbody>
+	  <row>
+	    <entry>Forward <acronym>DNS</acronym></entry>
+	    <entry>Mapping of hostnames to <acronym>IP</acronym>
+	      addresses.</entry>
+	  </row>
+
+	  <row>
+	    <entry>Origin</entry>
+	    <entry>Refers to the domain covered in a particular zone
+	      file.</entry>
+	  </row>
+
+	  <row>
+	    <entry><application>named</application>, BIND</entry>
+	    <entry>Common names for the BIND name server package
+	      within &os;.</entry>
+	  </row>
+
+	  <row>
+	    <entry>Resolver</entry>
+	    <entry>A system process through which a machine queries
+	      a name server for zone information.</entry>
+	  </row>
+
+	  <row>
+	    <entry>Reverse <acronym>DNS</acronym></entry>
+	    <entry>Mapping of <acronym>IP</acronym> addresses to
+	      hostnames.</entry>
+	  </row>
+
+	  <row>
+	    <entry>Root zone</entry>
+
+	    <entry>The beginning of the Internet zone hierarchy.  All
+	      zones fall under the root zone, similar to how all files
+	      in a file system fall under the root directory.</entry>
+	  </row>
+
+	  <row>
+	    <entry>Zone</entry>
+	    <entry>An individual domain, subdomain, or portion of the
+	      <acronym>DNS</acronym> administered by the same
+	      authority.</entry>
+	  </row>
+	</tbody>
+      </tgroup>
+    </table>
 
-      <table frame="none" pgwide="1">
-	<title><acronym>DNS</acronym> Terminology</title>
-	<tgroup cols="2">
-	  <colspec colwidth="1*"/>
-	  <colspec colwidth="3*"/>
-
-	  <thead>
-	    <row>
-	      <entry>Term</entry>
-	      <entry>Definition</entry>
-	    </row>
-	  </thead>
-
-	  <tbody>
-	    <row>
-	      <entry>Forward <acronym>DNS</acronym></entry>
-	      <entry>Mapping of hostnames to <acronym>IP</acronym>
-		addresses.</entry>
-	    </row>
-
-	    <row>
-	      <entry>Origin</entry>
-	      <entry>Refers to the domain covered in a particular zone
-		file.</entry>
-	    </row>
-
-	    <row>
-	      <entry><application>named</application>, BIND</entry>
-	      <entry>Common names for the BIND name server package
-		within &os;.</entry>
-	    </row>
-
-	    <row>
-	      <entry>Resolver</entry>
-	      <entry>A system process through which a machine queries
-		a name server for zone information.</entry>
-	    </row>
-
-	    <row>
-	      <entry>Reverse <acronym>DNS</acronym></entry>
-	      <entry>Mapping of <acronym>IP</acronym> addresses to
-		hostnames.</entry>
-	    </row>
-
-	    <row>
-	      <entry>Root zone</entry>
-
-	      <entry>The beginning of the Internet zone hierarchy.
-		All zones fall under the root zone, similar to how
-		all files in a file system fall under the root
-		directory.</entry>
-	    </row>
-
-	    <row>
-	      <entry>Zone</entry>
-	      <entry>An individual domain, subdomain, or portion of
-		the <acronym>DNS</acronym> administered by the same
-		authority.</entry>
-	    </row>
-	  </tbody>
-	</tgroup>
-      </table>
-
-      <indexterm>
-	<primary>zones</primary>
-	<secondary>examples</secondary>
-      </indexterm>
-
-      <para>Examples of zones:</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para><hostid>.</hostid> is how the root zone is usually
-	    referred to in documentation.</para>
-	</listitem>
-
-	<listitem>
-	  <para><hostid>org.</hostid> is a Top Level Domain
-	    (<acronym>TLD</acronym>) under the root zone.</para>
-	</listitem>
+    <indexterm>
+      <primary>zones</primary>
+      <secondary>examples</secondary>
+    </indexterm>
 
-	<listitem>
-	  <para><hostid role="domainname">example.org.</hostid> is a
-	    zone under the <hostid>org.</hostid>
-	    <acronym>TLD</acronym>.</para>
-	</listitem>
+    <para>Examples of zones:</para>
 
-	<listitem>
-	  <para><hostid>1.168.192.in-addr.arpa</hostid> is a zone
-	    referencing all <acronym>IP</acronym> addresses which fall
-	    under the <hostid role="ipaddr">192.168.1.*</hostid>
-	    <acronym>IP</acronym> address space.</para>
-	</listitem>
-      </itemizedlist>
-
-      <para>As one can see, the more specific part of a hostname
-	appears to its left.  For example,
-	<hostid role="domainname">example.org.</hostid> is more
-	specific than <hostid>org.</hostid>, as <hostid>org.</hostid>
-	is more specific than the root zone.  The layout of each part
-	of a hostname is much like a file system: the
-	<filename class="directory">/dev</filename> directory falls
-	within the root, and so on.</para>
+    <itemizedlist>
+      <listitem>
+	<para><hostid>.</hostid> is how the root zone is usually
+	  referred to in documentation.</para>
+      </listitem>
+
+      <listitem>
+	<para><hostid>org.</hostid> is a Top Level Domain
+	  (<acronym>TLD</acronym>) under the root zone.</para>
+      </listitem>
+
+      <listitem>
+	<para><hostid role="domainname">example.org.</hostid> is a
+	  zone under the <hostid>org.</hostid>
+	  <acronym>TLD</acronym>.</para>
+      </listitem>
+
+      <listitem>
+	<para><hostid>1.168.192.in-addr.arpa</hostid> is a zone
+	  referencing all <acronym>IP</acronym> addresses which fall
+	  under the <hostid role="ipaddr">192.168.1.*</hostid>
+	  <acronym>IP</acronym> address space.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>As one can see, the more specific part of a hostname
+      appears to its left.  For example, <hostid
+	role="domainname">example.org.</hostid> is more specific than
+      <hostid>org.</hostid>, as <hostid>org.</hostid> is more specific
+      than the root zone.  The layout of each part of a hostname is
+      much like a file system: the <filename
+	class="directory">/dev</filename> directory falls within the
+      root, and so on.</para>
 
     <sect2>
       <title>Reasons to Run a Name Server</title>
@@ -4405,18 +4407,19 @@ $include Kexample.com.+005+nnnnn.ZSK.key
       <secondary>setting up</secondary></indexterm>
     <indexterm><primary>Apache</primary></indexterm>
 
-    <para>The open source
-      <application>Apache HTTP Server</application> is the most widely
-      used web server.  &os; does not install this web server by default,
-      but it can be installed from the
-      <filename role="package">www/apache24</filename> package or port.</para>
-
-    <para>This section summarizes how to configure and start version 2.<replaceable>x</replaceable> of the
-	<application>Apache HTTP Server</application>, the
-	most widely used version, on &os;.  For more detailed
-	information about
-	<application>Apache</application>&nbsp;2.X and its configuration directives, refer to
-	<ulink url="http://httpd.apache.org/">httpd.apache.org</ulink>.</para>
+    <para>The open source <application>Apache HTTP Server
+	</application> is the most widely used web server.  &os; does
+      not install this web server by default, but it can be installed
+      from the <filename
+	role="package">www/apache24</filename> package or port.</para>
+
+    <para>This section summarizes how to configure and start version
+      2.<replaceable>x</replaceable> of the <application>Apache HTTP
+	Server</application>, the most widely used version, on &os;.
+      For more detailed information about
+      <application>Apache</application>&nbsp;2.X and its configuration
+      directives, refer to <ulink
+	url="http://httpd.apache.org/">httpd.apache.org</ulink>.</para>
 
     <sect2>
       <title>Configuring and Starting Apache</title>
@@ -4424,20 +4427,20 @@ $include Kexample.com.+005+nnnnn.ZSK.key
       <indexterm><primary>Apache</primary>
 	<secondary>configuration file</secondary></indexterm>
 
-      <para>In &os;, the main <application>Apache HTTP Server</application>
-	configuration file is installed as
+      <para>In &os;, the main <application>Apache HTTP
+	  Server</application> configuration file is installed as
 	<filename>/usr/local/etc/apache2<replaceable>x</replaceable>/httpd.conf</filename>.
-	This ASCII text file begins
-	comment lines with the <literal>#</literal>.  The
-	most frequently modified directives are:</para>
+	This ASCII text file begins comment lines with the
+	<literal>#</literal>.  The most frequently modified directives
+	are:</para>
 
       <variablelist>
 	<varlistentry>
 	  <term><literal>ServerRoot "/usr/local"</literal></term>
 
 	  <listitem>
-	    <para>Specifies the default directory hierarchy for
-	      the <application>Apache</application> installation.
+	    <para>Specifies the default directory hierarchy for the
+	      <application>Apache</application> installation.
 	      Binaries are stored in the
 	      <filename class="directory">bin</filename> and
 	      <filename class="directory">sbin</filename>
@@ -4451,7 +4454,8 @@ $include Kexample.com.+005+nnnnn.ZSK.key
 	  <term><literal>ServerAdmin you@your.address</literal></term>
 
 	  <listitem>
-	    <para>The email address to receive problems with the server.  This address also appears on some
+	    <para>The email address to receive problems with the
+	      server.  This address also appears on some
 	      server-generated pages, such as error documents.</para>
 	  </listitem>
 	</varlistentry>
@@ -4463,8 +4467,8 @@ $include Kexample.com.+005+nnnnn.ZSK.key
 	    <para>Allows an
 	      administrator to set a host name which is sent back to
 	      clients for the server.  For example,
-	      <hostid>www</hostid> can be used instead of the actual host
-	      name.</para>
+	      <hostid>www</hostid> can be used instead of the actual
+	      host name.</para>
 	  </listitem>
 	</varlistentry>
 
@@ -4487,8 +4491,8 @@ $include Kexample.com.+005+nnnnn.ZSK.key
 	making changes.  When the configuration of
 	<application>Apache</application>, is complete, save the
 	file and verify the configuration using apachectl(8).
-	Running <command>apachectl configtest</command>
-	should return <literal>Syntax OK</literal>.</para>
+	Running <command>apachectl configtest</command> should return
+	<literal>Syntax OK</literal>.</para>
 
       <indexterm><primary>Apache</primary>
 	<secondary>starting or stopping</secondary></indexterm>
@@ -4507,16 +4511,17 @@ $include Kexample.com.+005+nnnnn.ZSK.key
 
       <para>If <application>Apache</application> should be started
 	with non-default options, the following line may be added to
-	<filename>/etc/rc.conf</filename> to specify the needed flags:</para>
+	<filename>/etc/rc.conf</filename> to specify the needed
+	flags:</para>
 
       <programlisting>apache24_flags=""</programlisting>
 
       <para>The <application>Apache</application> configuration can be
-	tested for errors after making subsequent
-	configuration changes while <command>httpd</command> is
-	running.  This can be done by the &man.rc.8; script directly,
-	or by the &man.service.8; utility by issuing one of the
-	following commands:</para>
+	tested for errors after making subsequent configuration
+	changes while <command>httpd</command> is running.  This can
+	be done by the &man.rc.8; script directly, or by the
+	&man.service.8; utility by issuing one of the following
+	commands:</para>
 
       <screen>&prompt.root; <userinput>service apache24 configtest</userinput></screen>
 
@@ -4873,66 +4878,72 @@ DocumentRoot /www/someotherdomain.tld
     -->
     <title>File Transfer Protocol (<acronym>FTP</acronym>)</title>
 
-    <indexterm><primary><acronym>FTP</acronym> servers</primary></indexterm>
+    <indexterm><primary><acronym>FTP</acronym>
+	servers</primary></indexterm>
 
-    <para>The File Transfer Protocol (<acronym>FTP</acronym>) provides users with a
-      simple way to transfer files to and from an
-      <acronym>FTP</acronym> server.
-      &os; includes <acronym>FTP</acronym> server
-      software, <application>ftpd</application>, in the base system.</para>
-      
-      <para>&os; provides several configuration files for controlling access
-	to the <acronym>FTP</acronym> server. This section summarizes
-	these files.  Refer to &man.ftpd.8; for more details about the
-	built-in <acronym>FTP</acronym> server.</para>
+    <para>The File Transfer Protocol (<acronym>FTP</acronym>) provides
+      users with a simple way to transfer files to and from an
+      <acronym>FTP</acronym> server.  &os; includes
+      <acronym>FTP</acronym> server software,
+      <application>ftpd</application>, in the base system.</para>
+
+    <para>&os; provides several configuration files for controlling
+      access to the <acronym>FTP</acronym> server.  This section
+      summarizes these files.  Refer to &man.ftpd.8; for more details
+      about the built-in <acronym>FTP</acronym> server.</para>
 
-      <sect2>
-	<title>Configuration</title>
+    <sect2>
+      <title>Configuration</title>
 
       <para>The most important configuration step is deciding which
-	accounts will be allowed access to the <acronym>FTP</acronym> server.  A
-	&os; system has a number of system accounts which
-	should not be allowed <acronym>FTP</acronym> access.
-	The list of users disallowed any <acronym>FTP</acronym> access
-	can be found in <filename>/etc/ftpusers</filename>.
-	By
-	default, it includes system accounts.  Additional
-	users that should not be
+	accounts will be allowed access to the <acronym>FTP</acronym>
+	server.  A &os; system has a number of system accounts which
+	should not be allowed <acronym>FTP</acronym> access.  The list
+	of users disallowed any <acronym>FTP</acronym> access can be
+	found in <filename>/etc/ftpusers</filename>.  By default, it
+	includes system accounts.  Additional users that should not be
 	allowed access to <acronym>FTP</acronym> can be added.</para>
 
       <para>In some cases it may be desirable to restrict the access
 	of some users without preventing them completely from using
 	<acronym>FTP</acronym>.  This can be accomplished be creating
-	<filename>/etc/ftpchroot</filename> as described in &man.ftpchroot.5;.  This file lists
-	users and groups subject to <acronym>FTP</acronym> access restrictions.</para>
+	<filename>/etc/ftpchroot</filename> as described in
+	&man.ftpchroot.5;.  This file lists users and groups subject
+	to <acronym>FTP</acronym> access restrictions.</para>
 
       <indexterm>
 	<primary><acronym>FTP</acronym></primary>
 	<secondary>anonymous</secondary>
       </indexterm>
 
-      <para>To enable anonymous <acronym>FTP</acronym> access to the server, create a
-	user named <username>ftp</username> on the &os; system.  Users
-	will then be able to log on to the <acronym>FTP</acronym> server with a username
-	of <username>ftp</username> or <username>anonymous</username>.  When prompted for the password,
-	any input will be accepted, but by convention, an email address
-	should be used as the password.  The <acronym>FTP</acronym> server will
-	call &man.chroot.2; when an anonymous user logs in, to
-	restrict access to only the home directory of the
+      <para>To enable anonymous <acronym>FTP</acronym> access to the
+	server, create a user named <username>ftp</username> on the
+	&os; system.  Users will then be able to log on to the
+	<acronym>FTP</acronym> server with a username of
+	<username>ftp</username> or <username>anonymous</username>.
+	When prompted for the password, any input will be accepted,
+	but by convention, an email address should be used as the
+	password.  The <acronym>FTP</acronym> server will call
+	&man.chroot.2; when an anonymous user logs in, to restrict
+	access to only the home directory of the
 	<username>ftp</username> user.</para>
 
-      <para>There are two text files that can be created to specify welcome messages to
-	be displayed to <acronym>FTP</acronym> clients.  The contents of
+      <para>There are two text files that can be created to specify
+	welcome messages to be displayed to <acronym>FTP</acronym>
+	clients.  The contents of
 	<filename>/etc/ftpwelcome</filename> will be displayed to
 	users before they reach the login prompt.  After a successful
 	login, the contents of
 	<filename>/etc/ftpmotd</filename> will be displayed.  Note
 	that the path to this file is relative to the login
-	environment, so the contents of <filename>~ftp/etc/ftpmotd</filename>
-	would be displayed for anonymous users.</para>
-
-      <para>Once the <acronym>FTP</acronym> server has been configured, set the appropriate variable in
-	<filename>/etc/rc.conf</filename> to start the service during boot:</para>
+	environment, so the contents of
+	<filename>~ftp/etc/ftpmotd</filename> would be displayed for
+	anonymous users.</para>
+
+      <para>Once the <acronym>FTP</acronym> server has been
+	configured, set the appropriate variable in
+	<filename>/etc/rc.conf</filename> to start the service during
+	boot:</para>
 
       <programlisting>ftpd_enable="YES"</programlisting>
 
@@ -4940,7 +4951,8 @@ DocumentRoot /www/someotherdomain.tld
 
       <screen>&prompt.root; <userinput>service ftpd start</userinput></screen>
 
-      <para>Test the connection to the <acronym>FTP</acronym> server by typing:</para>
+      <para>Test the connection to the <acronym>FTP</acronym> server
+	by typing:</para>
 
       <screen>&prompt.user; <userinput>ftp localhost</userinput></screen>
 
@@ -4950,9 +4962,10 @@ DocumentRoot /www/someotherdomain.tld
 
       <para>The <application>ftpd</application> daemon uses
 	&man.syslog.3; to log messages.  By default, the system log
-	daemon will write messages related to <acronym>FTP</acronym> in
-	<filename>/var/log/xferlog</filename>.  The location of
-	the <acronym>FTP</acronym> log can be modified by changing the following line in
+	daemon will write messages related to <acronym>FTP</acronym>
+	in <filename>/var/log/xferlog</filename>.  The location of
+	the <acronym>FTP</acronym> log can be modified by changing the
+	following line in
 	<filename>/etc/syslog.conf</filename>:</para>
 
       <programlisting>ftp.info      /var/log/xferlog</programlisting>
@@ -4963,14 +4976,15 @@ DocumentRoot /www/someotherdomain.tld
       </indexterm>
 
       <note>
-      <para>Be aware of the potential problems involved with running
-	an anonymous <acronym>FTP</acronym> server.  In particular, think twice about
-	allowing anonymous users to upload files.  It may turn out
-	that the <acronym>FTP</acronym> site becomes a forum for the trade of unlicensed
-	commercial software or worse.  If anonymous <acronym>FTP</acronym> uploads are
-	required, then verify the permissions so that these files can
-	not be read by other anonymous users until they have been
-	reviewed by an administrator.</para>
+	<para>Be aware of the potential problems involved with running
+	  an anonymous <acronym>FTP</acronym> server.  In particular,
+	  think twice about allowing anonymous users to upload files.
+	  It may turn out that the <acronym>FTP</acronym> site becomes
+	  a forum for the trade of unlicensed commercial software or
+	  worse.  If anonymous <acronym>FTP</acronym> uploads are
+	  required, then verify the permissions so that these files
+	  can not be read by other anonymous users until they have
+	  been reviewed by an administrator.</para>
       </note>
     </sect2>
   </sect1>

From owner-svn-doc-all@FreeBSD.ORG  Tue Oct 22 08:42:53 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id C41BD509;
 Tue, 22 Oct 2013 08:42:53 +0000 (UTC)
 (envelope-from jkois@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B18A328B9;
 Tue, 22 Oct 2013 08:42:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9M8grk0042825;
 Tue, 22 Oct 2013 08:42:53 GMT (envelope-from jkois@svn.freebsd.org)
Received: (from jkois@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9M8grrF042824;
 Tue, 22 Oct 2013 08:42:53 GMT (envelope-from jkois@svn.freebsd.org)
Message-Id: <201310220842.r9M8grrF042824@svn.freebsd.org>
From: Johann Kois <jkois@FreeBSD.org>
Date: Tue, 22 Oct 2013 08:42:53 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43019 - head/de_DE.ISO8859-1/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Oct 2013 08:42:53 -0000

Author: jkois
Date: Tue Oct 22 08:42:53 2013
New Revision: 43019
URL: http://svnweb.freebsd.org/changeset/doc/43019

Log:
  r42963 -> r43014
  
  MFde:   Resync the project news
  
  Obtained from:  The FreeBSD German Documentation Project

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

Modified: head/de_DE.ISO8859-1/share/xml/news.xml
==============================================================================
--- head/de_DE.ISO8859-1/share/xml/news.xml	Mon Oct 21 22:51:19 2013	(r43018)
+++ head/de_DE.ISO8859-1/share/xml/news.xml	Tue Oct 22 08:42:53 2013	(r43019)
@@ -4,7 +4,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r42963
+     basiert auf: r43014
 -->
 
 <!-- Simple schema for FreeBSD Project news.
@@ -42,6 +42,18 @@
       <name>10</name>
 
       <day>
+	<name>20</name>
+
+	<event>
+	  <title>Statusreport Juli-September 2013</title>
+
+	  <p>Der Statusreport für die Monate Juli bis September 2013
+	    mit 30 Einträgen ist ab sofort <a
+	    href="&enbase;/news/status/report-2013-07-2013-09.html">verfügbar</a>.</p>
+	</event>
+      </day>
+
+      <day>
 	<name>14</name>
 
 	<event>

From owner-svn-doc-all@FreeBSD.ORG  Tue Oct 22 10:04:16 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B22B7CFE;
 Tue, 22 Oct 2013 10:04:16 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9F7622D58;
 Tue, 22 Oct 2013 10:04:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9MA4GeC086411;
 Tue, 22 Oct 2013 10:04:16 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9MA4GMV086410;
 Tue, 22 Oct 2013 10:04:16 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201310221004.r9MA4GMV086410@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Tue, 22 Oct 2013 10:04:16 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43020 - head/ja_JP.eucJP/books/handbook/cutting-edge
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Oct 2013 10:04:16 -0000

Author: ryusuke
Date: Tue Oct 22 10:04:16 2013
New Revision: 43020
URL: http://svnweb.freebsd.org/changeset/doc/43020

Log:
  - full-width space -> half-width space
  - add missing punctuation.

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 Oct 22 08:42:53 2013	(r43019)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Tue Oct 22 10:04:16 2013	(r43020)
@@ -1778,7 +1778,7 @@ Fetching 133 new ports or files... done.
       <itemizedlist>
 	<listitem>
 	  <para>¸Å¤¤¥³¥ó¥Ñ¥¤¥é¤Ï¡¢
-	¡¡  ¥Ð¥°¤ò´Þ¤ß¿·¤·¤¤¥«¡¼¥Í¥ë¤ò¥³¥ó¥Ñ¥¤¥ë¤Ç¤­¤Ê¤¤²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹
+	    ¥Ð¥°¤ò´Þ¤ß¿·¤·¤¤¥«¡¼¥Í¥ë¤ò¥³¥ó¥Ñ¥¤¥ë¤Ç¤­¤Ê¤¤²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
 	    ¤½¤Î¤¿¤á¡¢¿·¤·¤¤¥«¡¼¥Í¥ë¤Î¹½Ãۤˤϡ¢
 	    ¿·¤·¤¤¥³¥ó¥Ñ¥¤¥é¤ò»È¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
 	    ¤³¤È¤Î¤³¤È¤Ï¡¢¿·¤·¤¤¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤¹¤ëÁ°¤Ë¡¢

From owner-svn-doc-all@FreeBSD.ORG  Tue Oct 22 18:58:13 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 79420A6B;
 Tue, 22 Oct 2013 18:58:13 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4B0F52FA3;
 Tue, 22 Oct 2013 18:58:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9MIwD0j089517;
 Tue, 22 Oct 2013 18:58:13 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9MIwDNd089516;
 Tue, 22 Oct 2013 18:58:13 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310221858.r9MIwDNd089516@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 22 Oct 2013 18:58:13 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43021 - head/en_US.ISO8859-1/books/handbook/basics
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Oct 2013 18:58:13 -0000

Author: dru
Date: Tue Oct 22 18:58:12 2013
New Revision: 43021
URL: http://svnweb.freebsd.org/changeset/doc/43021

Log:
  Combine "Processes" and "Daemons, Signals, and Killing Processes" into one section entitled "Processes and Daemons"
  - introduce daemons and processes in same introductory section
  - add headings for viewing processes and for killing processes
  - update listings
  
  To be followed by a white space fix.

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

Modified: head/en_US.ISO8859-1/books/handbook/basics/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Tue Oct 22 10:04:16 2013	(r43020)
+++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Tue Oct 22 18:58:12 2013	(r43021)
@@ -2859,7 +2859,7 @@ root     5211  0.0  0.2  3620  1724   2 
   </sect1>
 
   <sect1 id="basics-processes">
-    <title>Processes</title>
+    <title>Processes and Daemons</title>
 
     <para>&os; is a multi-tasking operating system.  Each program
       running at any one time is called a
@@ -2877,9 +2877,33 @@ root     5211  0.0  0.2  3620  1724   2 
       process which has the shell as its parent process.  The
       exception is a special process called &man.init.8; which is
       always the first process to start at boot time and which always
-      has a <acronym>PID</acronym> of 1.</para>
+      has a <acronym>PID</acronym> of <literal>1</literal>.</para>
 
-    <para>To see the processes on the system, use &man.ps.1; and
+     <para>Some programs are not designed
+      to be run with continuous user input and disconnect from the
+      terminal at the first opportunity.  For example, a web server
+      responds to web requests, rather than user input.  Mail servers
+      are another example of this type of application.  These types of
+      programs are known as <firstterm>daemons</firstterm>.
+      The term daemon comes from Greek mythology and represents an
+      entity that is neither good nor evil, and which invisibly
+      performs useful tasks.  This is why the BSD mascot is the
+      cheerful-looking daemon with sneakers and a pitchfork.</para>
+
+    <para>There is a convention to name programs that normally run as
+      daemons with a trailing <quote>d</quote>.  For example,
+      <application>BIND</application> is the Berkeley Internet Name
+      Domain, but the actual program that executes is <command>named</command>.
+      The <application>Apache</application> web server program is
+      <command>httpd</command> and the line printer spooling daemon
+      is <command>lpd</command>.  This is only a naming convention.  For example,
+      the main mail daemon for the <application>Sendmail</application>
+      application is <command>sendmail</command>, and not
+      <literal>maild</literal>.</para>     
+    <sect2>
+      <title>Viewing Processes</title>
+
+    <para>To see the processes running on the system, use &man.ps.1; or
       &man.top.1;.   To display a static list of the currently running
       processes, their <acronym>PID</acronym>s, how much memory they
       are using, and the command they were started with, use
@@ -2891,21 +2915,9 @@ root     5211  0.0  0.2  3620  1724   2 
       running and owned by the user.  For example:</para>
 
     <screen>&prompt.user; <userinput>ps</userinput>
-  PID  TT  STAT      TIME COMMAND
-  298  p0  Ss     0:01.10 tcsh
- 7078  p0  S      2:40.88 xemacs mdoc.xsl (xemacs-21.1.14)
-37393  p0  I      0:03.11 xemacs freebsd.dsl (xemacs-21.1.14)
-72210  p0  R+     0:00.00 ps
-  390  p1  Is     0:01.14 tcsh
- 7059  p2  Is+    1:36.18 /usr/local/bin/mutt -y
- 6688  p3  IWs    0:00.00 tcsh
-10735  p4  IWs    0:00.00 tcsh
-20256  p5  IWs    0:00.00 tcsh
-  262  v0  IWs    0:00.00 -tcsh (tcsh)
-  270  v0  IW+    0:00.00 /bin/sh /usr/X11R6/bin/startx -- -bpp 16
-  280  v0  IW+    0:00.00 xinit /home/nik/.xinitrc -- -bpp 16
-  284  v0  IW     0:00.00 /bin/sh /home/nik/.xinitrc
-  285  v0  S      0:38.45 /usr/X11R6/bin/sawfish</screen>
+ PID TT  STAT    TIME COMMAND
+8203  0  Ss   0:00.59 /bin/csh
+8895  0  R+   0:00.00 ps</screen>
 
     <para>The output from &man.ps.1; is organized into a number of
       columns.  The <literal>PID</literal> column displays the process
@@ -2922,19 +2934,18 @@ root     5211  0.0  0.2  3620  1724   2 
       <literal>COMMAND</literal> is the command that was used to start
       the program.</para>
 
-    <para>&man.ps.1; supports a number of different options to change
+    <para>A number of different options are available to change
       the information that is displayed.  One of the most useful sets
-      is <literal>auxww</literal>.  <option>a</option> displays
-      information about all the running processes of all users.
-      <option>u</option> displays the username of the process' owner,
-      as well as memory usage.  <option>x</option> displays
+      is <literal>auxww</literal>, where  <option>a</option> displays
+      information about all the running processes of all users,
+      <option>u</option> displays the username and memory usage of the process' owner,
+      <option>x</option> displays
       information about daemon processes, and <option>ww</option>
       causes &man.ps.1; to display the full command line for each
       process, rather than truncating it once it gets too long to fit
       on the screen.</para>
 
-    <para>The output from &man.top.1; is similar.  A sample session
-      looks like this:</para>
+    <para>The output from &man.top.1; is similar:</para>
 
     <screen>&prompt.user; <userinput>top</userinput>
 last pid: 72257;  load averages:  0.13,  0.09,  0.03    up 0+13:38:33  22:39:10
@@ -2943,23 +2954,38 @@ CPU states: 12.6% user,  0.0% nice,  7.8
 Mem: 36M Active, 5256K Inact, 13M Wired, 6312K Cache, 15M Buf, 408K Free
 Swap: 256M Total, 38M Used, 217M Free, 15% Inuse
 
-  PID USERNAME PRI NICE  SIZE    RES STATE    TIME   WCPU    CPU COMMAND
-72257 nik       28   0  1960K  1044K RUN      0:00 14.86%  1.42% top
- 7078 nik        2   0 15280K 10960K select   2:54  0.88%  0.88% xemacs-21.1.14
-  281 nik        2   0 18636K  7112K select   5:36  0.73%  0.73% XF86_SVGA
-  296 nik        2   0  3240K  1644K select   0:12  0.05%  0.05% xterm
-  175 root       2   0   924K   252K select   1:41  0.00%  0.00% syslogd
- 7059 nik        2   0  7260K  4644K poll     1:38  0.00%  0.00% mutt
-...</screen>
+last pid:  9609;  load averages:  0.56,  0.45,  0.36              up 0+00:20:03  10:21:46
+107 processes: 2 running, 104 sleeping, 1 zombie
+CPU:  6.2% user,  0.1% nice,  8.2% system,  0.4% interrupt, 85.1% idle
+Mem: 541M Active, 450M Inact, 1333M Wired, 4064K Cache, 1498M Free
+ARC: 992M Total, 377M MFU, 589M MRU, 250K Anon, 5280K Header, 21M Other
+Swap: 2048M Total, 2048M Free
+
+  PID USERNAME    THR PRI NICE   SIZE    RES STATE   C   TIME   WCPU COMMAND
+  557 root          1 -21  r31   136M 42296K select  0   2:20  9.96% Xorg
+ 8198 dru           2  52    0   449M 82736K select  3   0:08  5.96% kdeinit4
+ 8311 dru          27  30    0  1150M   187M uwait   1   1:37  0.98% firefox
+  431 root          1  20    0 14268K  1728K select  0   0:06  0.98% moused
+ 9551 dru           1  21    0 16600K  2660K CPU3    3   0:01  0.98% top
+ 2357 dru           4  37    0   718M   141M select  0   0:21  0.00% kdeinit4
+ 8705 dru           4  35    0   480M    98M select  2   0:20  0.00% kdeinit4
+ 8076 dru           6  20    0   552M   113M uwait   0   0:12  0.00% soffice.bin
+ 2623 root          1  30   10 12088K  1636K select  3   0:09  0.00% powerd
+ 2338 dru           1  20    0   440M 84532K select  1   0:06  0.00% kwin
+ 1427 dru           5  22    0   605M 86412K select  1   0:05  0.00% kdeinit4</screen>
 
     <para>The output is split into two sections.  The header (the
-      first five lines) shows the <acronym>PID</acronym> of the last
+      first five or six lines) shows the <acronym>PID</acronym> of the last
       process to run, the system load averages (which are a measure
       of how busy the system is), the system uptime (time since the
       last reboot) and the current time.  The other figures in the
-      header relate to how many processes are running (47 in this
-      case), how much memory and swap space has been used, and how
-      much time the system is spending in different CPU states.</para>
+      header relate to how many processes are running,
+      how much memory and swap space has been used, and how
+      much time the system is spending in different CPU states.  If
+      the system has been formatted with the <acronym>ZFS</acronym>
+      file system, the <literal>ARC</literal> line provides an
+      indication of how much data was read from the memory cache
+      instead of from disk.</para>
 
     <para>Below the header is a series of columns containing similar
       information to the output from &man.ps.1;, such as the
@@ -2969,46 +2995,18 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       This is split into two columns: one for total size and one for
       resident size.  Total size is how much memory the application
       has needed and the resident size is how much it is actually
-      using at the moment.  In this example,
-      <application>mutt</application> has required almost 8&nbsp;MB
-      of RAM, but is currently only using 5&nbsp;MB.</para>
+      using now.</para>
 
     <para>&man.top.1; automatically updates the display every two
       seconds.  A different interval can be specified with
       <option>-s</option>.</para>
-  </sect1>
+  </sect2>
 
-  <sect1 id="basics-daemons">
-    <title>Daemons, Signals, and Killing Processes</title>
-
-    <para>When using an editor, it is easy to control the editor and
-      load files because the editor provides facilities to do so, and
-      because the editor is attached to a
-      <firstterm>terminal</firstterm>.  Some programs are not designed
-      to be run with continuous user input and disconnect from the
-      terminal at the first opportunity.  For example, a web server
-      responds to web requests, rather than user input.  Mail servers
-      are another example of this type of application.</para>
-
-    <para>These programs are known as <firstterm>daemons</firstterm>.
-      The term daemon comes from Greek mythology and represents an
-      entity that is neither good or evil, and which invisibly
-      performs useful tasks.  This is why the BSD mascot is the
-      cheerful-looking daemon with sneakers and a pitchfork.</para>
-
-    <para>There is a convention to name programs that normally run as
-      daemons with a trailing <quote>d</quote>.
-      <application>BIND</application> is the Berkeley Internet Name
-      Domain, but the actual program that executes is &man.named.8;.
-      The <application>Apache</application> web server program is
-      <command>httpd</command> and the line printer spooling daemon
-      is &man.lpd.8;.  This is only a naming convention.  For example,
-      the main mail daemon for the <application>Sendmail</application>
-      application is &man.sendmail.8;, and not
-      <literal>maild</literal>.</para>
+  <sect2 id="basics-daemons">
+    <title>Killing Processes</title>
 
-    <para>One way to communicate with a daemon, or any running
-      process, is to send a <firstterm>signal</firstterm> using
+    <para>One way to communicate with any running
+      process or daemon is to send a <firstterm>signal</firstterm> using
       &man.kill.1;.  There are a number of different signals; some
       have a specific meaning while others are described in the
       application's documentation.  A user can only send a signal to a
@@ -3017,13 +3015,13 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <username>root</username> user, who can send signals to anyone's
       processes.</para>
 
-    <para>&os; can also send a signal to a process.  If an application
+    <para>The operating system can also send a signal to a process.  If an application
       is badly written and tries to access memory that it is not
       supposed to, &os; will send the process the
-      <firstterm>Segmentation Violation</firstterm> signal
-      (<literal>SIGSEGV</literal>).  If an application has used the
+      <quote>Segmentation Violation</quote> signal
+      (<literal>SIGSEGV</literal>).  If an application has been written to use the
       &man.alarm.3; system call to be alerted after a period of time
-      has elapsed, it will be sent the Alarm signal
+      has elapsed, it will be sent the <quote>Alarm</quote> signal
       (<literal>SIGALRM</literal>).</para>
 
     <para>Two signals can be used to stop a process:
@@ -3036,8 +3034,7 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       that can not be interrupted.</para>
 
     <para><literal>SIGKILL</literal> can not be ignored by a process.
-      This is the <quote>I do not care what you are doing, stop right
-      now</quote> signal.  Sending a <literal>SIGKILL</literal> to a
+      Sending a <literal>SIGKILL</literal> to a
       process will usually stop that process there and then.<footnote>
 	<para>There are a few tasks that can not be interrupted.  For
 	  example, if the process is trying to read from a file that
@@ -3050,7 +3047,7 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 
     <para>Other commonly used signals are <literal>SIGHUP</literal>,
       <literal>SIGUSR1</literal>, and <literal>SIGUSR2</literal>.
-      These are general purpose signals and different applications
+      Since these are general purpose signals, different applications
       will respond differently.</para>
 
     <para>For example, after changing a web server's configuration
@@ -3112,19 +3109,17 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 	    <filename>/bin/kill</filename>.  Be aware that different
 	    shells have a different syntax for specifying the name of
 	    the signal to send.  Rather than try to learn all of them,
-	    it can be simpler to use <command>/bin/kill
-	      <replaceable>...</replaceable></command>
-	    directly.</para>
+	    it can be simpler to specify <command>/bin/kill</command>.</para>
 	</note>
       </step>
     </procedure>
 
     <para>When sending other signals, substitute
-      <literal>TERM</literal> or <literal>KILL</literal> in the
-      command line as necessary.</para>
+      <literal>TERM</literal> or <literal>KILL</literal> with the name
+      of the signal.</para>
 
     <important>
-      <para>Killing a random process on the system can be a bad idea.
+      <para>Killing a random process on the system is a bad idea.
 	In particular, &man.init.8;, <acronym>PID</acronym> 1, is
 	special.  Running <command>/bin/kill -s KILL 1</command> is
 	a quick, and unrecommended, way to shutdown the system.
@@ -3132,6 +3127,7 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 	&man.kill.1; <emphasis>before</emphasis> pressing
 	<keycap>Return</keycap>.</para>
     </important>
+  </sect2>
   </sect1>
 
   <sect1 id="shells">

From owner-svn-doc-all@FreeBSD.ORG  Tue Oct 22 19:39:04 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 43E20570;
 Tue, 22 Oct 2013 19:39:04 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2F9292257;
 Tue, 22 Oct 2013 19:39:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9MJd4Yn011613;
 Tue, 22 Oct 2013 19:39:04 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9MJd4jC011612;
 Tue, 22 Oct 2013 19:39:04 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310221939.r9MJd4jC011612@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 22 Oct 2013 19:39:04 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43022 - head/en_US.ISO8859-1/books/handbook/basics
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Oct 2013 19:39:04 -0000

Author: dru
Date: Tue Oct 22 19:39:03 2013
New Revision: 43022
URL: http://svnweb.freebsd.org/changeset/doc/43022

Log:
  White space fix only. Translators can ignore.

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

Modified: head/en_US.ISO8859-1/books/handbook/basics/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Tue Oct 22 18:58:12 2013	(r43021)
+++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Tue Oct 22 19:39:03 2013	(r43022)
@@ -542,7 +542,7 @@ console none                            
 	</listitem>
       </varlistentry>
     </variablelist>
-  </sect3>
+    </sect3>
 
     <sect3 id="users-superuser">
       <title>The Superuser Account</title>
@@ -1305,7 +1305,7 @@ teamtwo:*:1100:jru,db</screen>
 
       <screen>&prompt.user; <userinput>id jru</userinput>
 uid=1001(jru) gid=1001(jru) groups=1001(jru), 1100(teamtwo)</screen>
-    </example>
+      </example>
 
       <para>In this example, <username>jru</username> is a member of
 	the groups <groupname>jru</groupname> and
@@ -2879,75 +2879,78 @@ root     5211  0.0  0.2  3620  1724   2 
       always the first process to start at boot time and which always
       has a <acronym>PID</acronym> of <literal>1</literal>.</para>
 
-     <para>Some programs are not designed
-      to be run with continuous user input and disconnect from the
-      terminal at the first opportunity.  For example, a web server
-      responds to web requests, rather than user input.  Mail servers
-      are another example of this type of application.  These types of
-      programs are known as <firstterm>daemons</firstterm>.
-      The term daemon comes from Greek mythology and represents an
-      entity that is neither good nor evil, and which invisibly
-      performs useful tasks.  This is why the BSD mascot is the
-      cheerful-looking daemon with sneakers and a pitchfork.</para>
+    <para>Some programs are not designed to be run with continuous
+      user input and disconnect from the terminal at the first
+      opportunity.  For example, a web server responds to web
+      requests, rather than user input.  Mail servers are another
+      example of this type of application.  These types of programs
+      are known as <firstterm>daemons</firstterm>.  The term daemon
+      comes from Greek mythology and represents an entity that is
+      neither good nor evil, and which invisibly performs useful
+      tasks.  This is why the BSD mascot is the cheerful-looking
+      daemon with sneakers and a pitchfork.</para>
 
     <para>There is a convention to name programs that normally run as
       daemons with a trailing <quote>d</quote>.  For example,
       <application>BIND</application> is the Berkeley Internet Name
-      Domain, but the actual program that executes is <command>named</command>.
-      The <application>Apache</application> web server program is
+      Domain, but the actual program that executes is
+      <command>named</command>.  The
+      <application>Apache</application> web server program is
       <command>httpd</command> and the line printer spooling daemon
-      is <command>lpd</command>.  This is only a naming convention.  For example,
-      the main mail daemon for the <application>Sendmail</application>
-      application is <command>sendmail</command>, and not
-      <literal>maild</literal>.</para>     
+      is <command>lpd</command>.  This is only a naming convention.
+      For example, the main mail daemon for the
+      <application>Sendmail</application> application is
+      <command>sendmail</command>, and not
+      <literal>maild</literal>.</para>
+
     <sect2>
       <title>Viewing Processes</title>
 
-    <para>To see the processes running on the system, use &man.ps.1; or
-      &man.top.1;.   To display a static list of the currently running
-      processes, their <acronym>PID</acronym>s, how much memory they
-      are using, and the command they were started with, use
-      &man.ps.1;.  To display all the running processes and update
-      the display every few seconds in order to interactively see
-      what the computer is doing, use &man.top.1;.</para>
+      <para>To see the processes running on the system, use &man.ps.1;
+	or &man.top.1;.   To display a static list of the currently
+	running processes, their <acronym>PID</acronym>s, how much
+	memory they are using, and the command they were started with,
+	use &man.ps.1;.  To display all the running processes and
+	update the display every few seconds in order to interactively
+	see what the computer is doing, use &man.top.1;.</para>
 
-    <para>By default, &man.ps.1; only shows the commands that are
-      running and owned by the user.  For example:</para>
+      <para>By default, &man.ps.1; only shows the commands that are
+	running and owned by the user.  For example:</para>
 
-    <screen>&prompt.user; <userinput>ps</userinput>
+      <screen>&prompt.user; <userinput>ps</userinput>
  PID TT  STAT    TIME COMMAND
 8203  0  Ss   0:00.59 /bin/csh
 8895  0  R+   0:00.00 ps</screen>
 
-    <para>The output from &man.ps.1; is organized into a number of
-      columns.  The <literal>PID</literal> column displays the process
-      ID.  <acronym>PID</acronym>s are assigned starting at 1, go up
-      to 99999, then wrap around back to the beginning.  However, a
-      <acronym>PID</acronym> is not reassigned if it is already in
-      use.  The <literal>TT</literal> column shows the tty the program
-      is running on and <literal>STAT</literal> shows the program's
-      state.  <literal>TIME</literal> is the amount of time the
-      program has been running on the CPU.  This is usually not the
-      elapsed time since the program was started, as most programs
-      spend a lot of time waiting for things to happen before they
-      need to spend time on the CPU.  Finally,
-      <literal>COMMAND</literal> is the command that was used to start
-      the program.</para>
-
-    <para>A number of different options are available to change
-      the information that is displayed.  One of the most useful sets
-      is <literal>auxww</literal>, where  <option>a</option> displays
-      information about all the running processes of all users,
-      <option>u</option> displays the username and memory usage of the process' owner,
-      <option>x</option> displays
-      information about daemon processes, and <option>ww</option>
-      causes &man.ps.1; to display the full command line for each
-      process, rather than truncating it once it gets too long to fit
-      on the screen.</para>
+      <para>The output from &man.ps.1; is organized into a number of
+	columns.  The <literal>PID</literal> column displays the
+	process ID.  <acronym>PID</acronym>s are assigned starting at
+	1, go up to 99999, then wrap around back to the beginning.
+	However, a <acronym>PID</acronym> is not reassigned if it is
+	already in use.  The <literal>TT</literal> column shows the
+	tty the program is running on and <literal>STAT</literal>
+	shows the program's state.  <literal>TIME</literal> is the
+	amount of time the program has been running on the CPU.  This
+	is usually not the elapsed time since the program was started,
+	as most programs spend a lot of time waiting for things to
+	happen before they need to spend time on the CPU.  Finally,
+	<literal>COMMAND</literal> is the command that was used to
+	start the program.</para>
+
+      <para>A number of different options are available to change the
+	information that is displayed.  One of the most useful sets is
+	<literal>auxww</literal>, where  <option>a</option> displays
+	information about all the running processes of all users,
+	<option>u</option> displays the username and memory usage of
+	the process' owner, <option>x</option> displays
+	information about daemon processes, and <option>ww</option>
+	causes &man.ps.1; to display the full command line for each
+	process, rather than truncating it once it gets too long to
+	fit on the screen.</para>
 
-    <para>The output from &man.top.1; is similar:</para>
+      <para>The output from &man.top.1; is similar:</para>
 
-    <screen>&prompt.user; <userinput>top</userinput>
+      <screen>&prompt.user; <userinput>top</userinput>
 last pid: 72257;  load averages:  0.13,  0.09,  0.03    up 0+13:38:33  22:39:10
 47 processes:  1 running, 46 sleeping
 CPU states: 12.6% user,  0.0% nice,  7.8% system,  0.0% interrupt, 79.7% idle
@@ -2974,68 +2977,70 @@ Swap: 2048M Total, 2048M Free
  2338 dru           1  20    0   440M 84532K select  1   0:06  0.00% kwin
  1427 dru           5  22    0   605M 86412K select  1   0:05  0.00% kdeinit4</screen>
 
-    <para>The output is split into two sections.  The header (the
-      first five or six lines) shows the <acronym>PID</acronym> of the last
-      process to run, the system load averages (which are a measure
-      of how busy the system is), the system uptime (time since the
-      last reboot) and the current time.  The other figures in the
-      header relate to how many processes are running,
-      how much memory and swap space has been used, and how
-      much time the system is spending in different CPU states.  If
-      the system has been formatted with the <acronym>ZFS</acronym>
-      file system, the <literal>ARC</literal> line provides an
-      indication of how much data was read from the memory cache
-      instead of from disk.</para>
-
-    <para>Below the header is a series of columns containing similar
-      information to the output from &man.ps.1;, such as the
-      <acronym>PID</acronym>, username, amount of CPU time, and the
-      command that started the process.  By default, &man.top.1; also
-      displays the amount of memory space taken by the process.
-      This is split into two columns: one for total size and one for
-      resident size.  Total size is how much memory the application
-      has needed and the resident size is how much it is actually
-      using now.</para>
-
-    <para>&man.top.1; automatically updates the display every two
-      seconds.  A different interval can be specified with
-      <option>-s</option>.</para>
-  </sect2>
+      <para>The output is split into two sections.  The header (the
+	first five or six lines) shows the <acronym>PID</acronym> of
+	the last process to run, the system load averages (which are a
+	measure of how busy the system is), the system uptime (time
+	since the last reboot) and the current time.  The other
+	figures in the header relate to how many processes are
+	running, how much memory and swap space has been used, and how
+	much time the system is spending in different CPU states.  If
+	the system has been formatted with the <acronym>ZFS</acronym>
+	file system, the <literal>ARC</literal> line provides an
+	indication of how much data was read from the memory cache
+	instead of from disk.</para>
+
+      <para>Below the header is a series of columns containing similar
+	information to the output from &man.ps.1;, such as the
+	<acronym>PID</acronym>, username, amount of CPU time, and the
+	command that started the process.  By default, &man.top.1;
+	also displays the amount of memory space taken by the process.
+	This is split into two columns: one for total size and one for
+	resident size.  Total size is how much memory the application
+	has needed and the resident size is how much it is actually
+	using now.</para>
+
+      <para>&man.top.1; automatically updates the display every two
+	seconds.  A different interval can be specified with
+	<option>-s</option>.</para>
+    </sect2>
 
-  <sect2 id="basics-daemons">
-    <title>Killing Processes</title>
+    <sect2 id="basics-daemons">
+      <title>Killing Processes</title>
 
-    <para>One way to communicate with any running
-      process or daemon is to send a <firstterm>signal</firstterm> using
-      &man.kill.1;.  There are a number of different signals; some
-      have a specific meaning while others are described in the
-      application's documentation.  A user can only send a signal to a
-      process they own and sending a signal to someone else's process
-      will result in a permission denied error.  The exception is the
-      <username>root</username> user, who can send signals to anyone's
-      processes.</para>
-
-    <para>The operating system can also send a signal to a process.  If an application
-      is badly written and tries to access memory that it is not
-      supposed to, &os; will send the process the
-      <quote>Segmentation Violation</quote> signal
-      (<literal>SIGSEGV</literal>).  If an application has been written to use the
-      &man.alarm.3; system call to be alerted after a period of time
-      has elapsed, it will be sent the <quote>Alarm</quote> signal
-      (<literal>SIGALRM</literal>).</para>
-
-    <para>Two signals can be used to stop a process:
-      <literal>SIGTERM</literal> and <literal>SIGKILL</literal>.
-      <literal>SIGTERM</literal> is the polite way to kill a process
-      as the process can read the signal, close any log files it may
-      have open, and attempt to finish what it is doing before
-      shutting down.  In some cases, a process may ignore
-      <literal>SIGTERM</literal> if it is in the middle of some task
-      that can not be interrupted.</para>
-
-    <para><literal>SIGKILL</literal> can not be ignored by a process.
-      Sending a <literal>SIGKILL</literal> to a
-      process will usually stop that process there and then.<footnote>
+      <para>One way to communicate with any running process or daemon
+	is to send a <firstterm>signal</firstterm> using &man.kill.1;.
+	There are a number of different signals; some have a specific
+	meaning while others are described in the application's
+	documentation.  A user can only send a signal to a process
+	they own and sending a signal to someone else's process will
+	result in a permission denied error.  The exception is the
+	<username>root</username> user, who can send signals to
+	anyone's processes.</para>
+
+      <para>The operating system can also send a signal to a process.
+	If an application is badly written and tries to access memory
+	that it is not supposed to, &os; will send the process the
+	<quote>Segmentation Violation</quote> signal
+	(<literal>SIGSEGV</literal>).  If an application has been
+	written to use the &man.alarm.3; system call to be alerted
+	after a period of time has elapsed, it will be sent the
+	<quote>Alarm</quote> signal
+	(<literal>SIGALRM</literal>).</para>
+
+      <para>Two signals can be used to stop a process:
+	<literal>SIGTERM</literal> and <literal>SIGKILL</literal>.
+	<literal>SIGTERM</literal> is the polite way to kill a process
+	as the process can read the signal, close any log files it may
+	have open, and attempt to finish what it is doing before
+	shutting down.  In some cases, a process may ignore
+	<literal>SIGTERM</literal> if it is in the middle of some task
+	that can not be interrupted.</para>
+
+      <para><literal>SIGKILL</literal> can not be ignored by a
+	process.  Sending a <literal>SIGKILL</literal> to a
+	process will usually stop that process there and then.
+	<footnote>
 	<para>There are a few tasks that can not be interrupted.  For
 	  example, if the process is trying to read from a file that
 	  is on another computer on the network, and the other
@@ -3045,89 +3050,91 @@ Swap: 2048M Total, 2048M Free
 	  out occurs the process will be killed.</para>
 	</footnote>.</para>
 
-    <para>Other commonly used signals are <literal>SIGHUP</literal>,
-      <literal>SIGUSR1</literal>, and <literal>SIGUSR2</literal>.
-      Since these are general purpose signals, different applications
-      will respond differently.</para>
-
-    <para>For example, after changing a web server's configuration
-      file, the web server needs to be told to re-read its
-      configuration.  Restarting <command>httpd</command> would result
-      in a brief outage period on the web server.  Instead, send the
-      daemon the <literal>SIGHUP</literal> signal.  Be aware that
-      different daemons will have different behavior, so refer to the
-      documentation for the daemon to determine if
-      <literal>SIGHUP</literal> will achieve the desired
-      results.</para>
-
-    <procedure>
-      <title>Sending a Signal to a Process</title>
-
-      <para>This example shows how to send a signal to &man.inetd.8;.
-	The &man.inetd.8; configuration file is
-	<filename>/etc/inetd.conf</filename>, and &man.inetd.8; will
-	re-read this configuration file when it is sent a
-	<literal>SIGHUP</literal>.</para>
-
-      <step>
-	<para>Find the <acronym>PID</acronym> of the process to send
-	  the signal to using &man.pgrep.1;.  In this example, the
-	  <acronym>PID</acronym> for &man.inetd.8; is 198:</para>
+      <para>Other commonly used signals are <literal>SIGHUP</literal>,
+	<literal>SIGUSR1</literal>, and <literal>SIGUSR2</literal>.
+	Since these are general purpose signals, different
+	applications will respond differently.</para>
+
+      <para>For example, after changing a web server's configuration
+	file, the web server needs to be told to re-read its
+	configuration.  Restarting <command>httpd</command> would
+	result in a brief outage period on the web server.  Instead,
+	send the daemon the <literal>SIGHUP</literal> signal.  Be
+	aware that different daemons will have different behavior, so
+	refer to the documentation for the daemon to determine if
+	<literal>SIGHUP</literal> will achieve the desired
+	results.</para>
+
+      <procedure>
+	<title>Sending a Signal to a Process</title>
+
+	<para>This example shows how to send a signal to
+	  &man.inetd.8;.  The &man.inetd.8; configuration file is
+	  <filename>/etc/inetd.conf</filename>, and &man.inetd.8; will
+	  re-read this configuration file when it is sent a
+	  <literal>SIGHUP</literal>.</para>
+
+	<step>
+	  <para>Find the <acronym>PID</acronym> of the process to send
+	    the signal to using &man.pgrep.1;.  In this example, the
+	    <acronym>PID</acronym> for &man.inetd.8; is 198:</para>
 
-	<screen>&prompt.user; <userinput>pgrep -l inetd</userinput>
+	  <screen>&prompt.user; <userinput>pgrep -l inetd</userinput>
 198  inetd -wW</screen>
 
-      </step>
+	</step>
 
-      <step>
-	<para>Use &man.kill.1; to send the signal.  Because
-	  &man.inetd.8; is owned by <username>root</username>, use
-	  &man.su.1; to become <username>root</username> first.</para>
+	<step>
+	  <para>Use &man.kill.1; to send the signal.  Because
+	    &man.inetd.8; is owned by <username>root</username>, use
+	    &man.su.1; to become <username>root</username>
+	    first.</para>
 
-	<screen>&prompt.user; <userinput>su</userinput>
+	  <screen>&prompt.user; <userinput>su</userinput>
 <prompt>Password:</prompt>
 &prompt.root; <userinput>/bin/kill -s HUP 198</userinput></screen>
 
-	<para>Like most &unix; commands, &man.kill.1; will not print
-	  any output if it is successful.  If a signal is sent to a
-	  process not owned by that user, the message
-	  <errorname>kill: <replaceable>PID</replaceable>: Operation
-	    not permitted</errorname> will be displayed.  Mistyping
-	  the <acronym>PID</acronym> will either send the signal to
-	  the wrong process, which could have negative results, or
-	  will send the signal to a <acronym>PID</acronym> that is
-	  not currently in use, resulting in the error
-	  <errorname>kill: <replaceable>PID</replaceable>: No such
-	    process</errorname>.</para>
-
-	<note>
-	  <title>Why Use <command>/bin/kill</command>?</title>
-
-	  <para>Many shells provide <command>kill</command> as a built
-	    in command, meaning that the shell will send the signal
-	    directly, rather than running
-	    <filename>/bin/kill</filename>.  Be aware that different
-	    shells have a different syntax for specifying the name of
-	    the signal to send.  Rather than try to learn all of them,
-	    it can be simpler to specify <command>/bin/kill</command>.</para>
-	</note>
-      </step>
-    </procedure>
-
-    <para>When sending other signals, substitute
-      <literal>TERM</literal> or <literal>KILL</literal> with the name
-      of the signal.</para>
-
-    <important>
-      <para>Killing a random process on the system is a bad idea.
-	In particular, &man.init.8;, <acronym>PID</acronym> 1, is
-	special.  Running <command>/bin/kill -s KILL 1</command> is
-	a quick, and unrecommended, way to shutdown the system.
-	<emphasis>Always</emphasis> double check the arguments to
-	&man.kill.1; <emphasis>before</emphasis> pressing
-	<keycap>Return</keycap>.</para>
-    </important>
-  </sect2>
+	  <para>Like most &unix; commands, &man.kill.1; will not print
+	    any output if it is successful.  If a signal is sent to a
+	    process not owned by that user, the message
+	    <errorname>kill: <replaceable>PID</replaceable>: Operation
+	      not permitted</errorname> will be displayed.  Mistyping
+	    the <acronym>PID</acronym> will either send the signal to
+	    the wrong process, which could have negative results, or
+	    will send the signal to a <acronym>PID</acronym> that is
+	    not currently in use, resulting in the error
+	    <errorname>kill: <replaceable>PID</replaceable>: No such
+	      process</errorname>.</para>
+
+	  <note>
+	    <title>Why Use <command>/bin/kill</command>?</title>
+
+	    <para>Many shells provide <command>kill</command> as a
+	      built in command, meaning that the shell will send the
+	      signal directly, rather than running
+	      <filename>/bin/kill</filename>.  Be aware that different
+	      shells have a different syntax for specifying the name
+	      of the signal to send.  Rather than try to learn all of
+	      them, it can be simpler to specify
+	      <command>/bin/kill</command>.</para>
+	  </note>
+	</step>
+      </procedure>
+
+      <para>When sending other signals, substitute
+	<literal>TERM</literal> or <literal>KILL</literal> with the
+	name of the signal.</para>
+
+      <important>
+	<para>Killing a random process on the system is a bad idea.
+	  In particular, &man.init.8;, <acronym>PID</acronym> 1, is
+	  special.  Running <command>/bin/kill -s KILL 1</command> is
+	  a quick, and unrecommended, way to shutdown the system.
+	  <emphasis>Always</emphasis> double check the arguments to
+	  &man.kill.1; <emphasis>before</emphasis> pressing
+	  <keycap>Return</keycap>.</para>
+      </important>
+    </sect2>
   </sect1>
 
   <sect1 id="shells">

From owner-svn-doc-all@FreeBSD.ORG  Tue Oct 22 20:37:07 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 080F96F3;
 Tue, 22 Oct 2013 20:37:07 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D96A3266E;
 Tue, 22 Oct 2013 20:37:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9MKb6m2035291;
 Tue, 22 Oct 2013 20:37:06 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9MKb69t035290;
 Tue, 22 Oct 2013 20:37:06 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201310222037.r9MKb69t035290@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 22 Oct 2013 20:37:06 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43023 -
 head/en_US.ISO8859-1/books/handbook/network-servers
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Oct 2013 20:37:07 -0000

Author: emaste (src committer)
Date: Tue Oct 22 20:37:06 2013
New Revision: 43023
URL: http://svnweb.freebsd.org/changeset/doc/43023

Log:
  Add missing articles ("the" and "a") in the iSCSI chapter.

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

Modified: head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Tue Oct 22 19:39:03 2013	(r43022)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Tue Oct 22 20:37:06 2013	(r43023)
@@ -5841,7 +5841,7 @@ Logging to FILE /var/log/messages</scree
       <title>iSCSI Target</title>
 
       <para>Note: the native iSCSI target is supported starting with
-	&os; 10.0-RELEASE.  To use iSCSI in older versions, use
+	&os; 10.0-RELEASE.  To use iSCSI in older versions, use a
 	userspace target installed from ports, such as istgt.  This
 	chapter only applies to the native target.</para>
 
@@ -5886,15 +5886,15 @@ target iqn.2012-06.com.example:target0 {
 	  authentication.  Following two lines make <ulink
 	    url="http://www.freebsd.org/cgi/man.cgi?query=ctld&amp;sektion=8&amp;manpath=FreeBSD+10-current">ctld(8)</ulink>
 	  listen on all IPv4 ("listen 0.0.0.0") and IPv6 ("listen
-	  [::]") addresses configured on network interfaces, on
+	  [::]") addresses configured on network interfaces, on the
 	  default port (3560).  One does not always need to define
 	  a new portal group - there is a default one, called
-	  "default".  Difference between "default" and "pg0" above is
+	  "default".  The difference between "default" and "pg0" above is
 	  that with the former, the iSCSI SendTargets discovery is
 	  always denied, while in the latter it is always
 	  allowed.</para>
 
-	<para>Second entry defines a single target.  Target has two
+	<para>The second entry defines a single target.  Target has two
 	  meanings - it is a machine serving iSCSI, but it's also
 	  a named group of LUNs.  In this example, we use the latter
 	  meaning.  The "iqn.2012-06.com.example:target0" is the
@@ -5905,21 +5905,21 @@ target iqn.2012-06.com.example:target0 {
 	  "target0" can be pretty much whatever.  There can be any
 	  number of targets defined in the config file.</para>
 
-	<para>First line in the target configuration ("auth-group
+	<para>The first line in the target configuration ("auth-group
 	  no-authentication") allows every initiator to connect to it.
-	  Second line ("portal-group pg0") makes the target reachable
+	  The second line ("portal-group pg0") makes the target reachable
 	  through the "pg0" portal group.</para>
 
 	<para>After that come LUNs.  To the initiator, each LUN will
 	  be visible as a separate disk device - e.g.
 	  <filename>/dev/da0</filename>, <filename>/dev/da1</filename>
 	  etc.  There may be multiple LUNs defined for each target.
-	  LUNs are identified by numbers; LUN 0 is mandatory.  First
-	  line of LUN configuration ("path /data/target0-0") defines
+	  LUNs are identified by numbers; LUN 0 is mandatory.  The first
+	  line of LUN configuration ("path /data/target0-0") defines the
 	  full path to a file or ZVOL backing the LUN.  The file must
 	  exist before starting <ulink
 	    url="http://www.freebsd.org/cgi/man.cgi?query=ctld&amp;sektion=8&amp;manpath=FreeBSD+10-current">ctld(8)</ulink>.
-	  Second line is optional and specifies the size.</para>
+	  The second line is optional and specifies the size.</para>
 
 	<para>To make sure <ulink
 	    url="http://www.freebsd.org/cgi/man.cgi?query=ctld&amp;sektion=8&amp;manpath=FreeBSD+10-current">ctld(8)</ulink>
@@ -5976,15 +5976,15 @@ target iqn.2012-06.com.example:target0 {
 }</programlisting>
 
 	<para>The auth-group section defines username/password pairs.
-	  Initiator trying to connect to
+	  An initiator trying to connect to
 	  iqn.2012-06.com.example:target0 must specify either of
 	  those.  The SendTargets discovery is still permitted without
 	  any kind of authentication; to change it, set
 	  "discovery-auth-group" to something else.</para>
 
-	<para>Common case for iSCSI is to have a single exported
+	<para>A common case for iSCSI is to have a single exported
 	  target for every initiator.  As a shorthand for syntax
-	  above, one can specify username and password directly in the
+	  above, one can specify the username and password directly in the
 	  target entry, like this:</para>
 
 	<programlisting>target iqn.2012-06.com.example:target0 {
@@ -6004,7 +6004,7 @@ target iqn.2012-06.com.example:target0 {
 
       <note>
 	<para>The current iSCSI initiator is supported starting with
-	  &os; 10.0-RELEASE.  To use iSCSI initiator available in
+	  &os; 10.0-RELEASE.  To use the iSCSI initiator available in
 	  older versions, refer to <ulink
 	    url="http://www.freebsd.org/cgi/man.cgi?query=iscontrol&amp;sektion=8&amp;manpath=FreeBSD+10-current">iscontrol(8)</ulink>.
 	  This chapter only applies to the new
@@ -6065,7 +6065,7 @@ iqn.2012-06.com.example:target0         
 	<programlisting>Target name                                     Target addr     State
 iqn.2012-06.com.example:target0                 10.10.10.10     Waiting for iscsid(8)</programlisting>
 
-	<para>The following suggests network-level problem, such as
+	<para>The following suggests a network-level problem, such as a
 	  wrong <acronym>IP</acronym> address or port:</para>
 
 	<programlisting>Target name                                     Target addr     State
@@ -6083,7 +6083,7 @@ iqn.2012-06.com.example:atrget0         
 	<programlisting>Target name                                     Target addr     State
 iqn.2012-06.com.example:target0                 10.10.10.10     Authentication failed</programlisting>
 
-	<para>To specify CHAP username and secret, use the following
+	<para>To specify a CHAP username and secret, use the following
 	  syntax:</para>
 
 	<screen>&prompt.root; <userinput>iscsictl -A -h 10.10.10.10 -t iqn.2012-06.com.example:target0 -u user -s secretsecret</userinput></screen>

From owner-svn-doc-all@FreeBSD.ORG  Wed Oct 23 01:15:21 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 1FB3B305;
 Wed, 23 Oct 2013 01:15:21 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0B0F4265E;
 Wed, 23 Oct 2013 01:15:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9N1FKcq037938;
 Wed, 23 Oct 2013 01:15:20 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9N1FK9C037937;
 Wed, 23 Oct 2013 01:15:20 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310230115.r9N1FK9C037937@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 23 Oct 2013 01:15:20 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43024 - head/en_US.ISO8859-1/books/handbook/basics
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 01:15:21 -0000

Author: dru
Date: Wed Oct 23 01:15:20 2013
New Revision: 43024
URL: http://svnweb.freebsd.org/changeset/doc/43024

Log:
  Minor edits to the sections on Shells and Manual Pages. These sections are correct, though a bit on the light side.

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

Modified: head/en_US.ISO8859-1/books/handbook/basics/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Tue Oct 22 20:37:06 2013	(r43023)
+++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Wed Oct 23 01:15:20 2013	(r43024)
@@ -3143,7 +3143,7 @@ Swap: 2048M Total, 2048M Free
     <indexterm><primary>shells</primary></indexterm>
     <indexterm><primary>command line</primary></indexterm>
 
-    <para>&os; provides a command line interface called a shell.  A
+    <para>A <firstterm>shell</firstterm> provides a command line interface for interacting with the operating system.  A
       shell receives commands from the input channel and executes
       them.  Many shells provide built in functions to help with
       everyday tasks such as file management, file globbing, command
@@ -3162,8 +3162,8 @@ Swap: 2048M Total, 2048M Free
 
     <para>One common shell feature is filename completion.  After a
       user types the first few letters of a command or filename and
-      presses <keycap>Tab</keycap>, the shell will automatically
-      complete the rest of the command or filename.  Consider two
+      presses <keycap>Tab</keycap>, the shell automatically
+      completes the rest of the command or filename.  Consider two
       files called <filename>foobar</filename> and
       <filename>foo.bar</filename>.  To delete
       <filename>foo.bar</filename>, type <command>rm
@@ -3177,7 +3177,7 @@ Swap: 2048M Total, 2048M Free
       is more than one match.  Both <filename>foobar</filename> and
       <filename>foo.bar</filename> start with <literal>fo</literal>.
       By typing <literal>.</literal>, then pressing
-      <keycap>Tab</keycap> again, the shell would be able to fill in
+      <keycap>Tab</keycap> again, the shell is able to fill in
       the rest of the filename.</para>
 
     <indexterm><primary>environment variables</primary></indexterm>
@@ -3186,10 +3186,13 @@ Swap: 2048M Total, 2048M Free
       variables.  Environment variables are a variable/key pair stored
       in the shell's environment.  This environment can be read by any
       program invoked by the shell, and thus contains a lot of program
-      configuration.  Here is a list of common environment variables
-      and their meanings:</para>
+      configuration.  Table 4.3 provides a list of common environment variables
+      and their meanings.  Note that the names of environment
+      variables are always in uppercase.</para>
+
+    <table frame="none" pgwide="1">
+      <title>Common Environment Variables</title>
 
-    <informaltable frame="none" pgwide="1">
       <tgroup cols="2">
 	<thead>
 	  <row>
@@ -3253,7 +3256,8 @@ Swap: 2048M Total, 2048M Free
 
 	  <row>
 	    <entry><envar>PAGER</envar></entry>
-	    <entry>The user's preferred text pager.</entry>
+	    <entry>The user's preferred utility for viewing text one
+	      page at a time.</entry>
 	  </row>
 
 	  <row>
@@ -3263,7 +3267,7 @@ Swap: 2048M Total, 2048M Free
 	  </row>
 	</tbody>
       </tgroup>
-    </informaltable>
+    </table>
 
     <indexterm><primary>Bourne shells</primary></indexterm>
 
@@ -3294,9 +3298,9 @@ Swap: 2048M Total, 2048M Free
       meta-character is <literal>*</literal>, which represents any
       number of characters in a filename.  Meta-characters can be
       used to perform filename globbing.  For example,
-      <command>echo *</command> is equivalent to &man.ls.1; because
+      <command>echo *</command> is equivalent to <command>ls</command> because
       the shell takes all the files that match <literal>*</literal>
-      and &man.echo.1; lists them on the command line.</para>
+      and <command>echo</command> lists them on the command line.</para>
 
     <para>To prevent the shell from interpreting a special character,
       escape it from the shell by starting it with a backslash
@@ -3306,13 +3310,13 @@ Swap: 2048M Total, 2048M Free
       string <literal>$TERM</literal>.</para>
 
     <sect2 id="changing-shells">
-      <title>Changing Your Shell</title>
+      <title>Changing the Shell</title>
 
       <para>The easiest way to permanently change the default shell is
 	to use <command>chsh</command>.  Running this command will
 	open the editor that is configured in the
 	<envar>EDITOR</envar> environment variable, which by default
-	is set to &man.vi.1;.  Change the <quote>Shell:</quote> line
+	is set to &man.vi.1;.  Change the <literal>Shell:</literal> line
 	to the full path of the new shell.</para>
 
       <para>Alternately, use <command>chsh -s</command> which will set
@@ -3332,7 +3336,7 @@ Swap: 2048M Total, 2048M Free
 
 	<screen>&prompt.root; <userinput>echo <replaceable>/usr/local/bin/bash</replaceable> &gt;&gt; /etc/shells</userinput></screen>
 
-	<para>Then rerun &man.chsh.1;.</para>
+	<para>Then, rerun &man.chsh.1;.</para>
       </note>
     </sect2>
   </sect1>
@@ -3362,7 +3366,7 @@ Swap: 2048M Total, 2048M Free
       <replaceable>filename</replaceable> is the name of the file to
       be edited.  Once inside the editor, all of the commands for
       manipulating the editor's functions are listed at the top of the
-      display.  The caret <literal>^</literal> represents
+      display.  The caret (<literal>^</literal>) represents
       <keycap>Ctrl</keycap>, so <literal>^e</literal> expands to
       <keycombo
 	action="simul"><keycap>Ctrl</keycap><keycap>e</keycap></keycombo>.
@@ -3372,33 +3376,28 @@ Swap: 2048M Total, 2048M Free
       modified.</para>
 
     <indexterm>
-      <primary>&man.vi.1;</primary>
+      <primary><command>vi</command></primary>
     </indexterm>
     <indexterm>
       <primary>editors</primary>
-      <secondary>&man.vi.1;</secondary>
     </indexterm>
     <indexterm>
       <primary><command>emacs</command></primary>
     </indexterm>
-    <indexterm>
-      <primary>editors</primary>
-      <secondary><command>emacs</command></secondary>
-    </indexterm>
 
     <para>&os; also comes with more powerful text editors, such as
       &man.vi.1;, as part of the base system.  Other editors, like
       <filename role="package">editors/emacs</filename> and
       <filename role="package">editors/vim</filename>, are part of the
       &os; Ports Collection.  These editors offer more functionality
-      at the expense of being a more complicated to learn.  Learning a
+      at the expense of being more complicated to learn.  Learning a
       more powerful editor such as <application>vim</application> or
       <application>Emacs</application> can save more time in the long
       run.</para>
 
     <para>Many applications which modify files or require typed input
-      will automatically open a text editor.  To alter the default
-      editor used, set the <envar>EDITOR</envar> environment
+      will automatically open a text editor.  To change the default
+      editor, set the <envar>EDITOR</envar> environment
       variable as described in <xref linkend="shells"/>.</para>
   </sect1>
 
@@ -3423,10 +3422,7 @@ Swap: 2048M Total, 2048M Free
   </sect1>
 
   <sect1 id="basics-more-information">
-    <title>For More Information</title>
-
-    <sect2 id="basics-man">
-      <title>Manual Pages</title>
+    <title>Manual Pages</title>
 
       <indexterm><primary>manual pages</primary></indexterm>
 
@@ -3444,8 +3440,9 @@ Swap: 2048M Total, 2048M Free
 
       <screen>&prompt.user; <userinput>man ls</userinput></screen>
 
-      <para>The online manual is divided into numbered
-	sections:</para>
+      <para>Manual pages are divided into sections which represent the type of topic.  In &os;,
+	the following
+	sections are available:</para>
 
       <orderedlist>
 	<listitem>
@@ -3481,13 +3478,13 @@ Swap: 2048M Total, 2048M Free
 	</listitem>
 
 	<listitem>
-	  <para>Kernel developers.</para>
+	  <para>System kernel interfaces.</para>
 	</listitem>
       </orderedlist>
 
       <para>In some cases, the same topic may appear in more than one
 	section of the online manual.  For example, there is a
-	&man.chmod.1; user command and a
+	<command>chmod</command> user command and a
 	<function>chmod()</function> system call.  To tell &man.man.1;
 	which section to display, specify the section number:</para>
 
@@ -3499,8 +3496,8 @@ Swap: 2048M Total, 2048M Free
 	written documentation, so &man.chmod.1; refers to the user
 	command and &man.chmod.2; refers to the system call.</para>
 
-      <para>If the command name is unknown, use <command>man
-	  -k</command> to search for keywords in the command
+      <para>If the name of the manual page is unknown, use <command>man
+	  -k</command> to search for keywords in the manual page
 	descriptions:</para>
 
       <screen>&prompt.user; <userinput>man -k <replaceable>mail</replaceable></userinput></screen>
@@ -3509,19 +3506,17 @@ Swap: 2048M Total, 2048M Free
 	keyword <quote>mail</quote> in their descriptions.  This is
 	equivalent to using &man.apropos.1;.</para>
 
-      <para>To determine what the commands in
-	<filename class="directory">/usr/bin</filename> do,
+      <para>To read the descriptions for the commands in
+	<filename class="directory">/usr/bin</filename>,
 	type:</para>
 
       <screen>&prompt.user; <userinput>cd /usr/bin</userinput>
-&prompt.user; <userinput>man -f *</userinput></screen>
+&prompt.user; <userinput>man -f * | more</userinput></screen>
 
       <para>or</para>
 
       <screen>&prompt.user; <userinput>cd /usr/bin</userinput>
-&prompt.user; <userinput>whatis *</userinput></screen>
-
-    </sect2>
+&prompt.user; <userinput>whatis * |more</userinput></screen>
 
     <sect2 id="basics-info">
       <title>GNU Info Files</title>

From owner-svn-doc-all@FreeBSD.ORG  Wed Oct 23 01:29:29 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id AF39895E;
 Wed, 23 Oct 2013 01:29:29 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9BCA12708;
 Wed, 23 Oct 2013 01:29:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9N1TTBI041634;
 Wed, 23 Oct 2013 01:29:29 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9N1TTKL041633;
 Wed, 23 Oct 2013 01:29:29 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310230129.r9N1TTKL041633@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 23 Oct 2013 01:29:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43025 - head/en_US.ISO8859-1/books/handbook/basics
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 01:29:29 -0000

Author: dru
Date: Wed Oct 23 01:29:29 2013
New Revision: 43025
URL: http://svnweb.freebsd.org/changeset/doc/43025

Log:
  White space fix only. Translators can ignore.

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

Modified: head/en_US.ISO8859-1/books/handbook/basics/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Wed Oct 23 01:15:20 2013	(r43024)
+++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Wed Oct 23 01:29:29 2013	(r43025)
@@ -3143,14 +3143,15 @@ Swap: 2048M Total, 2048M Free
     <indexterm><primary>shells</primary></indexterm>
     <indexterm><primary>command line</primary></indexterm>
 
-    <para>A <firstterm>shell</firstterm> provides a command line interface for interacting with the operating system.  A
-      shell receives commands from the input channel and executes
-      them.  Many shells provide built in functions to help with
-      everyday tasks such as file management, file globbing, command
-      line editing, command macros, and environment variables.  &os;
-      comes with several shells, including the Bourne shell
-      (&man.sh.1;) and the extended C shell (&man.tcsh.1;).  Other
-      shells are available from the &os; Ports Collection, such as
+    <para>A <firstterm>shell</firstterm> provides a command line
+      interface for interacting with the operating system.  A shell
+      receives commands from the input channel and executes them.
+      Many shells provide built in functions to help with everyday
+      tasks such as file management, file globbing, command line
+      editing, command macros, and environment variables.  &os; comes
+      with several shells, including the Bourne shell (&man.sh.1;) and
+      the extended C shell (&man.tcsh.1;).  Other shells are available
+      from the &os; Ports Collection, such as
       <command>zsh</command> and <command>bash</command>.</para>
 
     <para>The shell that is used is really a matter of taste.  A C
@@ -3162,11 +3163,10 @@ Swap: 2048M Total, 2048M Free
 
     <para>One common shell feature is filename completion.  After a
       user types the first few letters of a command or filename and
-      presses <keycap>Tab</keycap>, the shell automatically
-      completes the rest of the command or filename.  Consider two
-      files called <filename>foobar</filename> and
-      <filename>foo.bar</filename>.  To delete
-      <filename>foo.bar</filename>, type <command>rm
+      presses <keycap>Tab</keycap>, the shell automatically completes
+      the rest of the command or filename.  Consider two files called
+      <filename>foobar</filename> and <filename>foo.bar</filename>.
+      To delete <filename>foo.bar</filename>, type <command>rm
 	fo[<keycap>Tab</keycap>].[<keycap>Tab</keycap>]</command>.</para>
 
     <para>The shell should print out
@@ -3177,8 +3177,8 @@ Swap: 2048M Total, 2048M Free
       is more than one match.  Both <filename>foobar</filename> and
       <filename>foo.bar</filename> start with <literal>fo</literal>.
       By typing <literal>.</literal>, then pressing
-      <keycap>Tab</keycap> again, the shell is able to fill in
-      the rest of the filename.</para>
+      <keycap>Tab</keycap> again, the shell is able to fill in the
+      rest of the filename.</para>
 
     <indexterm><primary>environment variables</primary></indexterm>
 
@@ -3186,9 +3186,9 @@ Swap: 2048M Total, 2048M Free
       variables.  Environment variables are a variable/key pair stored
       in the shell's environment.  This environment can be read by any
       program invoked by the shell, and thus contains a lot of program
-      configuration.  Table 4.3 provides a list of common environment variables
-      and their meanings.  Note that the names of environment
-      variables are always in uppercase.</para>
+      configuration.  Table 4.3 provides a list of common environment
+      variables and their meanings.  Note that the names of
+      environment variables are always in uppercase.</para>
 
     <table frame="none" pgwide="1">
       <title>Common Environment Variables</title>
@@ -3296,18 +3296,19 @@ Swap: 2048M Total, 2048M Free
     <para>Shells treat special characters, known as meta-characters,
       as special representations of data.  The most common
       meta-character is <literal>*</literal>, which represents any
-      number of characters in a filename.  Meta-characters can be
-      used to perform filename globbing.  For example,
-      <command>echo *</command> is equivalent to <command>ls</command> because
+      number of characters in a filename.  Meta-characters can be used
+      to perform filename globbing.  For example, <command>echo
+	*</command> is equivalent to <command>ls</command> because
       the shell takes all the files that match <literal>*</literal>
-      and <command>echo</command> lists them on the command line.</para>
+      and <command>echo</command> lists them on the command
+      line.</para>
 
     <para>To prevent the shell from interpreting a special character,
       escape it from the shell by starting it with a backslash
-      (<literal>\</literal>).  For example,
-      <command>echo $TERM</command> prints the terminal setting
-      whereas <command>echo \$TERM</command> literally prints the
-      string <literal>$TERM</literal>.</para>
+      (<literal>\</literal>).  For example, <command>echo
+	$TERM</command> prints the terminal setting whereas
+      <command>echo \$TERM</command> literally prints the string
+      <literal>$TERM</literal>.</para>
 
     <sect2 id="changing-shells">
       <title>Changing the Shell</title>
@@ -3316,8 +3317,8 @@ Swap: 2048M Total, 2048M Free
 	to use <command>chsh</command>.  Running this command will
 	open the editor that is configured in the
 	<envar>EDITOR</envar> environment variable, which by default
-	is set to &man.vi.1;.  Change the <literal>Shell:</literal> line
-	to the full path of the new shell.</para>
+	is set to &man.vi.1;.  Change the <literal>Shell:</literal>
+	line to the full path of the new shell.</para>
 
       <para>Alternately, use <command>chsh -s</command> which will set
 	the specified shell without opening an editor.  For example,
@@ -3330,9 +3331,8 @@ Swap: 2048M Total, 2048M Free
 	  <filename>/etc/shells</filename>.  If the shell was
 	  installed from the &os; Ports Collection as described in
 	  <xref linkend="ports"/>, it should be automatically added
-	  to this file.  If it is missing, add it using this
-	  command, replacing the path with the path of the
-	  shell:</para>
+	  to this file.  If it is missing, add it using this command,
+	  replacing the path with the path of the shell:</para>
 
 	<screen>&prompt.root; <userinput>echo <replaceable>/usr/local/bin/bash</replaceable> &gt;&gt; /etc/shells</userinput></screen>
 
@@ -3424,98 +3424,97 @@ Swap: 2048M Total, 2048M Free
   <sect1 id="basics-more-information">
     <title>Manual Pages</title>
 
-      <indexterm><primary>manual pages</primary></indexterm>
+    <indexterm><primary>manual pages</primary></indexterm>
 
-      <para>The most comprehensive documentation on &os; is in the
-	form of manual pages.  Nearly every program on the system
-	comes with a short reference manual explaining the basic
-	operation and available arguments.  These manuals can be
-	viewed using <command>man</command>:</para>
+    <para>The most comprehensive documentation on &os; is in the form
+      of manual pages.  Nearly every program on the system comes with
+      a short reference manual explaining the basic operation and
+      available arguments.  These manuals can be viewed using
+      <command>man</command>:</para>
 
-      <screen>&prompt.user; <userinput>man <replaceable>command</replaceable></userinput></screen>
+    <screen>&prompt.user; <userinput>man <replaceable>command</replaceable></userinput></screen>
 
-      <para>where <replaceable>command</replaceable> is the name of
-	the command to learn about.  For example, to learn more about
-	&man.ls.1;, type:</para>
+    <para>where <replaceable>command</replaceable> is the name of the
+      command to learn about.  For example, to learn more about
+      &man.ls.1;, type:</para>
 
-      <screen>&prompt.user; <userinput>man ls</userinput></screen>
+    <screen>&prompt.user; <userinput>man ls</userinput></screen>
 
-      <para>Manual pages are divided into sections which represent the type of topic.  In &os;,
-	the following
-	sections are available:</para>
+    <para>Manual pages are divided into sections which represent the
+      type of topic.  In &os;, the following sections are
+      available:</para>
 
-      <orderedlist>
-	<listitem>
-	  <para>User commands.</para>
-	</listitem>
+    <orderedlist>
+      <listitem>
+	<para>User commands.</para>
+      </listitem>
 
-	<listitem>
-	  <para>System calls and error numbers.</para>
-	</listitem>
+      <listitem>
+	<para>System calls and error numbers.</para>
+      </listitem>
 
-	<listitem>
-	  <para>Functions in the C libraries.</para>
-	</listitem>
+      <listitem>
+	<para>Functions in the C libraries.</para>
+      </listitem>
 
-	<listitem>
-	  <para>Device drivers.</para>
-	</listitem>
+      <listitem>
+	<para>Device drivers.</para>
+      </listitem>
 
-	<listitem>
-	  <para>File formats.</para>
-	</listitem>
+      <listitem>
+	<para>File formats.</para>
+      </listitem>
 
-	<listitem>
-	  <para>Games and other diversions.</para>
-	</listitem>
+      <listitem>
+	<para>Games and other diversions.</para>
+      </listitem>
 
-	<listitem>
-	  <para>Miscellaneous information.</para>
-	</listitem>
+      <listitem>
+	<para>Miscellaneous information.</para>
+      </listitem>
 
-	<listitem>
-	  <para>System maintenance and operation commands.</para>
-	</listitem>
+      <listitem>
+	<para>System maintenance and operation commands.</para>
+      </listitem>
 
-	<listitem>
-	  <para>System kernel interfaces.</para>
-	</listitem>
-      </orderedlist>
+      <listitem>
+	<para>System kernel interfaces.</para>
+      </listitem>
+    </orderedlist>
 
-      <para>In some cases, the same topic may appear in more than one
-	section of the online manual.  For example, there is a
-	<command>chmod</command> user command and a
-	<function>chmod()</function> system call.  To tell &man.man.1;
-	which section to display, specify the section number:</para>
+    <para>In some cases, the same topic may appear in more than one
+      section of the online manual.  For example, there is a
+      <command>chmod</command> user command and a
+      <function>chmod()</function> system call.  To tell &man.man.1;
+      which section to display, specify the section number:</para>
 
-      <screen>&prompt.user; <userinput>man 1 chmod</userinput></screen>
+    <screen>&prompt.user; <userinput>man 1 chmod</userinput></screen>
 
-      <para>This will display the manual page for the user command
-	&man.chmod.1;.  References to a particular section of the
-	online manual are traditionally placed in parenthesis in
-	written documentation, so &man.chmod.1; refers to the user
-	command and &man.chmod.2; refers to the system call.</para>
+    <para>This will display the manual page for the user command
+      &man.chmod.1;.  References to a particular section of the
+      online manual are traditionally placed in parenthesis in
+      written documentation, so &man.chmod.1; refers to the user
+      command and &man.chmod.2; refers to the system call.</para>
 
-      <para>If the name of the manual page is unknown, use <command>man
-	  -k</command> to search for keywords in the manual page
-	descriptions:</para>
+    <para>If the name of the manual page is unknown, use <command>man
+	-k</command> to search for keywords in the manual page
+      descriptions:</para>
 
-      <screen>&prompt.user; <userinput>man -k <replaceable>mail</replaceable></userinput></screen>
+    <screen>&prompt.user; <userinput>man -k <replaceable>mail</replaceable></userinput></screen>
 
-      <para>This command displays a list of commands that have the
-	keyword <quote>mail</quote> in their descriptions.  This is
-	equivalent to using &man.apropos.1;.</para>
+    <para>This command displays a list of commands that have the
+      keyword <quote>mail</quote> in their descriptions.  This is
+      equivalent to using &man.apropos.1;.</para>
 
-      <para>To read the descriptions for the commands in
-	<filename class="directory">/usr/bin</filename>,
-	type:</para>
+    <para>To read the descriptions for the commands in <filename
+	class="directory">/usr/bin</filename>, type:</para>
 
-      <screen>&prompt.user; <userinput>cd /usr/bin</userinput>
+    <screen>&prompt.user; <userinput>cd /usr/bin</userinput>
 &prompt.user; <userinput>man -f * | more</userinput></screen>
 
-      <para>or</para>
+    <para>or</para>
 
-      <screen>&prompt.user; <userinput>cd /usr/bin</userinput>
+    <screen>&prompt.user; <userinput>cd /usr/bin</userinput>
 &prompt.user; <userinput>whatis * |more</userinput></screen>
 
     <sect2 id="basics-info">
@@ -3525,14 +3524,13 @@ Swap: 2048M Total, 2048M Free
 	<primary>Free Software Foundation</primary>
       </indexterm>
 
-      <para>&os; includes many applications and utilities produced
-	by the Free Software Foundation (FSF).  In addition to manual
+      <para>&os; includes many applications and utilities produced by
+	the Free Software Foundation (FSF).  In addition to manual
 	pages, these programs may include hypertext documents called
 	<literal>info</literal> files.  These can be viewed using
-	&man.info.1; or, if
-	<filename role="package">editors/emacs</filename> is
-	installed, the info mode of
-	<application>emacs</application>.</para>
+	&man.info.1; or, if <filename
+	  role="package">editors/emacs</filename> is installed, the
+	info mode of <application>emacs</application>.</para>
 
       <para>To use &man.info.1;, type:</para>
 

From owner-svn-doc-all@FreeBSD.ORG  Wed Oct 23 14:48:15 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 1A47F841;
 Wed, 23 Oct 2013 14:48:15 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 062FE2547;
 Wed, 23 Oct 2013 14:48:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NEmECQ013413;
 Wed, 23 Oct 2013 14:48:14 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NEmEds013412;
 Wed, 23 Oct 2013 14:48:14 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201310231448.r9NEmEds013412@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 23 Oct 2013 14:48:14 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43026 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 14:48:15 -0000

Author: emaste (src committer)
Date: Wed Oct 23 14:48:14 2013
New Revision: 43026
URL: http://svnweb.freebsd.org/changeset/doc/43026

Log:
  Remove reference to acnc.com per their request

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

Modified: head/share/xml/commercial.hardware.xml
==============================================================================
--- head/share/xml/commercial.hardware.xml	Wed Oct 23 01:29:29 2013	(r43025)
+++ head/share/xml/commercial.hardware.xml	Wed Oct 23 14:48:14 2013	(r43026)
@@ -83,19 +83,6 @@
     </description>
   </entry>
 
-  <entry id="AdvancedComputer">
-    <name>Advanced Computer and Network Management Corporation</name>
-    <url>http://www.acnc.com/</url>
-    <description>
-      Advanced Computer and Network Corporation Our site, dedicated to RAID
-      (Redundant Array of Independent Disks) technology, features, an
-      excellent, easy-to-understand, graphical RAID tutorial. We are a
-      one-stop source for cost-effective, high-performance RAID arrays,
-      SCSI switches, boosters, cables, fiber-optic extenders, and
-      high-availability solutions.
-    </description>
-  </entry>
-
   <entry id="ASA">
     <name>ASA Computers</name>
     <url>http://www.asacomputers.com/</url>

From owner-svn-doc-all@FreeBSD.ORG  Wed Oct 23 16:04:33 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 3D6F7EA4;
 Wed, 23 Oct 2013 16:04:33 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2683E29C2;
 Wed, 23 Oct 2013 16:04:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NG4XB9040377;
 Wed, 23 Oct 2013 16:04:33 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NG4X18040376;
 Wed, 23 Oct 2013 16:04:33 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201310231604.r9NG4X18040376@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 23 Oct 2013 16:04:32 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43027 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 16:04:33 -0000

Author: emaste (src committer)
Date: Wed Oct 23 16:04:32 2013
New Revision: 43027
URL: http://svnweb.freebsd.org/changeset/doc/43027

Log:
  Remove link to defunct company http://www.adcomtec.com

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

Modified: head/share/xml/commercial.hardware.xml
==============================================================================
--- head/share/xml/commercial.hardware.xml	Wed Oct 23 14:48:14 2013	(r43026)
+++ head/share/xml/commercial.hardware.xml	Wed Oct 23 16:04:32 2013	(r43027)
@@ -68,21 +68,6 @@
     </description>
   </entry>
 
-  <entry id="ADCOMTEC">
-    <name>ADCOMTEC</name>
-    <url>http://www.adcomtec.com</url>
-    <description>
-      ADCOMTEC specializes in providing high-performance, advanced
-      communications and networking solutions. FreeBSD driver support is
-      provided for a range of high-performance WAN adapters for ADSL, T1,
-      E1, and Synchronous Serial (RS-232/V.35/X.21/EIA530) connectivity
-      that support a number of downloadable protocol modules including ATM,
-      Frame Relay, X.25, HDLC, SDLC, PPP, and SS7. For more information,
-      contact <a href="mailto:info@adcomtec.com">info@adcomtec.com</a> or
-      visit <a href="http://www.adcomtec.com">http://www.adcomtec.com</a>.
-    </description>
-  </entry>
-
   <entry id="ASA">
     <name>ASA Computers</name>
     <url>http://www.asacomputers.com/</url>

From owner-svn-doc-all@FreeBSD.ORG  Wed Oct 23 16:13:43 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id BE69E3A1;
 Wed, 23 Oct 2013 16:13:43 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id AA54C2A72;
 Wed, 23 Oct 2013 16:13:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NGDhOK044066;
 Wed, 23 Oct 2013 16:13:43 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NGDhRm044065;
 Wed, 23 Oct 2013 16:13:43 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201310231613.r9NGDhRm044065@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 23 Oct 2013 16:13:43 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43028 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 16:13:43 -0000

Author: emaste (src committer)
Date: Wed Oct 23 16:13:43 2013
New Revision: 43028
URL: http://svnweb.freebsd.org/changeset/doc/43028

Log:
  Remove defunct reference to Cyclades
  
  They've been through a series of acquisitions, none of which reference
  FreeBSD.

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

Modified: head/share/xml/commercial.hardware.xml
==============================================================================
--- head/share/xml/commercial.hardware.xml	Wed Oct 23 16:04:32 2013	(r43027)
+++ head/share/xml/commercial.hardware.xml	Wed Oct 23 16:13:43 2013	(r43028)
@@ -153,16 +153,6 @@
     </description>
   </entry>
 
-  <entry id="CycladesCorporation">
-    <name>Cyclades Corporation</name>
-    <url>http://www.cyclades.com/</url>
-    <description>
-      Cyclades Corporation sells a variety of high performance, multiport
-      serial cards which FreeBSD supports directly in its standard
-      releases.
-    </description>
-  </entry>
-
   <entry id="DAVICOM">
     <name>DAVICOM Semiconductor, Inc.</name>
     <url>http://www.davicom.com.tw/</url>

From owner-svn-doc-all@FreeBSD.ORG  Wed Oct 23 16:55:21 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 9F591CE4;
 Wed, 23 Oct 2013 16:55:21 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 88B912D78;
 Wed, 23 Oct 2013 16:55:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NGtLxQ057397;
 Wed, 23 Oct 2013 16:55:21 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NGtLe0057395;
 Wed, 23 Oct 2013 16:55:21 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201310231655.r9NGtLe0057395@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 23 Oct 2013 16:55:21 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43029 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 16:55:21 -0000

Author: emaste (src committer)
Date: Wed Oct 23 16:55:20 2013
New Revision: 43029
URL: http://svnweb.freebsd.org/changeset/doc/43029

Log:
  FreeBSD systems is now a redirect to Servaris, already on the list

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

Modified: head/share/xml/commercial.hardware.xml
==============================================================================
--- head/share/xml/commercial.hardware.xml	Wed Oct 23 16:13:43 2013	(r43028)
+++ head/share/xml/commercial.hardware.xml	Wed Oct 23 16:55:20 2013	(r43029)
@@ -224,28 +224,6 @@
     </description>
   </entry>
 
-  <entry id="FreeBSDSystems">
-    <name>FreeBSD Systems</name>
-    <url>http://www.freebsdsystems.com</url>
-    <description>
-      Since 1999 FreeBSD Systems manufactures fast and reliable
-      Rackmount, Tower Servers and RAID Systems.  Our Servers
-      comprise of AMD Opteron Single-Core and Dual-Core, Intel Xeon and
-      Pentium Processors in SCSI and SATA configurations.  All of our
-      Servers and RAID Systems have built-in Remote Hardware Management
-      functionality to prevent needless downtime due to a malfunctioning
-      component.  Our build/burn-in has proven very successful in
-      preventing our clients with Servers and RAID Systems becoming
-      problematic.  We provide On-Site Hardware Warranty Support in many
-      countries.<br />We ship world wide and offer complete customization
-      on a per order basis.  We can be reached by calling our toll-free
-      number 1.877.963.1900 in North America.  For Toll-Free Outside
-      North America please <a
-        href="http://www.freebsdsystems.com/contact.php">see here</a>
-      or by <a href="mailto:info@freebsdsystems.com">email</a>
-    </description>
-  </entry>
-
   <entry id="FreedomTechnologies">
     <name>Freedom Technologies</name>
     <url>http://www.freedomtc.com</url>

From owner-svn-doc-all@FreeBSD.ORG  Wed Oct 23 17:29:49 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id E167055B;
 Wed, 23 Oct 2013 17:29:49 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CCB872F79;
 Wed, 23 Oct 2013 17:29:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NHTnW8069232;
 Wed, 23 Oct 2013 17:29:49 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NHTnLC069231;
 Wed, 23 Oct 2013 17:29:49 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310231729.r9NHTnLC069231@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 23 Oct 2013 17:29:49 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43030 - head/en_US.ISO8859-1/books/handbook/basics
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 17:29:50 -0000

Author: dru
Date: Wed Oct 23 17:29:49 2013
New Revision: 43030
URL: http://svnweb.freebsd.org/changeset/doc/43030

Log:
  Added some clarifications and Table headings to sections 4.3 to 4.3.2.5.
  
  The pw section should have at least one example.
  
  The limiting users section needs to be moved elsewhere.
  
  To be followed by a whitespace fix.

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	Wed Oct 23 16:55:20 2013	(r43029)
+++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Wed Oct 23 17:29:49 2013	(r43030)
@@ -620,10 +620,14 @@ Password:
     </indexterm>
 
     <para>&os; provides a variety of different commands to manage
-      user accounts.  The most common commands are summarized below,
-      followed by more detailed examples of their usage.</para>
+      user accounts.  The most common commands are summarized in Table 4.1,
+      followed by some examples of their usage.  Refer to the manual
+      page for each utility for more details and usage
+      examples.</para>
+
+    <table frame="none" pgwide="1">
+      <title>Utilities for Managing User Accounts</title>
 
-    <informaltable frame="none" pgwide="1">
       <tgroup cols="2">
 	<colspec colwidth="1*"/>
 	<colspec colwidth="2*"/>
@@ -655,7 +659,7 @@ Password:
 
 	  <row>
 	    <entry>&man.passwd.1;</entry>
-	    <entry>The simple command-line tool to change user
+	    <entry>The command-line tool to change user
 	      passwords.</entry>
 	  </row>
 
@@ -666,7 +670,7 @@ Password:
 	  </row>
 	</tbody>
       </tgroup>
-    </informaltable>
+    </table>
 
     <sect3 id="users-adduser">
       <title><command>adduser</command></title>
@@ -683,14 +687,25 @@ Password:
 	  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
+      <para>The recommended program for adding new users is &man.adduser.8;.
 	When a new user is added, this program automatically updates
 	<filename>/etc/passwd</filename> and
 	<filename>/etc/group</filename>.  It also creates a home
 	directory for the new user, copies in the default
 	configuration files from <filename
 	  class="directory">/usr/share/skel</filename>, and can
-	optionally mail the new user a welcome message.</para>
+	optionally mail the new user a welcome message.  This utility
+	must be run as the <username>superuser</username></para>
+	
+      <para>The &man.adduser.8; utility is interactive and walks
+	through the steps for creating a new user account. As seen in
+	Example 4.2, either input the required information or press
+	<keycap>Return</keycap> to accept the default value shown in
+	square brackets.  In this example, the user has been invited
+	into the <groupname>wheel</groupname> group, which is
+	required to provide the account with superuser
+	access.  When finished, the utility will prompt to either
+	create another user or to exit.</para>
 
       <example>
 	<title>Adding a User on &os;</title>
@@ -743,13 +758,13 @@ Goodbye!
 	<secondary>removing</secondary>
       </indexterm>
 
-      <para>To completely remove a user from the system use
-	&man.rmuser.8;.  This command performs the following
+      <para>To completely remove a user from the system, run
+	&man.rmuser.8; as the superuser.  This command performs the following
 	steps:</para>
 
       <procedure>
 	<step>
-	  <para>Removes the user's &man.crontab.1; entry if one
+	  <para>Removes the user's &man.crontab.1; entry, if one
 	    exists.</para>
 	</step>
 
@@ -768,7 +783,7 @@ Goodbye!
 	</step>
 
 	<step>
-	  <para>Removes the user's home directory, if it is owned by
+	  <para>Optionally removes the user's home directory, if it is owned by
 	    the user.</para>
 	</step>
 
@@ -786,14 +801,11 @@ Goodbye!
 
 	<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
+	    it belongs in <filename>/etc/group</filename>.  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>
 
@@ -813,12 +825,7 @@ Matching password entry:
 jru:*:1001:1001::0:0:J. Random User:/home/jru:/usr/local/bin/zsh
 Is this the entry you wish to remove? <userinput>y</userinput>
 Remove user's home directory (/home/jru)? <userinput>y</userinput>
-Updating password file, updating databases, done.
-Updating group file: trusted (removing group jru -- personal group is empty) done.
-Removing user's incoming mail file /var/mail/jru: done.
-Removing files belonging to jru from /tmp: done.
-Removing files belonging to jru from /var/tmp: done.
-Removing files belonging to jru from /var/tmp/vi.recover: done.
+Removing user (jru): mailspool home passwd.
 &prompt.root;</screen>
       </example>
     </sect3>
@@ -827,12 +834,9 @@ Removing files belonging to jru from /va
       <title><command>chpass</command></title>
 
       <indexterm><primary><command>chpass</command></primary></indexterm>
-      <para>&man.chpass.1; can be used to change user database
-	information such as passwords, shells, and personal
-	information.</para>
-
-      <para>Only the superuser can change other users' information and
-	passwords with &man.chpass.1;.</para>
+      <para>Any user can use &man.chpass.1; to change their default
+	shell and personal
+	information associated with their user account.  The superuser can use this utility to change additional account information for any user.</para>
 
       <para>When passed no options, aside from an optional username,
 	&man.chpass.1; displays an editor containing user information.
@@ -840,12 +844,19 @@ Removing files belonging to jru from /va
 	updated with the new information.</para>
 
       <note>
-	<para>You will be asked for your password after exiting the
-	  editor if you are not the superuser.</para>
+	<para>This utility will prompt for the user's password when exiting the
+	  editor, unless the utility is run as the superuser.</para>
       </note>
+      
+      <para>In Example 4.4, the superuser has typed
+	<command>chpass jru</command> and is now viewing the fields
+	that can be changed for this user.  If
+	<username>jru</username> runs this command instead, only the 
+	last six fields will be displayed and available for
+	editing.  This is shown in Example 4.5.</para>
 
       <example>
-	<title>Interactive <command>chpass</command> by
+	<title>Using <command>chpass</command> as
 	  Superuser</title>
 
 	<screen>#Changing user database information for jru.
@@ -865,11 +876,8 @@ Home Phone:
 Other information:</screen>
       </example>
 
-      <para>A user can change only a small subset of this
-	information, and only for their own user account.</para>
-
       <example>
-	<title>Interactive <command>chpass</command> by Normal
+	<title>Using <command>chpass</command> as Regular
 	  User</title>
 
 	<screen>#Changing user database information for jru.
@@ -884,8 +892,8 @@ Other information:</screen>
       <note>
 	<para>&man.chfn.1; and &man.chsh.1; are links to
 	  &man.chpass.1;, as are &man.ypchpass.1;, &man.ypchfn.1;, and
-	  &man.ypchsh.1;.  <acronym>NIS</acronym> support is
-	  automatic, so specifying the <literal>yp</literal> before
+	  &man.ypchsh.1;.  Since <acronym>NIS</acronym> support is
+	  automatic, specifying the <literal>yp</literal> before
 	  the command is not necessary.  How to configure NIS is
 	  covered in <xref linkend="network-servers"/>.</para>
       </note>
@@ -898,16 +906,10 @@ Other information:</screen>
 	<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 user
-	  must enter their original password before a new password can
-	  be set.  This is not the case when the superuser changes a
-	  user's password.</para>
-      </note>
+      <para>Any user can easily change their password using &man.passwd.1;.
+	To prevent accidental or unauthorized changes, this command will
+	prompt for the user's original password before a new password can
+	  be set:</para>
 
       <example>
 	<title>Changing Your Password</title>
@@ -921,6 +923,12 @@ passwd: updating the database...
 passwd: done</screen>
       </example>
 
+      <para>The superuser can change any user's password by specifying
+	the username when running &man.passwd.1;.  When this utility
+	is run as the superuser, it will not prompt for the user's
+	current password.  This allows the password to be changed when
+	a user cannot remember the original password.</para>
+
       <example>
 	<title>Changing Another User's Password as the
 	  Superuser</title>
@@ -935,7 +943,7 @@ passwd: done</screen>
 
       <note>
 	<para>As with &man.chpass.1;, &man.yppasswd.1; is a link to
-	  &man.passwd.1;, so NIS works with either command.</para>
+	  &man.passwd.1;, so <acronym>NIS</acronym> works with either command.</para>
       </note>
     </sect3>
 

From owner-svn-doc-all@FreeBSD.ORG  Wed Oct 23 17:44:02 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 81D31A24;
 Wed, 23 Oct 2013 17:44:02 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6ED73209D;
 Wed, 23 Oct 2013 17:44:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NHi2g1075097;
 Wed, 23 Oct 2013 17:44:02 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NHi2FM075096;
 Wed, 23 Oct 2013 17:44:02 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310231744.r9NHi2FM075096@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 23 Oct 2013 17:44:02 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43031 - head/en_US.ISO8859-1/books/handbook/basics
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 17:44:02 -0000

Author: dru
Date: Wed Oct 23 17:44:01 2013
New Revision: 43031
URL: http://svnweb.freebsd.org/changeset/doc/43031

Log:
  White space fix only. Translators can ignore.

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

Modified: head/en_US.ISO8859-1/books/handbook/basics/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Wed Oct 23 17:29:49 2013	(r43030)
+++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Wed Oct 23 17:44:01 2013	(r43031)
@@ -620,9 +620,9 @@ Password:
     </indexterm>
 
     <para>&os; provides a variety of different commands to manage
-      user accounts.  The most common commands are summarized in Table 4.1,
-      followed by some examples of their usage.  Refer to the manual
-      page for each utility for more details and usage
+      user accounts.  The most common commands are summarized in Table
+      4.1, followed by some examples of their usage.  Refer to the
+      manual page for each utility for more details and usage
       examples.</para>
 
     <table frame="none" pgwide="1">
@@ -687,25 +687,25 @@ Password:
 	  class="directory">/usr/share/skel</filename></primary>
       </indexterm>
       <indexterm><primary>skeleton directory</primary></indexterm>
-      <para>The recommended program for adding new users is &man.adduser.8;.
-	When a new user is added, this program automatically updates
-	<filename>/etc/passwd</filename> and
+      <para>The recommended program for adding new users is
+	&man.adduser.8;.  When a new user is added, this program
+	automatically updates <filename>/etc/passwd</filename> and
 	<filename>/etc/group</filename>.  It also creates a home
 	directory for the new user, copies in the default
 	configuration files from <filename
 	  class="directory">/usr/share/skel</filename>, and can
 	optionally mail the new user a welcome message.  This utility
 	must be run as the <username>superuser</username></para>
-	
+
       <para>The &man.adduser.8; utility is interactive and walks
-	through the steps for creating a new user account. As seen in
+	through the steps for creating a new user account.  As seen in
 	Example 4.2, either input the required information or press
 	<keycap>Return</keycap> to accept the default value shown in
 	square brackets.  In this example, the user has been invited
 	into the <groupname>wheel</groupname> group, which is
-	required to provide the account with superuser
-	access.  When finished, the utility will prompt to either
-	create another user or to exit.</para>
+	required to provide the account with superuser access.  When
+	finished, the utility will prompt to either create another
+	user or to exit.</para>
 
       <example>
 	<title>Adding a User on &os;</title>
@@ -759,8 +759,8 @@ Goodbye!
       </indexterm>
 
       <para>To completely remove a user from the system, run
-	&man.rmuser.8; as the superuser.  This command performs the following
-	steps:</para>
+	&man.rmuser.8; as the superuser.  This command performs the
+	following steps:</para>
 
       <procedure>
 	<step>
@@ -783,8 +783,8 @@ Goodbye!
 	</step>
 
 	<step>
-	  <para>Optionally removes the user's home directory, if it is owned by
-	    the user.</para>
+	  <para>Optionally removes the user's home directory, if it is
+	    owned by the user.</para>
 	</step>
 
 	<step>
@@ -802,10 +802,9 @@ Goodbye!
 	<step>
 	  <para>Finally, removes the username from all groups to which
 	    it belongs in <filename>/etc/group</filename>.  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>
+	    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>
 	</step>
       </procedure>
 
@@ -835,8 +834,9 @@ Removing user (jru): mailspool home pass
 
       <indexterm><primary><command>chpass</command></primary></indexterm>
       <para>Any user can use &man.chpass.1; to change their default
-	shell and personal
-	information associated with their user account.  The superuser can use this utility to change additional account information for any user.</para>
+	shell and personal information associated with their user
+	account.  The superuser can use this utility to change
+	additional account information for any user.</para>
 
       <para>When passed no options, aside from an optional username,
 	&man.chpass.1; displays an editor containing user information.
@@ -844,16 +844,17 @@ Removing user (jru): mailspool home pass
 	updated with the new information.</para>
 
       <note>
-	<para>This utility will prompt for the user's password when exiting the
-	  editor, unless the utility is run as the superuser.</para>
+	<para>This utility will prompt for the user's password when
+	  exiting the editor, unless the utility is run as the
+	  superuser.</para>
       </note>
-      
+
       <para>In Example 4.4, the superuser has typed
 	<command>chpass jru</command> and is now viewing the fields
 	that can be changed for this user.  If
-	<username>jru</username> runs this command instead, only the 
-	last six fields will be displayed and available for
-	editing.  This is shown in Example 4.5.</para>
+	<username>jru</username> runs this command instead, only the
+	last six fields will be displayed and available for editing.
+	This is shown in Example 4.5.</para>
 
       <example>
 	<title>Using <command>chpass</command> as
@@ -906,10 +907,10 @@ Other information:</screen>
 	<primary>accounts</primary>
 	<secondary>changing password</secondary>
       </indexterm>
-      <para>Any user can easily change their password using &man.passwd.1;.
-	To prevent accidental or unauthorized changes, this command will
-	prompt for the user's original password before a new password can
-	  be set:</para>
+      <para>Any user can easily change their password using
+	&man.passwd.1;.  To prevent accidental or unauthorized
+	changes, this command will prompt for the user's original
+	password before a new password can be set:</para>
 
       <example>
 	<title>Changing Your Password</title>
@@ -943,7 +944,8 @@ passwd: done</screen>
 
       <note>
 	<para>As with &man.chpass.1;, &man.yppasswd.1; is a link to
-	  &man.passwd.1;, so <acronym>NIS</acronym> works with either command.</para>
+	  &man.passwd.1;, so <acronym>NIS</acronym> works with either
+	  command.</para>
       </note>
     </sect3>
 

From owner-svn-doc-all@FreeBSD.ORG  Wed Oct 23 21:02:21 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 53112C3;
 Wed, 23 Oct 2013 21:02:21 +0000 (UTC)
 (envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3EAE020A5;
 Wed, 23 Oct 2013 21:02:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NL2LVd046465;
 Wed, 23 Oct 2013 21:02:21 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NL2KLD046460;
 Wed, 23 Oct 2013 21:02:20 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201310232102.r9NL2KLD046460@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Wed, 23 Oct 2013 21:02:20 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43032 - head/ru_RU.KOI8-R/books/porters-handbook
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 21:02:21 -0000

Author: pluknet
Date: Wed Oct 23 21:02:20 2013
New Revision: 43032
URL: http://svnweb.freebsd.org/changeset/doc/43032

Log:
  MFen r39245 -> r42833.
  Set proper svn properties.

Added:
  head/ru_RU.KOI8-R/books/porters-handbook/uses.xml   (contents, props changed)
  head/ru_RU.KOI8-R/books/porters-handbook/versions.xml   (contents, props changed)
Modified:
  head/ru_RU.KOI8-R/books/porters-handbook/Makefile
  head/ru_RU.KOI8-R/books/porters-handbook/book.xml   (contents, props changed)

Modified: head/ru_RU.KOI8-R/books/porters-handbook/Makefile
==============================================================================
--- head/ru_RU.KOI8-R/books/porters-handbook/Makefile	Wed Oct 23 17:44:01 2013	(r43031)
+++ head/ru_RU.KOI8-R/books/porters-handbook/Makefile	Wed Oct 23 21:02:20 2013	(r43032)
@@ -27,6 +27,8 @@ INSTALL_ONLY_COMPRESSED?=
 
 # XML content
 SRCS=  book.xml
+SRCS+= uses.xml
+SRCS+= versions.xml
 
 # Entities
 #SRCS+= ../../../en_US.ISO8859-1/books/handbook/authors.ent

Modified: head/ru_RU.KOI8-R/books/porters-handbook/book.xml
==============================================================================
--- head/ru_RU.KOI8-R/books/porters-handbook/book.xml	Wed Oct 23 17:44:01 2013	(r43031)
+++ head/ru_RU.KOI8-R/books/porters-handbook/book.xml	Wed Oct 23 21:02:20 2013	(r43032)
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="koi8-r"?>
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-	"../../../share/xml/freebsd45.dtd">
+	"../../../share/xml/freebsd45.dtd" [
+<!ENTITY values.uses SYSTEM "uses.xml">
+<!ENTITY values.versions SYSTEM "versions.xml">
+]>
 
 <!--
      The FreeBSD Russian Documentation Project
@@ -8,7 +11,7 @@
      $FreeBSD$
      $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/porters-handbook/book.xml,v 1.136 2006/10/20 09:25:00 marck Exp $
 
-     Original revision: r39245
+     Original revision: r42833
 -->
 
 <book lang="ru">
@@ -19,7 +22,7 @@
       <corpauthor>The FreeBSD Documentation Project</corpauthor>
     </authorgroup>
 
-    <pubdate>áÐÒÅÌØ 2000</pubdate>
+    <pubdate>$FreeBSD$</pubdate>
 
     <copyright>
       <year>2000</year>
@@ -35,6 +38,7 @@
       <year>2010</year>
       <year>2011</year>
       <year>2012</year>
+      <year>2013</year>
       <holder role="mailto:doc@FreeBSD.org">
         The FreeBSD Documentation Project</holder>
     </copyright>
@@ -124,12 +128,7 @@
       <para>íÉÎÉÍÁÌØÎÙÊ <filename>Makefile</filename> ÂÕÄÅÔ ×ÙÇÌÑÄÅÔØ
         ÐÒÉÍÅÒÎÏ ÔÁË:</para>
 
-      <programlisting># New ports collection makefile for:   oneko
-# Date created:        5 December 1994
-# Whom:                asami
-#
-# &dollar;FreeBSD&dollar;
-#
+      <programlisting># &dollar;FreeBSD&dollar;
 
 PORTNAME=      oneko
 PORTVERSION=   1.1b
@@ -137,13 +136,21 @@ CATEGORIES=    games
 MASTER_SITES=  ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/
 
 MAINTAINER=    asami@FreeBSD.org
+COMMENT=       Cat chasing a mouse all over the screen
 
 MAN1=	       oneko.1
 MANCOMPRESSED= yes
-USE_IMAKE=     yes
 
 .include &lt;bsd.port.mk&gt;</programlisting>
 
+      <note>
+	<para>÷ ÎÅËÏÔÏÒÙÈ ÓÌÕÞÁÑÈ × ÚÁÇÏÌÏ×ËÅ <filename>Makefile</filename>
+	  ÓÕÝÅÓÔ×ÕÀÝÅÇÏ ÐÏÒÔÁ ÍÏÇÕÔ ÓÏÄÅÒÖÁÔØÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÓÔÒÏËÉ,
+	  ÔÁËÉÅ ËÁË ÎÁÚ×ÁÎÉÅ ÐÏÒÔÁ É ÄÁÔÁ ÅÇÏ ÓÏÚÄÁÎÉÑ.
+	  üÔÁ ÄÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÂÙÌÁ ÏÂßÑ×ÌÅÎÁ ÕÓÔÁÒÅ×ÛÅÊ
+	  É ÎÁÈÏÄÉÔÓÑ × ÐÒÏÃÅÓÓÅ ÕÄÁÌÅÎÉÑ.</para>
+      </note>
+
       <para>ðÏÓÍÏÔÒÉÍ, ÓÍÏÖÅÔÅ ÌÉ ×Ù ÅÇÏ ÐÏÎÑÔØ.  îÅ ÏÂÒÁÝÁÊÔÅ ×ÎÉÍÁÎÉÅ ÎÁ
         ÓÏÄÅÒÖÉÍÏÅ ÓÔÒÏÞËÉ <literal>&dollar;FreeBSD&dollar;</literal>, ÏÎÁ
         ÂÕÄÅÔ ÚÁÐÏÌÎÅÎÁ Á×ÔÏÍÁÔÉÞÅÓËÉ ÓÉÓÔÅÍÏÊ SVN, ËÏÇÄÁ ÐÏÒÔ ÂÕÄÅÔ
@@ -174,12 +181,33 @@ USE_IMAKE=     yes
             ÉÚ <filename>README</filename> ÉÌÉ ÓÔÒÁÎÉÃ
             ÓÐÒÁ×ÏÞÎÉËÁ</emphasis>; ÓÌÉÛËÏÍ ÞÁÓÔÏ ÏÎÉ ÎÅ Ñ×ÌÑÀÔÓÑ ËÒÁÔËÉÍ
             ÏÐÉÓÁÎÉÅÍ ÐÏÒÔÁ ÉÌÉ ÉÍÅÀÔ ÎÅÕÄÏÂÎÙÊ ÆÏÒÍÁÔ (ÎÁÐÒÉÍÅÒ, ÓÔÒÁÎÉÃÙ
-	    ÓÐÒÁ×ÏÞÎÉËÁ ×ÙÒÏ×ÎÅÎÙ ÐÒÏÂÅÌÁÍÉ).  åÓÌÉ ÐÏÒÔÉÒÕÅÍÏÅ ÐÒÉÌÏÖÅÎÉÅ
-	    ÉÍÅÅÔ ÏÆÉÃÉÁÌØÎÕÀ ÓÔÒÁÎÉÞËÕ éÎÔÅÒÎÅÔ, ÕËÁÖÉÔÅ ÅÅ ÚÄÅÓØ.
-	    ðÅÒÅÄ <emphasis>ÏÄÎÉÍ</emphasis> ÉÚ ÓÁÊÔÏ× ÄÏÂÁ×ØÔÅ ÓÌÏ×Ï
-	    <literal>WWW:</literal> ÄÌÑ ÔÏÇÏ, ÞÔÏÂÙ ×ÓÐÏÍÏÇÁÔÅÌØÎÙÅ ÕÔÉÌÉÔÙ
-	    ÒÁÂÏÔÁÌÉ ÐÒÁ×ÉÌØÎÏ.</para>
-        </note>
+	    ÓÐÒÁ×ÏÞÎÉËÁ ×ÙÒÏ×ÎÅÎÙ ÐÒÏÂÅÌÁÍÉ, ÐÏÓËÏÌØËÕ ÜÔÏ ×ÙÇÌÑÄÉÔ ×
+	    ÏÓÏÂÅÎÎÏÓÔÉ ÐÌÏÈÏ Ó ÍÏÎÏÛÉÒÉÎÎÙÍÉ ÛÒÉÆÔÁÍÉ).</para>
+	</note>
+
+	<para>èÏÒÏÛÏ ÓÏÓÔÁ×ÌÅÎÎÙÊ <filename>pkg-descr</filename>
+	  ÏÐÉÓÙ×ÁÅÔ ÐÏÒÔ ÄÏÓÔÁÔÏÞÎÏ ÐÏÌÎÏ, ÞÔÏÂÙ ÐÏÌØÚÏ×ÁÔÅÌÀ ÎÅ
+	  ÐÒÉÈÏÄÉÌÏÓØ Ó×ÅÒÑÔØÓÑ Ó ÄÏËÕÍÅÎÔÁÃÉÅÊ ÉÌÉ ÐÏÓÅÝÁÔØ ×ÅÂÓÁÊÔ
+	  ÄÌÑ ÐÏÎÉÍÁÎÉÑ ÔÏÇÏ, ÞÔÏ ÄÅÌÁÅÔ ÄÁÎÎÏÅ ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ,
+	  ÞÅÍ ÏÎÏ ÍÏÖÅÔ ÂÙÔØ ÐÏÌÅÚÎÏ ÉÌÉ ËÁËÉÅ ÈÏÒÏÛÉÅ ÆÕÎËÃÉÉ Õ ÎÅÇÏ
+	  ÉÍÅÀÔÓÑ.  õÐÏÍÉÎÁÎÉÅ ÐÒÏ ÏÐÒÅÄÅÌ£ÎÎÙÅ ÔÒÅÂÏ×ÁÎÉÑ, ÔÁËÉÅ ËÁË
+	  ÉÓÐÏÌØÚÕÅÍÙÊ ÇÒÁÆÉÞÅÓËÉÊ ÉÎÓÔÒÕÍÅÎÔÁÒÉÊ, ÔÑÖ£ÌÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ,
+	  ÏËÒÕÖÅÎÉÅ ÄÌÑ ÚÁÐÕÓËÁ ÉÌÉ ÉÓÐÏÌØÚÕÅÍÙÊ ÑÚÙË ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÑ
+	  ÐÏÍÏÇÕÔ ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÏÐÒÅÄÅÌÉÔØÓÑ, ÂÕÄÅÔ ÌÉ ÜÔÏÔ ÐÏÒÔ ÄÌÑ
+	  ÎÉÈ ÒÁÂÏÔÁÔØ.</para>
+
+	<para>÷ËÌÀÞÉÔÅ ÓÀÄÁ URL ÏÆÉÃÉÁÌØÎÏÊ ÄÏÍÁÛÎÅÊ ÓÔÒÁÎÉÃÙ éÎÔÅÒÎÅÔ.
+	  ðÅÒÅÄ <emphasis>ÏÄÎÉÍ</emphasis> ÉÚ ÓÁÊÔÏ× (×ÙÂÅÒÉÔÅ ÏÓÎÏ×ÎÏÊ)
+	  ÄÏÂÁ×ØÔÅ <literal>WWW:</literal> (Ó ÐÏÓÌÅÄÕÀÝÉÍ ÅÄÉÎÉÞÎÙÍ
+	  ÐÒÏÂÅÌÏÍ) ÄÌÑ ÔÏÇÏ, ÞÔÏÂÙ ×ÓÐÏÍÏÇÁÔÅÌØÎÙÅ ÕÔÉÌÉÔÙ ÒÁÂÏÔÁÌÉ
+	  ÐÒÁ×ÉÌØÎÏ.  åÓÌÉ URI Ñ×ÌÑÅÔÓÑ ËÏÒÎÅÍ ÓÁÊÔÁ ÉÌÉ ËÁÔÁÌÏÇÏÍ,
+	  ÔÏ ÚÎÁÞÅÎÉÅ ÄÏÌÖÎÏ ÂÙÔØ ÄÏÐÏÌÎÅÎÏ ËÏÓÏÊ ÞÅÒÔÏÊ.</para>
+
+	<note>
+	  <para>åÓÌÉ ÕËÁÚÁÎÎÁÑ ÄÌÑ ÐÏÒÔÁ ×ÅÂ-ÓÔÒÁÎÉÃÁ ÎÅ ÄÏÓÔÕÐÎÁ,
+	    ÐÏÐÙÔÁÊÔÅÓØ ÓÐÅÒ×Á ÐÏÉÓËÁÔØ, ÂÙÌ ÌÉ ÏÆÉÃÉÁÌØÎÙÊ ÓÁÊÔ
+	    ÐÅÒÅÍÅÝ£Î, ÐÅÒÅÉÍÅÎÏ×ÁÎ ÉÌÉ ÒÁÚÍÅÝ£Î × ÄÒÕÇÏÍ ÍÅÓÔÅ.</para>
+	</note>
 
         <para>óÌÅÄÕÀÝÉÊ ÐÒÉÍÅÒ ÐÏËÁÚÙ×ÁÅÔ, ËÁË ÄÏÌÖÅÎ ×ÙÇÌÑÄÅÔØ ×ÁÛ
 	  <filename>pkg-descr</filename>:</para>
@@ -255,6 +283,18 @@ PLIST_DIRS=     lib/X11/oneko</programli
         <para>ëÏÎÅÞÎÏ, ÐÅÒÅÍÅÎÎÁÑ <makevar>PLIST_DIRS</makevar> ÎÅ ÄÏÌÖÎÁ
           ÚÁÄÁ×ÁÔØÓÑ, ÅÓÌÉ ÐÏÒÔ ÎÅ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÎÉËÁËÉÈ ËÁÔÁÌÏÇÏ×.</para>
 
+	<note>
+	  <para>îÅÓËÏÌØËÏ ÐÏÒÔÏ× ÍÏÇÕÔ ÓÏ×ÍÅÓÔÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÏÂÝÉÊ
+	    ËÁÔÁÌÏÇ.  ÷ ÜÔÏÍ ÓÌÕÞÁÅ <makevar>PLIST_DIRS</makevar>
+	    ÓÌÅÄÕÅÔ ÚÁÍÅÎÉÔØ ÎÁ <makevar>PLIST_DIRSTRY</makevar>, ÔÁË
+	    ÞÔÏÂÙ ËÁÔÁÌÏÇ ÕÄÁÌÑÌÓÑ ÔÏÌØËÏ ÅÓÌÉ ÏÎ ÐÕÓÔ, Á ÉÎÁÞÅ
+	    ÉÇÎÏÒÉÒÏ×ÁÌÓÑ.  éÓÐÏÌØÚÏ×ÁÎÉÅ <makevar>PLIST_DIRS</makevar>
+	    É <makevar>PLIST_DIRSTRY</makevar> ÁÎÁÌÏÇÉÞÎÏ
+	    <literal>@dirrm</literal> É <literal>@dirrmtry</literal>
+	    × <filename>pkg-plist</filename>, ÏÐÉÓÁÎÉÅ ËÏÔÏÒÙÈ
+	    ×ÈÏÄÉÔ × <xref linkend="plist-dir-cleaning"/>.</para>
+	</note>
+
         <para>ïÂÒÁÔÎÏÊ ÓÔÏÒÏÎÏÊ ÔÁËÏÇÏ ÓÐÏÓÏÂÁ ÐÅÒÅÞÉÓÌÅÎÉÑ ÆÁÊÌÏ× É
           ËÁÔÁÌÏÇÏ× ÐÏÒÔÁ Ñ×ÌÑÅÔÓÑ ÎÅ×ÏÚÍÏÖÎÏÓÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÑ
           ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÅÊ ËÏÍÁÎÄ, ÏÐÉÓÁÎÎÙÈ × &man.pkg.create.1;.
@@ -435,10 +475,11 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	ÏÞÅÒÅÄÉ ÄÌÑ ×ËÌÀÞÅÎÉÑ ×Ï &os;.</para>
 
       <para>íÙ ÒÁÓÓÍÏÔÒÉÍ ×ÁÛ ÐÏÒÔ, ÐÒÉ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ×ÅÒÎ£Í ÅÇÏ ÏÂÒÁÔÎÏ, Á
-        ÚÁÔÅÍ ×ËÌÀÞÉÍ ÐÏÒÔ × ÎÁÛÅ ÄÅÒÅ×Ï.  ÷ÁÛÅ ÉÍÑ ÔÁËÖÅ ÐÏÑ×ÉÔÓÑ × ÓÐÉÓËÅ
-	<ulink url="&url.articles.contributors;/contrib-additional.html">
-        äÏÐÏÌÎÉÔÅÌØÎÙÈ ËÏÎÔÒÉÂÕÔÏÒÏ× ÐÒÏÅËÔÁ FreeBSD</ulink> É ÄÒÕÇÉÈ
-	ÆÁÊÌÁÈ.  òÁÚ×Å ÜÔÏ ÎÅ ×ÅÌÉËÏÌÅÐÎÏ?!? <!-- smiley -->:-)</para>
+        ÚÁÔÅÍ ×ËÌÀÞÉÍ ÐÏÒÔ × ÎÁÛÅ ÄÅÒÅ×Ï.  ÷ÁÛÅ ÉÍÑ ÔÁËÖÅ ÂÕÄÅÔ ÄÏÂÁ×ÌÅÎÏ
+	× ÓÐÉÓÏË <ulink
+	  url="&url.articles.contributors;/contrib-additional.html">
+	  äÏÐÏÌÎÉÔÅÌØÎÙÈ ËÏÎÔÒÉÂÕÔÏÒÏ× ÐÒÏÅËÔÁ FreeBSD</ulink> É ÄÒÕÇÉÅ
+	ÆÁÊÌÙ.</para>
     </sect1>
   </chapter>
 
@@ -521,12 +562,6 @@ PLIST_DIRS=     lib/X11/oneko</programli
 		<filename><makevar>WRKSRC</makevar>/configure</filename>.
 	      </para>
 	    </listitem>
-
-	    <listitem>
-	      <para>åÓÌÉ ÚÁÄÁÎÁ ÐÅÒÅÍÅÎÎÁÑ <makevar>USE_IMAKE</makevar>,
-		ÔÏ ÚÁÐÕÓËÁÅÔÓÑ ËÏÍÁÎÄÁ <makevar>XMKMF</makevar> (ÐÏ ÕÍÏÌÞÁÎÉÀ
-		ÜÔÏ <command>xmkmf -a</command>).</para>
-	    </listitem>
 	  </orderedlist>
 	</step>
 
@@ -534,7 +569,7 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	  <para>÷ÙÐÏÌÎÑÅÔÓÑ ÃÅÌØ <maketarget>build</maketarget>.  ïÎÁ
 	    ÏÔ×ÅÞÁÅÔ ÚÁ ÐÅÒÅÈÏÄ × ÓÏÂÓÔ×ÅÎÎÙÊ ÒÁÂÏÞÉÊ ËÁÔÁÌÏÇ ÐÏÒÔÁ
 	    (<makevar>WRKSRC</makevar>) É ÅÇÏ ÐÏÓÔÒÏÅÎÉÅ.  åÓÌÉ ÚÁÄÁÎÁ
-	    ÐÅÒÅÍÅÎÎÁÑ <makevar>USE_GMAKE</makevar>, ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ
+	    ÐÅÒÅÍÅÎÎÁÑ <makevar>USES= gmake</makevar>, ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ
 	    GNU-×ÅÒÓÉÑ ÕÔÉÌÉÔÙ <command>make</command>, × ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ
 	    ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎÁ ÓÉÓÔÅÍÎÁÑ ÕÔÉÌÉÔÁ
 	    <command>make</command>.</para>
@@ -759,8 +794,7 @@ PLIST_DIRS=     lib/X11/oneko</programli
 	ÎÁ ÚÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ.  ðÒÉÍÅÒ:</para>
 
       <programlisting>post-patch:
-	@${REINPLACE_CMD} -e 's|for Linux|for FreeBSD|g' ${WRKSRC}/README
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure</programlisting>
+	@${REINPLACE_CMD} -e 's|for Linux|for FreeBSD|g' ${WRKSRC}/README</programlisting>
 
       <para>äÏ×ÏÌØÎÏ ÞÁÓÔÏ ÂÙ×ÁÀÔ ÓÉÔÕÁÃÉÉ, ËÏÇÄÁ ÐÏÒÔÉÒÕÅÍÏÅ ÐÒÏÇÒÁÍÍÎÏÅ
 	ÏÂÅÓÐÅÞÅÎÉÅ, ÏÓÏÂÅÎÎÏ ÅÓÌÉ ÏÓÎÏ×ÎÏÊ ÐÌÁÔÆÏÒÍÏÊ ÒÁÚÒÁÂÏÔËÉ Ñ×ÌÑÅÔÓÑ
@@ -993,6 +1027,26 @@ DOS2UNIX_REGEX=  .*\.(c|cpp|h)</programl
             (ÉÚÎÁÞÁÌØÎÏ ÜÔÏ ÎÅ ÓÞÉÔÁÌÏÓØ ÂÙ ÂÏÌÅÅ ÎÏ×ÏÊ ×ÅÒÓÉÅÊ, ÔÁË ËÁË
             20000801 ÞÉÓÌÅÎÎÏ ÂÏÌØÛÅ, ÞÅÍ 1).</para>
 
+	  <tip>
+	    <para>òÅÚÕÌØÔÁÔ ÓÒÁ×ÎÅÎÉÑ ÎÏÍÅÒÁ ×ÅÒÓÉÉ ÎÅ ×ÓÅÇÄÁ ÏÞÅ×ÉÄÅÎ.
+	      äÌÑ ×ÙÐÏÌÎÅÎÉÑ ÓÒÁ×ÎÅÎÉÑ Ä×ÕÈ ÓÔÒÏË Ó ÎÏÍÅÒÏÍ ×ÅÒÓÉÉ ÍÏÖÎÏ
+	      ÉÓÐÏÌØÚÏ×ÁÔØ &man.pkg.version.1;.  üË×É×ÁÌÅÎÔÏÍ ×
+	      <application>pkgng</application> Ñ×ÌÑÅÔÓÑ
+	      <command>pkg version -t</command>.  îÁÐÒÉÍÅÒ:</para>
+
+	    <screen>&prompt.user; <userinput>pkg_version -t 0.031 0.29</userinput>
+></screen>
+
+	    <para>äÌÑ ÐÏÌØÚÏ×ÁÔÅÌÅÊ <application>pkgng</application>:</para>
+
+	    <screen>&prompt.user; <userinput>pkg version -t 0.031 0.29</userinput>
+></screen>
+
+	    <para>óÔÒÏËÁ <literal>&gt;</literal> × ×Ù×ÏÄÅ ËÏÍÁÎÄÙ ÏÚÎÁÞÁÅÔ,
+	      ÞÔÏ ×ÅÒÓÉÑ 0.031 ÓÞÉÔÁÅÔÓÑ ×ÙÛÅ, ÞÅÍ ×ÅÒÓÉÑ 0.29, ÞÔÏ ÍÏÖÅÔ
+	      ÂÙÔØ ÎÅ ÏÞÅ×ÉÄÎÏ ÄÌÑ ÔÏÇÏ, ËÔÏ ×ÙÐÏÌÎÑÅÔ ÐÏÒÔÉÒÏ×ÁÎÉÅ.</para>
+	</tip>
+
           <para>÷ ÓÉÔÕÁÃÉÑÈ, ÐÏÄÏÂÎÙÈ ÜÔÏÊ, ÄÏÌÖÎÏ ÂÙÔØ Õ×ÅÌÉÞÅÎÏ ÚÎÁÞÅÎÉÅ
             <makevar>PORTEPOCH</makevar>.  åÓÌÉ ÚÎÁÞÅÎÉÅ
             <makevar>PORTEPOCH</makevar> ÎÅ ÒÁ×ÎÏ ÎÕÌÀ, ÔÏ ÏÎÏ ÄÏÂÁ×ÌÑÅÔÓÑ Ë
@@ -2003,11 +2057,7 @@ PORTEPOCH=      1</programlisting>
                   ÐÏÄÄÅÒÖÉ×ÁÅÔ ÓÁÍÕ ÏËÏÎÎÕÀ ÓÉÓÔÅÍÕ.  îÅ ÐÏÍÅÝÁÊÔÅ ÓÀÄÁ
                   ÏÂÙÞÎÙÅ ÐÒÉÌÏÖÅÎÉÑ ÄÌÑ X: ÂÏÌØÛÉÎÓÔ×Ï ÉÚ ÎÉÈ ÄÏÌÖÎÙ ÂÙÔØ
                   ÐÅÒÅÎÅÓÅÎÙ × ÄÒÕÇÉÅ ËÁÔÅÇÏÒÉÉ <filename>x11-*</filename>
-                  (ÓÍÏÔÒÉÔÅ ÎÉÖÅ).  åÓÌÉ ×ÁÛ ÐÏÒÔ <emphasis>Ñ×ÌÑÅÔÓÑ</emphasis>
-                  ÐÒÉÌÏÖÅÎÉÅÍ ÄÌÑ X, ÚÁÄÁÊÔÅ <makevar>USE_XLIB</makevar> (ÞÔÏ
-                  ÐÏÄÒÁÚÕÍÅ×ÁÅÔÓÑ ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ
-                  <makevar>USE_IMAKE</makevar>) É ÕËÁÖÉÔÅ ÐÏÄÈÏÄÑÝÕÀ
-	          ËÁÔÅÇÏÒÉÀ.</entry>
+		  (ÓÍÏÔÒÉÔÅ ÎÉÖÅ).</entry>
 	      </row>
 
 	      <row>
@@ -3343,19 +3393,102 @@ ALWAYS_KEEP_DISTFILES=  yes
     <sect1 id="makefile-comment">
       <title><makevar>COMMENT</makevar></title>
 
-      <para>üÔÏ ÏÄÎÏÓÔÒÏÞÎÏÅ ÏÐÉÓÁÎÉÅ ÐÏÒÔÁ.  <emphasis>ðÏÖÁÌÕÊÓÔÁ</emphasis>,
-        ÎÅ ×ËÌÀÞÁÊÔÅ ÓÀÄÁ ÎÁÚ×ÁÎÉÅ ÐÁËÅÔÁ (ÉÌÉ ÎÏÍÅÒ ×ÅÒÓÉÉ ÐÒÏÇÒÁÍÍÎÏÇÏ
-        ÏÂÅÓÐÅÞÅÎÉÑ).  ëÏÍÍÅÎÔÁÒÉÊ ÄÏÌÖÅÎ ÎÁÞÉÎÁÔØÓÑ Ó ÚÁÇÌÁ×ÎÏÊ ÂÕË×Ù É ÎÅ
-        ÚÁËÁÎÞÉ×ÁÔØÓÑ ÔÏÞËÏÊ.  ÷ÏÔ ÐÒÉÍÅÒ:</para>
+      <para>óÏÄÅÒÖÉÔ ÏÄÎÏÓÔÒÏÞÎÏÅ ÏÐÉÓÁÎÉÅ ÐÏÒÔÁ.  ðÏÖÁÌÕÊÓÔÁ, ÓÏÂÌÀÄÁÊÔÅ
+	ÓÌÅÄÕÀÝÉÅ ÐÒÁ×ÉÌÁ:</para>
+
+      <orderedlist>
+	<listitem>
+	  <para>óÔÁÒÁÊÔÅÓØ ÄÅÌÁÔØ ÓÔÒÏËÕ COMMENT ÄÌÉÎÏÊ ÎÅ ÂÏÌØÛÅ, ÞÅÍ 70
+	    ÓÉÍ×ÏÌÏ×, ÔÁË ËÁË ÜÔÁ ÓÔÒÏËÁ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎÁ ÐÒÏÇÒÁÍÍÏÊ
+	    &man.pkg.info.1; ÄÌÑ ÏÔÏÂÒÁÖÅÎÉÑ ÏÄÎÏÓÔÒÏÞÎÏÇÏ ÏÐÉÓÁÎÉÑ
+	    ÐÏÒÔÁ;</para>
+	</listitem>
+
+	<listitem>
+	  <para><emphasis>îÅ</emphasis> ×ËÌÀÞÁÊÔÅ ÓÀÄÁ ÎÁÚ×ÁÎÉÅ ÐÁËÅÔÁ
+	    (ÉÌÉ ÎÏÍÅÒ ×ÅÒÓÉÉ ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ);</para>
+	</listitem>
+
+	<listitem>
+	  <para>ëÏÍÍÅÎÔÁÒÉÊ ÄÏÌÖÅÎ ÎÁÞÉÎÁÔØÓÑ Ó ÚÁÇÌÁ×ÎÏÊ ÂÕË×Ù É ÎÅ
+	    ÚÁËÁÎÞÉ×ÁÔØÓÑ ÔÏÞËÏÊ;</para>
+	</listitem>
+
+	<listitem>
+	  <para>îÅ ÎÁÞÉÎÁÊÔÅ ËÏÍÍÅÎÔÁÒÉÊ Ó ÎÅÏÐÒÅÄÅÌ£ÎÎÏÇÏ ÁÒÔÉËÌÑ (A
+	    ÉÌÉ An);</para>
+	</listitem>
+
+	<listitem>
+	  <para>éÍÅÎÁ ÐÉÛÕÔÓÑ Ó ÚÁÇÌÁ×ÎÏÊ ÂÕË×Ù (ÎÁÐÒÉÍÅÒ, Apache,
+	    JavaScript. Perl);</para>
+	</listitem>
+
+	<listitem>
+	  <para>äÌÑ ÐÅÒÅÞÉÓÌÅÎÉÊ ÉÓÐÏÌØÚÕÊÔÅ ÁÎÇÌÉÊÓËÕÀ ïËÓÆÏÒÄÓËÕÀ
+	    ÚÁÐÑÔÕÀ (ÁÎÇÌ. Oxford comma) (ÎÁÐÒÉÍÅÒ, green,
+	    red<emphasis>,</emphasis> and blue);</para>
+	</listitem>
+
+	<listitem>
+	  <para>éÓÐÏÌØÚÕÊÔÅ ÐÒÏÇÒÁÍÍÕ ÐÒÏ×ÅÒËÉ ÏÒÆÏÇÒÁÆÉÉ.</para>
+	</listitem>
+      </orderedlist>
+
+      <para>÷ÏÔ ÐÒÉÍÅÒ:</para>
 
-      <programlisting>A cat chasing a mouse all over the screen</programlisting>
+      <programlisting>Cat chasing a mouse all over the screen</programlisting>
 
       <para>÷ ÆÁÊÌÅ <filename>Makefile</filename> ÐÅÒÅÍÅÎÎÁÑ COMMENT ÄÏÌÖÎÁ
         ÓÌÅÄÏ×ÁÔØ ÓÒÁÚÕ ÚÁ ÐÅÒÅÍÅÎÎÏÊ MAINTAINER.</para>
+    </sect1>
+
+    <sect1 id="makefile-portscout">
+      <title><makevar>PORTSCOUT</makevar></title>
+
+      <para><application>Portscout</application> Ñ×ÌÑÅÔ ÓÏÂÏÊ
+	Á×ÔÏÍÁÔÉÚÉÒÏ×ÁÎÎÏÅ ÓÒÅÄÓÔ×Ï ÐÒÏ×ÅÒËÉ ÄÏÓÔÕÐÎÏÓÔÉ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÈ
+	ÆÁÊÌÏ× ÄÌÑ ëÏÌÌÅËÃÉÉ ðÏÒÔÏ× &os;, ÐÏÄÒÏÂÎÏÅ ÏÐÉÓÁÎÉÅ ËÏÔÏÒÏÇÏ
+	ÐÒÅÄÏÓÔÁ×ÌÑÅÔ <xref linkend="distfile-survey"/>.</para>
+
+      <para>ðÅÒÅÍÅÎÎÁÑ <makevar>PORTSCOUT</makevar> ÚÁÄÁ£Ô ÓÐÅÃÉÁÌØÎÙÅ
+	ÕÓÌÏ×ÉÑ, ÏÇÒÁÎÉÞÉ×ÁÀÝÉÅ ÒÁÂÏÔÕ <application>Portscout</application>
+	-  ÓËÁÎÅÒÁ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÈ ÆÁÊÌÏ×.</para>
+
+      <para>óÉÔÕÁÃÉÉ, ÐÒÉ ËÏÔÏÒÙÈ ÓÌÅÄÕÅÔ ÕËÁÚÙ×ÁÔØ ÐÅÒÅÍÅÎÎÕÀ
+	<makevar>PORTSCOUT</makevar>:</para>
+
+      <itemizedlist>
+	<listitem>
+	  <para>ëÏÇÄÁ ÄÏÌÖÎÙ ÉÇÎÏÒÉÒÏ×ÁÔØÓÑ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÅ ÆÁÊÌÙ ÄÌÑ
+	    ËÏÎËÒÅÔÎÙÈ ×ÅÒÓÉÊ ÉÌÉ ÍÌÁÄÛÉÈ ÒÅ×ÉÚÉÊ.  îÁÐÒÉÍÅÒ, ÞÔÏÂÙ
+	    ÉÓËÌÀÞÉÔØ ÉÚ ÐÒÏ×ÅÒÏË ÎÏ×ÙÈ ×ÅÒÓÉÊ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÈ ÆÁÊÌÏ×
+	    ×ÅÒÓÉÀ <replaceable>8.2</replaceable> ÐÏ ÐÒÉÞÉÎÅ ÔÏÇÏ, ÞÔÏ
+	    ÏÎÁ Ñ×ÌÑÅÔÓÑ ÐÏÌÏÍÁÎÎÏÊ, ÄÏÂÁ×ØÔÅ ÓÌÅÄÕÀÝÅÅ:</para>
+
+	  <programlisting>PORTSCOUT=	ignore:8.2</programlisting>
+
+	</listitem>
+	<listitem>
+	  <para>ëÏÇÄÁ ÄÏÌÖÎÙ ÐÒÏ×ÅÒÑÔØÓÑ ËÏÎËÒÅÔÎÙÅ ×ÅÒÓÉÉ ÉÌÉ ÓÔÁÒÛÉÅ
+	    É ÍÌÁÄÛÉÅ ÒÅ×ÉÚÉÉ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÈ ÆÁÊÌÏ×.  îÁÐÒÉÍÅÒ, ÅÓÌÉ
+	    ÓÌÅÄÕÅÔ ÏÇÒÁÎÉÞÉÔØÓÑ ÐÒÏ×ÅÒËÏÊ ×ÅÒÓÉÉ
+	    <replaceable>0.6.4</replaceable>, ÐÏÔÏÍÕ ÞÔÏ ÂÏÌÅÅ ÎÏ×ÙÅ
+	    ×ÅÒÓÉÉ ÉÍÅÀÔ ÐÒÏÂÌÅÍÙ ÓÏ×ÍÅÓÔÉÍÏÓÔÉ Ó &os;, ÄÏÂÁ×ØÔÅ:</para>
+
+	  <programlisting>PORTSCOUT=	limit:^0\.6\.4</programlisting>
+
+	</listitem>
+	<listitem>
+	  <para>ëÏÇÄÁ URL, × ËÏÔÏÒÙÈ ÕËÁÚÁÎÙ ÄÏÓÔÕÐÎÙÅ ×ÅÒÓÉÉ, ÏÔÌÉÞÁÀÔÓÑ
+	    ÏÔ URL ÉÈ ÚÁÇÒÕÚËÉ.  îÁÐÒÉÍÅÒ, ÞÔÏÂÙ ÐÒÉ×ÑÚÁÔØ ÐÒÏ×ÅÒËÕ ÎÏ×ÙÈ
+	    ×ÅÒÓÉÊ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÈ ÆÁÊÌÏ× Ë ÓÔÒÁÎÉÃÅ ÚÁÇÒÕÚËÉ ÄÌÑ ÐÏÒÔÁ
+	    <filename role="package">databases/pgtune</filename>,
+	    ÄÏÂÁ×ØÔÅ:</para>
 
-      <para>ðÏÖÁÌÕÊÓÔÁ, ÐÏÓÔÁÒÁÊÔÅÓØ ÄÅÌÁÔØ ÓÔÒÏËÕ COMMENT ÄÌÉÎÏÊ ÎÅ ÂÏÌØÛÅ,
-        ÞÅÍ 70 ÓÉÍ×ÏÌÏ×, ÔÁË ËÁË ÜÔÁ ÓÔÒÏËÁ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎÁ ÐÒÏÇÒÁÍÍÏÊ
-	&man.pkg.info.1; ÄÌÑ ÏÔÏÂÒÁÖÅÎÉÑ ÏÄÎÏÓÔÒÏÞÎÏÇÏ ÏÐÉÓÁÎÉÑ ÐÏÒÔÁ.</para>
+	  <programlisting>PORTSCOUT=	site:http://pgfoundry.org/frs/?group_id=1000416</programlisting>
+	</listitem>
+      </itemizedlist>
     </sect1>
 
     <sect1 id="makefile-depend">
@@ -3377,38 +3510,23 @@ ALWAYS_KEEP_DISTFILES=  yes
 
 	<para>üÔÁ ÐÅÒÅÍÅÎÎÁÑ ÕËÁÚÙ×ÁÅÔ, ÏÔ ËÁËÉÈ ÓÏ×ÍÅÓÔÎÏ ÉÓÐÏÌØÚÕÅÍÙÈ
 	  ÂÉÂÌÉÏÔÅË ÚÁ×ÉÓÉÔ ÐÏÒÔ.  üÔÏ ÓÐÉÓÏË ÐÁÒ
-	  <replaceable>lib</replaceable>:<replaceable>dir</replaceable><optional><replaceable>:target</replaceable></optional>
+	  <replaceable>lib</replaceable>:<replaceable>dir</replaceable>
 	  ÇÄÅ <replaceable>lib</replaceable> - ÜÔÏ ÉÍÑ ÂÉÂÌÉÏÔÅËÉ,
 	  <replaceable>dir</replaceable> - ÜÔÏ ËÁÔÁÌÏÇ, × ËÏÔÏÒÏÍ ÍÏÖÎÏ ÅÅ
-	  ÎÁÊÔÉ × ÓÌÕÞÁÅ, ÅÓÌÉ ÅÅ ÎÅÔ ÎÁ ÍÁÛÉÎÅ, É
-	  <replaceable>target</replaceable> - ÜÔÏ ÃÅÌØ, ËÏÔÏÒÕÀ ÎÕÖÎÏ ×ÙÚ×ÁÔØ
-	  × ÜÔÏÍ ËÁÔÁÌÏÇÅ.  îÁÐÒÉÍÅÒ,</para>
+	  ÎÁÊÔÉ × ÓÌÕÞÁÅ, ÅÓÌÉ ÅÅ ÎÅÔ ÎÁ ÍÁÛÉÎÅ.  îÁÐÒÉÍÅÒ,</para>
 
-	<programlisting>LIB_DEPENDS=   jpeg:${PORTSDIR}/graphics/jpeg</programlisting>
+	<programlisting>LIB_DEPENDS=   libjpeg.so:${PORTSDIR}/graphics/jpeg</programlisting>
 
 	<para>ÐÒÏ×ÅÒÉÔ ÎÁÌÉÞÉÅ ÂÉÂÌÉÏÔÅËÉ jpeg Ó ÌÀÂÙÍ ÎÏÍÅÒÏÍ ×ÅÒÓÉÉ É
 	  ÐÅÒÅÊÄÅÔ × ÐÏÄËÁÔÁÌÏÇ <filename>graphics/jpeg</filename> ×ÁÛÅÇÏ
 	  ÄÅÒÅ×Á ÐÏÒÔÏ× ÄÌÑ ÅÅ ÐÏÓÔÒÏÅÎÉÑ É ÕÓÔÁÎÏ×ËÉ, ÅÓÌÉ ÂÉÂÌÉÏÔÅËÁ
-	  ÏÔÓÕÔÓÔ×ÕÅÔ.	þÁÓÔØ <replaceable>target</replaceable> ÍÏÖÅÔ ÂÙÔØ
-	  ÏÐÕÝÅÎÁ, ÅÓÌÉ ÏÎÁ ÒÁ×ÎÁ <makevar>DEPENDS_TARGET</makevar>
-	  (ÐÏ ÕÍÏÌÞÁÎÉÀ <literal>install</literal>).</para>
-
-	<note>
-	  <para>þÁÓÔØ <replaceable>lib</replaceable> Ñ×ÌÑÅÔÓÑ ÒÅÇÕÌÑÒÎÙÍ
-	    ×ÙÒÁÖÅÎÉÅÍ, ËÏÔÏÒÏÅ ×ÙÚÙ×ÁÅÔÓÑ ÄÌÑ ×Ù×ÏÄÁ, ÐÏÌÕÞÅÎÎÏÇÏ ÉÚ
-	    <command>ldconfig -r</command>.  òÁÚÒÅÛÁÀÔÓÑ ÔÁËÉÅ ÚÎÁÞÅÎÉÑ, ËÁË
-	    <literal>intl.9</literal> É <literal>intl.[5-7]</literal>.
-	    ðÅÒ×ÙÊ ÛÁÂÌÏÎ, <literal>intl.9</literal>, ÓÏ×ÐÁÄÁÅÔ ÔÏÌØËÏ Ó
-	    intl ×ÅÒÓÉÉ 9, × ÔÏ ×ÒÅÍÑ ËÁË <literal>intl.[5-7]</literal>
-	    ÓÏ×ÐÁÄÁÅÔ Ó ÌÀÂÙÍ ÉÚ: <literal>intl.5</literal>,
-	    <literal>intl.6</literal> É <literal>intl.7</literal>.</para>
-	</note>
+	  ÏÔÓÕÔÓÔ×ÕÅÔ.</para>
 
 	<para>úÁ×ÉÓÉÍÏÓÔØ ÐÒÏ×ÅÒÑÅÔÓÑ Ä×ÁÖÄÙ, ÏÄÉÎ ÒÁÚ ×ÎÕÔÒÉ ÃÅÌÉ
 	  <maketarget>extract</maketarget>, Á ÚÁÔÅÍ ÉÚ ÃÅÌÉ
 	  <maketarget>install</maketarget>.  ëÒÏÍÅ ÔÏÇÏ, ÉÍÑ ÚÁ×ÉÓÉÍÏÓÔÉ
 	  ÐÏÍÅÝÁÅÔÓÑ × ÐÁËÅÔ, ÔÁË ÞÔÏ &man.pkg.add.1; ÂÕÄÅÔ
-	  Á×ÔÏÍÁÔÉÞÅÓËÉ ÅÇÏ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, ÅÓÌÉ ÅÇÏ ÎÅÔ ÎÁ ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÊ
+	  Á×ÔÏÍÁÔÉÞÅÓËÉ Å£ ÕÓÔÁÎÁ×ÌÉ×ÁÔØ, ÅÓÌÉ Å£ ÎÅÔ ÎÁ ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÊ
 	  ÓÉÓÔÅÍÅ.</para>
       </sect2>
 
@@ -3484,7 +3602,7 @@ ALWAYS_KEEP_DISTFILES=  yes
 	  Ó ÐÅÒÅÍÅÎÎÙÍÉ <makevar>USE_<replaceable>*</replaceable></makevar>,
 	  ËÏÔÏÒÙÅ ÏÂÒÁÂÁÔÙ×ÁÀÔÓÑ × <filename>ports/Mk/bsd.*.mk</filename>
 	  ÄÌÑ ÐÏÐÏÌÎÅÎÉÑ ÐÅÒ×ÏÎÁÞÁÌØÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ ÐÏÓÔÒÏÅÎÉÑ.  îÁÐÒÉÍÅÒ,
-	  <literal>USE_GMAKE=yes</literal> ÄÏÂÁ×ÌÑÅÔ
+	  <literal>USES= gmake</literal> ÄÏÂÁ×ÌÑÅÔ
 	  <filename role="package">devel/gmake</filename> ×
 	  <makevar>BUILD_DEPENDS</makevar>.  äÌÑ ÐÒÅÄÏÔ×ÒÁÝÅÎÉÑ ÚÁÇÒÑÚÎÅÎÉÑ
 	  <makevar>RUN_DEPENDS</makevar> ÐÏÄÏÂÎÙÍÉ ÄÏÐÏÌÎÉÔÅÌØÎÙÍÉ
@@ -3595,6 +3713,26 @@ ALWAYS_KEEP_DISTFILES=  yes
           ÓÏ×ÐÁÄÁÅÔ Ó <makevar>DEPENDS_TARGET</makevar>.</para>
       </sect2>
 
+      <sect2 id="uses">
+	<title><makevar>USES</makevar></title>
+
+	<para>óÕÝÅÓÔ×ÕÅÔ ÎÅÓËÏÌØËÏ ÐÁÒÁÍÅÔÒÏ× ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ ÒÁÚÌÉÞÎÙÈ
+	  ×ÉÄÏ× ÈÁÒÁËÔÅÒÎÙÈ ÏÓÏÂÅÎÎÏÓÔÅÊ É ÚÁ×ÉÓÉÍÏÓÔÅÊ, ËÏÔÏÒÙÍÉ
+	  ÏÂÌÁÄÁÅÔ ÒÁÓÓÍÁÔÒÉ×ÁÅÍÙÊ ÐÏÒÔ.  ïÎÉ ÍÏÇÕÔ ÂÙÔØ ÕËÁÚÁÎÙ ÐÕÔ£Í
+	  ÄÏÂÁ×ÌÅÎÉÑ ÓÌÅÄÕÀÝÅÊ ÓÔÒÏËÉ × <filename>Makefile</filename>
+	  ÐÏÒÔÁ:</para>
+
+	<programlisting>USES= feature[:arguments]</programlisting>
+
+	<para>äÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÌÎÏÇÏ ÓÐÉÓËÁ ÚÎÁÞÅÎÉÊ ÓÍÏÔÒÉÔÅ <xref
+	    linkend="uses-values"/>.</para>
+
+	<warning>
+	  <para>úÎÁÞÅÎÉÅ <makevar>USES</makevar> ÎÅÌØÚÑ ÐÒÉÓ×ÁÉ×ÁÔØ
+	    ÐÏÓÌÅ ÐÏÄËÌÀÞÅÎÉÑ <filename>bsd.port.pre.mk</filename>.</para>
+	</warning>
+      </sect2>
+
       <sect2 id="use-vars">
 	<title><makevar>USE_<replaceable>*</replaceable></makevar></title>
 
@@ -3614,10 +3752,11 @@ ALWAYS_KEEP_DISTFILES=  yes
 	  × <filename>/etc/make.conf</filename> <emphasis>×ÓÅÇÄÁ</emphasis>
 	  Ñ×ÌÑÅÔÓÑ ÏÛÉÂÏÞÎÙÍ ÄÅÊÓÔ×ÉÅÍ.  ÷ ÞÁÓÔÎÏÓÔÉ, ÕÓÔÁÎÏ×ËÁ</para>
 
-	  <programlisting>USE_GCC=        3.4</programlisting>
+	  <programlisting>USE_GCC=X.Y</programlisting>
 
-	  <para>ÄÏÂÁ×ÉÔ ÚÁ×ÉÓÉÍÏÓÔØ
-	  ÏÔ gcc34 Ë ËÁÖÄÏÍÕ ÐÏÒÔÕ, ×ËÌÀÞÁÑ ÓÁÍ gcc34!</para>
+	  <para>(ÇÄÅ X.Y ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ ×ÅÒÓÉÉ) ÄÏÂÁ×ÉÔ ÚÁ×ÉÓÉÍÏÓÔØ
+	    ÏÔ gccXY Ë ËÁÖÄÏÍÕ ÐÏÒÔÕ, ×ËÌÀÞÁÑ É ÓÁÍ
+	    <literal>lang/gccXY</literal>!</para>
 	</note>
 
 	<table frame="none">
@@ -3629,7 +3768,7 @@ ALWAYS_KEEP_DISTFILES=  yes
 	      <row>
 		<entry>ðÅÒÅÍÅÎÎÁÑ</entry>
 
-		<entry>óÍÙÓÌ</entry>
+		<entry>úÎÁÞÅÎÉÅ</entry>
 	      </row>
 	    </thead>
 
@@ -3649,35 +3788,30 @@ ALWAYS_KEEP_DISTFILES=  yes
 	      </row>
 
 	      <row>
-		<entry><makevar>USE_BISON</makevar></entry>
-
-		<entry>äÌÑ ÐÏÓÔÒÏÅÎÉÑ ÐÏÒÔ ÉÓÐÏÌØÚÕÅÔ
-                  <command>bison</command>.</entry>
-	      </row>
-
-	      <row>
-		<entry><makevar>USE_CDRTOOLS</makevar></entry>
-
-		<entry>ðÏÒÔ ÔÒÅÂÕÅÔ <application>cdrecord</application>
-		  ÉÚ <filename
-		  role="package">sysutils/cdrtools</filename> ÉÌÉ <filename
-		  role="package">sysutils/cdrtools-cjk</filename> ×
-		  ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÐÒÅÄÐÏÞÔÅÎÉÊ ÐÏÌØÚÏ×ÁÔÅÌÑ.</entry>
-	      </row>
-
-	      <row>
 		<entry><makevar>USE_GCC</makevar></entry>
 
-		<entry>ðÏÒÔ ÔÒÅÂÕÅÔ ÄÌÑ ÓÂÏÒËÉ ÓÐÅÃÉÁÌØÎÕÀ ×ÅÒÓÉÀ
-		  <command>gcc</command>.  ôÏÞÎÁÑ ×ÅÒÓÉÑ ÍÏÖÅÔ ÂÙÔØ ÕËÁÚÁÎÁ
-		  × ÚÎÁÞÅÎÉÉ ÐÅÒÅÍÅÎÎÏÊ, ÎÁÐÒÉÍÅÒ <literal>3.4</literal>.
-		  íÉÎÉÍÁÌØÎÏ ÎÅÏÂÈÏÄÉÍÕÀ ×ÅÒÓÉÀ ÍÏÖÎÏ ÕËÁÚÁÔØ ËÁË
-		  <literal>3.4+</literal>.  <command>gcc</command> ÉÚ
-		  ÏÓÎÏ×ÎÏÊ ÓÉÓÔÅÍÙ ÉÓÐÏÌØÚÕÅÔÓÑ × ÓÌÕÞÁÅ, ÅÓÌÉ ÏÎ
-		  ÕÄÏ×ÌÅÔ×ÏÒÑÅÔ ÚÁÐÒÏÛÅÎÎÏÊ ×ÅÒÓÉÉ, ÉÎÁÞÅ ÐÒÏÉÚ×ÏÄÉÔÓÑ
-		  ËÏÍÐÉÌÑÃÉÑ ÐÏÄÈÏÄÑÝÅÊ ×ÅÒÓÉÉ <command>gcc</command> ÉÚ
-		  ÐÏÒÔÏ× Ó ËÏÒÒÅËÃÉÊ ÐÅÒÅÍÅÎÎÙÈ <makevar>CC</makevar> É
-		  <makevar>CXX</makevar>.</entry>
+		<entry>äÌÑ ÓÂÏÒËÉ ÐÏÒÔÁ ÔÒÅÂÕÅÔÓÑ GCC
+		  (<command>gcc</command> ÉÌÉ <command>g++</command>).
+		  îÅËÏÔÏÒÙÍ ÐÏÒÔÁÍ ÐÏÄÈÏÄÉÔ ÌÀÂÁÑ ×ÅÒÓÉÑ, ÄÌÑ ÄÒÕÇÉÈ
+		  ÔÒÅÂÕÀÔÓÑ ÐÏÓÌÅÄÎÉÅ ÓÏ×ÒÅÍÅÎÎÙÅ ×ÅÒÓÉÉ.  ïÂÙÞÎÏ
+		  ÉÓÐÏÌØÚÕÅÔÓÑ ÓÏ ÚÎÁÞÅÎÉÅÍ <literal>any</literal> (×
+		  ÜÔÏÍ ÓÌÕÞÁÅ ÉÓÐÏÌØÚÕÅÔÓÑ ×ÓÔÒÏÅÎÎÙÊ GCC × ÔÅÈ
+		  ×ÅÒÓÉÑÈ &os;, × ÓÏÓÔÁ× ËÏÔÏÒÙÈ ÏÎ ×Ó£ ÅÝ£ ×ÈÏÄÉÔ,
+		  ÉÌÉ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÐÏÒÔ
+		  <literal>lang/gcc</literal>, ËÏÇÄÁ Clang Ñ×ÌÑÅÔÓÑ
+		  ËÏÍÐÉÌÑÔÏÒÏÍ C/C++ ÐÏ ÕÍÏÌÞÁÎÉÀ) ÉÌÉ
+		  <literal>yes</literal> (×ÓÅÇÄÁ ÉÓÐÏÌØÚÕÅÔÓÑ
+		  ÓÔÁÂÉÌØÎÁÑ ÓÏ×ÒÅÍÅÎÎÁÑ ×ÅÒÓÉÑ GCC ÉÚ ÐÏÒÔÁ
+		  <literal>lang/gcc</literal>).  ôÁËÖÅ × ÚÎÁÞÅÎÉÉ
+		  ÐÅÒÅÍÅÎÎÏÊ ÍÏÖÎÏ ÕËÁÚÁÔØ ÔÏÞÎÕÀ ×ÅÒÓÉÀ, ÎÁÐÒÉÍÅÒ
+		  <literal>4.7</literal>.  íÉÎÉÍÁÌØÎÏ ÄÏÐÕÓÔÉÍÕÀ
+		  ×ÅÒÓÉÀ ÍÏÖÎÏ ÕËÁÚÁÔØ ËÁË <literal>4.6+</literal>.
+		  GCC ÉÚ ÏÓÎÏ×ÎÏÊ ÓÉÓÔÅÍÙ ÉÓÐÏÌØÚÕÅÔÓÑ × ÓÌÕÞÁÅ, ÅÓÌÉ
+		  ÅÇÏ ×ÅÒÓÉÑ ÕÄÏ×ÌÅÔ×ÏÒÑÅÔ ÚÁÐÒÏÛÅÎÎÏÊ, ÉÎÁÞÅ
+		  ÓÏÂÉÒÁÅÔÓÑ ÐÏÄÈÏÄÑÝÁÑ ×ÅÒÓÉÉ ËÏÍÐÉÌÑÔÏÒÁ ÉÚ ÐÏÒÔÁ Ó
+		  ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ËÏÒÒÅËÃÉÅÊ ÐÅÒÅÍÅÎÎÙÈ
+		  <makevar>CC</makevar> É <makevar>CXX</makevar>.
+		</entry>
 	      </row>
 
 	    </tbody>
@@ -3810,11 +3944,11 @@ LIB_DEPENDS=	bar:${PORTSDIR}/foo/bar
 	  <title>ëÏÒÒÅËÔÎÏÅ ÏÂßÑ×ÌÅÎÉÅ ÎÅÏÂÑÚÁÔÅÌØÎÏÊ ÚÁ×ÉÓÉÍÏÓÔÉ</title>
 
 	  <programlisting>OPTIONS_DEFINE=	BAR
-BAR_DESC=	Enable bar support
+BAR_DESC=	Bar support
 
 .include &lt;bsd.port.options.mk&gt;
 
-.if ${PORTOPTIONS:MBAR}
+.if ${PORT_OPTIONS:MBAR}
 LIB_DEPENDS=	bar:${PORTSDIR}/foo/bar
 .endif</programlisting>
 	</example>
@@ -3962,13 +4096,6 @@ MASTERDIR=	${.CURDIR}/../xdvi300
       <filename>bsd.port.mk</filename> ÎÉÞÅÇÏ ÄÏÐÏÌÎÉÔÅÌØÎÏ ÄÅÌÁÔØ ÎÅ
       ÎÕÖÎÏ.</para>
 
-    <para>úÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ <makevar>MANCOMPRESSED</makevar> Á×ÔÏÍÁÔÉÞÅÓËÉ
-      ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ × <literal>yes</literal>, ÅÓÌÉ ÐÅÒÅÍÅÎÎÁÑ
-      <makevar>USE_IMAKE</makevar> ÚÁÄÁÎÁ, Á
-      <makevar>NO_INSTALL_MANPAGES</makevar> ÎÅÔ, É × ÚÎÁÞÅÎÉÅ
-      <literal>no</literal> × ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ.  ÷ÁÍ ÎÅ ÎÕÖÎÏ ÚÁÄÁ×ÁÔØ ÅÅ
-      Ñ×ÎÏ, ÅÓÌÉ ÚÎÁÞÅÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ ÐÏÄÈÏÄÉÔ ×ÁÛÅÍÕ ÐÏÒÔÕ.</para>
-
     <para>åÓÌÉ ×ÁÛ ÐÏÒÔ ÏÐÒÅÄÅÌÑÅÔ ËÏÒÎÅÍ ÄÌÑ ÆÁÊÌÏ× óÐÒÁ×ÏÞÎÉËÁ ËÁÔÁÌÏÇ,
       ÏÔÌÉÞÎÙÊ ÏÔ <makevar>PREFIX</makevar>, ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ
       ÐÅÒÅÍÅÎÎÕÀ <makevar>MANPREFIX</makevar>, ÞÔÏÂÙ ÚÁÄÁÔØ ÅÇÏ Ñ×ÎÏ.  ëÒÏÍÅ
@@ -4078,7 +4205,7 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</progr
 
 	  <para>üÔÉ ÐÅÒÅÍÅÎÎÙÅ ÐÒÅÄÎÁÚÎÁÞÅÎÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÓÉÓÔÅÍÎÙÍ
 	    ÁÄÍÉÎÉÓÔÒÁÔÏÒÏÍ.  íÎÏÇÉÅ ÉÚ ÎÉÈ ÓÔÁÎÄÁÒÔÉÚÏ×ÁÎÙ × ÆÁÊÌÅ
-	    <ulink url="http://svn.FreeBSD.org/ports/head/KNOBS?view=markup"><filename>ports/KNOBS</filename></ulink>.</para>
+	    <ulink url="http://svnweb.FreeBSD.org/ports/head/KNOBS?view=markup"><filename>ports/KNOBS</filename></ulink>.</para>
 
 	  <para>ðÒÉ ÓÏÚÄÁÎÉÉ ÐÏÒÔÁ ÎÅ ÄÁ×ÁÊÔÅ ÉÍÑ ÄÌÑ knob, ÓÐÅÃÉÆÉÞÎÏÅ
 	    ÄÌÑ ÄÁÎÎÏÇÏ ÐÒÉÌÏÖÅÎÉÑ.  îÁ ÐÒÉÍÅÒÅ ÐÏÒÔÁ Avahi, ÉÓÐÏÌØÚÕÊÔÅ
@@ -4110,19 +4237,11 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</progr
 	        <row>
 		  <entry>ðÅÒÅÍÅÎÎÁÑ</entry>
 
-		  <entry>úÎÁÞÅÎÉÑ</entry>
+		  <entry>úÎÁÞÅÎÉÅ</entry>
 	        </row>
 	      </thead>
 
 	      <tbody>
-	        <row id="knobs-without-nls">
-		  <entry><makevar>WITHOUT_NLS</makevar></entry>
-
-		  <entry>åÓÌÉ ÕÓÔÁÎÏ×ÌÅÎÁ, ÕËÁÚÙ×ÁÅÔ ÎÅ ÚÁÄÅÊÓÔ×Ï×ÁÔØ
-		    ÉÎÔÅÒÎÁÃÉÏÎÁÌÉÚÁÃÉÀ, ÞÔÏ ÍÏÖÅÔ ÕÓËÏÒÉÔØ ËÏÍÐÉÌÑÃÉÀ.
-		    ðÏ ÕÍÏÌÞÁÎÉÀ, ÉÎÔÅÒÎÁÃÉÏÎÁÌÉÚÁÃÉÑ ÉÓÐÏÌØÚÕÅÔÓÑ.</entry>
-	        </row>
-
 	        <row>
 		  <entry><makevar>WITH_OPENSSL_BASE</makevar></entry>
 
@@ -4136,15 +4255,6 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</progr
 		    <filename role="package">security/openssl</filename>,
 		    ÄÁÖÅ ÅÓÌÉ × ÂÁÚÏ×ÏÊ ÓÉÓÔÅÍÅ ÐÏÓÌÅÄÎÑÑ ×ÅÒÓÉÑ.</entry>
 	        </row>
-
-	        <row>
-		  <entry><makevar>WITHOUT_X11</makevar></entry>
-
-		  <entry>ðÏÒÔÙ, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÂÙÔØ ÓÏÂÒÁÎÙ Ó ÐÏÄÄÅÒÖËÏÊ
-		    ÉÌÉ ÂÅÚ ÐÏÄÄÅÒÖËÉ X, ÏÂÙÞÎÏ ÓÏÂÉÒÁÀÔÓÑ Ó ÐÏÄÄÅÒÖËÏÊ
-		    X.  åÓÌÉ ÜÔÁ ÐÅÒÅÍÅÎÎÁÑ ÏÐÒÅÄÅÌÅÎÁ, ÔÏ ÂÕÄÅÔ ÓÏÂÒÁÎÁ
-		    ×ÅÒÓÉÑ ÂÅÚ ÐÏÄÄÅÒÖËÉ X.</entry>
-	        </row>
 	      </tbody>
 	    </tgroup>
 	  </table>
@@ -4157,7 +4267,7 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</progr
 	      knobs ÄÌÑ ÐÏÍÏÝÉ ËÏÎÅÞÎÙÍ ÐÏÌØÚÏ×ÁÔÅÌÑÍ É ÄÌÑ ÐÏÄÄÅÒÖÁÎÉÑ
 	      ËÏÌÉÞÅÓÔ×Á ÎÁÉÍÅÎÏ×ÁÎÉÊ knobs × ÎÅÂÏÌØÛÏÍ ËÏÌÉÞÅÓÔ×Å.
 	      óÐÉÓÏË ÐÏÐÕÌÑÒÎÙÈ ÎÁÚ×ÁÎÉÊ knobs ÍÏÖÎÏ ÎÁÊÔÉ × ÆÁÊÌÅ <ulink
-		url="http://svn.FreeBSD.org/ports/head/KNOBS?view=markup"><filename>KNOBS</filename></ulink>
+		url="http://svnweb.FreeBSD.org/ports/head/KNOBS?view=markup"><filename>KNOBS</filename></ulink>
 	    </para>
 
 	    <para>îÁÚ×ÁÎÉÑ knobs ÄÏÌÖÎÙ ÏÔÒÁÖÁÔØ, ÞÔÏ ÜÔÏ ÔÁËÏÅ É ÞÔÏ
@@ -4249,6 +4359,13 @@ OPT6_DESC=	Describe OPT6</programlisting
 	    <programlisting>OPTIONS_SINGLE=		SG1
 OPTIONS_SINGLE_SG1=	OPT3 OPT4</programlisting>
 
+	    <para><makevar>OPTIONS</makevar> ÍÏÖÎÏ ÇÒÕÐÐÉÒÏ×ÁÔØ × ×ÉÄÅ
+	      ÐÅÒÅËÌÀÞÁÔÅÌÅÊ, ÄÌÑ ËÏÔÏÒÙÈ ÒÁÚÒÅÛÅÎ ×ÙÂÏÒ ÅÄÉÎÓÔ×ÅÎÎÏÇÏ
+	      ×ÁÒÉÁÎÔÁ (ÉÌÉ ÎÉ ÏÄÎÏÇÏ) × ËÁÖÄÏÊ ÇÒÕÐÐÅ:</para>
+
+	    <programlisting>OPTIONS_RADIO=		RG1
+OPTIONS_RADIO_RG1=	OPT7 OPT8</programlisting>
+
 	    <para><makevar>OPTIONS</makevar> ÔÁËÖÅ ÍÏÖÎÏ ÇÒÕÐÐÉÒÏ×ÁÔØ
 	      × ×ÉÄÅ ÓÐÉÓËÏ× ÓÏ ÍÎÏÖÅÓÔ×ÅÎÎÙÍ ×ÙÂÏÒÏÍ, ÄÌÑ ËÏÔÏÒÙÈ
 	      ÏÂÑÚÁÎ ÂÙÔØ ×ËÌÀÞÅÎ <emphasis>ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ
@@ -4257,20 +4374,13 @@ OPTIONS_SINGLE_SG1=	OPT3 OPT4</programli
 	    <programlisting>OPTIONS_MULTI=		MG1
 OPTIONS_MULTI_MG1=	OPT5 OPT6</programlisting>
 
-	    <para><makevar>OPTIONS_MULTI</makevar> É
-	      <makevar>OPTIONS_SINGLE</makevar> ÔÁËÖÅ ÄÏÐÕÓËÁÀÔ
-	      ÏÔÓÕÔÓÔ×ÉÅ ×ÙÂÏÒÁ ÐÕÔ£Í ×ËÌÀÞÅÎÉÑ ÇÒÕÐÐÙ ×
-	      <makevar>OPTIONS_DEFINE</makevar>:</para>
-
-	    <programlisting>OPTIONS_DEFINE=		MG1
-OPTIONS_MULTI=		MG1
-OPTIONS_MULTI_MG1=	OPT5 OPT6</programlisting>
+	    <para><makevar>OPTIONS</makevar> ÔÁËÖÅ ÍÏÖÎÏ ÇÒÕÐÐÉÒÏ×ÁÔØ
+	      × ×ÉÄÅ ÓÐÉÓËÏ× ÓÏ ÍÎÏÖÅÓÔ×ÅÎÎÙÍ ×ÙÂÏÒÏÍ, ÄÌÑ ËÏÔÏÒÙÈ
+	      ÍÏÇÕÔ ÂÙÔØ ×ËÌÀÞÅÎÙ ÌÀÂÙÅ ÐÁÒÁÍÅÔÒÙ, ×ËÌÀÞÁÑ ÏÔÓÕÔÓÔ×ÉÅ
+	      ×ÙÂÏÒÁ:</para>
 
-	    <para>ðÏÓÌÅ ÜÔÏÇÏ ÇÒÕÐÐÁ ÔÒÅÂÕÅÔ ÐÏ ËÒÁÊÎÅÊ ÍÅÒÅ ÏÄÉÎ
-	      <makevar>OPTION</makevar> ÉÚ <makevar>MG1</makevar>,
-	      ÔÏÌØËÏ ÅÓÌÉ ×ÙÂÒÁÎ ÎÏ×ÙÊ <makevar>MG1</makevar>
-	      <makevar>OPTION</makevar>.  òÅËÏÍÅÎÄÕÅÔÓÑ
-	      ÐÏÜËÓÐÅÒÉÍÅÎÔÉÒÏ×ÁÔØ, ÞÔÏÂÙ ÕÌÕÞÛÉÔØ ÐÏÎÉÍÁÎÉÅ.</para>
+	    <programlisting>OPTIONS_GROUP=		GG1
+OPTIONS_GROUP_GG1=	OPT9 OPT10</programlisting>
 
 	    <para>ðÏ ÕÍÏÌÞÁÎÉÀ <makevar>OPTIONS</makevar> ÎÁÈÏÄÉÔÓÑ ×
 	      ×ÙËÌÀÞÅÎÎÏÍ ÐÏÌÏÖÅÎÉÉ, ÅÓÌÉ ÐÒÉ ÜÔÏÍ ÏÎÏ ÔÁËÖÅ ÏÔÓÕÔÓÔ×ÕÅÔ
@@ -4314,6 +4424,15 @@ RUN_DEPENDS+=	bar:${PORTSDIR}/bar/bar
 .include &lt;bsd.port.mk&gt;</programlisting>
 	  </example>
 
+	  <example id ="ports-options-check-unset">
+	    <title>ðÒÏ×ÅÒËÁ ÎÅÚÁÄÁÎÎÙÈ ÚÎÁÞÅÎÉÊ
+	      <makevar>OPTIONS</makevar></title>
+
+	    <programlisting>.if ! ${PORT_OPTIONS:MEXAMPLES}
+CONFIGURE_ARGS+=--without-examples
+.endif</programlisting>
+	  </example>
+
 	  <example id="ports-options-practical-use">
 	    <title>ðÒÉÍÅÒ ÒÅÁÌØÎÏÇÏ ÉÓÐÏÌØÚÏ×ÁÎÉÑ
 	      <makevar>OPTIONS</makevar></title>
@@ -4349,32 +4468,42 @@ CONFIGURE_ARGS+=	--without-postgres
 LIB_DEPENDS+=	icuuc:${PORTSDIR}/devel/icu
 .endif
 
-# Check other OPTIONS
-
-.include &lt;bsd.port.mk&gt;</programlisting>
-	  </example>
-
-	  <example id="ports-options-old-style-use">
-	    <title>éÓÐÏÌØÚÏ×ÁÎÉÅ <makevar>OPTIONS</makevar>
-	      × ÓÔÁÒÏÍ ÓÔÉÌÅ</title>
-	    <programlisting>OPTIONS=      FOO "Enable option foo" On
-
-.include &lt;bsd.port.pre.mk&gt;
-
-.if defined(WITHOUT_FOO)
-CONFIGURE_ARGS+=	--without-foo
-.else
-CONFIGURE_ARGS+=	--with-foo
+.if ! ${PORT_OPTIONS:MEXAMPLES}
+CONFIGURE_ARGS+=	--without-examples
 .endif
 
-.include &lt;bsd.port.post.mk&gt;</programlisting>
+# ðÒÏ×ÅÒËÁ ÄÒÕÇÉÈ ÐÁÒÁÍÅÔÒÏ× OPTIONS
+
+.include &lt;bsd.port.mk&gt;</programlisting>
 	  </example>
+	</sect3>
 
-	  <important>
-	    <para>ôÁËÏÊ ÓÐÏÓÏ ÉÓÐÏÌØÚÏ×ÁÎÉÑ <makevar>OPTIONS</makevar>
-	      Ñ×ÌÑÅÔÓÑ ÕÓÔÁÒÅ×ÛÉÍ, É × ÂÕÄÕÝÅÍ ÅÇÏ ÐÏÄÄÅÒÖËÁ ÂÕÄÅÔ
-	      ÕÄÁÌ£ÎÁ.  îÅ ÉÓÐÏÌØÚÕÊÔÅ ÜÔÏÔ ÓÐÏÓÏ ÄÌÑ ÎÏ×ÙÈ ÐÏÒÔÏ×.</para>
-	  </important>
+	<sect3>
+	  <title>ðÁÒÁÍÅÔÒÙ ÐÏ ÕÍÏÌÞÁÎÉÀ</title>
+  	  <para>óÌÅÄÕÀÝÉÅ ÐÁÒÁÍÅÔÒÙ ÐÏ ÕÍÏÌÞÁÎÉÀ ×ÓÅÇÄÁ ×ËÌÀÞÅÎÙ.</para>
+          <itemizedlist>
+	    <listitem>
+	      <para><literal>DOCS</literal> &mdash; ÐÏÓÔÒÏÅÎÉÅ É ÕÓÔÁÎÏ×ËÁ
+		ÄÏËÕÍÅÎÔÁÃÉÉ.</para>
+	    </listitem>
+	    <listitem>
+	      <para><literal>NLS</literal> &mdash; ÉÎÔÅÒÎÁÃÉÏÎÁÌÉÚÁÃÉÑ.</para>
+            </listitem>
+	    <listitem>
+	      <para><literal>EXAMPLES</literal> &mdash; ÐÏÓÔÒÏÅÎÉÅ É
+		ÕÓÔÁÎÏ×ËÁ ÐÒÉÍÅÒÏ× ÉÓÐÏÌØÚÏ×ÁÎÉÑ.</para>
+	    </listitem>
+	    <listitem>
+	      <para><literal>IPV6</literal> &mdash; ÐÏÄÄÅÒÖËÁ ÐÒÏÔÏËÏÌÁ
+		IPv6.</para>
+	    </listitem>
+	  </itemizedlist>
+	  <note>
+	    <para>îÅÔ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÄÏÂÁ×ÌÑÔØ ÜÔÉ ÐÁÒÁÍÅÔÒÙ ×
+	      <makevar>OPTIONS_DEFAULT</makevar>.  ôÅÍ ÎÅ ÍÅÎÅÅ, ÞÔÏÂÙ
+	      ÏÔÏÂÒÁÚÉÔØ ÉÈ × ÏËÎÅ ÄÉÁÌÏÇÁ ×ÙÂÏÒÁ ÐÁÒÁÍÅÔÒÏ×, ÏÎÉ ÄÏÌÖÎÙ
+	      ÂÙÔØ ÄÏÂÁ×ÌÅÎÙ × <makevar>OPTIONS_DEFINE</makevar>.</para>
+          </note>
 	</sect3>
       </sect2>
 
@@ -4393,7 +4522,7 @@ CONFIGURE_ARGS+=	--with-foo
 	  <title>îÅÐÒÁ×ÉÌØÎÏÅ ÕÐÒÁ×ÌÅÎÉÅ ÏÐÃÉÅÊ</title>
 
 	  <programlisting>.if ${PORT_OPTIONS:MFOO}
-LIB_DEPENDS+=		foo:${PORTSDIR}/devel/foo
+LIB_DEPENDS+=		libfoo.so:${PORTSDIR}/devel/foo
 CONFIGURE_ARGS+=	--enable-foo
 .endif</programlisting>
 	</example>
@@ -4412,7 +4541,7 @@ CONFIGURE_ARGS+=	--enable-foo
 	  <title>ðÒÁ×ÉÌØÎÏÅ ÕÐÒÁ×ÌÅÎÉÅ ÏÐÃÉÅÊ</title>
 
 	  <programlisting>.if ${PORT_OPTIONS:MFOO}
-LIB_DEPENDS+=		foo:${PORTSDIR}/devel/foo
+LIB_DEPENDS+=		libfoo.so:${PORTSDIR}/devel/foo
 CONFIGURE_ARGS+=	--enable-foo
 .else
 CONFIGURE_ARGS+=	--disable-foo
@@ -4422,148 +4551,445 @@ CONFIGURE_ARGS+=	--disable-foo
 	<para>÷Ï ×ÔÏÒÏÍ ÐÒÉÍÅÒÅ ÂÉÂÌÉÏÔÅËÁ libfoo ÏÔËÌÀÞÅÎÁ Ñ×ÎÙÍ ÏÂÒÁÚÏÍ.
 	  óÃÅÎÁÒÉÊ configure ÎÅ ×ËÌÀÞÁÅÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ÆÕÎËÃÉÉ × ÐÒÉÌÏÖÅÎÉÉ,
 	  ÎÅÓÍÏÔÒÑ ÎÁ ÐÒÉÓÕÔÓÔ×ÉÅ ÂÉÂÌÉÏÔÅËÉ × ÓÉÓÔÅÍÅ.</para>
-      </sect2>
 
-    </sect1>
+	<note>
+	  <para>ðÒÉ ÏÐÒÅÄÅÌÅÎÎÙÈ ÕÓÌÏ×ÉÑÈ ÓÏËÒÁÝÅÎÎÙÊ ÓÉÎÔÁËÓÉÓ ÚÁÐÉÓÉ
+	    ÕÓÌÏ×ÉÊ ÍÏÖÅÔ ×ÙÚÙ×ÁÔØ ÐÒÏÂÌÅÍÙ ÓÏ ÓÌÏÖÎÙÍÉ ËÏÎÓÔÒÕËÃÉÑÍÉ.
+	    åÓÌÉ ×Ù ÐÏÌÕÞÁÅÔÅ ÏÛÉÂËÉ, ÔÁËÉÅ ËÁË <literal>Malformed
+	      conditional</literal>, ÔÏ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ
+	    ÁÌØÔÅÒÎÁÔÉ×ÎÙÊ ÓÉÎÔÁËÓÉÓ.</para>
+
+	  <programlisting>.if !empty(VARIABLE:MVALUE)
+# as an alternative to
+.if ${VARIABLE:MVALUE}</programlisting>
+	</note>
+      </sect2>
 
-    <sect1 id="makefile-wrkdir">
-      <title>úÁÄÁÎÉÅ ÒÁÂÏÞÅÇÏ ËÁÔÁÌÏÇÁ</title>
+      <sect2>
+	<title>÷ÓÐÏÍÏÇÁÔÅÌØÎÙÅ ÍÁËÒÏÓÙ</title>
 
-      <para>ëÁÖÄÙÊ ÐÏÒÔ ÒÁÓÐÁËÏ×Ù×ÁÅÔÓÑ × ÒÁÂÏÞÉÊ ËÁÔÁÌÏÇ, ËÏÔÏÒÙÊ ÄÏÌÖÅÎ ÂÙÔØ
-        ÄÏÓÔÕÐÎÙÍ ÄÌÑ ÚÁÐÉÓÉ.  ÷ ÓÉÓÔÅÍÅ ÐÏÒÔÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ
-        <makevar>DISTFILES</makevar> ÒÁÓÐÁËÏ×Ù×ÁÀÔÓÑ × ËÁÔÁÌÏÇ Ó ÉÍÅÎÅÍ
-        <literal>${DISTNAME}</literal>.  äÒÕÇÉÍÉ ÓÌÏ×ÁÍÉ, ÅÓÌÉ ×Ù
-        ÚÁÄÁÌÉ:</para>
+	<para>óÕÝÅÓÔ×ÕÅÔ ÎÅÓËÏÌØËÏ ÍÁËÒÏÓÏ×, ÕÐÒÏÝÁÀÝÉÈ ÚÁÐÉÓØ ÕÓÌÏ×ÎÙÈ
+	  ÚÎÁÞÅÎÉÊ, ËÏÔÏÒÙÅ ÏÔÌÉÞÁÀÔÓÑ × ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÎÁÂÏÒÁ
+	  ÐÁÒÁÍÅÔÒÏ×.</para>
 
-      <programlisting>PORTNAME=      foo
-PORTVERSION=   1.0</programlisting>
+	<para>åÓÌÉ ÐÅÒÅÍÅÎÎÁÑ <makevar>OPTIONS_SUB</makevar> ÉÍÅÅÔ
+	  ÚÎÁÞÅÎÉÅ <literal>yes</literal>, ÔÏ ËÁÖÄÙÊ ÉÚ ÕËÁÚÁÎÎÙÈ ×
+	  <makevar>OPTIONS_DEFINE</makevar> ÐÁÒÁÍÅÔÒÏ× ÂÕÄÅÔ ÄÏÂÁ×ÌÅÎ
+	  × <makevar>PLIST_SUB</makevar>.  óÌÅÄÕÀÝÁÑ ÚÁÐÉÓØ:</para>
 
-      <para>ÔÏ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÅ ÆÁÊÌÙ ÐÏÒÔÁ ÓÏÄÅÒÖÁÔ ËÁÔÁÌÏÇ ×ÅÒÈÎÅÇÏ ÕÒÏ×ÎÑ,
-        <filename>foo-1.0</filename>, É ×ÓÅ ÆÁÊÌÙ ÒÁÓÐÏÌÏÖÅÎÙ × ÜÔÏÍ
-        ËÁÔÁÌÏÇÅ.</para>
+	<programlisting>OPTIONS_DEFINE=	OPT1
+OPTIONS_SUB=	yes</programlisting>
 
-      <para>åÓÌÉ ÜÔÏ ÎÅ ×ÁÛ ÓÌÕÞÁÊ, ÔÏ ÉÍÅÅÔÓÑ ÎÅÓËÏÌØËÏ ÐÅÒÅÍÅÎÎÙÈ, ËÏÔÏÒÙÅ
-        ×Ù ÍÏÖÅÔÅ ÐÅÒÅÏÐÒÅÄÅÌÉÔØ.</para>
+	<para>ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ:</para>
 
-      <sect2>
-        <title><makevar>WRKSRC</makevar></title>
+	<programlisting>OPTIONS_DEFINE=	OPT1
 
-        <para>üÔÁ ÐÅÒÅÍÅÎÎÁÑ ÚÁÄÁ£Ô ÉÍÑ ËÁÔÁÌÏÇÁ, ËÏÔÏÒÙÊ ÓÏÚÄÁ£ÔÓÑ ÐÒÉ
-          ÒÁÓÐÁËÏ×ËÅ ÉÓÈÏÄÎÙÈ ÆÁÊÌÏ× ÐÒÉÌÏÖÅÎÉÑ.  ÷ ÎÁÛÅÍ ÐÒÅÄÙÄÕÝÅÍ
-          ÐÒÉÍÅÒÅ ÅÓÌÉ ÂÙ ÒÁÓÐÁËÏ×ËÁ ÐÒÏÉÓÈÏÄÉÌÁ × ËÁÔÁÌÏÇ Ó ÉÍÅÎÅÍ
-          <filename>foo</filename> (Á ÎÅ
-          <filename>foo-1.0</filename>), ÔÏ ×Ù ÄÏÌÖÎÙ ÎÁÐÉÓÁÔØ:</para>
+.include &lt;bsd.port.options.mk&gt;
 
-        <programlisting>WRKSRC=      ${WRKDIR}/foo</programlisting>
+.if ${PORT_OPTIONS:MOPT1}
+PLIST_SUB+=	OPT1=""
+.else
+PLIST_SUB+=	OPT1="@comment "
+.endif</programlisting>
 
-        <para>ÉÌÉ, ËÁË ×ÁÒÉÁÎÔ</para>
+	<para><makevar>X_CONFIGURE_ENABLE</makevar> ÄÏÐÉÓÙ×ÁÅÔ ×
+	  <makevar>CONFIGURE_ARGS</makevar> ÓÔÒÏËÕ
+	  <literal>--enable-${X_CONFIGURE_ENABLE}</literal> ÉÌÉ
+	  <literal>--disable-${X_CONFIGURE_ENABLE}</literal> ×
+	  ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÓÏÓÔÏÑÎÉÅÍ <makevar>X</makevar>.  óÌÅÄÕÀÝÁÑ
+	  ÚÁÐÉÓØ:</para>
 
-        <programlisting>WRKSRC=      ${WRKDIR}/${PORTNAME}</programlisting>
-      </sect2>
+	<programlisting>OPTIONS_DEFINE=	OPT1
+OPT1_CONFIGURE_ENABLE=	test</programlisting>
 
-      <sect2>
-        <title><makevar>NO_WRKSUBDIR</makevar></title>
+	<para>ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ:</para>
 
-        <para>åÓÌÉ ÐÏÒÔ ×ÏÏÂÝÅ ÎÅ ÒÁÓÐÁËÏ×Ù×ÁÅÔÓÑ ÎÉ × ËÁËÏÊ ËÁÔÁÌÏÇ, ÔÏ ×Ù
-          ÄÏÌÖÎÙ ÚÁÄÁÔØ ÐÅÒÅÍÅÎÎÕÀ <makevar>NO_WRKSUBDIR</makevar> ÄÌÑ ÕËÁÚÁÎÉÑ
-          ÎÁ ÜÔÏÔ ÆÁËÔ.</para>
+	<programlisting>OPTIONS_DEFINE=	OPT1
 
-        <programlisting>NO_WRKSUBDIR= yes</programlisting>
-      </sect2>
-    </sect1>
+.include &lt;bsd.port.options.mk&gt;
 
-    <sect1 id="conflicts">
-      <title>òÁÚÒÅÛÅÎÉÅ ËÏÎÆÌÉËÔÏ×</title>
+.if ${PORT_OPTIONS:MOPT1}
+CONFIGURE_ARGS+=	--enable-test
+.else
+CONFIGURE_ARGS+=	--disable-test
+.endif</programlisting>
 
-      <para>äÌÑ ÒÅÇÉÓÔÒÁÃÉÉ ËÏÎÆÌÉËÔÁ ÍÅÖÄÕ ÐÁËÅÔÁÍÉ É ÐÏÒÔÁÍÉ ÉÓÐÏÌØÚÕÀÔÓÑ
-	ÔÒÉ ÒÁÚÌÉÞÎÙÅ ÐÅÒÅÍÅÎÎÙÅ: <makevar>CONFLICTS</makevar>,
-	<makevar>CONFLICTS_INSTALL</makevar> É
-	<makevar>CONFLICTS_BUILD</makevar>.</para>
+	<para><makevar>X_CONFIGURE_WITH</makevar> ÄÏÐÉÓÙ×ÁÅÔ ×
+	  <makevar>CONFIGURE_ARGS</makevar> ÓÔÒÏËÕ
+	  <literal>--with-${X_CONFIGURE_WITH}</literal> ÉÌÉ
+	  <literal>--without-${X_CONFIGURE_WITH}</literal> ×
+	  ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÓÏÓÔÏÑÎÉÅÍ <makevar>X</makevar>.  óÌÅÄÕÀÝÁÑ
+	  ÚÁÐÉÓØ:</para>
 
-      <note>
-	<para>ðÅÒÅÍÅÎÎÙÅ ÒÅÇÉÓÔÒÁÃÉÉ ËÏÎÆÌÉËÔÁ Á×ÔÏÍÁÔÉÞÅÓËÉ ÏÐÒÅÄÅÌÑÀÔ
-	  ÐÅÒÅÍÅÎÎÕÀ <makevar>IGNORE</makevar>, ËÏÔÏÒÁÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏ
-	  ÏÐÉÓÁÎÁ × <xref linkend="dads-noinstall"/>.</para>
-      </note>
+	<programlisting>OPTIONS_DEFINE=	OPT1
+OPT1_CONFIGURE_WITH=	test</programlisting>
 
-      <para>ðÒÉ ÕÄÁÌÅÎÉÉ ÏÄÎÏÇÏ ÉÚ ËÏÎÆÌÉËÔÕÀÝÉÈ ÐÏÒÔÏ× ÃÅÌÅÓÏÏÂÒÁÚÎÏ
-	ÓÏÈÒÁÎÉÔØ ÚÁÐÉÓÉ <makevar>CONFLICTS</makevar> × ÔÅÈ ÄÒÕÇÉÈ ÐÏÒÔÁÈ
-	× ÔÅÞÅÎÉÉ ÎÅÓËÏÌØËÉÈ ÍÅÓÑÃÅ×, ÞÔÏÂÙ ÐÏÚÁÂÏÔÉÔØÓÑ Ï ÔÅÈ ÐÏÌØÚÏ×ÁÔÅÌÅÊ,
-	ËÏÔÏÒÙÅ ÏÂÎÏ×ÌÑÀÔÓÑ ÏÔ ÓÌÕÞÁÑ Ë ÓÌÕÞÁÀ.</para>
+	<para>ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ:</para>
 
-      <sect2>
-	<title><makevar>CONFLICTS_INSTALL</makevar></title>
+	<programlisting>OPTIONS_DEFINE=	OPT1
 
-	<para>åÓÌÉ ×ÁÛ ÐÁËÅÔ ÎÅ ÍÏÖÅÔ ÓÕÝÅÓÔ×Ï×ÁÔØ ×ÍÅÓÔÅ Ó ÄÒÕÇÉÍÉ
-	  (ÉÚ-ÚÁ ËÏÎÆÌÉËÔÁ ÆÁÊÌÏ×, ÎÅÓÏ×ÍÅÓÔÉÍÏÓÔÉ ×ÒÅÍÅÎÉ ×ÙÐÏÌÎÅÎÉÑ É ÔÁË
-	  ÄÁÌÅÅ), ÐÅÒÅÞÉÓÌÉÔÅ ÉÍÅÎÁ ÏÓÔÁÌØÎÙÈ ÐÁËÅÔÏ× × ÐÅÒÅÍÅÎÎÏÊ
-	  <makevar>CONFLICTS_INSTALL</makevar>.  úÄÅÓØ ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ
-	  ÛÁÂÌÏÎÙ ËÏÍÁÎÄÎÏÇÏ ÉÎÔÅÒÐÒÅÔÁÔÏÒÁ, ÔÁËÉÅ ËÁË <literal>*</literal>
-	  É <literal>?</literal>.  éÍÅÎÁ ÐÁËÅÔÏ× ÄÏÌÖÎÙ ×ÙÇÌÑÄÅÔØ ÔÁË ÖÅ,
-	  ËÁË × <filename>/var/db/pkg</filename>.  ðÏÖÁÌÕÊÓÔÁ, ÕÂÅÄÉÔÅÓØ,
-	  ÞÔÏ <makevar>CONFLICTS_INSTALL</makevar> ÎÅ ÓÏÄÅÒÖÉÔ ÐÁËÅÔ ÓÁÍÏÇÏ
-	  ÜÔÏÇÏ ÐÏÒÔÁ.  ÷ ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ ÎÅ ÂÕÄÅÔ ÒÁÂÏÔÁÔØ ÕÓÔÁÎÏ×ËÁ Ó
-	  ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÅÒÅÍÅÎÎÏÊ <makevar>FORCE_PKG_REGISTER</makevar>.
-	  ðÒÏ×ÅÒËÁ CONFLICTS_INSTALL ×ÙÐÏÌÎÑÅÔÓÑ ÐÏÓÌÅ ÐÒÏÃÅÓÓÁ ÓÂÏÒËÉ É
-	  ÄÏ ÐÒÏÃÅÓÓÁ ÕÓÔÁÎÏ×ËÉ.</para>
-      </sect2>
+.include &lt;bsd.port.options.mk&gt;
 
-      <sect2>
-	<title><makevar>CONFLICTS_BUILD</makevar></title>
+.if ${PORT_OPTIONS:MOPT1}
+CONFIGURE_ARGS+=	--with-test
+.else
+CONFIGURE_ARGS+=	--without-test
+.endif</programlisting>
 
-	<para>åÓÌÉ ×ÁÛ ÐÏÒÔ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÓÏÂÒÁÎ, ËÏÇÄÁ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ
-	  ÄÒÕÇÏÊ, ÐÅÒÅÞÉÓÌÉÔÅ ÉÍÅÎÁ ÏÓÔÁÌØÎÙÈ ÐÏÒÔÏ× × ÐÅÒÅÍÅÎÎÏÊ
-	  <makevar>CONFLICTS_BUILD</makevar>.  úÄÅÓØ ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ
-	  ÛÁÂÌÏÎÙ ËÏÍÁÎÄÎÏÇÏ ÉÎÔÅÒÐÒÅÔÁÔÏÒÁ, ÔÁËÉÅ ËÁË <literal>*</literal>
-	  É <literal>?</literal>.  éÍÅÎÁ ÐÁËÅÔÏ× ÄÏÌÖÎÙ ×ÙÇÌÑÄÅÔØ ÔÁË ÖÅ,
-	  ËÁË × <filename>/var/db/pkg</filename>.  ðÒÏ×ÅÒËÁ CONFLICTS_BUILD
-	  ×ÙÐÏÌÎÑÅÔÓÑ ÄÏ ÐÒÏÃÅÓÓÁ ÓÂÏÒËÉ.  ëÏÎÆÌÉËÔÙ ÓÂÏÒËÉ × ÐÏÌÕÞÁÅÍÏÍ
-	  ÐÁËÅÔÅ ÎÅ ÚÁÐÉÓÙ×ÁÀÔÓÑ.</para>
-      </sect2>
+	<para>úÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ <makevar>X_CONFIGURE_ON</makevar>
+	  ÂÕÄÅÔ ÄÏÐÉÓÁÎÏ × <makevar>CONFIGURE_ARGS</makevar> ×
+	  ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÓÏÓÔÏÑÎÉÅÍ <makevar>X</makevar>.  óÌÅÄÕÀÝÁÑ
+	  ÚÁÐÉÓØ:</para>
 
-      <sect2>
-	<title><makevar>CONFLICTS</makevar></title>
+	<programlisting>OPTIONS_DEFINE=	OPT1
+OPT1_CONFIGURE_ON=	--add-test</programlisting>
 
-	<para>åÓÌÉ ×ÁÛ ÐÏÒÔ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÓÏÂÒÁÎ, ËÏÇÄÁ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ
-	  ÄÒÕÇÏÊ, Á ÐÏÌÕÞÁÅÍÙÊ ÐÁËÅÔ ÎÅ ÍÏÖÅÔ ÓÕÝÅÓÔ×Ï×ÁÔØ ×ÍÅÓÔÅ Ó ÄÒÕÇÉÍÉ,
-	  ÐÅÒÅÞÉÓÌÉÔÅ ÉÍÅÎÁ ÏÓÔÁÌØÎÙÈ ÐÁËÅÔÏ× × ÐÅÒÅÍÅÎÎÏÊ
-	  <makevar>CONFLICTS</makevar>.  úÄÅÓØ ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÛÁÂÌÏÎÙ
-	  ËÏÍÁÎÄÎÏÇÏ ÉÎÔÅÒÐÒÅÔÁÔÏÒÁ, ÔÁËÉÅ ËÁË <literal>*</literal> É
-	  <literal>?</literal>.  éÍÅÎÁ ÐÁËÅÔÏ× ÄÏÌÖÎÙ ×ÙÇÌÑÄÅÔØ ÔÁË ÖÅ, ËÁË
-	  × <filename>/var/db/pkg</filename>.  ðÏÖÁÌÕÊÓÔÁ, ÕÂÅÄÉÔÅÓØ, ÞÔÏ
-	  <makevar>CONFLICTS</makevar> ÎÅ ÓÏÄÅÒÖÉÔ ÐÁËÅÔ ÓÁÍÏÇÏ ÜÔÏÇÏ ÐÏÒÔÁ.
-	  ÷ ÐÒÏÔÉ×ÎÏÍ ÓÌÕÞÁÅ ÎÅ ÂÕÄÅÔ ÒÁÂÏÔÁÔØ ÕÓÔÁÎÏ×ËÁ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ
-	  ÐÅÒÅÍÅÎÎÏÊ <makevar>FORCE_PKG_REGISTER</makevar>.  ðÒÏ×ÅÒËÁ
-	  CONFLICTS ×ÙÐÏÌÎÑÅÔÓÑ ÄÏ ÐÒÏÃÅÓÓÏ× ÓÂÏÒËÉ É ÕÓÔÁÎÏ×ËÉ.</para>
-      </sect2>
-    </sect1>
+	<para>ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ:</para>
 
-    <sect1 id="install">
-      <title>õÓÔÁÎÏ×ËÁ ÆÁÊÌÏ×</title>
+	<programlisting>OPTIONS_DEFINE=	OPT1
 
-      <sect2 id="install-macros">
-	<title>íÁËÒÏÓÙ INSTALL_*</title>
+.include &lt;bsd.port.options.mk&gt;
 
-	<para>éÓÐÏÌØÚÕÊÔÅ ÍÁËÒÏÓÙ, ËÏÔÏÒÙÅ ÅÓÔØ × ÆÁÊÌÅ
-	  <filename>bsd.port.mk</filename> ÄÌÑ ÏÂÅÓÐÅÞÅÎÉÑ ÐÒÁ×ÉÌØÎÙÈ ÐÒÁ×
-	  ÄÏÓÔÕÐÁ É ×ÌÁÄÅÎÉÑ ÆÁÊÌÏ× × Ó×ÏÉÈ ÃÅÌÑÈ
-	  <maketarget>*-install</maketarget>.</para>
+.if ${PORT_OPTIONS:MOPT1}
+CONFIGURE_ARGS+=	--add-test
+.endif</programlisting>
 
-	<itemizedlist>
-	  <listitem>
-	    <para><makevar>INSTALL_PROGRAM</makevar> - ÜÔÏ ËÏÍÁÎÄÁ ÄÌÑ
-	      ÕÓÔÁÎÏ×ËÉ ÂÉÎÁÒÎÙÈ ×ÙÐÏÌÎÉÍÙÈ ÆÁÊÌÏ×.</para>
-	  </listitem>
+	<para>úÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ <makevar>X_CONFIGURE_OFF</makevar>
+	  ÂÕÄÅÔ ÄÏÐÉÓÁÎÏ × <makevar>CONFIGURE_ARGS</makevar> ×
+	  ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÓÏÓÔÏÑÎÉÅÍ <makevar>X</makevar>.  óÌÅÄÕÀÝÁÑ
+	  ÚÁÐÉÓØ:</para>
 
-	  <listitem>
-	    <para><makevar>INSTALL_SCRIPT</makevar> - ÜÔÏ ËÏÍÁÎÄÁ ÄÌÑ ÕÓÔÁÎÏ×ËÉ
-	      ×ÙÐÏÌÎÉÍÙÈ ÓËÒÉÐÔÏ×.</para>
-	  </listitem>
+	<programlisting>OPTIONS_DEFINE=	OPT1
+OPT1_CONFIGURE_OFF=	--no-test</programlisting>
 
-	  <listitem>
-	    <para><makevar>INSTALL_LIB</makevar> - ÜÔÏ ËÏÍÁÎÄÁ ÄÌÑ ÕÓÔÁÎÏ×ËÉ
-	      ÄÉÎÁÍÉÞÅÓËÉÈ ÂÉÂÌÉÏÔÅË.</para>
-	  </listitem>
+	<para>ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ:</para>
+
+	<programlisting>OPTIONS_DEFINE=	OPT1
+.include &lt;bsd.port.options.mk&gt;
+.if ! ${PORT_OPTIONS:MOPT1}
+CONFIGURE_ARGS+=	--no-test
+.endif</programlisting>
+
+	<para>úÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ <makevar>X_CMAKE_ON</makevar> ÂÕÄÅÔ
+	  ÄÏÐÉÓÁÎÏ × <makevar>CMAKE_ARGS</makevar> × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó
+	  ÓÏÓÔÏÑÎÉÅÍ <makevar>X</makevar>.  óÌÅÄÕÀÝÁÑ ÚÁÐÉÓØ:</para>
+
+	<programlisting>OPTIONS_DEFINE=	OPT1
+OPT1_CMAKE_ON=	-DTEST:BOOL=true</programlisting>
+
+	<para>ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ:</para>
+
+	<programlisting>OPTIONS_DEFINE=	OPT1
+
+.include &lt;bsd.port.options.mk&gt;
+
+.if ${PORT_OPTIONS:MOPT1}
+CMAKE_ARGS+=	-DTEST:BOOL=true
+.endif</programlisting>
+
+	<para>úÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ <makevar>X_CMAKE_OFF</makevar> ÂÕÄÅÔ
+	  ÄÏÐÉÓÁÎÏ × <makevar>CMAKE_ARGS</makevar> × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó
+	  ÓÏÓÔÏÑÎÉÅÍ <makevar>X</makevar>.  óÌÅÄÕÀÝÁÑ ÚÁÐÉÓØ:</para>
+
+	<programlisting>OPTIONS_DEFINE=	OPT1
+OPT1_CMAKE_OFF=	-DTEST:BOOL=false</programlisting>
+
+	<para>ÓÏÏÔ×ÅÔÓÔ×ÕÅÔ:</para>
+
+	<programlisting>OPTIONS_DEFINE=	OPT1
+
+.include &lt;bsd.port.options.mk&gt;
+
+.if ! ${PORT_OPTIONS:MOPT1}
+CMAKE_ARGS+=	-DTEST:BOOL=false
+.endif</programlisting>
+
+	<para>äÌÑ ÌÀÂÏÊ ÉÚ ÓÌÅÄÕÀÝÉÈ ÐÅÒÅÍÅÎÎÙÈ:</para>

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

From owner-svn-doc-all@FreeBSD.ORG  Wed Oct 23 21:11:04 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B7138669;
 Wed, 23 Oct 2013 21:11:04 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A32852152;
 Wed, 23 Oct 2013 21:11:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NLB4X7050086;
 Wed, 23 Oct 2013 21:11:04 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NLB4Ah050085;
 Wed, 23 Oct 2013 21:11:04 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310232111.r9NLB4Ah050085@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 23 Oct 2013 21:11:04 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43033 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 21:11:04 -0000

Author: dru
Date: Wed Oct 23 21:11:04 2013
New Revision: 43033
URL: http://svnweb.freebsd.org/changeset/doc/43033

Log:
  Add some clarifications to section 8.4.
  
  Tighten up some headings by moving content into an existing Table.
  
  Fix some tags.
  
  To be followed by a white space fix.

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	Wed Oct 23 21:02:20 2013	(r43032)
+++ head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml	Wed Oct 23 21:11:04 2013	(r43033)
@@ -32,7 +32,7 @@
       recorded audio, adding sound effects, and controlling attached
       MIDI devices.</para>
 
-    <para>&os; also supports the playback of video files and DVDs.
+    <para>&os; also supports the playback of video files and <acronym>DVD</acronym>s.
       The &os; Ports Collection contains applications to encode,
       convert, and playback various video media.</para>
 
@@ -61,12 +61,12 @@
       </listitem>
 
       <listitem>
-	<para>Play DVDs, <filename>.mpg</filename>, and
+	<para>Play <acronym>DVD</acronym>s, <filename>.mpg</filename>, and
 	  <filename>.avi</filename> files.</para>
       </listitem>
 
       <listitem>
-	<para>Rip CD and DVD content into files.</para>
+	<para>Rip CD and <acronym>DVD</acronym> content into files.</para>
       </listitem>
 
       <listitem>
@@ -713,48 +713,47 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz
   </sect1>
 
   <sect1 id="video-playback">
+    <!--
     <sect1info>
       <authorgroup>
 	<author>
 	  <firstname>Ross</firstname>
 	  <surname>Lippert</surname>
-	  <contrib>Contributed by </contrib>
+	  <contrib>Contributed by in June 2002</contrib>
 	</author>
       </authorgroup>
-      <!-- 5 June 2002 -->
     </sect1info>
+    -->
 
     <title>Video Playback</title>
 
     <para>Before configuring video playback, determine the model
-      of the video card and the chip it uses.  While
+      and chipset of the video card.  While
       <application>&xorg;</application> supports a wide variety of
-      video cards, fewer give good playback performance.  To obtain
+      video cards, not all provide good playback performance.  To obtain
       a list of extensions supported by the
       <application>&xorg;</application> server using the card, run
-      &man.xdpyinfo.1; while <application>&xorg;</application> is
+      <command>xdpyinfo</command> while <application>&xorg;</application> is
       running.</para>
 
     <para>It is a good idea to have a short MPEG test file for
-      evaluating various players and options.  Since some DVD
-      applications look for DVD media in <filename
+      evaluating various players and options.  Since some <acronym>DVD</acronym>
+      applications look for <acronym>DVD</acronym> media in <filename
 	class="directory">/dev/dvd</filename> by default, or have this
-      device name hardcoded in them, it might be useful to make
-      symbolic links to the proper devices:</para>
+      device name hardcoded in them, it might be useful to make a
+      symbolic links to the proper device:</para>
 
-    <screen>&prompt.root; <userinput>ln -sf /dev/acd0 /dev/dvd</userinput>
-&prompt.root; <userinput>ln -sf /dev/acd0 /dev/rdvd</userinput></screen>
+    <screen>&prompt.root; <userinput>ln -sf /dev/cd0 /dev/dvd</userinput></screen>
 
     <para>Due to the nature of &man.devfs.5;, manually created links
-      will not persist after a system reboot.  In order to create the
-      symbolic links automatically when the system boots, add the
-      following lines to <filename>/etc/devfs.conf</filename>:</para>
+      will not persist after a system reboot.  In order to recreate the
+      symbolic link automatically when the system boots, add the
+      following line to <filename>/etc/devfs.conf</filename>:</para>
 
-    <programlisting>link acd0 dvd
-link acd0 rdvd</programlisting>
+    <programlisting>link cd0 dvd</programlisting>
 
-    <para>DVD decryption invokes special DVD-ROM functions and
-      requires write permission on the DVD devices.</para>
+    <para><acronym>DVD</acronym> decryption invokes certain functions that
+      require write permission to the <acronym>DVD</acronym> device.</para>
 
     <para>To enhance the shared memory
       <application>&xorg;</application> interface, it is
@@ -772,7 +771,7 @@ kern.ipc.shmall=32768</programlisting>
     <indexterm><primary>DGA</primary></indexterm>
 
     <para>There are several possible ways to display video under
-      <application>&xorg;</application>.  What works is largely
+      <application>&xorg;</application> and what works is largely
       hardware dependent.  Each method described below will have
       varying quality across different hardware.</para>
 
@@ -786,41 +785,52 @@ kern.ipc.shmall=32768</programlisting>
 
       <listitem>
 	<para>XVideo: an extension to the
-	  <application>&xorg;</application> interface which supports
-	  video in any drawable object.</para>
+	  <application>&xorg;</application> interface which 
+	allows video to be directly displayed in drawable objects
+	through a special acceleration.  This extension provides
+	good quality playback even on low-end machines.  The next section describes
+	  how to determine if this extension is running.</para>
       </listitem>
 
       <listitem>
 	<para><acronym>SDL</acronym>: the Simple Directmedia
-	  Layer.</para>
+	  Layer is a porting layer for many operating systems,
+      allowing cross-platform applications to be developed which make
+      efficient use of sound and graphics.  <acronym>SDL</acronym> provides a
+      low-level abstraction to the hardware which can sometimes be
+      more efficient than the <application>&xorg;</application>
+      interface.  On &os;, <acronym>SDL</acronym> can be installed using the <filename
+	role="package">devel/sdl20</filename> package or port.</para>
       </listitem>
 
       <listitem>
 	<para><acronym>DGA</acronym>: the Direct Graphics
-	  Access.</para>
+	  Access is an
+      <application>&xorg;</application> extension which allows a
+      program to bypass the <application>&xorg;</application> server
+      and directly alter the framebuffer.  Because it relies on a low
+      level memory mapping, programs using it must be run as
+      <username>root</username>.  The <acronym>DGA</acronym> extension can be tested and
+      benchmarked using &man.dga.1;.  When <command>dga</command> is
+      running, it changes the colors of the display whenever a key is
+      pressed.  To quit, press <keycap>q</keycap>.</para>
       </listitem>
 
       <listitem>
-	<para>SVGAlib: low level console graphics layer.</para>
+	<para>SVGAlib: a low level console graphics layer.</para>
       </listitem>
     </orderedlist>
 
     <sect3 id="video-interface-xvideo">
       <title>XVideo</title>
 
-      <para><application>&xorg;</application> has an extension called
-	<emphasis>XVideo</emphasis>, also known as Xvideo, Xv, and xv.
-	It allows video to be directly displayed in drawable objects
-	through a special acceleration.  This extension provides
-	good quality playback even on low-end machines.</para>
-
-      <para>To check whether the extension is running, use
+      <para>To check whether this extension is running, use
 	<command>xvinfo</command>:</para>
 
       <screen>&prompt.user; <userinput>xvinfo</userinput></screen>
 
-      <para>XVideo is supported for the card if the result looks
-	like:</para>
+      <para>XVideo is supported for the card if the result is similar
+	to:</para>
 
       <screen>X-Video Extension version 2.2
   screen #0
@@ -895,7 +905,7 @@ kern.ipc.shmall=32768</programlisting>
       with every implementation of XVideo and their absence may hinder
       some players.</para>
 
-    <para>If the result looks like:</para>
+    <para>If the result instead looks like:</para>
 
     <screen>X-Video Extension version 2.2
 screen #0
@@ -903,42 +913,8 @@ no adaptors present</screen>
 
     <para>XVideo is probably not supported for the card.  This means
       that it will be more difficult for the display to meet the
-      computational demands of rendering video.  Depending on the
-      video card and processor, one might still be able to have a
-      satisfying experience.</para>
-
-  </sect3>
-
-  <sect3 id="video-interface-SDL">
-    <title>Simple Directmedia Layer</title>
-
-    <para>The Simple Directmedia Layer, SDL, is a
-      porting layer for many operating systems
-      allowing cross-platform applications to be developed which make
-      efficient use of sound and graphics.  The SDL layer provides a
-      low-level abstraction to the hardware which can sometimes be
-      more efficient than the <application>&xorg;</application>
-      interface.</para>
-
-    <para><acronym>SDL</acronym> can be installed using the <filename
-	role="package">devel/sdl12</filename> package or port.</para>
-
-  </sect3>
-
-  <sect3 id="video-interface-DGA">
-    <title>Direct Graphics Access</title>
-
-    <para><acronym>DGA</acronym> is an
-      <application>&xorg;</application> extension which allows a
-      program to bypass the <application>&xorg;</application> server
-      and directly alter the framebuffer.  Because it relies on a low
-      level memory mapping, programs using it must be run as
-      <username>root</username>.</para>
-
-    <para>The <acronym>DGA</acronym> extension can be tested and
-      benchmarked using &man.dga.1;.  When <command>dga</command> is
-      running, it changes the colors of the display whenever a key is
-      pressed.  To quit, press <keycap>q</keycap>.</para>
+      computational demands of rendering video, depending on the
+      video card and processor.</para>
 
   </sect3>
 </sect2>
@@ -953,101 +929,26 @@ no adaptors present</screen>
       the &os; Ports Collection which can be used for video
       playback.</para>
 
-    <para>Many of the video applications which run on &os; were
-      developed as &linux; applications.  Many of these applications
-      are still beta-quality.  Some of the problems commonly
-      encountered with video packages on &os; include:</para>
-
-    <orderedlist>
-
-      <listitem>
-	<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>
-      </listitem>
-
-      <listitem>
-	<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 bad artifacts from a buggy rescaling
-	  routine.</para>
-      </listitem>
-
-      <listitem>
-	<para>An application frequently dumps core.</para>
-      </listitem>
-
-      <listitem>
-	<para>Documentation is not installed with the port and can be
-	  found either on the web or under the port's <filename
-	    class='directory'>work</filename>
-	  directory.</para>
-      </listitem>
-
-    </orderedlist>
-
-    <para>Many applications may also exhibit
-      <quote>&linux;-isms</quote>.  There may be issues resulting from
-      the way some standard libraries are implemented in the &linux;
-      distributions, or some features of the &linux; kernel which have
-      been assumed by the authors of the applications.  These issues
-      are not always noticed and worked around by the port
-      maintainers, which can lead to problems like these:</para>
-
-    <orderedlist>
-      <listitem>
-	<para>The use of <filename>/proc/cpuinfo</filename> to detect
-	  processor characteristics.</para>
-      </listitem>
-
-      <listitem>
-	<para>A misuse of threads which causes a program to hang upon
-	  completion instead of truly terminating.</para>
-      </listitem>
-
-      <listitem>
-	<para>Relies on software which is not yet available in the
-	  &os; Ports Collection.</para>
-      </listitem>
-    </orderedlist>
-
     <sect3 id="video-mplayer">
-      <title>MPlayer</title>
+      <title><application>MPlayer</application> and <application>MEncoder</application></title>
 
       <para><application>MPlayer</application> is a command-line video
 	player with an optional graphical interface which aims to
-	provide speed and flexibility.  This application, as well as
-	other graphical front-ends, is available from the &os; Ports
+	provide speed and flexibility.  Other
+	graphical front-ends to <application>MPlayer</application> are available from the &os; Ports
 	Collection.</para>
 
-      <sect4 id="video-mplayer-building">
-	<title>Building MPlayer</title>
-
-	<indexterm><primary>MPlayer</primary>
-	  <secondary>making</secondary></indexterm>
+        <indexterm><primary>MPlayer</primary></indexterm>
 
-	<para><application>MPlayer</application> is available as a
-	  package or port in <filename
-	    role="package">multimedia/mplayer</filename>.  Several
+	<para><application>MPlayer</application> can be installed using
+	  the <filename
+	    role="package">multimedia/mplayer</filename> package or port.  Several
 	  compile options are available and a variety of hardware
 	  checks occur during the build process.  For these reasons,
 	  some users prefer to build the port rather than install the
-	  package.  The available options will be displayed in a
-	  menu after these commands are input:</para>
-
-	<screen>&prompt.root; <userinput>cd /usr/ports/multimedia/mplayer</userinput>
-&prompt.root; <userinput>make</userinput></screen>
+	  package.</para>
 
-	<para>The menu options should be reviewed to determine the
+	<para>When compiling the port, the menu options should be reviewed to determine the
 	  type of support to compile into the port.  If an option is
 	  not selected, <application>MPlayer</application> will not be
 	  able to display that type of video format.  Use the arrow
@@ -1055,21 +956,13 @@ no adaptors present</screen>
 	  finished, press <keycap>Enter</keycap> to continue the port
 	  compile and installation.</para>
 
-	<para>By default, this package or port will build the
+	<para>By default, the package or port will build the
 	  <command>mplayer</command> command line utility and the
 	  <command>gmplayer</command> graphical utility.  To encode
-	  videos, install the <filename
+	  videos, compile the <filename
 	    role="package">multimedia/mencoder</filename> port.  Due
 	  to licensing restrictions, a package is not available for
-	  <command>MEncoder</command>.</para>
-
-      </sect4>
-
-      <sect4 id="video-mplayer-using">
-	<title>Using MPlayer</title>
-
-	<indexterm><primary>MPlayer</primary>
-	  <secondary>use</secondary></indexterm>
+	  <application>MEncoder</application>.</para>
 
 	<para>The first time <application>MPlayer</application> is
 	  run, it will create <filename
@@ -1078,13 +971,13 @@ no adaptors present</screen>
 	  of the user-specific configuration files.</para>
 
 	<para>This section describes only a few common uses.  Refer
-	  to the <command>mplayer</command> manual page for a complete
+	  to mplayer(1) for a complete
 	  description of its numerous options.</para>
 
 	<para>To play the file
 	  <filename><replaceable>testfile.avi</replaceable></filename>,
 	  specify the video interfaces with
-	  <option>-vo</option>:</para>
+	  <option>-vo</option>, as seen in the following examples:</para>
 
 	  <screen>&prompt.user; <userinput>mplayer -vo xv <replaceable>testfile.avi</replaceable></userinput></screen>
 
@@ -1100,31 +993,31 @@ no adaptors present</screen>
 	  relative performance depends on many factors and will vary
 	  significantly with hardware.</para>
 
-	<para>To play a DVD, replace the
+	<para>To play a <acronym>DVD</acronym>, replace
 	  <filename><replaceable>testfile.avi</replaceable></filename>
 	  with <option>dvd://<replaceable>N</replaceable> -dvd-device
 	   <replaceable>DEVICE</replaceable></option>, where
 	  <replaceable>N</replaceable> is the title number to play
-	  and <filename><replaceable>DEVICE</replaceable></filename>
-	  is the device node for the DVD-ROM.  For example, to play
+	  and <replaceable>DEVICE</replaceable>
+	  is the device node for the <acronym>DVD</acronym>.  For example, to play
 	  title 3 from <devicename>/dev/dvd</devicename>:</para>
 
 	<screen>&prompt.root; <userinput>mplayer -vo xv dvd://3 -dvd-device /dev/dvd</userinput></screen>
 
 	<note>
-	  <para>The default DVD device can be defined during the build
+	  <para>The default <acronym>DVD</acronym> device can be defined during the build
 	    of the <application>MPlayer</application> port by
 	    including the
 	    <makevar>WITH_DVD_DEVICE=/path/to/desired/device</makevar>
 	    option.  By default, the device is
-	    <filename>/dev/acd0</filename>.  More details can be found
+	    <filename>/dev/cd0</filename>.  More details can be found
 	    in the port's
 	    <filename>Makefile.options</filename>.</para>
 	</note>
 
-	<para>To stop, pause, advance, and so on, consult the
-	  keybindings, which are displayed by running <command>mplayer
-	    -h</command>, or read the manual page.</para>
+	<para>To stop, pause, advance, and so on, use a
+	  keybinding.  To see the list of keybindings, run <command>mplayer
+	    -h</command>  or read mplayer(1).</para>
 
 	<para>Additional playback options include
 	  <option>-fs -zoom</option>, which engages fullscreen mode,
@@ -1138,38 +1031,28 @@ no adaptors present</screen>
 fs=yes
 zoom=yes</programlisting>
 
-	<para><command>mplayer</command> can be used to rip a DVD
+	<para><command>mplayer</command> can be used to rip a <acronym>DVD</acronym>
 	  title to a <filename>.vob</filename>.  To dump the second
-	  title from a DVD:</para>
+	  title from a <acronym>DVD</acronym>:</para>
 
 	  <screen>&prompt.root; <userinput>mplayer -dumpstream -dumpfile out.vob dvd://2 -dvd-device /dev/dvd</userinput></screen>
 
 	<para>The output file, <filename>out.vob</filename>, will be
-	  MPEG and can be manipulated by the other packages described
-	  in this section.</para>
+	  in <acronym>MPEG</acronym> format.</para>
 
-	<para>The <ulink url="http://www.mplayerhq.hu/DOCS/">MPlayer
-	    documentation</ulink> is technically informative and
-	  should be consulted by anyone wishing to obtain a high level
-	  of expertise with &unix; video.  The
-	  <application>MPlayer</application> mailing list is hostile
-	  to anyone who has not bothered to read the documentation, so
-	  before making a bug report, read the documentation
-	  first.</para>
-
-      </sect4>
-      <sect4 id="video-mencoder">
-	<title><application>MEncoder</application></title>
+	<para>Anyone wishing to obtain a high level
+	  of expertise with &unix; video should consult <ulink url="http://www.mplayerhq.hu/DOCS/">mplayerhq.hu/DOCS</ulink> as it is technically informative.
+	  This documentation should be considered as required reading
+	  before submitting any bug reports.</para>
 
 	<indexterm>
 	  <primary>mencoder</primary>
 	</indexterm>
 
 	<para>Before using <command>mencoder</command>, it is a good
-	  idea to become familiar with the options described in the
+	  idea to become familiar with the options described at
 	  <ulink
-	    url="http://www.mplayerhq.hu/DOCS/HTML/en/mencoder.html">HTML
-	  documentation</ulink>.  There are innumerable ways to
+	    url="http://www.mplayerhq.hu/DOCS/HTML/en/mencoder.html">mplayerhq.hu/DOCS/HTML/en/mencoder.html</ulink>.  There are innumerable ways to
 	  improve quality, lower bitrate, and change formats, and some
 	  of these options may make the difference between good or bad
 	  performance.  Improper combinations of command line options
@@ -1200,11 +1083,9 @@ zoom=yes</programlisting>
 	<para><filename><replaceable>input.avi</replaceable></filename>
 	  can be replaced with <option>dvd://1 -dvd-device
 	    /dev/dvd</option> and run as <username>root</username>
-	  to re-encode a DVD title directly.  Since it may take a few
-	  tries to get the desired result, it is recommended to dump
+	  to re-encode a <acronym>DVD</acronym> title directly.  Since it may take a few
+	  tries to get the desired result, it is recommended to instead dump
 	  the title to a file and to work on the file.</para>
-      </sect4>
-
     </sect3>
 
     <sect3 id="video-xine">
@@ -1226,40 +1107,35 @@ zoom=yes</programlisting>
 	to open a specific file.</para>
 
       <para>Alternatively, <application>xine</application> may be
-	invoked to play a file immediately without the graphical
-	interface:</para>
-
-      <screen>&prompt.user; <userinput>xine</userinput></screen>
-
-      <para>Alternatively, it may be invoked to play a file
-	immediately without the GUI with the command:</para>
+	invoked from the command line
+	by specifying the name of the file to play:</para>
 
       <screen>&prompt.user; <userinput>xine -g -p <replaceable>mymovie.avi</replaceable></userinput></screen>
 
-      <para>The <ulink
-	  url="http://dvd.sourceforge.net/xine-howto/en_GB/html/howto.html">
-	xine HOWTO</ulink> contains a chapter on performance
-	improvement which is general to all players.</para>
+      <para>Refer to <ulink
+	  url="http://www.xine-project.org/faq">
+	xine-project.org/faq</ulink> for more information and
+	troubleshooting tips.</para>
     </sect3>
 
     <sect3 id="video-ports-transcode">
-      <title>The <application>transcode</application>
+      <title>The <application>Transcode</application>
 	Utilities</title>
 
-      <para><application>transcode</application> provides a suite of
+      <para><application>Transcode</application> provides a suite of
 	tools for re-encoding video and audio files.
-	<application>transcode</application> can be used to merge
+	<application>Transcode</application> can be used to merge
 	video files or repair broken files using command line tools
-	with <filename>stdin/stdout</filename> stream
+	with stdin/stdout stream
 	interfaces.</para>
 
-      <para><application>transcode</application> can be installed
+      <para>In &os;, <application>Transcode</application> can be installed
 	using the <filename
 	  role="package">multimedia/transcode</filename> package or
 	port.  Many users prefer to compile the port as it provides a
 	menu of compile options for specifying the support and codecs
 	to compile in.  If an option is not selected,
-	<application>transcode</application> will not be able to
+	<application>Transcode</application> will not be able to
 	encode that format.  Use the arrow keys and spacebar to select
 	the required formats.  When finished, press
 	<keycap>Enter</keycap> to continue the port compile and
@@ -1272,18 +1148,17 @@ zoom=yes</programlisting>
 <replaceable>input.avi</replaceable> -V --export_prof vcd-pal -o output_vcd</userinput>
 &prompt.user; <userinput>mplex -f 1 -o <replaceable>output_vcd.mpg output_vcd.m1v output_vcd.mpa</replaceable></userinput></screen>
 
-    <para>The resulting MPEG file,
+    <para>The resulting <acronym>MPEG</acronym> file,
       <filename><replaceable>output_vcd.mpg</replaceable></filename>,
       is ready to be played with <application>MPlayer</application>.
-      The file can be burned on a CD-R media to create a Video CD.  In
-      this, install and use the <filename
-	role="package">multimedia/vcdimager</filename> and <filename
-	role="package">sysutils/cdrdao</filename> programs.</para>
+      The file can be burned on a <acronym>CD</acronym> media to create a video <acronym>CD</acronym> using a utility such as
+      <filename
+	role="package">multimedia/vcdimager</filename> or <filename
+	role="package">sysutils/cdrdao</filename>.</para>
 
     <para>In addition to the manual page for
-      <command>transcode</command>, refer to the <ulink
-	url="http://www.transcoding.org/cgi-bin/transcode">transcode
-	wiki</ulink> for further information and examples.</para>
+      <command>transcode</command>, refer to  <ulink
+	url="http://www.transcoding.org/cgi-bin/transcode">transcoding.org/cgi-bin/transcode</ulink> for further information and examples.</para>
   </sect3>
 </sect2>
 </sect1>

From owner-svn-doc-all@FreeBSD.ORG  Wed Oct 23 21:41:14 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 8B62F49A;
 Wed, 23 Oct 2013 21:41:14 +0000 (UTC)
 (envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 76BC72341;
 Wed, 23 Oct 2013 21:41:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NLfEX2060193;
 Wed, 23 Oct 2013 21:41:14 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NLfEfI060192;
 Wed, 23 Oct 2013 21:41:14 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201310232141.r9NLfEfI060192@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Wed, 23 Oct 2013 21:41:14 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43034 - head/ru_RU.KOI8-R/books/porters-handbook
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 21:41:14 -0000

Author: pluknet
Date: Wed Oct 23 21:41:13 2013
New Revision: 43034
URL: http://svnweb.freebsd.org/changeset/doc/43034

Log:
  o Enable callout images.
  o Point to SVN revision in 'Original revision' reference.

Modified:
  head/ru_RU.KOI8-R/books/porters-handbook/Makefile

Modified: head/ru_RU.KOI8-R/books/porters-handbook/Makefile
==============================================================================
--- head/ru_RU.KOI8-R/books/porters-handbook/Makefile	Wed Oct 23 21:11:04 2013	(r43033)
+++ head/ru_RU.KOI8-R/books/porters-handbook/Makefile	Wed Oct 23 21:41:13 2013	(r43034)
@@ -4,7 +4,7 @@
 # $FreeBSD$
 # $FreeBSDru: frdp/doc/ru_RU.KOI8-R/books/porters-handbook/Makefile,v 1.7 2003/09/26 02:34:16 andy Exp $
 #
-# Original reivision: 1.4
+# Original revision: r42686
 #
 
 #
@@ -30,6 +30,29 @@ SRCS=  book.xml
 SRCS+= uses.xml
 SRCS+= versions.xml
 
+# Images from the cross-document image library
+IMAGES_LIB+=	callouts/1.png
+IMAGES_LIB+=	callouts/2.png
+IMAGES_LIB+=	callouts/3.png
+IMAGES_LIB+=	callouts/4.png
+IMAGES_LIB+=	callouts/5.png
+IMAGES_LIB+=	callouts/6.png
+IMAGES_LIB+=	callouts/7.png
+IMAGES_LIB+=	callouts/8.png
+IMAGES_LIB+=	callouts/9.png
+IMAGES_LIB+=	callouts/10.png
+IMAGES_LIB+=	callouts/11.png
+IMAGES_LIB+=	callouts/12.png
+IMAGES_LIB+=	callouts/13.png
+IMAGES_LIB+=	callouts/14.png
+IMAGES_LIB+=	callouts/15.png
+IMAGES_LIB+=	callouts/16.png
+IMAGES_LIB+=	callouts/17.png
+IMAGES_LIB+=	callouts/18.png
+IMAGES_LIB+=	callouts/19.png
+IMAGES_LIB+=	callouts/20.png
+IMAGES_LIB+=	callouts/21.png
+
 # Entities
 #SRCS+= ../../../en_US.ISO8859-1/books/handbook/authors.ent
 

From owner-svn-doc-all@FreeBSD.ORG  Wed Oct 23 21:56:05 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id D2B639AD;
 Wed, 23 Oct 2013 21:56:05 +0000 (UTC)
 (envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id BEB462409;
 Wed, 23 Oct 2013 21:56:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NLu5sf063969;
 Wed, 23 Oct 2013 21:56:05 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NLu5sX063968;
 Wed, 23 Oct 2013 21:56:05 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201310232156.r9NLu5sX063968@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Wed, 23 Oct 2013 21:56:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43035 - head/ru_RU.KOI8-R/books/porters-handbook
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 21:56:05 -0000

Author: pluknet
Date: Wed Oct 23 21:56:05 2013
New Revision: 43035
URL: http://svnweb.freebsd.org/changeset/doc/43035

Log:
  Finally remove the commented out and long unused authors.ent.

Modified:
  head/ru_RU.KOI8-R/books/porters-handbook/Makefile

Modified: head/ru_RU.KOI8-R/books/porters-handbook/Makefile
==============================================================================
--- head/ru_RU.KOI8-R/books/porters-handbook/Makefile	Wed Oct 23 21:41:13 2013	(r43034)
+++ head/ru_RU.KOI8-R/books/porters-handbook/Makefile	Wed Oct 23 21:56:05 2013	(r43035)
@@ -53,8 +53,6 @@ IMAGES_LIB+=	callouts/19.png
 IMAGES_LIB+=	callouts/20.png
 IMAGES_LIB+=	callouts/21.png
 
-# Entities
-#SRCS+= ../../../en_US.ISO8859-1/books/handbook/authors.ent
-
 DOC_PREFIX?= ${.CURDIR}/../../..
+
 .include "${DOC_PREFIX}/share/mk/doc.project.mk"

From owner-svn-doc-all@FreeBSD.ORG  Wed Oct 23 23:35:28 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 53A61BB6;
 Wed, 23 Oct 2013 23:35:28 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 40D9928F4;
 Wed, 23 Oct 2013 23:35:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NNZSJ7098693;
 Wed, 23 Oct 2013 23:35:28 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NNZS9h098692;
 Wed, 23 Oct 2013 23:35:28 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201310232335.r9NNZS9h098692@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Wed, 23 Oct 2013 23:35:28 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43036 - head/en_US.ISO8859-1/articles/contributors
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 23:35:28 -0000

Author: delphij
Date: Wed Oct 23 23:35:27 2013
New Revision: 43036
URL: http://svnweb.freebsd.org/changeset/doc/43036

Log:
  Add Xiaoding Liu for his contribution.

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

Modified: head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Wed Oct 23 21:56:05 2013	(r43035)
+++ head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Wed Oct 23 23:35:27 2013	(r43036)
@@ -10877,6 +10877,11 @@
     </listitem>
 
     <listitem>
+      <para>Xiaoding Liu
+	<email>xiaoding+freebsd@xiaoding.org</email></para>
+    </listitem>
+
+    <listitem>
       <para>Yamagi Burmeister
 	<email>yamagi@yamagi.org</email></para>
     </listitem>

From owner-svn-doc-all@FreeBSD.ORG  Thu Oct 24 01:28:40 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 78974FAB;
 Thu, 24 Oct 2013 01:28:40 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 646F82EEF;
 Thu, 24 Oct 2013 01:28:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9O1SecR037266;
 Thu, 24 Oct 2013 01:28:40 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9O1SepG037265;
 Thu, 24 Oct 2013 01:28:40 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310240128.r9O1SepG037265@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 24 Oct 2013 01:28:40 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43037 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Oct 2013 01:28:40 -0000

Author: dru
Date: Thu Oct 24 01:28:39 2013
New Revision: 43037
URL: http://svnweb.freebsd.org/changeset/doc/43037

Log:
  White space fix only. Translators can ignore.

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	Wed Oct 23 23:35:27 2013	(r43036)
+++ head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml	Thu Oct 24 01:28:39 2013	(r43037)
@@ -32,9 +32,10 @@
       recorded audio, adding sound effects, and controlling attached
       MIDI devices.</para>
 
-    <para>&os; also supports the playback of video files and <acronym>DVD</acronym>s.
-      The &os; Ports Collection contains applications to encode,
-      convert, and playback various video media.</para>
+    <para>&os; also supports the playback of video files and
+      <acronym>DVD</acronym>s.  The &os; Ports Collection contains
+      applications to encode, convert, and playback various video
+      media.</para>
 
     <para>This chapter describes how to configure sound cards, video
       playback, TV tuner cards, and scanners on &os;.  It also
@@ -61,12 +62,13 @@
       </listitem>
 
       <listitem>
-	<para>Play <acronym>DVD</acronym>s, <filename>.mpg</filename>, and
-	  <filename>.avi</filename> files.</para>
+	<para>Play <acronym>DVD</acronym>s, <filename>.mpg</filename>,
+	  and <filename>.avi</filename> files.</para>
       </listitem>
 
       <listitem>
-	<para>Rip CD and <acronym>DVD</acronym> content into files.</para>
+	<para>Rip CD and <acronym>DVD</acronym> content into
+	  files.</para>
       </listitem>
 
       <listitem>
@@ -87,7 +89,7 @@
     <itemizedlist>
       <listitem><para>Know how to install applications as described in
 	<xref linkend="ports"/>.</para></listitem>
-      </itemizedlist>
+    </itemizedlist>
   </sect1>
 
   <sect1 id="sound-setup">
@@ -112,25 +114,25 @@
 
     <title>Setting Up the Sound Card</title>
 
-      <indexterm><primary>PCI</primary></indexterm>
-      <indexterm><primary>sound cards</primary></indexterm>
-      <para>Before beginning the configuration, determine the model of
-	the sound card and the chip it uses.  &os; supports a wide
-	variety of sound cards.  Check the supported audio devices
-	list of the <ulink url="&rel.current.hardware;">Hardware
-	  Notes</ulink> to see if the card is supported and which &os;
-	driver it uses.</para>
+    <indexterm><primary>PCI</primary></indexterm>
+    <indexterm><primary>sound cards</primary></indexterm>
+    <para>Before beginning the configuration, determine the model of
+      the sound card and the chip it uses.  &os; supports a wide
+      variety of sound cards.  Check the supported audio devices
+      list of the <ulink url="&rel.current.hardware;">Hardware
+	Notes</ulink> to see if the card is supported and which &os;
+      driver it uses.</para>
 
-      <indexterm>
-	<primary>kernel</primary>
-	<secondary>configuration</secondary>
-      </indexterm>
+    <indexterm>
+      <primary>kernel</primary>
+      <secondary>configuration</secondary>
+    </indexterm>
 
-      <para>In order to use the sound device, its device driver
-	must be loaded.
-	The easiest way is to load a kernel module for the sound card
-	with &man.kldload.8;.  This example loads the driver for a
-	built-in audio chipset based on the Intel specification:</para>
+    <para>In order to use the sound device, its device driver must be
+      loaded.  The easiest way is to load a kernel module for the
+      sound card with &man.kldload.8;.  This example loads the driver
+      for a built-in audio chipset based on the Intel
+      specification:</para>
 
     <screen>&prompt.root; <userinput>kldload snd_hda</userinput></screen>
 
@@ -157,23 +159,24 @@
       after loading the <filename>snd_driver</filename> metadriver,
       type <command>cat /dev/sndstat</command>.</para>
 
-  <sect2>
-    <title>Configuring a Custom Kernel with Sound Support</title>
+    <sect2>
+      <title>Configuring a Custom Kernel with Sound Support</title>
 
-    <para>This section is for users who prefer to statically compile in support for the
-      sound card in a custom kernel.  For more information about recompiling a
-      kernel, refer to <xref linkend="kernelconfig"/>.</para>
-
-    <para>When using a custom kernel to provide sound support, make
-      sure that the audio framework driver exists in the custom kernel
-      configuration file:</para>
-
-    <programlisting>device sound</programlisting>
-
-    <para>Next, add support for the sound card.  To continue the example
-      of the built-in audio chipset based on the Intel specification from the
-      previous section, use the following line in the custom kernel
-      configuration file:</para>
+      <para>This section is for users who prefer to statically compile
+	in support for the sound card in a custom kernel.  For more
+	information about recompiling a kernel, refer to <xref
+	  linkend="kernelconfig"/>.</para>
+
+      <para>When using a custom kernel to provide sound support, make
+	sure that the audio framework driver exists in the custom
+	kernel configuration file:</para>
+
+      <programlisting>device sound</programlisting>
+
+      <para>Next, add support for the sound card.  To continue the
+	example of the built-in audio chipset based on the Intel
+	specification from the previous section, use the following
+	line in the custom kernel configuration file:</para>
 
       <programlisting>device snd_hda</programlisting>
 
@@ -215,69 +218,71 @@ hint.sbc.0.flags="0x15"</programlisting>
 	cases, the IRQ or other settings may need to be changed to
 	match the card.  Refer to &man.snd.sbc.4; for more information
 	about this card.</para>
-  </sect2>
+    </sect2>
 
-  <sect2 id="sound-testing">
-    <title>Testing Sound</title>
+    <sect2 id="sound-testing">
+      <title>Testing Sound</title>
 
-    <para>After loading
-      the required module or rebooting into the custom kernel,
-      the sound card should be detected.
-	To confirm, run <command>dmesg | grep pcm</command>.  This
-	example is from a system with a built-in Conexant CX20590 chipset:</para>
+      <para>After loading the required module or rebooting into the
+	custom kernel, the sound card should be detected.  To confirm,
+	run <command>dmesg | grep pcm</command>.  This example is
+	from a system with a built-in Conexant CX20590 chipset:</para>
 
-    <screen>pcm0: &lt;NVIDIA (0x001c) (HDMI/DP 8ch)&gt; at nid 5 on hdaa0
+      <screen>pcm0: &lt;NVIDIA (0x001c) (HDMI/DP 8ch)&gt; at nid 5 on hdaa0
 pcm1: &lt;NVIDIA (0x001c) (HDMI/DP 8ch)&gt; at nid 6 on hdaa0
 pcm2: &lt;Conexant CX20590 (Analog 2.0+HP/2.0)&gt; at nid 31,25 and 35,27 on hdaa1</screen>
 
-    <para>The status of the sound card may also be checked using this
-      command:</para>
+      <para>The status of the sound card may also be checked using
+	this command:</para>
 
-    <screen>&prompt.root; <userinput>cat /dev/sndstat</userinput>
+      <screen>&prompt.root; <userinput>cat /dev/sndstat</userinput>
 FreeBSD Audio Driver (newpcm: 64bit 2009061500/amd64)
 Installed devices:
 pcm0: &lt;NVIDIA (0x001c) (HDMI/DP 8ch)&gt; (play)
 pcm1: &lt;NVIDIA (0x001c) (HDMI/DP 8ch)&gt; (play)
 pcm2: &lt;Conexant CX20590 (Analog 2.0+HP/2.0)&gt; (play/rec) default</screen>
 
-    <para>The output will vary depending upon the sound card.  If no
-      <devicename>pcm</devicename> devices are listed, double-check that the correct
-      device driver was loaded or compiled into the kernel.  The
-      next section lists some common problems and their solutions.</para>
-
-    <para>If all goes well, the sound card should now work in os;.  If
-      the <acronym>CD</acronym> or <acronym>DVD</acronym> drive is properly
-      connected to the sound card, one can insert an audio CD in the
-      drive and play it with &man.cdcontrol.1;:</para>
+      <para>The output will vary depending upon the sound card.  If no
+	<devicename>pcm</devicename> devices are listed, double-check
+	that the correct device driver was loaded or compiled into the
+	kernel.  The next section lists some common problems and their
+	solutions.</para>
+
+      <para>If all goes well, the sound card should now work in os;.
+	If the <acronym>CD</acronym> or <acronym>DVD</acronym> drive
+	is properly connected to the sound card, one can insert an
+	audio CD in the drive and play it with
+	&man.cdcontrol.1;:</para>
 
       <screen>&prompt.user; <userinput>cdcontrol -f /dev/acd0 play 1</userinput></screen>
 
-    <warning>
-      <para>Audio CDs have specialized encodings which means that they should not be
-	mounted using &man.mount.8;.</para>
-    </warning>
-    
-    <para>Various applications, such as <filename
-	role="package">audio/workman</filename>, provide a friendlier
-      interface.  The <filename role="package">audio/mpg123</filename>
-      port can be installed to listen to MP3 audio files.</para>
-
-    <para>Another quick way to test the card is to send data to
-      <devicename>/dev/dsp</devicename>:</para>
-
-    <screen>&prompt.user; <userinput>cat <replaceable>filename</replaceable> &gt; /dev/dsp</userinput></screen>
-
-    <para>where
-      <filename><replaceable>filename</replaceable></filename> can
-      be any type of file.  This command should produce some noise, confirming
-      that the sound card is working.</para>
+      <warning>
+	<para>Audio CDs have specialized encodings which means that
+	  they should not be mounted using &man.mount.8;.</para>
+      </warning>
+
+      <para>Various applications, such as <filename
+	  role="package">audio/workman</filename>, provide a
+	friendlier interface.  The <filename
+	  role="package">audio/mpg123</filename> port can be installed
+	to listen to MP3 audio files.</para>
+
+      <para>Another quick way to test the card is to send data to
+	<devicename>/dev/dsp</devicename>:</para>
+
+      <screen>&prompt.user; <userinput>cat <replaceable>filename</replaceable> &gt; /dev/dsp</userinput></screen>
+
+      <para>where
+	<filename><replaceable>filename</replaceable></filename> can
+	be any type of file.  This command should produce some noise,
+	confirming that the sound card is working.</para>
 
-    <note>
-      <para>The <devicename>/dev/dsp*</devicename> device nodes will
-	be created automatically as needed.  When not in use, they
-	do not exist and will not appear in the output of
-	&man.ls.1;.</para>
-    </note>
+      <note>
+	<para>The <devicename>/dev/dsp*</devicename> device nodes will
+	  be created automatically as needed.  When not in use, they
+	  do not exist and will not appear in the output of
+	  &man.ls.1;.</para>
+      </note>
     </sect2>
 
     <sect2 id="troubleshooting">
@@ -292,7 +297,8 @@ pcm2: &lt;Conexant CX20590 (Analog 2.0+H
 	solutions:</para>
 
       <table frame="none" pgwide="1">
-      <title>Common Error Messages</title>
+	<title>Common Error Messages</title>
+
 	<tgroup cols="2">
 	  <thead>
 	    <row>
@@ -327,8 +333,8 @@ pcm2: &lt;Conexant CX20590 (Analog 2.0+H
 	      <entry><errorname>xxx: can't open
 		  /dev/dsp!</errorname></entry>
 	      <entry><para>Type <command>fstat | grep
-		  dsp</command> to check if another application is holding the
-		device open.  Noteworthy troublemakers are
+		  dsp</command> to check if another application is
+		holding the device open.  Noteworthy troublemakers are
 		<application>esound</application> and
 		<application>KDE</application>'s sound
 		support.</para></entry>
@@ -337,11 +343,10 @@ pcm2: &lt;Conexant CX20590 (Analog 2.0+H
 	</tgroup>
       </table>
 
-      <para>Modern graphics cards often come
-	with their own sound driver for use with
-	<acronym>HDMI</acronym>.  This sound device is
-	sometimes enumerated before the sound card meaning that the sound
-	card will not be used as the default playback
+      <para>Modern graphics cards often come with their own sound
+	driver for use with <acronym>HDMI</acronym>.  This sound
+	device is sometimes enumerated before the sound card meaning
+	that the sound card will 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
@@ -365,11 +370,12 @@ 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>In this example, the graphics card (<literal>NVidia</literal>) has
-	been enumerated before the sound card (<literal>Realtek
-	ALC889</literal>).  To use the sound card as the default
-	playback device, change <varname>hw.snd.default_unit</varname>
-	to the unit that should be used for playback:</para>
+      <para>In this example, the graphics card
+	(<literal>NVidia</literal>) has been enumerated before the
+	sound card (<literal>Realtek ALC889</literal>).  To use the
+	sound card as the default playback device, change
+	<varname>hw.snd.default_unit</varname> to the unit that should
+	be used for playback:</para>
 
       <screen>&prompt.root; <userinput>sysctl hw.snd.default_unit=<replaceable>n</replaceable></userinput></screen>
 
@@ -401,25 +407,24 @@ pcm7: &lt;HDA Realtek ALC889 PCM #3 Digi
 	Sound Channels</quote> to multiplex the
       sound card's playback by mixing sound in the kernel.</para>
 
-    <para>Three
-      &man.sysctl.8; knobs are available for configuring virtual channels:</para>
+    <para>Three &man.sysctl.8; knobs are available for configuring
+      virtual channels:</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>This example allocates four virtual channels, which
-      is a practical number for everyday use.  Both
+    <para>This 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 configurable after a device has been
-      attached and represent the number of
-      virtual channels <devicename>pcm0</devicename> has for playback
-      and recording.  Since the
-      <devicename>pcm</devicename> module can be loaded independently
-      of the hardware drivers, <varname>hw.snd.maxautovchans</varname>
-      indicates how many virtual channels will be given to an audio device
-      when it is attached.  Refer to &man.pcm.4; for more
-      information.</para>
+      <varname>dev.pcm.0.rec.vchans=4</varname> are configurable after
+      a device has been attached and represent the number of virtual
+      channels <devicename>pcm0</devicename> has for playback and
+      recording.  Since the <devicename>pcm</devicename> module can be
+      loaded independently of the hardware drivers,
+      <varname>hw.snd.maxautovchans</varname> indicates how many
+      virtual channels will be given to an audio device when it is
+      attached.  Refer to &man.pcm.4; for more information.</para>
 
     <note>
       <para>The number of virtual channels for a device cannot be
@@ -451,10 +456,9 @@ pcm7: &lt;HDA Realtek ALC889 PCM #3 Digi
     <para>The default values for the different mixer channels are
       hardcoded in the source code of the &man.pcm.4; driver.  While
       sound card mixer levels can be changed using &man.mixer.8; or
-      third-party applications and daemons, this is not a permanent solution.
-      To instead set default
-      mixer values at the driver level,
-      define the appropriate values in
+      third-party applications and daemons, this is not a permanent
+      solution.  To instead set default mixer values at the driver
+      level, define the appropriate values in
       <filename>/boot/device.hints</filename>, as seen in this
       example:</para>
 
@@ -727,18 +731,19 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz
 
     <title>Video Playback</title>
 
-    <para>Before configuring video playback, determine the model
-      and chipset of the video card.  While
+    <para>Before configuring video playback, determine the model and
+      chipset of the video card.  While
       <application>&xorg;</application> supports a wide variety of
-      video cards, not all provide good playback performance.  To obtain
-      a list of extensions supported by the
+      video cards, not all provide good playback performance.  To
+      obtain a list of extensions supported by the
       <application>&xorg;</application> server using the card, run
-      <command>xdpyinfo</command> while <application>&xorg;</application> is
-      running.</para>
+      <command>xdpyinfo</command> while
+      <application>&xorg;</application> is running.</para>
 
     <para>It is a good idea to have a short MPEG test file for
-      evaluating various players and options.  Since some <acronym>DVD</acronym>
-      applications look for <acronym>DVD</acronym> media in <filename
+      evaluating various players and options.  Since some
+      <acronym>DVD</acronym> applications look for
+      <acronym>DVD</acronym> media in <filename
 	class="directory">/dev/dvd</filename> by default, or have this
       device name hardcoded in them, it might be useful to make a
       symbolic links to the proper device:</para>
@@ -746,14 +751,15 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz
     <screen>&prompt.root; <userinput>ln -sf /dev/cd0 /dev/dvd</userinput></screen>
 
     <para>Due to the nature of &man.devfs.5;, manually created links
-      will not persist after a system reboot.  In order to recreate the
-      symbolic link automatically when the system boots, add the
+      will not persist after a system reboot.  In order to recreate
+      the symbolic link automatically when the system boots, add the
       following line to <filename>/etc/devfs.conf</filename>:</para>
 
     <programlisting>link cd0 dvd</programlisting>
 
-    <para><acronym>DVD</acronym> decryption invokes certain functions that
-      require write permission to the <acronym>DVD</acronym> device.</para>
+    <para><acronym>DVD</acronym> decryption invokes certain functions
+      that require write permission to the <acronym>DVD</acronym>
+      device.</para>
 
     <para>To enhance the shared memory
       <application>&xorg;</application> interface, it is
@@ -785,35 +791,38 @@ kern.ipc.shmall=32768</programlisting>
 
       <listitem>
 	<para>XVideo: an extension to the
-	  <application>&xorg;</application> interface which 
-	allows video to be directly displayed in drawable objects
-	through a special acceleration.  This extension provides
-	good quality playback even on low-end machines.  The next section describes
-	  how to determine if this extension is running.</para>
+	  <application>&xorg;</application> interface which
+	  allows video to be directly displayed in drawable objects
+	  through a special acceleration.  This extension provides
+	  good quality playback even on low-end machines.  The next
+	  section describes how to determine if this extension is
+	  running.</para>
       </listitem>
 
       <listitem>
-	<para><acronym>SDL</acronym>: the Simple Directmedia
-	  Layer is a porting layer for many operating systems,
-      allowing cross-platform applications to be developed which make
-      efficient use of sound and graphics.  <acronym>SDL</acronym> provides a
-      low-level abstraction to the hardware which can sometimes be
-      more efficient than the <application>&xorg;</application>
-      interface.  On &os;, <acronym>SDL</acronym> can be installed using the <filename
-	role="package">devel/sdl20</filename> package or port.</para>
+	<para><acronym>SDL</acronym>: the Simple Directmedia Layer is
+	  a porting layer for many operating systems, allowing
+	  cross-platform applications to be developed which make
+	  efficient use of sound and graphics.  <acronym>SDL</acronym>
+	  provides a low-level abstraction to the hardware which can
+	  sometimes be more efficient than the
+	  <application>&xorg;</application> interface.  On &os;,
+	  <acronym>SDL</acronym> can be installed using the <filename
+	    role="package">devel/sdl20</filename> package or
+	  port.</para>
       </listitem>
 
       <listitem>
-	<para><acronym>DGA</acronym>: the Direct Graphics
-	  Access is an
-      <application>&xorg;</application> extension which allows a
-      program to bypass the <application>&xorg;</application> server
-      and directly alter the framebuffer.  Because it relies on a low
-      level memory mapping, programs using it must be run as
-      <username>root</username>.  The <acronym>DGA</acronym> extension can be tested and
-      benchmarked using &man.dga.1;.  When <command>dga</command> is
-      running, it changes the colors of the display whenever a key is
-      pressed.  To quit, press <keycap>q</keycap>.</para>
+	<para><acronym>DGA</acronym>: the Direct Graphics Access is an
+	  <application>&xorg;</application> extension which allows a
+	  program to bypass the <application>&xorg;</application>
+	  server and directly alter the framebuffer.  Because it
+	  relies on a low level memory mapping, programs using it must
+	  be run as <username>root</username>.  The
+	  <acronym>DGA</acronym> extension can be tested and
+	  benchmarked using &man.dga.1;.  When <command>dga</command>
+	  is running, it changes the colors of the display whenever a
+	  key is pressed.  To quit, press <keycap>q</keycap>.</para>
       </listitem>
 
       <listitem>
@@ -901,23 +910,22 @@ kern.ipc.shmall=32768</programlisting>
         depth: 1
         red, green, blue masks: 0x0, 0x0, 0x0</screen>
 
-    <para>The formats listed, such as YUV2 and YUV12, are not present
-      with every implementation of XVideo and their absence may hinder
-      some players.</para>
+      <para>The formats listed, such as YUV2 and YUV12, are not
+	present with every implementation of XVideo and their absence
+	may hinder some players.</para>
 
-    <para>If the result instead looks like:</para>
+      <para>If the result instead looks like:</para>
 
-    <screen>X-Video Extension version 2.2
+      <screen>X-Video Extension version 2.2
 screen #0
 no adaptors present</screen>
 
-    <para>XVideo is probably not supported for the card.  This means
-      that it will be more difficult for the display to meet the
-      computational demands of rendering video, depending on the
-      video card and processor.</para>
-
-  </sect3>
-</sect2>
+      <para>XVideo is probably not supported for the card.  This means
+	that it will be more difficult for the display to meet the
+	computational demands of rendering video, depending on the
+	video card and processor.</para>
+    </sect3>
+  </sect2>
 
   <sect2 id="video-ports">
     <title>Ports and Packages Dealing with Video</title>
@@ -930,162 +938,163 @@ no adaptors present</screen>
       playback.</para>
 
     <sect3 id="video-mplayer">
-      <title><application>MPlayer</application> and <application>MEncoder</application></title>
+      <title><application>MPlayer</application> and
+	<application>MEncoder</application></title>
 
       <para><application>MPlayer</application> is a command-line video
 	player with an optional graphical interface which aims to
-	provide speed and flexibility.  Other
-	graphical front-ends to <application>MPlayer</application> are available from the &os; Ports
-	Collection.</para>
+	provide speed and flexibility.  Other graphical front-ends to
+	<application>MPlayer</application> are available from the &os;
+	Ports Collection.</para>
+
+      <indexterm><primary>MPlayer</primary></indexterm>
+
+      <para><application>MPlayer</application> can be installed using
+	the <filename role="package">multimedia/mplayer</filename>
+	package or port.  Several compile options are available and a
+	variety of hardware checks occur during the build process.
+	For these reasons, some users prefer to build the port rather
+	than install the package.</para>
+
+      <para>When compiling the port, the menu options should be
+	reviewed to determine the type of support to compile into the
+	port.  If an option is not selected,
+	<application>MPlayer</application> will not be able to
+	display that type of video format.  Use the arrow keys and
+	spacebar to select the required formats.  When finished,
+	press <keycap>Enter</keycap> to continue the port compile
+	and installation.</para>
+
+      <para>By default, the package or port will build the
+	<command>mplayer</command> command line utility and the
+	<command>gmplayer</command> graphical utility.  To encode
+	videos, compile the <filename
+	  role="package">multimedia/mencoder</filename> port.  Due to
+	licensing restrictions, a package is not available for
+	<application>MEncoder</application>.</para>
+
+      <para>The first time <application>MPlayer</application> is run,
+	it will create <filename
+	  class="directory">~/.mplayer</filename> in the user's home
+	directory.  This subdirectory contains default versions of
+	the user-specific configuration files.</para>
+
+      <para>This section describes only a few common uses.  Refer to
+	mplayer(1) for a complete description of its numerous
+	options.</para>
+
+      <para>To play the file
+	<filename><replaceable>testfile.avi</replaceable></filename>,
+	specify the video interfaces with <option>-vo</option>, as
+	seen in the following examples:</para>
+
+      <screen>&prompt.user; <userinput>mplayer -vo xv <replaceable>testfile.avi</replaceable></userinput></screen>
+
+      <screen>&prompt.user; <userinput>mplayer -vo sdl <replaceable>testfile.avi</replaceable></userinput></screen>
+
+      <screen>&prompt.user; <userinput>mplayer -vo x11 <replaceable>testfile.avi</replaceable></userinput></screen>
+
+      <screen>&prompt.root; <userinput>mplayer -vo dga <replaceable>testfile.avi</replaceable></userinput></screen>
+
+      <screen>&prompt.root; <userinput>mplayer -vo 'sdl:dga' <replaceable>testfile.avi</replaceable></userinput></screen>
+
+      <para>It is worth trying all of these options, as their
+	relative performance depends on many factors and will vary
+	significantly with hardware.</para>
+
+      <para>To play a <acronym>DVD</acronym>, replace
+	<filename><replaceable>testfile.avi</replaceable></filename>
+	with <option>dvd://<replaceable>N</replaceable> -dvd-device
+	 <replaceable>DEVICE</replaceable></option>, where
+	<replaceable>N</replaceable> is the title number to play and
+	<replaceable>DEVICE</replaceable> is the device node for the
+	<acronym>DVD</acronym>.  For example, to play title 3 from
+	<devicename>/dev/dvd</devicename>:</para>
 
-        <indexterm><primary>MPlayer</primary></indexterm>
+      <screen>&prompt.root; <userinput>mplayer -vo xv dvd://3 -dvd-device /dev/dvd</userinput></screen>
 
-	<para><application>MPlayer</application> can be installed using
-	  the <filename
-	    role="package">multimedia/mplayer</filename> package or port.  Several
-	  compile options are available and a variety of hardware
-	  checks occur during the build process.  For these reasons,
-	  some users prefer to build the port rather than install the
-	  package.</para>
-
-	<para>When compiling the port, the menu options should be reviewed to determine the
-	  type of support to compile into the port.  If an option is
-	  not selected, <application>MPlayer</application> will not be
-	  able to display that type of video format.  Use the arrow
-	  keys and spacebar to select the required formats.  When
-	  finished, press <keycap>Enter</keycap> to continue the port
-	  compile and installation.</para>
-
-	<para>By default, the package or port will build the
-	  <command>mplayer</command> command line utility and the
-	  <command>gmplayer</command> graphical utility.  To encode
-	  videos, compile the <filename
-	    role="package">multimedia/mencoder</filename> port.  Due
-	  to licensing restrictions, a package is not available for
-	  <application>MEncoder</application>.</para>
-
-	<para>The first time <application>MPlayer</application> is
-	  run, it will create <filename
-	    class="directory">~/.mplayer</filename> in the user's
-	  home directory.  This subdirectory contains default versions
-	  of the user-specific configuration files.</para>
-
-	<para>This section describes only a few common uses.  Refer
-	  to mplayer(1) for a complete
-	  description of its numerous options.</para>
-
-	<para>To play the file
-	  <filename><replaceable>testfile.avi</replaceable></filename>,
-	  specify the video interfaces with
-	  <option>-vo</option>, as seen in the following examples:</para>
-
-	  <screen>&prompt.user; <userinput>mplayer -vo xv <replaceable>testfile.avi</replaceable></userinput></screen>
-
-	  <screen>&prompt.user; <userinput>mplayer -vo sdl <replaceable>testfile.avi</replaceable></userinput></screen>
-
-<screen>&prompt.user; <userinput>mplayer -vo x11 <replaceable>testfile.avi</replaceable></userinput></screen>
-
-<screen>&prompt.root; <userinput>mplayer -vo dga <replaceable>testfile.avi</replaceable></userinput></screen>
-
-<screen>&prompt.root; <userinput>mplayer -vo 'sdl:dga' <replaceable>testfile.avi</replaceable></userinput></screen>
-
-	<para>It is worth trying all of these options, as their
-	  relative performance depends on many factors and will vary
-	  significantly with hardware.</para>
-
-	<para>To play a <acronym>DVD</acronym>, replace
-	  <filename><replaceable>testfile.avi</replaceable></filename>
-	  with <option>dvd://<replaceable>N</replaceable> -dvd-device
-	   <replaceable>DEVICE</replaceable></option>, where
-	  <replaceable>N</replaceable> is the title number to play
-	  and <replaceable>DEVICE</replaceable>
-	  is the device node for the <acronym>DVD</acronym>.  For example, to play
-	  title 3 from <devicename>/dev/dvd</devicename>:</para>
-
-	<screen>&prompt.root; <userinput>mplayer -vo xv dvd://3 -dvd-device /dev/dvd</userinput></screen>
-
-	<note>
-	  <para>The default <acronym>DVD</acronym> device can be defined during the build
-	    of the <application>MPlayer</application> port by
-	    including the
-	    <makevar>WITH_DVD_DEVICE=/path/to/desired/device</makevar>
-	    option.  By default, the device is
-	    <filename>/dev/cd0</filename>.  More details can be found
-	    in the port's
-	    <filename>Makefile.options</filename>.</para>
-	</note>
-
-	<para>To stop, pause, advance, and so on, use a
-	  keybinding.  To see the list of keybindings, run <command>mplayer
-	    -h</command>  or read mplayer(1).</para>
-
-	<para>Additional playback options include
-	  <option>-fs -zoom</option>, which engages fullscreen mode,
-	  and <option>-framedrop</option>, which helps
-	  performance.</para>
+      <note>
+	<para>The default <acronym>DVD</acronym> device can be defined
+	  during the build of the <application>MPlayer</application>
+	  port by including the
+	  <makevar>WITH_DVD_DEVICE=/path/to/desired/device</makevar>
+	  option.  By default, the device is
+	  <filename>/dev/cd0</filename>.  More details can be found in
+	  the port's <filename>Makefile.options</filename>.</para>
+      </note>
 
-	<para>Each user can add commonly used options to their
-	  <filename>~/.mplayer/config</filename> like so:</para>
+      <para>To stop, pause, advance, and so on, use a keybinding.  To
+	see the list of keybindings, run <command>mplayer
+	  -h</command> or read mplayer(1).</para>
+
+      <para>Additional playback options include <option>-fs
+	  -zoom</option>, which engages fullscreen mode, and
+	<option>-framedrop</option>, which helps performance.</para>
 
-	<programlisting>vo=xv
+      <para>Each user can add commonly used options to their
+	<filename>~/.mplayer/config</filename> like so:</para>
+
+      <programlisting>vo=xv
 fs=yes
 zoom=yes</programlisting>
 
-	<para><command>mplayer</command> can be used to rip a <acronym>DVD</acronym>
-	  title to a <filename>.vob</filename>.  To dump the second
-	  title from a <acronym>DVD</acronym>:</para>
-
-	  <screen>&prompt.root; <userinput>mplayer -dumpstream -dumpfile out.vob dvd://2 -dvd-device /dev/dvd</userinput></screen>
-
-	<para>The output file, <filename>out.vob</filename>, will be
-	  in <acronym>MPEG</acronym> format.</para>
-
-	<para>Anyone wishing to obtain a high level
-	  of expertise with &unix; video should consult <ulink url="http://www.mplayerhq.hu/DOCS/">mplayerhq.hu/DOCS</ulink> as it is technically informative.
-	  This documentation should be considered as required reading
-	  before submitting any bug reports.</para>
-
-	<indexterm>
-	  <primary>mencoder</primary>
-	</indexterm>
-
-	<para>Before using <command>mencoder</command>, it is a good
-	  idea to become familiar with the options described at
-	  <ulink
-	    url="http://www.mplayerhq.hu/DOCS/HTML/en/mencoder.html">mplayerhq.hu/DOCS/HTML/en/mencoder.html</ulink>.  There are innumerable ways to
-	  improve quality, lower bitrate, and change formats, and some
-	  of these options may make the difference between good or bad
-	  performance.  Improper combinations of command line options
-	  can yield output files that are unplayable even by
-	  <command>mplayer</command>.</para>
-
-	<para>Here is an example of a simple copy:</para>
-
-	 <screen>&prompt.user; <userinput>mencoder <replaceable>input.avi</replaceable> -oac copy -ovc copy -o <replaceable>output.avi</replaceable></userinput></screen>
-
-	<para>To rip to a file, use <option>-dumpfile</option> with
-	  <command>mplayer</command>.</para>
-
-	<para>To convert
-	  <filename><replaceable>input.avi</replaceable></filename>
-	  to the MPEG4 codec with MPEG3 audio encoding, first install
-	  the <filename role="package">audio/lame</filename> port.
-	  Due to licensing restrictions, a package is not available.
-	  Once installed, type:</para>
+      <para><command>mplayer</command> can be used to rip a
+	<acronym>DVD</acronym> title to a <filename>.vob</filename>.
+	To dump the second title from a <acronym>DVD</acronym>:</para>
+
+      <screen>&prompt.root; <userinput>mplayer -dumpstream -dumpfile out.vob dvd://2 -dvd-device /dev/dvd</userinput></screen>
+
+      <para>The output file, <filename>out.vob</filename>, will be in
+	<acronym>MPEG</acronym> format.</para>
+
+      <para>Anyone wishing to obtain a high level of expertise with
+	&unix; video should consult <ulink
+	  url="http://www.mplayerhq.hu/DOCS/">mplayerhq.hu/DOCS</ulink>
+	as it is technically informative.  This documentation should
+	be considered as required reading before submitting any bug
+	reports.</para>
 
-	<screen>&prompt.user; <userinput>mencoder <replaceable>input.avi</replaceable> -oac mp3lame -lameopts br=192 \
+      <indexterm>
+	<primary>mencoder</primary>
+      </indexterm>
+
+      <para>Before using <command>mencoder</command>, it is a good
+	idea to become familiar with the options described at
+	<ulink
+	  url="http://www.mplayerhq.hu/DOCS/HTML/en/mencoder.html">mplayerhq.hu/DOCS/HTML/en/mencoder.html</ulink>.
+	There are innumerable ways to improve quality, lower bitrate,
+	and change formats, and some of these options may make the
+	difference between good or bad performance.  Improper
+	combinations of command line options can yield output files
+	that are unplayable even by <command>mplayer</command>.</para>
+
+      <para>Here is an example of a simple copy:</para>
+
+      <screen>&prompt.user; <userinput>mencoder <replaceable>input.avi</replaceable> -oac copy -ovc copy -o <replaceable>output.avi</replaceable></userinput></screen>
+
+      <para>To rip to a file, use <option>-dumpfile</option> with
+	<command>mplayer</command>.</para>
+
+      <para>To convert
+	<filename><replaceable>input.avi</replaceable></filename> to
+	the MPEG4 codec with MPEG3 audio encoding, first install the
+	<filename role="package">audio/lame</filename> port.  Due to
+	licensing restrictions, a package is not available.  Once
+	installed, type:</para>
+
+      <screen>&prompt.user; <userinput>mencoder <replaceable>input.avi</replaceable> -oac mp3lame -lameopts br=192 \
 	 -ovc lavc -lavcopts vcodec=mpeg4:vhq -o <replaceable>output.avi</replaceable></userinput></screen>
 
-	<para>This will produce output playable by applications such
-	  as <command>mplayer</command> and
-	  <command>xine</command>.</para>
-
-	<para><filename><replaceable>input.avi</replaceable></filename>
-	  can be replaced with <option>dvd://1 -dvd-device
-	    /dev/dvd</option> and run as <username>root</username>
-	  to re-encode a <acronym>DVD</acronym> title directly.  Since it may take a few
-	  tries to get the desired result, it is recommended to instead dump
-	  the title to a file and to work on the file.</para>
+      <para>This will produce output playable by applications such as
+	<command>mplayer</command> and <command>xine</command>.</para>
+
+      <para><filename><replaceable>input.avi</replaceable></filename>
+	can be replaced with <option>dvd://1 -dvd-device
+	  /dev/dvd</option> and run as <username>root</username> to
+	re-encode a <acronym>DVD</acronym> title directly.  Since it
+	may take a few tries to get the desired result, it is
+	recommended to instead dump the title to a file and to work on
+	the file.</para>
     </sect3>
 
     <sect3 id="video-xine">
@@ -1129,8 +1138,8 @@ zoom=yes</programlisting>
 	with stdin/stdout stream
 	interfaces.</para>
 
-      <para>In &os;, <application>Transcode</application> can be installed
-	using the <filename
+      <para>In &os;, <application>Transcode</application> can be
+	installed using the <filename
 	  role="package">multimedia/transcode</filename> package or
 	port.  Many users prefer to compile the port as it provides a
 	menu of compile options for specifying the support and codecs
@@ -1144,23 +1153,25 @@ zoom=yes</programlisting>
       <para>This example demonstrates how to convert a DivX file into
 	a PAL MPEG-1 file (PAL VCD):</para>
 
-    <screen>&prompt.user; <userinput>transcode -i
+      <screen>&prompt.user; <userinput>transcode -i
 <replaceable>input.avi</replaceable> -V --export_prof vcd-pal -o output_vcd</userinput>
 &prompt.user; <userinput>mplex -f 1 -o <replaceable>output_vcd.mpg output_vcd.m1v output_vcd.mpa</replaceable></userinput></screen>
 
-    <para>The resulting <acronym>MPEG</acronym> file,
-      <filename><replaceable>output_vcd.mpg</replaceable></filename>,
-      is ready to be played with <application>MPlayer</application>.
-      The file can be burned on a <acronym>CD</acronym> media to create a video <acronym>CD</acronym> using a utility such as
-      <filename
-	role="package">multimedia/vcdimager</filename> or <filename
-	role="package">sysutils/cdrdao</filename>.</para>
-
-    <para>In addition to the manual page for
-      <command>transcode</command>, refer to  <ulink
-	url="http://www.transcoding.org/cgi-bin/transcode">transcoding.org/cgi-bin/transcode</ulink> for further information and examples.</para>
-  </sect3>
-</sect2>
+      <para>The resulting <acronym>MPEG</acronym> file,
+	<filename><replaceable>output_vcd.mpg</replaceable></filename>,
+	is ready to be played with <application>MPlayer</application>.
+	The file can be burned on a <acronym>CD</acronym> media to
+	create a video <acronym>CD</acronym> using a utility such as
+	  <filename
+	  role="package">multimedia/vcdimager</filename> or <filename
+	  role="package">sysutils/cdrdao</filename>.</para>
+
+      <para>In addition to the manual page for
+	<command>transcode</command>, refer to  <ulink
+	  url="http://www.transcoding.org/cgi-bin/transcode">transcoding.org/cgi-bin/transcode</ulink>
+	for further information and examples.</para>
+    </sect3>
+  </sect2>
 </sect1>
 
 <sect1 id="tvcard">
@@ -1189,16 +1200,16 @@ zoom=yes</programlisting>
     <primary>TV cards</primary>
   </indexterm>
 
-    <para>TV cards can be used to watch broadcast or cable TV on
-      a computer.  Most cards accept composite video via an <acronym>RCA</acronym> or
-      S-video input and some cards include a <acronym>FM</acronym> radio tuner.</para>
-
-    <para>&os; provides support for PCI-based TV cards using a
-      Brooktree Bt848/849/878/879
-      video capture chip with the &man.bktr.4; driver.  This driver
-      supports most Pinnacle PCTV video cards.  Before purchasing a TV card,
-      onsult &man.bktr.4; for a
-      list of supported tuners.</para>
+  <para>TV cards can be used to watch broadcast or cable TV on a
+    computer.  Most cards accept composite video via an
+    <acronym>RCA</acronym> or S-video input and some cards include a
+    <acronym>FM</acronym> radio tuner.</para>
+
+  <para>&os; provides support for PCI-based TV cards using a
+    Brooktree Bt848/849/878/879 video capture chip with the
+    &man.bktr.4; driver.  This driver supports most Pinnacle PCTV
+    video cards.  Before purchasing a TV card, onsult &man.bktr.4; for
+    a list of supported tuners.</para>
 
   <sect2>
     <title>Loading the Driver</title>
@@ -1223,9 +1234,9 @@ device	smbus</programlisting>
 	components are interconnected via an I2C bus.  Then, build and
 	install a new kernel.</para>
 
-      <para>To test that the tuner is correctly detected, reboot the system.  The TV card
-	should appear in the boot messages, as seen in this
-	example:</para>
+      <para>To test that the tuner is correctly detected, reboot the
+	system.  The TV card should appear in the boot messages, as
+	seen in this example:</para>
 
       <programlisting>bktr0: &lt;BrookTree 848A&gt; mem 0xd7000000-0xd7000fff irq 10 at device 10.0 on pci0
 iicbb0: &lt;I2C bit-banging driver&gt; on bti2c0
@@ -1247,8 +1258,8 @@ bktr0: Pinnacle/Miro TV, Philips SECAM t
 
       <screen>&prompt.root; <userinput>sysctl hw.bt848.tuner=6</userinput></screen>
 
-      <para>Refer to &man.bktr.4; for a description
-	of the available &man.sysctl.8; parameters and kernel options.</para>
+      <para>Refer to &man.bktr.4; for a description of the available
+	&man.sysctl.8; parameters and kernel options.</para>
     </sect2>
 
     <sect2>
@@ -1281,10 +1292,10 @@ bktr0: Pinnacle/Miro TV, Philips SECAM t
     <sect2>
       <title>Troubleshooting</title>
 
-      <para>If any problems are encountered with the TV card,
-	check that the video capture chip and the tuner are
-	supported by &man.bktr.4; and that the right configuration
-	options were used.  For more support or to ask questions
+      <para>If any problems are encountered with the TV card, check
+	that the video capture chip and the tuner are supported by
+	&man.bktr.4; and that the right configuration options were
+	used.  For more support or to ask questions
 	about supported TV cards, refer to the
 	&a.multimedia.name; mailing list.</para>
     </sect2>
@@ -1294,44 +1305,45 @@ bktr0: Pinnacle/Miro TV, Philips SECAM t
     <title>MythTV</title>
 
     <para>MythTV is a popular, open source Personal Video Recorder
-      (<acronym>PVR</acronym>)
-      application.  This section demonstrates how to install and
-      setup MythTV on &os;.  Refer to <ulink
+      (<acronym>PVR</acronym>) application.  This section demonstrates
+      how to install and setup MythTV on &os;.  Refer to <ulink
 	url="http://www.mythtv.org/wiki/">mythtv.org/wiki</ulink> for
       more information on how to use MythTV.</para>
 
-      <para>MythTV requires a frontend and a backend.  These components
-	can either be installed on the same system or on
-	different machines.</para>
-
-      <para>The frontend can be installed on &os; using the <filename
-	  role="package">multimedia/mythtv-frontend</filename> package or port.
-	<application>&xorg;</application> must also be installed and configured as described in
-	<xref linkend="x11"/>.  Ideally, this
-	system has a video card that supports X-Video Motion Compensation
-	(<acronym>XvMC</acronym>) and,
-	optionally, a Linux Infrared Remote Control
-	(<acronym>LIRC</acronym>)-compatible remote.</para>
-
-      <para>To install both the backend and the frontend on &os;, use the <filename
-	  role="package">multimedia/mythtv</filename> package or port.
-	A &mysql; database server is also required and should
-	automatically be installed as a dependency.
-	Optionally, this system should have a tuner card
-	and sufficient storage to hold recorded data.</para>
+    <para>MythTV requires a frontend and a backend.  These
+      components can either be installed on the same system or on
+      different machines.</para>
+
+    <para>The frontend can be installed on &os; using the <filename
+	role="package">multimedia/mythtv-frontend</filename> package
+      or port.  <application>&xorg;</application> must also be
+      installed and configured as described in <xref
+	linkend="x11"/>.  Ideally, this system has a video card that
+      supports X-Video Motion Compensation
+      (<acronym>XvMC</acronym>) and, optionally, a Linux Infrared
+      Remote Control (<acronym>LIRC</acronym>)-compatible
+      remote.</para>
+
+    <para>To install both the backend and the frontend on &os;, use
+      the <filename role="package">multimedia/mythtv</filename>
+      package or port.  A &mysql; database server is also required
+      and should automatically be installed as a dependency.
+      Optionally, this system should have a tuner card and
+      sufficient storage to hold recorded data.</para>
 
     <sect2>
       <title>Hardware</title>
 
-      <para>MythTV uses Video for Linux (<acronym>V4L</acronym>) to access video input
-	devices such as encoders and tuners.  In &os;, MythTV
-	works best with <acronym>USB</acronym> DVB-S/C/T cards as they are well supported by the <filename
-	  role="package">multimedia/webcamd</filename> package or port which provides
-	a <acronym>V4L</acronym> userland application.
-	Any Digital Video Broadcasting (<acronym>DVB</acronym>)
-	card supported by <application>webcamd</application> should
-	work with MythTV.  A list of known working cards can be
-	found at <ulink
+      <para>MythTV uses Video for Linux (<acronym>V4L</acronym>) to
+	access video input devices such as encoders and tuners.  In
+	&os;, MythTV works best with <acronym>USB</acronym> DVB-S/C/T
+	cards as they are well supported by the <filename
+	  role="package">multimedia/webcamd</filename> package or port
+	which provides a <acronym>V4L</acronym> userland application.
+	Any Digital Video Broadcasting (<acronym>DVB</acronym>) card
+	supported by <application>webcamd</application> should work
+	with MythTV.  A list of known working cards can be found at
+	<ulink
 	  url="http://wiki.freebsd.org/WebcamCompat">wiki.freebsd.org/WebcamCompat</ulink>.
 	Drivers are also available for Hauppauge cards in the
 	<filename
@@ -1342,7 +1354,8 @@ bktr0: Pinnacle/Miro TV, Philips SECAM t
 	restrictions, no packages are available and these two ports
 	must be compiled.</para>

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

From owner-svn-doc-all@FreeBSD.ORG  Thu Oct 24 01:29:48 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id BC32480;
 Thu, 24 Oct 2013 01:29:48 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A7E2F2EF5;
 Thu, 24 Oct 2013 01:29:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9O1TmCo037416;
 Thu, 24 Oct 2013 01:29:48 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9O1TmLN037415;
 Thu, 24 Oct 2013 01:29:48 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310240129.r9O1TmLN037415@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 24 Oct 2013 01:29:48 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43038 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Oct 2013 01:29:48 -0000

Author: dru
Date: Thu Oct 24 01:29:48 2013
New Revision: 43038
URL: http://svnweb.freebsd.org/changeset/doc/43038

Log:
  Fix typo.

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	Thu Oct 24 01:28:39 2013	(r43037)
+++ head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml	Thu Oct 24 01:29:48 2013	(r43038)
@@ -1208,7 +1208,7 @@ zoom=yes</programlisting>
   <para>&os; provides support for PCI-based TV cards using a
     Brooktree Bt848/849/878/879 video capture chip with the
     &man.bktr.4; driver.  This driver supports most Pinnacle PCTV
-    video cards.  Before purchasing a TV card, onsult &man.bktr.4; for
+    video cards.  Before purchasing a TV card, consult &man.bktr.4; for
     a list of supported tuners.</para>
 
   <sect2>

From owner-svn-doc-all@FreeBSD.ORG  Thu Oct 24 21:24:35 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id BDB06F26;
 Thu, 24 Oct 2013 21:24:35 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9115C2C22;
 Thu, 24 Oct 2013 21:24:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9OLOZ3q043840;
 Thu, 24 Oct 2013 21:24:35 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9OLOZaq043839;
 Thu, 24 Oct 2013 21:24:35 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201310242124.r9OLOZaq043839@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 24 Oct 2013 21:24:35 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43039 - head/share/pgpkeys
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Oct 2013 21:24:35 -0000

Author: bdrewery (ports committer)
Date: Thu Oct 24 21:24:35 2013
New Revision: 43039
URL: http://svnweb.freebsd.org/changeset/doc/43039

Log:
  Update my key

Modified:
  head/share/pgpkeys/bdrewery.key

Modified: head/share/pgpkeys/bdrewery.key
==============================================================================
--- head/share/pgpkeys/bdrewery.key	Thu Oct 24 01:29:48 2013	(r43038)
+++ head/share/pgpkeys/bdrewery.key	Thu Oct 24 21:24:35 2013	(r43039)
@@ -1,183 +1,62 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh bdrewery 3C9B0CF9;
+sh addkey.sh bdrewery 35D771BB6E4697CF ;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   4096R/3C9B0CF9 2012-04-06 [expires: 2017-04-05]
-      Key fingerprint = 36FE BE99 2F52 80DF 4811  362A 6E78 2AC0 3C9B 0CF9
-uid                  Bryan Drewery <bryan@shatow.net>
-uid                  Bryan Drewery <bdrewery@gmail.com>
-uid                  Bryan Drewery <bryan@xzibition.com>
-uid                  Bryan Drewery <bdrewery@FreeBSD.org>
-sub   4096R/9E2CE2D3 2012-04-06 [expires: 2017-04-05]
+pub   2048R/35D771BB6E4697CF 2013-10-24 [expires: 2018-10-23]
+      Key fingerprint = F917 3CB2 C3AA EA7A 5C8A  1F09 35D7 71BB 6E46 97CF
+uid                          Bryan Drewery <bdrewery@FreeBSD.org>
+uid                          Bryan Drewery <bryan@shatow.net>
+sub   2048R/FF5A7FF27D55A32D 2013-10-24 [expires: 2018-10-23]
+
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQINBE9/K2UBEAC9jcJzDtt7Lih/ccwv71FHyVL8X23Fsoa0oMHKhw7o5P2PqRfz
-x3OKVyjzGUT7wzrmWoYPbzXrPMQlHUMq3I37F2q1XrB60ga+h8JpzrydPwM9opDI
-HaGmlcYitTFigjko/Gq+ioW+YSMr03lKuxtsPgb0GcDPkrhq4sNMHMXVw3fWCIiW
-tSHzhr5p6ATjh+gqxTQQ7hmrRCIUIch+QQoaBdsZI9leEWwcvM1rM+BStFhyu5vn
-bdJVpTGuE/7fhAyV/Ncf1iN1UHDi7Ow0KptMzVe0ENkM9QLvpDK3Aryx5PYUptSx
-gtnRDLuRwso8rsHZNWOBQAjR9jKpzX9nqhr4bVUMl629KBLqwsZp7e94gCO3+EXr
-4Ln+k/aXEZ13j6+/NZcmsJ9nuNHwka25yEVCwBl4FI+8QmJFc0VMHCbZ3+pyoWDR
-i4WWJiM2/EMur/qyxx67h2DuvqMVC5xrohVo3xzbfOy8Yn0P+tKjLmwlykgIyFPN
-0SrkVmwGp6G8YklgH6XhOJJZXKhzTict6t26JmxHk2pbn130awvRWNuBUHhPtkcM
-n+FRgzp970hM34CJWt+rLg8i3MoblhK0Ca10e3/k39GuFviWkdOXl9iypSRUyi2S
-KgCV6SdnctOjKYkbGbQtzPT0YtPokoDTrPfjw9iRBwIiGS2dhPdNpWXJSwARAQAB
-tCBCcnlhbiBEcmV3ZXJ5IDxicnlhbkBzaGF0b3cubmV0PohFBBMRCAAGBQJP0Bzl
-AAoJEFi7lhvQKwF5e6oAl0qroDYO+wM+MXko5e7a+BrJHlMAn2+k3dPXF7Fgm5+2
-w56QPy0vUSLHiEYEEBECAAYFAk+DSSYACgkQWlMewKPdsVUJYACdG6nA81tN1c54
-NotwNG6mnK9+OLMAn2baiPRzukv+bQ/EDenDuOrvu2axiEYEExEIAAYFAk/QGf0A
-CgkQNhxfcKl3LdMmegCfRlJVTOKVI1GJVHzz1AfKHgDTKWgAoJbqDy2cLknzsDv+
-y8XvXcx2jmg5iEYEExEIAAYFAk/QHUQACgkQZJPXj0JF1/VNjwCeKXeAsO+h6dK7
-Zt4iomRJxhxU30oAoMArYkKw7GWMGXXCmziVFYXtdnqviQEcBBMBAgAGBQJPfyxy
-AAoJEF8gbo+k61CF5zoH/RMAqb8OVw3FAtpikWur42pAUB15fijLnKtjt+hqcLTg
-jr/tO36o+WsKvE0UawND/SFSB8BKhn0pgPUBcLGZ7y1u3iaRebhG1ptcvympOrvm
-Ngrh0XNL+DF14KC/53InEe6Oj9gUQ4lNhiDR94oVOZkIRQhkvvc/zjGhStMvQVUl
-+iTo2NuSGm+YgTqd0dPmudDlT0LvsofXE9tbfIxvWaN6e5J1W71ENMlB1161/3Y6
-SYB00vylHPfEx/jDufCjxBayQVbe1nlLt+lCusKZFSxgA7IwfhDJzL0X+SW+H+7G
-OINGITH4iz9Fg4RWn0ql6wekZOQcNafYSLyO6T1e70+JARwEEwECAAYFAk+zomoA
-CgkQKuX60AZKS+rmXAf+LLH8ZjeIfzhEpsZ/QMPJJ5hMEd+EzkzSnuV1cVzEZt1H
-2bGpd3Pe88Y7ieniRpHLcF6ReAc5/yvXtUM0+rcd69vMhfrg5hvKk6tx/sBZdSFC
-cT8iJ3z7VLmmwIyZ2+fVk+Bd7BNYZVs19UV7rmKmxo1JwY7fwg3R7poFlTRkdW64
-bHmRSdYg9lh5TbeKvQMWj/t+mRudLW/gkja8eTAGjlVRzn+6pgHgUqs4OjI5Dm1y
-RHh+C2zgUL1ixnlqmwALtf0AFs65hU3YKoJrpN2patc9HNi6q8CqbM6alQNQUGYN
-lKQ9oX2fltvKAJqlbF4OIWV+yrSUvodLnhuQLviJUokCHAQQAQIABgUCT38vLQAK
-CRD2HinY7QNRF9QyEACY+Y9tBNLMJuUUY4UbFHIewilIN0+h4Z5KPLldmjLWfvz0
-/Oh7mKucDFGQvqgGQy3UfpJHdbA6l2XDLiM5jENFHfDjq45wC6TYmLIQX154r6y5
-UWxxYMgx/GyvxlyKC5Ox3sw/RiSxappC6Fjcmubs6AcX56PXeU/r/Y8nLjG7fGUH
-iRd5shqIFLP3SkoQThECoLdST/n7gcnK6oHrgKFVkSyeab/KS8NvEWWfE02kDGVm
-AGCGf8X2ABVcv1rEk2fZLl4tMBGJhcz+a4LNM1+kjQFZnSo3LolFRjau6W6JL84I
-84KpYpTJpdP4xZRIK4KCKAFQ3u/WK43FCumyQ5lIAhC/UHaT1zZI8C4OnIF+144M
-b3EK5qzhuJB4Nuu429NkcQPgBbuDmW5rhQ1/cH5IIDgOJBG2FcTkSyz+62ecZOq2
-+EqVfplXlHc3jn/VFpQWo3FRSL0oTfbYPwor2InogUDS6ieqJvUsMWt6qZRGILUP
-0tr5P42flT6sjMcv3WTUo66jKYcj2dhSSMx5rqaETPGaOWK/8vGWHwYnsWdCV0An
-q9sJ4yClyVTQttwLYgHN+gSzQah3t7qqG0Ofq18cUvLRYFJsSlN6j7Fxy3z/RsHL
-xZEiyhwpZKtwFDSR2BQKmVUnxJpjd3xsMypCD1/rK59UC729AiAkEdE+ng/gGIkC
-PgQTAQIAKAUCT38rZQIbIwUJCWYBgAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AA
-CgkQbngqwDybDPkwkhAAm/UVTf5EHLCX++PSbDZc7d8K+Sa0ZZQ+fDqMtgoxfe6Q
-GXN0uwwKUVf5Np2i4wR1lCWm7qaBAQEIuowdFCFEBtpAEzMp+mXWYeib7Us4+rfk
-AQ9b8Wu90j0Uo9fa4AreNBCmeB7WPUAcqzKCBo6vQzGlZ3fpt486GCk05FvEaRjB
-+CnGFgNrhgm/hJiFs5Encn+KlPoS6FCpfpACQVaHLHTOvDMUc48Mh32YbI0nywnS
-uARllLcdk7zI9ASbckBnrFghJ36elPgPwAoDPur/5qJf9B0ZMi/qb0/vGrP8tPd0
-9v70FbXMSnU1IsQlIam1N2VxW/PdN4vW84CfP2Z3LONrxt0wpzG75Kg6DUQySc4H
-XQ51z+iUJ2PW1IY6Jaf2yHWmJDTByR/UBC8yzyDB9A8fvkRTHNM9N9ruroaDBpNn
-djA5vdOKRvcK00ggWIyABaFQdmqxLw2PmiA6iVxe+qEE3k2zxrU09xYWIkyeSLrq
-RhL2r5+/fcTY26B/FnjLXu+z65XGRarscIATg2SiK23BijsNgB72HfqRfb+GB2jt
-OKjvKa92hUk7vRhvU7NcbmSJdWoFwx+AESzw4vNPN4vtZq/Ebf60tF0Qo2kv0GNh
-2r923C4efN4XKp7yBT4ehXSuJJT3rXCA5CxiZq07cxDjsK7C15zt3w4hRdAQHuaJ
-AkAEEwECACsCGyMFCQlmAYAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheABQJPfy0A
-AhkBAAoJEG54KsA8mwz5rJQP90RghGkhk6mf/4p5H3cGQ8owOcHIPNgOExGbscbT
-x3q5b1DyJQYZgEAW1FGVdiGdPMp753JZAW617J8f8dFI26tYTZxEkQBC8tRxKSsN
-Soah1wmQSibc00ypFsFiXWtvNr1FETe0jD4dn6ozW9FCixEpbSQioSjJBtwU+XkL
-KnZii1faUgo96EnFFmk2w8l/iZpwvoinb4LahS3vOnEKc7yR5KBThxu8ZFx/BiC6
-5wSJ6D2uEd3BvbcjKs8lV8V2KeDiKwHzo8Db/Pam9EM1hxqcdB+VrTWPYn7LBMqO
-K+CUtASWcd4AkNvBn3VW6kiCHCg5Uom17MzcKco4axW7fHNCUZ8/6UWbjhVUZt9i
-/ogKwtHeo9HTwy/flvC8AmYzC1livVcfN15YUe0cT7QWn1GQV8ktrODYrq872nPj
-83MruRgvApizLSLdS7CWBOtAiHIXZ+2XlQiYdvqcQor0ap3EBEwxV/4+fsMTbzyg
-LKyAf9/NQcmKtNHEm81xdDSk068l40W1jvPIQvjl5ruLscQN3fJA+maO3k30N/8a
-KZFg3ZuZJMY15UMIg7yIA611eukY7GbxaS6oy00Y/UnhOcYzaiwgMg/RA/hXqoTi
-nfczllM4syfGxirvZ6PJXtCUEgMa3e0pq2rguvFVEXT5XIFMWYtRzpdx9tj/4l4s
-NKO0IkJyeWFuIERyZXdlcnkgPGJkcmV3ZXJ5QGdtYWlsLmNvbT6IRgQQEQIABgUC
-T4NJJgAKCRBaUx7Ao92xVfl0AJ9FAyXtCMuExDDS5/HlqLS3DuloLACfUeuAs4oj
-QDYisS5m60e1Qx4+1DuJARwEEwECAAYFAk+zomoACgkQKuX60AZKS+otrAf/WqMO
-1jzlfWLLE474+oLakpzDx8/lg4MH5ufUnk2N/XsRe0XGW67t68SJ06d4R6kbWyix
-0NXnEz3tn/bOtn2erj3dqmOUin5KUjip95sEvi2H3cwhBdtQ984FXLNSoEWC6uDm
-BWKq7f0EQUd+y6g7ZlhuMBwb25PBwNYhZJXvGCaRNMqBxtxA+oCP5MRKjQ7OHyOd
-bs4Om21mRtYPqdzACEr2CaV3xPFlNpZaGj+wIqp7yLu01BLyQgplROVMKG3beQYW
-ceNW3ESwxaFu+PzSn3dPL7Y4fmfjU7rxO4AoxTDwULQFNhDa+1zKf2PWIgkxkeGI
-Zt48nrtEBrlz47YqsYkCHAQQAQIABgUCT38vLQAKCRD2HinY7QNRF8prD/sECeC7
-NEO63Fu0jdeY6VbVzPJvp5RpGMcExM5iWeIEmEr6qs1/pD99n3oEKD0Zgtr7Ucjg
-i2057gdZFHyZyhYJb8IbLGTeDPc4HlAUNiqVKej+N6rr+p4Rdzak7LlAHlQAICzA
-QMbfI27Ro6FX7p+0mLLw6d+z/mBjLiGgNJ6lY8+YsIiX+UGxFPzc8A7eJPaqQWmS
-fhZMsoW/C2rOxYPp681XvdSuMn3iIcNko9T3GhNVgqfLhZwmJ1We0UpBYStDvcrd
-cKXIlohFyoz/W+uaP7wjE8zVdIuYca8BcjWaK9vIV60mRl5eQYYHoQgClYaELSlK
-ixYWt+eEziruEvegddJJMnhIrtPd8PqGO97B0X+913YCqGWD/0URnz8/ICSwJata
-M2i6Sk0qs6i6NgjkIoJFOnZvX6YCGkrSVMwxwCMU7fL8DM4JsywkOKbww9K04Tc1
-V4c0vANp2ZBf0FEKm4i89Lb7IEQL/gkCGo1cGKiOdKikW+dKlKXxyJx556cyGCQ0
-dKTgFbM5w0WtfpGKMReKSF+tfPbtoGLRGeH2dPx3QOJfE5W/lLgOhW+EWhwL4bm5
-C/qyqEUQlapBxfcMnsTGcAADJeeBNuJkXoWp6IS1hj0iWBUiuTTHas4RH3fZBbHP
-cOmfyPgap4r+8IfLZMH8OzWsS72o6dCJxCPPAYkCPgQTAQIAKAUCT38s8wIbIwUJ
-CWYBgAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQbngqwDybDPm4dBAAtR8L
-4FXjpbb59b575eagyqzhyLfEV2d5xhHcEOVEBswN7NKUtC0Jb3yJOOvYzzGjsPlp
-13qs32XVdrD8+MBL3es5qpnkRyiftCKh730XN/roDgMZNboImSSq0wQSjFE4DMbD
-m+4aYYY0kk35wsCUDY6s6HTeD08HUn6gQsH/N1PpVN1BSCCKLornjnBusC16i8mX
-LLn0v+mg3DCv9KYP6fuBX7ps3effoWn8hfivmoSFL3hsgGRErmkNpDUq4O4Szqdq
-riJIKpFh/J8Ol6kaFOJKGkXVqYizcXIVuO+kCAVGILtPeBH+vEH/GKyaQXh1Gp40
-cfOxIunYg4jdaAc3XqNHypRvOUC+qbSHCRsK8rzDVWaNEHr9JujVnA46VfmyRnqg
-tw7c8uvN2bJa7vAGZFO8Dab25DFjF+POqv5uIV63fD21SgN6Vyi0F2W/tjUNbWSF
-2OLFTgxXKJNCH/YoT+Q+cvNbS/9PZevJxrmBLWLBQsJ76DLv86zE4UhPjUSUyEbA
-rJF0jfCu2a0a+bHFqYyTgeZR9GaMGHIuXb/gL8kQGvP1JSbcLMk518Z2j8M6WtHy
-/CwU2qsIRfRy2XmVJ3e3Ac6fQCBeJBJ2EiVAb7SySLix5bZPj/VUUzDtrwSHDL27
-Fipje2jKJpR7dkg51PrYWnX44OZrhNi4bgpu9/i0I0JyeWFuIERyZXdlcnkgPGJy
-eWFuQHh6aWJpdGlvbi5jb20+iEYEEBECAAYFAk+DSSYACgkQWlMewKPdsVVJ0wCf
-SzW4FG3a246rUWhICz3KeTutGPkAoJ/ZcZewI8zUNavcVtpMkDTobDj3iQEcBBMB
-AgAGBQJPs6JqAAoJECrl+tAGSkvqhKEH/2mqeekX0QIsMzRPFwfG8JTrPRRuGI+E
-n92r95qSFhrWA+segnBEnTc4ocFBFYdCaCGZZ2swpY0Xl2vJcfEliyJ4t4NuHdLa
-qszR5SS3KygwnN0PoV+qWU/jVbETOimjcaQaNThBgLWCwDpsZL/5Fzwx+b7ZDk3o
-MYDlQ2ZlXfGxVANx3AJv1mVu30wElCweRaWqfND93XWaK+knXV1lK45t91sGy7UJ
-WhEnu8O9NDwJEk9+PHdeto+1q2pZCoUP1xY1Mo6X5rCO6wVBJ0FLqi0Dg2QzfRnm
-yH+n6wfIEYXxDywFkI2oRwcfTah/UrN1A6cIyYuSN2y2Z7735xnoVP2JAhwEEAEC
-AAYFAk9/Ly0ACgkQ9h4p2O0DURfj8A//Zm5j0nez0/TvICDOaHTCskpt5q1lc/+d
-KUgmeb1pKVsdgZEvrtf+QbY0S92dXKaxJl+j6jWqZL0+k4QjZg7hjddlAhoDWan3
-VwMaDxS8Y5UrT5EXGtinMVhM1Mmh6R8AoC8jXv5tyem1CYfJ3yQs8UXdqcVp2DOh
-lGc3uh8xM8xbMemC6AyozSMXQrmV9XjpXFX+CSwQpkE9bG1xjUGuhDGJXn2f2ajV
-uSBhonhn3bUTGXVfJWPiqaJuuu62Ljiv0L+6/a6MGcOqJJoMFBoRDJ/f48kNBQiv
-/eYeFvFdPZU/ilXieP4ldkxv7FQ4trIWVB+Hxz/tWqx2/nV11RPMdJbXUiQo0NtC
-G5nyQTGdLkMaBhQv9QVfGW5ctP19asJLv7H9RcBurlqH856D5hWGHwr5vBRw9N6S
-omT4vveecJiq4uE+LnETFVImYPJmTG78Mdjpr/hnwUjM+7/3mROssubbzmUnZ2HM
-bf3jmPGYteKc1UL0Rq9ThbPn3BI7NLsi3owBysOKszclWglX6/a2PwH1mTAqQvgs
-78Mk3H7KJcHEZYO1kLKjyVMVbUv2UKn314DTw2BzFiuc05J3Ynjk/9Sn04kdaCPg
-/68Cx5U+O8ahO2bqw/5fPFssGtztCqpM3m7sjlFbbVxCSd5p1Y+kWgPXcJkTL98K
-m6IRJFWE9oKJAj4EEwECACgFAk9/LQcCGyMFCQlmAYAGCwkIBwMCBhUIAgkKCwQW
-AgMBAh4BAheAAAoJEG54KsA8mwz5XMsQAKwFXT217QP+Nd/4ih9Ccpe+3woYBBbf
-sF/s2Lmnb+nuX9u2a7kyk6dfuC5x1mmT6+1AUpd3EY6wz7x5sDCLVIO8HSpSvvuY
-MsjI1dyBr0pMbyXMLqxLkrPwFtNHk9vo7Gn4rDaREanQ6CYwQ+KEvc/MqOywGBne
-F5gcKF8LQcoVTwpFC7m7ACFv2KQxYJ+zR54zzi9O/Nb1ajlw8bSU+/egYOCCto0X
-D1BqRTL/YZwkUuR31dEoz7MJ729KTAXF3X2gMU08ZCTKR+K6Rs1uG8/ibePAbZWH
-tOyZeY5TMBJIt32ZvFdI6kDXAiZNWy40xot/jSTXlIplfDyWn/SQt4V0RvbwdVb2
-RUsyh9R6shEp0/hU83vGyWMd3eIK0tBKn5saq5xiInLFxce8DaYPqQ3Z/CGdTeoX
-8JAMejImqHdx8JXR+xFHzbm3dwBQ4LimvbDCTqaWMo8h3M7k/kT9Y0A5jmektAYs
-BSx1wWBAs1oJlmKenZwLHEc7BFUVO9Tv8onZdG9x6+kxeYnYk91edUUTraL8tpwd
-xqkwR8ljRANrlyeEtF7bHkIZAxLDIsX3mz/B2xE6e8ItFRYkM6y+aWu+pK2jBtYF
-Nzyhr9zTTss6gAio1wX4Sh68FQcfhRJnjqAPPH0OK9AblsJlKMlnez9v/GKFXUAg
-rH5HSmhrszYMtCRCcnlhbiBEcmV3ZXJ5IDxiZHJld2VyeUBGcmVlQlNELm9yZz6J
-AjwEEwECACYFAlAZTxMCGyMFCQlmAYAGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK
-CRBueCrAPJsM+fEbEACvEsDsyFYdFWqPomt7Iu5XLlDSibOj+f4GJBpBIb8P0QAV
-ah4Cg6DiI+HQliwgo1dEONJ8bi1N6tGMQWWRG9LCw1eazZp2GRySL0eTdpLLfSZr
-JkWEHiPNW9EKPp8cJNCnxTNJ947ME3icAiA+C6ftl65DaRvg8RjiQP4qmPt8nnba
-b6UDMIYVO+uzEgJQ4K7nxTk1uL9L7pm+XgYHslFrfo2T2+c3uKxkI+YUENLs2enp
-xhEEZ/yv2A78CkD2QJFtXr2yJtCzkjz+tZFsl0AN1IZDrOWUE6W8Q23M30lb0A0p
-tPujMKI7PvUkCSI1a0jJEpWBEIe2AGwhI5bzSkbIiXnCGiNsDOKixm5DpAPlGpUz
-XB+EQKlmnqDOcUyfkagktpTg/fdvpX5w4POsBg92FXL2ZjY0TBQ6UCGcLr7JtcMe
-kCL5a/ll/5N5PgkzOktphxjtFF3ul4Najs0QJrOJhWcoiUX1uHfbntL0swwLCeq7
-Ag9KXmzAMQGVUTylnTjuElvjRhQinImeqQkprsoF+m3Fk6s6XtFfGX1Jn81nF9So
-TReVoWusFOKjYUwnxjuWNtAp4H1kaGsLDiq/2pITfMo6G9ABrzEIBXf4+X+QZiGv
-kmX7NyzKu+80BRsd7l1GHPiJKyje1+xLtUux41bUYvwQE+xkotxOGDbKaPa+iLkC
-DQRPfytlARAAxGZnmCdKNElLjF9yNqDpSH1ae5VayK96+XjJxcgbmLk0yX4jC/1a
-TxDszurZl6So+8c7++jl0oHjsGAVgKGuJagTyGzVPYjMdMn03SnJmgaBg4ihq0VO
-0ehAcQ+gUmkQuogrqL+6SCQvNRZv2alSF7KBJMahNGkviqb2hcCZ0+EGH8W+jD44
-/bHCrFJOnSpPe4fHXFkACUMx0Ika00OXUABT7Rd/f0jK9YMIOu6ce4m4+L9Iu7MC
-OJcCxX8WmqFINtoIXaoVM3jJS5ekKmfwku+aoTXCRV63VuOnThitnA8gR7gIHzdb
-740Ve8m3mYldtjkdp82X4b70lwxwHoEg6UMK3CXXXdn2Stk9Wxi9x9mH9h46R9v1
-5Epgxym8J5ih6BXQ7VSQDlJPW35jp3uDSdorfFzn3O7wfr8zpRDZ8oTy97TlAA8x
-vCB3kUP0x15skK6rNUGFkncb4WzFr5utoeMIfjftdo1DEpeWCrfwaRJG6sgFlvQG
-5iC/8Ke7vKWDVjUJPfVE6LM6Q7uJV6KJpkDS7UKKTdOpwezm7D9f/xCn/vcgCZm4
-4+1ug3wjvtIHR4dByPAbhYJSb440YQZHNZ8GSUK/45qS9C/B2H03rxUCHsT+0LyG
-OD+40dQTahcMMJwLKFx37+xVvvScLAMCAZOk+zI9N4JfLayvcZodXl8AEQEAAYkC
-JQQYAQIADwUCT38rZQIbDAUJCWYBgAAKCRBueCrAPJsM+UzUD/46/TZsVL4H+vMN
-guTvCmul3ztK+N5oxwXLZFM3gCYREy/783IKpoH7USOarZXan5XV+OuJqKpznJJJ
-uUWOzMSArqYdpObbxju9PNMLFc6yHZFKzkgdbL90fNsXjs42GEuVgk8vqo5aHqde
-oZnVHWiu7DJu0U7ryvYO3hpaIQwWSSBnrNavz26m+bR3XEa4+oEvmzMEP9DG/4ym
-KFhOgBvjwDG9xkn1p7Noyw+17cETYp/kE0CpKbtashV/QO5+D1sE0jJ2Qy+TmXil
-52NnmhgNZYm+6q3UYVm8J3j4sYzKGLAURpPkJnfjSz6OlMJscBakQZ/oul/eb6DC
-tvqWgZTyML92k3ZvQPbk0ZM159osCKbkpYE+9epgLbLIQ+HaeNDx8UkQcWBRH9qM
-+RnjbQEBWc6qIihgWK5V8NaBfAMnUP6MBSk3Q79yVvTBJ2yoyLmQqOw5btOjhbO0
-bmbyxHO7WP6fF9TusxD7o5jpziJBcTDFg6e09+el4se8NHmkyK4nxDdlIaZkHk4A
-GMv28Y0tMM1fvBuIzTCe/6sEyj3Sqk/ghdRcC0JtHctQF4/xjwLFlWHjQtbTjO2E
-lwP/FkJClOS/9Va2d0CXb3mv/+GubknGAnZJc6OmmMR9tZCb2roLfbUxrWq13O/M
-SmNk9K30XXHue6DK2khQiL6a0j4UlQ==
-=BeOM
+mQENBFJphmsBCADiFgmS4bIzwZijrS31SjEMzg+n5zNellgM+HkShwehpqCiyhXd
+WrvH6dTZa6u50pbUIX7doTR7W7PQHCjCTqtpwvcj0eulZva+iHFp+XrbgSFHn+VV
+XgkYP2MFySyZRFabD2qqzJBEJofhpv4HvY6uQI5K99pMqKr1Z/lHqsijYYu4RH2O
+fwB5PinId7xeldzWEonVoCr+rfxzO/UrgA6v/3layGZcKNHFjmc3NqoN1DXtdaEH
+qtjIozzbndVkH6lkFvIpIrI6i5ox8pwpVxsxLCr/4Musd5CWgHiet5kSw2SzNeA8
+FbxdLYCpXNVu+uBACEbCUP+CSNy3NVfEUxsBABEBAAG0IEJyeWFuIERyZXdlcnkg
+PGJyeWFuQHNoYXRvdy5uZXQ+iQE9BBMBCgAnBQJSaYsDAhsDBQkJZgGABQsJCAcD
+BRUKCQgLBRYDAgEAAh4BAheAAAoJEDXXcbtuRpfPEBQH/jD4xd4tKMtQMmUyOhz2
+NNl4jyEBj0JkiAtWugi2OzYKBQQWzF5RhG5kR3etPDdadKyr9mrb4/P3z/QoH8UJ
+7GMqSqC/OVZszK5PuBSWtsw+CWo0cdmQFPv2ZsjFK8PD12k8B+RnxyVNOOkhXxOM
+5YgvfER9vEEYhx48BifqDn4oB1H3tYcYBOdFaRKkh5mHGZDp/sb5jmJJlCxSym6W
+an31FeXgNIPw21Z/d4cQltmF1IwoKf2cOXNBH4psyXQuwCS4aieYP2pheW4Mp9hE
+T7NG8f+4KThxhQhRwV6mE1llsYa/dzQb4IsF4dAxb1zG0nUTbpE4JMn6zuGSc6NF
+WyK0JEJyeWFuIERyZXdlcnkgPGJkcmV3ZXJ5QEZyZWVCU0Qub3JnPokBQAQTAQoA
+KgIbAwUJCWYBgAULCQgHAwUVCgkICwUWAwIBAAIeAQIXgAUCUmmLqAIZAQAKCRA1
+13G7bkaXz1woB/9jvZ2l1BMa8KR5zv3dk95RzVa4y94ZVHv59/smemCuZdBdb1Z/
+Lit3NNzhEzEfTv++5gZNh07z9/G95rpDh9gCUAY3I4m4Joz4khitoCWz608bZ/tH
+HbS7dmzZ3iE3kl8gRTb9khFAwe8kwlDdjcdlqm1FDoxidRrK+tuFjuIkrOU6nSLk
+/BWNrEQNYRxoqrqRHrCb9ddwIh8Th6CeBjYMYgbKumFQhxN7cd3mfNuHueiZ7o7m
+9rnfllVxaPukHjNtcBbc51tmL4bTDsakoBx40LQAhcQ6++1TyE7u9JLgDuztu/Ek
+twvrbSkV10KBPC4lIGm+pxsbfwM9CXXdz66kiQIcBBABCgAGBQJSaYmVAAoJEG54
+KsA8mwz5N90P/3eKNQgH2jGY0OkWPQOYIHZlNh7e04Xhc6oussyhOJkmdxpIuMQe
+qqj+LrYdOZaNF/aH8mm1rxmXcP52K9J0nb4NYCihn01qO3cXF6sdSa4RlZMbIgf+
+YG+eYHoaMGgIK03MhPT+oXMhIa1MNE+mymXP0Crvd3PezVm/nZgq+TC/VnDCT/h5
+9OKMT3has0i2gENaH5ad7tkkvVRT4o00ohgIEK/Hb3uWT+j9icaUy3Mf8WpRHdO7
+hCPzXXqJ6JXPrJHDJvjxtVopxzXaRrInw3xQON9hvrBn2iy0+vlkcHHsodxdMsCe
+guE2Xs65Qnh01KKdyJhrTDAsITa98cevcLs0DwlPd8pMhNPpHMPhWRjumxBy+dkA
+v+Gl+VS564T6CKBg2BGgzV76TQJgPPQEV9w9374wDsOexzkRb0GCya2YSdwnyDGZ
+aWbe6TQFgXq2tlrLjDKtm8miiNwtWL5qn+bn5zg6VW1E55Q4dC4q63Z5j2bL9IhW
+t+A8sAId/LvHCr17HbhlkAwdAavGtJp5jaVcVYfdmRSywMpkjAS65jew54lXo20J
+khpZuZXw8T+mWXjEMAl4Q4hM+IeY6kQEBPtQHBXXqN7do8XwQPhqMbgXTaquIf9d
+5uCu3HJ8EfUjZgQlQzA/yBO9OVP3ZHCc4zR8sFyGvv2n8ZlYXPAC1CLEuQENBFJp
+hmsBCACiVFPfkNfaFtUSuY0395ueo/rMyHPGPQ2iwvERFCpeFGSQSgagpenNHLpF
+QKTg/dl6FOoST5tqyxMqfyHGHDzzU51bvA/IfaGoNi/BIhTe/toZNMRvpcI3PLji
+GcnJnuwCCbAVOAGdb+t5cZtpNdOIcKYmrYG3u9RiBpe6dTF+qLrD/8Bs1wjhduQ8
+fcNNgnkXu8xDH4ZxY0lIc3QgvYWp9vimlQe6iKjUd2/DX28ETZcD5h6pYV331KMP
+TrEI0p0yvFijUZce8c1XHFyL1j9sBAha5qpszJl6Uq5iLolhKRcGfcdmtD72vHQj
+UYglUyudSJUVyo2gMYjdbiFKzJulABEBAAGJASUEGAEKAA8FAlJphmsCGwwFCQlm
+AYAACgkQNddxu25Gl89UPggA2mGQp28yCUKsJ6KHFVy/lpHfoQrKF+s7HfKTU2Ob
+VeVNX4I8ZdW1UO48mRqxEOwY8r5YSH6X06OmiqCX2aSMXg3N06/l+ztlB0+UGGlk
+XBjvl9/nii+bC6b8XWuu0X7Qpb9oYBK9YtoaoyuVplAmjdj/cPou65meKIaS1yDT
+jHh450DrW8Qghe6l0bFX4BHKTSm99U90ML7EY19B6iI2BZSqWutVsyD71oAREY6N
+GgDpCOIO6FS41+WeYCDRj8vsa/BiaoX2d2SBDsCwsEwe9fg5PYMi2uVIhvL6Orxn
+wOdB+TkgvOy5zZSNO29UG/JilZKoNdz2wpEaUzChGGqLvQ==
+=ExwC
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>

From owner-svn-doc-all@FreeBSD.ORG  Fri Oct 25 09:48:56 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 387BD3B5;
 Fri, 25 Oct 2013 09:48:56 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 16B1529F0;
 Fri, 25 Oct 2013 09:48:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9P9mubg096929;
 Fri, 25 Oct 2013 09:48:56 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9P9mtl5096928;
 Fri, 25 Oct 2013 09:48:55 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201310250948.r9P9mtl5096928@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 25 Oct 2013 09:48:55 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43040 - head/ja_JP.eucJP/books/handbook/users
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Mailman-Approved-At: Fri, 25 Oct 2013 12:07:37 +0000
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Oct 2013 09:48:56 -0000

Author: ryusuke
Date: Fri Oct 25 09:48:55 2013
New Revision: 43040
URL: http://svnweb.freebsd.org/changeset/doc/43040

Log:
  - Merge the following from the English version:
  
  	r41037 -> r42873	head/ja_JP.eucJP/books/handbook/users/chapter.xml
  
  Submitted by:	Yuta MASUMOTO <owata _at_ club dot kyutech dot ac dot jp>
  		ryusuke
  Reviewed by:	Yuta MASUMOTO <owata _at_ club dot kyutech dot ac dot jp>
  		ryusuke

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

Modified: head/ja_JP.eucJP/books/handbook/users/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/users/chapter.xml	Thu Oct 24 21:24:35 2013	(r43039)
+++ head/ja_JP.eucJP/books/handbook/users/chapter.xml	Fri Oct 25 09:48:55 2013	(r43040)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r41037
+     Original revision: r42873
      $FreeBSD$
 -->
 
@@ -30,43 +30,31 @@
       ¥·¥¹¥Æ¥à¤ò»È¤¦¤¿¤á¤Ë¤Ï¡¢
       ¤É¤Î¥æ¡¼¥¶¤â¥¢¥«¥¦¥ó¥È¤¬¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
 
-    <para>¤³¤Î¾Ï¤òÆɤà¤È¡¢°Ê²¼¤Î¤³¤È¤¬¤ï¤«¤ê¤Þ¤¹¡£</para>
+    <para>¤³¤Î¾Ï¤Ç¤Ï¡¢°Ê²¼¤Î¤³¤È¤òÀâÌÀ¤·¤Þ¤¹¡£</para>
 
     <itemizedlist>
       <listitem>
-	<para>&os; ¤Î¤µ¤Þ¤¶¤Þ¤Ê¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Î°ã¤¤</para>
+	<para>&os;
+	  ¥·¥¹¥Æ¥à¤Ë¤ª¤±¤ë¤µ¤Þ¤¶¤Þ¤Ê¼ïÎà¤Î¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Ë¤Ä¤¤¤Æ</para>
       </listitem>
 
       <listitem>
-	<para>¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤òÄɲä·¤¿¤êºï½ü¤¹¤ëÊýË¡</para>
+	<para>¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤òÄɲᢺï½ü¤ª¤è¤ÓÊѹ¹¤¹¤ëÊýË¡</para>
       </listitem>
 
       <listitem>
-	<para>¥æ¡¼¥¶¤Î̾Á°¤ä¥·¥§¥ë¤Ê¤É¡¢¥¢¥«¥¦¥ó¥È¤ÎºÙÌܤòÊѹ¹¤¹¤ëÊýË¡</para>
+	<para>¥æ¡¼¥¶¤ä¥°¥ë¡¼¥×¤¬ÍøÍѤǤ­¤ë¥ê¥½¡¼¥¹¤Î¾å¸Â¤òÀ©¸æ¤¹¤ëÊýË¡</para>
       </listitem>
 
       <listitem>
-	<para>¥¢¥«¥¦¥ó¥ÈËè¤ËÀ©¸Â¤ò¤«¤±¤Æ¡¢¥á¥â¥ê¤ä CPU »þ´Ö¤Ê¤É¡¢
-	  ¥¢¥«¥¦¥ó¥È¤ä¥°¥ë¡¼¥×¤ËÂФ·¤Æ¥¢¥¯¥»¥¹¤¬µö²Ä¤µ¤ì¤ë»ñ¸»¤òÀ©¸æ¤¹¤ëÊýË¡</para>
-      </listitem>
-
-      <listitem>
-	<para>¥¢¥«¥¦¥ó¥È´ÉÍý¤ò³Ú¤Ë¤¹¤ë¤¿¤á¤Î¥°¥ë¡¼¥×¤Î»È¤¤Êý</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>¤³¤Î¾Ï¤òÆɤàÁ°¤Ë</para>
-
-    <itemizedlist>
-      <listitem>
-	<para><link linkend="basics">&unix; ¤È &os; ¤Î´ðÁÃÃμ±</link>
-	  ¤òÍý²ò¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<para>¥°¥ë¡¼¥×¤ÎºîÀ®¡¢
+	¤ª¤è¤Ó¥°¥ë¡¼¥×¤Ë¥æ¡¼¥¶¤ò¥á¥ó¥Ð¤È¤·¤ÆÄɲ乤ëÊýË¡</para>
       </listitem>
     </itemizedlist>
   </sect1>
 
   <sect1 id="users-introduction">
-    <title>¤Ï¤¸¤á¤Ë</title>
+    <title>¥¢¥«¥¦¥ó¥È¤Î¼ïÎà</title>
 
     <para>&os; ¥·¥¹¥Æ¥à¤Ø¥¢¥¯¥»¥¹¤¹¤ë¤Ë¤Ï¡¢
       ¤«¤Ê¤é¤º¥¢¥«¥¦¥ó¥È¤¬»È¤ï¤ì¡¢
@@ -74,8 +62,73 @@
       ¥æ¡¼¥¶¤È¥¢¥«¥¦¥ó¥È¤Î´ÉÍý¤Ï¡¢½ÅÍפʤâ¤Î¤Ç¤¹¡£
     </para>
 
-    <para>&os; ¥·¥¹¥Æ¥à¾å¤Î¤É¤Î¥¢¥«¥¦¥ó¥È¤Ë¤â¡¢
-      ¤½¤Î¥¢¥«¥¦¥ó¥È¤ò¼±Ê̤¹¤ë¤¿¤á¤Î¾ðÊ󤬤ʤˤ«¤·¤é·ë¤ÓÉÕ¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+    <para>¥¢¥«¥¦¥ó¥È¤Ë¤ÏÂ礭¤¯Ê¬¤±¤Æ»°¼ïÎढ¤ê¤Þ¤¹¡£
+      ¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È (system accounts)¡¢¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È (user accounts)¡¢
+      ¤½¤·¤Æ¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶ (superuser) ¤Ç¤¹¡£</para>
+
+    <sect2 id="users-system">
+      <title>¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È</title>
+
+      <indexterm>
+	<primary>¥¢¥«¥¦¥ó¥È</primary>
+	<secondary>¥·¥¹¥Æ¥à</secondary>
+      </indexterm>
+
+      <para>¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È¤Ï¡¢DNS¡¢¥á¡¼¥ë¡¢
+	¥¦¥§¥Ö¥µ¡¼¥Ð¤È¤¤¤Ã¤¿³Æ¼ï¥µ¡¼¥Ó¥¹¤ò±¿ÍѤ¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£
+	¤³¤ÎÌÜŪ¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¤ò³ÎÊݤ¹¤ë¤¿¤á¤Ç¤¹¡£
+	¤â¤·¤¹¤Ù¤Æ¤Î¥µ¡¼¥Ó¥¹¤¬¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¤È¡¢
+	¤½¤ì¤é¤Î¥µ¡¼¥Ó¥¹¤Ï¤É¤ó¤ÊÆ°ºî¤Ç¤â²Äǽ¤È¤Ê¤ê¡¢
+	ŬÀÚ¤ÊÀ©¸Â¤òŬÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£</para>
+
+      <indexterm>
+	<primary>¥¢¥«¥¦¥ó¥È</primary>
+	<secondary><username>daemon</username></secondary>
+      </indexterm>
+      <indexterm>
+	<primary>¥¢¥«¥¦¥ó¥È</primary>
+	<secondary><username>operator</username></secondary>
+      </indexterm>
+
+      <para>¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È¤Î¶ñÂÎÎã¤Ï¡¢
+	<username>daemon</username>, <username>operator</username>,
+	<username>bind</username>, <username>news</username> ¤ª¤è¤Ó
+	<username>www</username> ¤È¤¤¤Ã¤¿¤â¤Î¤Ç¤¹¡£</para>
+
+      <indexterm>
+	<primary>¥¢¥«¥¦¥ó¥È</primary>
+	<secondary><username>nobody</username></secondary>
+      </indexterm>
+
+      <para><username>nobody</username>
+	¤ÏÄ̾ï¤ÎÆø¢¤ò»ý¤¿¤Ê¤¤¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È¤Ç¤¹¡£
+	¤·¤«¤·¡¢<username>nobody</username>
+	¤òÍøÍѤ¹¤ë¥µ¡¼¥Ó¥¹¤¬Áý¤¨¤ì¤ÐÁý¤¨¤ë¤Û¤É¡¢
+	¤½¤ì¤Ë½ê°¤¹¤ë¥Õ¥¡¥¤¥ë¤ä¥×¥í¥»¥¹¤âÁý¤¨¡¢
+	¤½¤ÎÆø¢¤âÂ礭¤¯¤Ê¤ë¤È¤¤¤¦¤³¤È¤ò˺¤ì¤Ê¤¤¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+    </sect2>
+
+    <sect2 id="users-user">
+      <title>¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È</title>
+
+      <indexterm>
+	<primary>¥¢¥«¥¦¥ó¥È</primary>
+	<secondary>user</secondary>
+      </indexterm>
+
+      <para>¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Ï¡¢
+	¼ç¤Ë¸½¼Â¤Î¥æ¡¼¥¶¤¬¥·¥¹¥Æ¥à¤Ë¥¢¥¯¥»¥¹¤¹¤ë¼êÃʤȤ·¤ÆÍѤ¤¤é¤ì¤ë¤â¤Î¤Ç¤¹¡£
+	¥·¥¹¥Æ¥à¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤Ï¡¢
+	¤½¤ì¤¾¤ìÍ£°ì¤Î¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤ò»ý¤Ä¤Ù¤­¤Ç¤¹¡£
+	¤³¤¦¤¹¤ë¤³¤È¤Ç´ÉÍý¼Ô¤Ï郎²¿¤ò¹Ô¤Ê¤Ã¤Æ¤¤¤ë¤«¤¬¤ï¤«¤ê¤Þ¤¹¤·¡¢
+	¾¤Î¿Í¤ÎÀßÄê¤ò²õ¤·¤Æ¤·¤Þ¤¦¤è¤¦¤Ê¤³¤È¤òÈò¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+
+      <para>¤½¤ì¤¾¤ì¤Î¥æ¡¼¥¶¤Ï²÷Ŭ¤Ë¥·¥¹¥Æ¥à¤òÍøÍѤ¹¤ë¤¿¤á¡¢
+	¥·¥§¥ë¡¢¥¨¥Ç¥£¥¿¡¢¥­¡¼ÀßÄê¡¢¸À¸ì¤Ê¤É¡¢
+	³Æ¼«¤Î´Ä¶­¤ò¥»¥Ã¥È¥¢¥Ã¥×¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+
+      <para>&os; ¥·¥¹¥Æ¥à¾å¤Î¤É¤Î¥¢¥«¥¦¥ó¥È¤Ë¤â¡¢
+	°Ê²¼¤Î¤è¤¦¤Ê¾ðÊ󤬤ʤˤ«¤·¤é·ë¤ÓÉÕ¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
     <variablelist>
       <varlistentry>
@@ -89,7 +142,7 @@
 	    Í­¸ú¤Ê¥æ¡¼¥¶Ì¾¤òºîÀ®¤¹¤ë¤Ë¤Ï &man.passwd.5;
 	    ¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤ë¤¤¤¯¤Ä¤â¤Îµ¬Â§¤¬¤¢¤ê¤Þ¤¹¡£
 	    ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¾å°Ì¸ß´¹À­¤òÊݤĤ¿¤á¤Ë¡¢
-	    8 ʸ»ú°Ê²¼¤Î¾®Ê¸»ú¤«¤é¤Ê¤ë¥æ¡¼¥¶Ì¾¤¬°ìÈÌŪ¤Ç¤¹¡£</para>
+	    8 ʸ»ú°Ê²¼¤Î¾®Ê¸»ú¤«¤é¤Ê¤ë¥æ¡¼¥¶Ì¾¤ò»È¤¦¤³¤È¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 	</listitem>
       </varlistentry>
 
@@ -97,10 +150,9 @@
 	<term>¥Ñ¥¹¥ï¡¼¥É</term>
 
 	<listitem>
-	  <para>¤½¤ì¤¾¤ì¤Î¥¢¥«¥¦¥ó¥È¤Ë¤Ï¥Ñ¥¹¥ï¡¼¥É¤¬¤¢¤ê¤Þ¤¹¡£
+	  <para>¤½¤ì¤¾¤ì¤Î¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Ë¤Ï¥Ñ¥¹¥ï¡¼¥É¤¬¤¢¤ê¤Þ¤¹¡£
 	    ¥Ñ¥¹¥ï¡¼¥É¤Ï¶õÇò¤Ë¤â¤Ç¤­¤Þ¤¹¤¬¡¢
-	    ¹Ô¤¦¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-	    ¤¹¤Ù¤Æ¤Î¥¢¥«¥¦¥ó¥È¤Ë¤Ï¥Ñ¥¹¥ï¡¼¥É¤ò¤Ä¤±¤ë¤Ù¤­¤Ç¤¹¡£</para>
+	    ¹Ô¤¦¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
 	</listitem>
       </varlistentry>
 
@@ -109,21 +161,12 @@
 
 	<listitem>
 	  <para>¥æ¡¼¥¶ ID (<acronym>UID</acronym>) ¤Ï¡¢
-	    ¥·¥¹¥Æ¥à¤¬¥æ¡¼¥¶¤ò°ì°Õ¤Ë¼±Ê̤¹¤ë¤¿¤á¤Î¡¢
-	    ÅÁÅýŪ¤Ë¤Ï 0 ¤«¤é 65535<footnote
-	      id="users-largeuidgid">
-	      <para><acronym>UID</acronym> ¤ä <acronym>GID</acronym>
-		¤Ë¤Ï 4294967295 ¤Þ¤Ç¤Î¿ô¤ò»È¤¨¤Þ¤¹¤¬¡¢
-		¤½¤Î¤è¤¦¤Ê ID ¤Ï¡¢ID
-		¤ÎÃͤËÂФ·¤Æ²¾Äê¤òÃÖ¤¤¤Æ¤¤¤ë¥½¥Õ¥È¥¦¥§¥¢¤ÇÌäÂê¤òµ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£</para>
-	    </footnote>¤Î´Ö¤Î¿ôÃͤǤ¹¡£ÆâÉôŪ¤Ë¤Ï¡¢&os; ¤Ï¥æ¡¼¥¶¤Î¼±Ê̤Ë
-	    <acronym>UID</acronym> ¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£
+	    &os; ¥·¥¹¥Æ¥à¤¬¥æ¡¼¥¶¤ò°ì°Õ¤Ë¼±Ê̤¹¤ë¤¿¤á¤Î¿ôÃͤǤ¹¡£
 	    ¥æ¡¼¥¶Ì¾¤ò»ØÄê¤Ç¤­¤ë¥³¥Þ¥ó¥É¤Ï¡¢
 	    ¥æ¡¼¥¶Ì¾¤ò <acronym>UID</acronym> ¤ËÊÑ´¹¤·¤Æ¤«¤é°·¤Ã¤Æ¤¤¤Þ¤¹¡£
-	    ¹¥¤Þ¤·¤¯¤¢¤ê¤Þ¤»¤ó¤¬¡¢Æ±¤¸ <acronym>UID</acronym>
-	    ¤ò»ý¤Ä°Û¤Ê¤ë¥æ¡¼¥¶Ì¾¤Î¥¢¥«¥¦¥ó¥È¤¬¤¤¤¯¤Ä¤¢¤Ã¤Æ¤â¤è¤¤¤È¤¤¤¦¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
-	    &os; ¤Ë¸Â¤Ã¤Æ¤¤¤¦¤È¡¢
-	    ¤³¤ì¤é¤Î¥¢¥«¥¦¥ó¥È¤Ï¤Ò¤È¤ê¤Î¥æ¡¼¥¶¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£</para>
+	    65535 ¤è¤êÂ礭¤Ê UID ¤Ï¡¢32
+	    ¥Ó¥Ã¥È°Ê¾å¤ÎÀ°¿ô¤ËÂбþ¤·¤Æ¤¤¤Ê¤¤¥½¥Õ¥È¥¦¥§¥¢¤Ë¤ª¤¤¤Æ¸ß´¹À­¤ÎÌäÂê¤ò°ú¤­µ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ë¤Î¤Ç¡¢
+	    65535 °Ê²¼¤Î UID ¤ò»ÈÍѤ¹¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 	</listitem>
       </varlistentry>
 
@@ -132,12 +175,13 @@
 
 	<listitem>
 	  <para>¥°¥ë¡¼¥× ID (<acronym>GID</acronym>) ¤Ï¡¢
-	    ¥æ¡¼¥¶¤¬Â°¤¹¤ëÂè°ì¥°¥ë¡¼¥×¤ò°ì°Õ¤Ë¼±Ê̤¹¤ë¤¿¤á¤Î¡¢
-	    ÅÁÅýŪ¤Ë¤Ï 0 ¤«¤é 65535<footnoteref linkend="users-largeuidgid"/>
-	    ¤Î´Ö¤Î¿ôÃͤǤ¹¡£¥°¥ë¡¼¥×¤Ï¡¢<acronym>UID</acronym> ¤Ç¤Ï¤Ê¤¯¡¢
+	    ¥æ¡¼¥¶¤¬Â°¤¹¤ëÂè°ì¥°¥ë¡¼¥×¤ò°ì°Õ¤Ë¼±Ê̤¹¤ë¤¿¤á¤Î¿ôÃͤǤ¹¡£
+	    ¥°¥ë¡¼¥×¤Ï¡¢<acronym>UID</acronym> ¤Ç¤Ï¤Ê¤¯¡¢
 	    ¥æ¡¼¥¶¤Î <acronym>GID</acronym> ¤Ë´ð¤Å¤¤¤Æ»ñ¸»¤Ø¤Î¥¢¥¯¥»¥¹¤òÀ©¸æ¤¹¤ë»ÅÁȤߤǤ¹¡£
 	    ¤³¤ì¤Ï¡¢¤¢¤ë¼ï¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤Î¥µ¥¤¥º¤òÂçÉý¤Ë¾®¤µ¤¯¤·¤Þ¤¹¡£
-	    ¥æ¡¼¥¶¤Ï¡¢Ê£¿ô¤Î¥°¥ë¡¼¥×¤Ë½ê°¤Ç¤­¤Þ¤¹¡£</para>
+	    ¥æ¡¼¥¶¤Ï¡¢Ê£¿ô¤Î¥°¥ë¡¼¥×¤Ë½ê°¤Ç¤­¤Þ¤¹¡£
+	    65535 ¤è¤êÂ礭¤Ê GID ¤Ï¡¢¥½¥Õ¥È¥¦¥§¥¢¤ËÌäÂê¤ò°ú¤­µ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ë¤Î¤Ç¡¢
+	    65535 °Ê²¼¤Î GID ¤ò»È¤¦¤³¤È¤ò¿ä¾©¤·¤Þ¤¹¡£</para>
 	</listitem>
       </varlistentry>
 
@@ -147,7 +191,8 @@
 	<listitem>
 	  <para>¥í¥°¥¤¥ó¥¯¥é¥¹¤Ï¥°¥ë¡¼¥×¤Î»ÅÁȤߤò³ÈÄ¥¤·¤¿¤â¤Î¤Ç¡¢
 	    ÊÌ¡¹¤Î¥æ¡¼¥¶¤ËÂФ·¤Æ¥·¥¹¥Æ¥à¤òÄ´À°¤¹¤ë»þ¤Ë¡¢
-	    ¤µ¤é¤Ê¤ë½ÀÆðÀ­¤òÄ󶡤·¤Þ¤¹¡£</para>
+	    ¤µ¤é¤Ê¤ë½ÀÆðÀ­¤òÄ󶡤·¤Þ¤¹¡£¥í¥°¥¤¥ó¥¯¥é¥¹¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	    <xref linkend="users-limiting"/> ¤ÇÀâÌÀ¤·¤Þ¤¹¡£</para>
 	</listitem>
       </varlistentry>
 
@@ -157,7 +202,8 @@
 	<listitem>
 	  <para>¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢&os;
 	    ¤ÏÄê´üŪ¤Ë¥Ñ¥¹¥ï¡¼¥É¤òÊѹ¹¤¹¤ë¤³¤È¤ò¥æ¡¼¥¶¤Ë¶¯À©¤·¤Þ¤»¤ó¡£
-	    ¤³¤ì¤ò¥æ¡¼¥¶¤´¤È¤ËÀßÄꤷ¤Æ¡¢°ìÉô¤Þ¤¿¤Ï¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤Ë¡¢
+	    ¤³¤ì¤ò &man.pw.8; ¤ò»ÈÍѤ·¤Æ¥æ¡¼¥¶¤´¤È¤ËÀßÄꤷ¡¢
+	    °ìÉô¤Þ¤¿¤Ï¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤Ë¡¢
 	    °ìÄê¤Î»þ´Ö¤¬¤¿¤Ã¤¿¤é¥Ñ¥¹¥ï¡¼¥É¤ò¶¯À©Åª¤ËÊѹ¹¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
 	</listitem>
       </varlistentry>
@@ -169,7 +215,7 @@
 	  <para>¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢&os; ¤Ï¥¢¥«¥¦¥ó¥È¤ò¼º¸ú¤µ¤»¤Þ¤»¤ó¡£
 	    ¤¿¤È¤¨¤Ð³Ø¹»¤ÇÀ¸Å̤Υ¢¥«¥¦¥ó¥È¤¬¤¢¤ë¾ì¹ç¤Ê¤É¡¢
 	    ¸Â¤é¤ì¤¿´ü´Ö¤À¤±¤Î¥¢¥«¥¦¥ó¥È¤òºîÀ®¤¹¤ë¤Ê¤é¡¢
-	    ¤½¤Î¥¢¥«¥¦¥ó¥È¤¬¤¤¤Ä¼º¸ú¤¹¤ë¤«»ØÄê¤Ç¤­¤Þ¤¹¡£
+	    ¤½¤Î¥¢¥«¥¦¥ó¥È¤¬¤¤¤Ä¼º¸ú¤¹¤ë¤« &man.pw.8; ¤ò»È¤Ã¤Æ»ØÄê¤Ç¤­¤Þ¤¹¡£
 	    Í­¸ú´ü´Ö¤¬·Ð²á¤·¤¿¤é¡¢
 	    ¤½¤Î¥¢¥«¥¦¥ó¥È¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ä¥Õ¥¡¥¤¥ë¤Ï»Ä¤Ã¤Æ¤¤¤Þ¤¹¤¬¡¢
 	    ¥·¥¹¥Æ¥à¤Ø¤Î¥í¥°¥¤¥ó¤Ï¤Ç¤­¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£</para>
@@ -182,7 +228,9 @@
 	<listitem>
 	  <para>&os; ¤Ç¤Ï¥æ¡¼¥¶Ì¾¤Ç¥¢¥«¥¦¥ó¥È¤ò°ì°Õ¤Ë¼±Ê̤·¤Þ¤¹¤¬¡¢
 	    ɬ¤º¤·¤â¥æ¡¼¥¶¤ÎËÜ̾¤òÈ¿±Ç¤·¤¿¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-	    ¤³¤Î¾ðÊó¤ò¥¢¥«¥¦¥ó¥È¤Ë´ØÏ¢ÉÕ¤±¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
+	    ¤³¤Î¾ðÊó¤ò¥¢¥«¥¦¥ó¥È¤Ë´ØÏ¢ÉÕ¤±¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
+	    ¤³¤Î¾ðÊó¤Ï¡¢¥³¥á¥ó¥È¤Î¤è¤¦¤Ë¡¢¶õÇò¡¢Âçʸ»ú¡¢¤ª¤è¤Ó
+	    8 »ú°Ê¾å¤Çµ­ºÜ¤Ç¤­¤Þ¤¹¡£</para>
 	</listitem>
       </varlistentry>
 
@@ -214,29 +262,20 @@
 	</listitem>
       </varlistentry>
     </variablelist>
+  </sect2>
 
-    <para>
-      ¥¢¥«¥¦¥ó¥È¤Ë¤ÏÂ礭¤¯Ê¬¤±¤Æ»°¼ïÎà¤Î¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£¤½¤ì¤Ï¡¢
-      <link linkend="users-superuser">¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶ (superuser)</link>¡¢
-      <link linkend="users-system">¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È (system accounts)</link>¡¢
-      ¤½¤·¤Æ<link linkend="users-user">¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È (user accounts)</link> ¤Ç¤¹¡£
-      ¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Î¥¢¥«¥¦¥ó¥È¤ÏÄ̾ï <username>root</username> ¤È¸Æ¤Ð¤ì¡¢
-      ̵À©¸Â¤ÎÆø¢¤ò»ý¤Ä¤¿¤á¤Ë¥·¥¹¥Æ¥à¤Î´ÉÍý¤ËÍѤ¤¤é¤ì¤Þ¤¹¡£
-      ¤Þ¤¿¡¢¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È¤Ï¥µ¡¼¥Ó¥¹¤Î±¿ÍѤËÍѤ¤¤é¤ì¡¢
-      ¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Ï¡¢
-      ¼ÂºÝ¤Î¥æ¡¼¥¶¤Ë³ä¤êÅö¤Æ¤é¤ì¡¢¥í¥°¥¤¥ó¤·¤Æ¥·¥¹¥Æ¥à¤òÍøÍѤ¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£</para>
-
-    <sect2 id="users-superuser">
+      <sect2 id="users-superuser">
       <title>¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È</title>
 
       <indexterm>
 	<primary>¥¢¥«¥¦¥ó¥È</primary>
 	<secondary>¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶ (root)</secondary>
       </indexterm>
+
       <para>¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤ÏÄ̾ï
 	<username>root</username> ¤È¸Æ¤Ð¤ì¡¢
-	¥·¥¹¥Æ¥à´ÉÍý¤ò¹Ô¤Ê¤¦¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£
-	¤³¤Î¥¢¥«¥¦¥ó¥È¤Ï¥á¡¼¥ë¤Î¤ä¤ê¤È¤ê¡¢¥·¥¹¥Æ¥à¤ÎÄ´ºº¡¢
+	¥·¥¹¥Æ¥à´ÉÍý¤ò¹Ô¤Ê¤¦¤¿¤á¤Ë»È¤ï¤ì¡¢¸¢¸Â¤ËÀ©¸Â¤¬¤¢¤ê¤Þ¤»¤ó¡£
+	¤½¤Î¤¿¤á¡¢¤³¤Î¥¢¥«¥¦¥ó¥È¤Ï¥á¡¼¥ë¤Î¤ä¤ê¤È¤ê¡¢¥·¥¹¥Æ¥à¤ÎÄ´ºº¡¢
 	¥×¥í¥°¥é¥ß¥ó¥°¤È¤¤¤Ã¤¿Æü¾ïŪ¤Êºî¶È¤ò¹Ô¤Ê¤¦¤¿¤á¤Ë»È¤ï¤ì¤ë¤Ù¤­¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
 
       <para>¤½¤ÎÍýͳ¤Ï¡¢¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤¬Ä̾ï¤Î¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤È°Û¤Ê¤ê¡¢
@@ -245,89 +284,58 @@
 	¥·¥¹¥Æ¥à¤Ë½ÅÂç¤Ê±Æ¶Á¤òÍ¿¤¨¤Æ¤·¤Þ¤¦¶²¤ì¤¬¤¢¤ë¤Î¤Ç¤¹¡£
 	¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Ç¤Ï¡¢
 	²¾¤ËÁàºî¤ò´Ö°ã¤¨¤Æ¤â¥·¥¹¥Æ¥à¤ò²õ¤·¤Æ¤·¤Þ¤¦¤è¤¦¤Ê¤³¤È¤Ï¤Ç¤­¤Ê¤¤¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-	¤·¤¿¤¬¤Ã¤ÆÆø¢¤òɬÍפȤ·¤Æ¤¤¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
-	¤Ç¤­¤ë¤À¤±¤¤¤Ä¤â¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤òÍøÍѤ¹¤ëÊý¤¬Ë¾¤Þ¤·¤¤¤È¸À¤¨¤ë¤Ç¤·¤ç¤¦¡£</para>
+	¤½¤Î¤¿¤á¡¢¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Ç¥í¥°¥¤¥ó¤·¡¢
+	¹â¤¤¸¢¸Â¤¬É¬Íפʥ³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¤­¤À¤±¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ë¤Ê¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
       <para>¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ç¼Â¹Ô¤¹¤ë¥³¥Þ¥ó¥É¤Ï¤¤¤Ä¤Ç¤â¡¢
 	Æó²ó¡¢»°²ó¤È³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
 	¤Ê¤¼¤Ê¤é¥¹¥Ú¡¼¥¹¤¬Â¿¤«¤Ã¤¿¤ê¡¢Ê¸»ú¤¬·ç¤±¤Æ¤¤¤¿¤ê¤¹¤ë¤À¤±¤Ç¡¢
 	¼è¤êÊÖ¤·¤Î¤Ä¤«¤Ê¤¤¥Ç¡¼¥¿¤ÎÇ˲õ¤Ë¤Ä¤Ê¤¬¤ë²ÄǽÀ­¤¬¤¢¤ë¤«¤é¤Ç¤¹¡£</para>
 
-      <para>¾ï¤Ë¥·¥¹¥Æ¥à´ÉÍý¼ÔÍѤ˥桼¥¶¥¢¥«¥¦¥ó¥È¤òºîÀ®¤·¡¢
-	°ìÈÌŪ¤Ê»ÈÍѤˤª¤¤¤Æ¤Ï¡¢¤½¤Î¥¢¥«¥¦¥ó¥È¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
-	¤³¤ì¤Ï¥Þ¥ë¥Á¥æ¡¼¥¶¥â¡¼¥É¡¢¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤òÌä¤ï¤º¡¢
-	ƱÍͤˤ¢¤Æ¤Ï¤Þ¤ê¤Þ¤¹¡£
-	¤³¤Î¾Ï¤Î¤¦¤·¤í¤ÎÊý¤Ç¤Ï¡¢¥¢¥«¥¦¥ó¥È¤ÎÄɲäÈÄ̾ï¤Î¥æ¡¼¥¶¤«¤é
-	¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ø¤È°Ü¹Ô¤¹¤ë¼ê½ç¤Ë¤Ä¤¤¤Æ°·¤¤¤Þ¤¹¡£</para>
-    </sect2>
-
-    <sect2 id="users-system">
-      <title>¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È</title>
-
-      <indexterm>
-	<primary>¥¢¥«¥¦¥ó¥È</primary>
-	<secondary>¥·¥¹¥Æ¥à</secondary>
-      </indexterm>
-      <para>¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È¤È¤Ï¡¢DNS¡¢¥á¡¼¥ë¡¢
-	¥¦¥§¥Ö¥µ¡¼¥Ð¤È¤¤¤Ã¤¿³Æ¼ï¥µ¡¼¥Ó¥¹¤ò±¿ÍѤ¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£
-	¤³¤ÎÌÜŪ¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¤ò³ÎÊݤ¹¤ë¤¿¤á¤Ç¤¹¡£
-	¤â¤·¥µ¡¼¥Ó¥¹¤¬¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¤È¡¢
-	¤½¤ì¤é¤Î¥µ¡¼¥Ó¥¹¤Ï (ËÜÍè°Õ¿Þ¤·¤Ê¤¤¤è¤¦¤Ê)
-	¤É¤ó¤ÊÆ°ºî¤Ç¤â²Äǽ¤È¤Ê¤ê¡¢Å¬ÀÚ¤ÊÀ©¸Â¤òŬÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£</para>
-
-      <indexterm>
-	<primary>¥¢¥«¥¦¥ó¥È</primary>
-	<secondary><username>daemon</username></secondary>
-      </indexterm>
-      <indexterm>
-	<primary>¥¢¥«¥¦¥ó¥È</primary>
-	<secondary><username>operator</username></secondary>
-      </indexterm>
-      <para>¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È¤Î¶ñÂÎÎã¤È¤·¤Æ¡¢
-	<username>daemon</username>, <username>operator</username>,
-	<username>bind</username>, <username>news</username> ¤ª¤è¤Ó
-	<username>www</username>
-	¤È¤¤¤Ã¤¿¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£</para>
+    <para>¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Î¸¢¸Â¤òÆÀ¤ë¤Ë¤Ï¡¢¤µ¤Þ¤¶¤Þ¤ÊÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£
+      <username>root</username> ¥æ¡¼¥¶¤È¤·¤Æ¥í¥°¥¤¥ó¤¹¤ëÊýË¡¤â¤¢¤ê¤Þ¤¹¤¬¡¢
+      ¤³¤ì¤Ï¤Þ¤Ã¤¿¤¯¤ª´«¤á¤Ç¤­¤Þ¤»¤ó¡£</para>
+
+    <para>¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Î¸¢¸Â¤ò¼ê¤ËÆþ¤ì¤ë¤Ë¤Ï¡¢¤«¤ï¤ê¤Ë &man.su.1;
+      ¤ò»È¤Ã¤Æ²¼¤µ¤¤¡£
+      <literal>-</literal> ¥ª¥×¥·¥ç¥ó¤ò¤Ä¤±¤Æ¼Â¹Ô¤¹¤ë¤È¡¢
+      ¼Â¹Ô¤·¤¿¥æ¡¼¥¶¤Ë root ¥æ¡¼¥¶¤Î´Ä¶­¤¬ÀßÄꤵ¤ì¤Þ¤¹¡£
+      ¤³¤Î¥³¥Þ¥ó¥É¤Ï <groupname>wheel</groupname>
+      ¥°¥ë¡¼¥×¤ËÆþ¤Ã¤Æ¤ë¥æ¡¼¥¶¤Î¤ß¤¬¼Â¹Ô¤Ç¤­¡¢Â¾¤Î¥æ¡¼¥¶¤Ï¼Â¹Ô½ÐÍè¤Þ¤»¤ó¡£
+      ¤Þ¤¿¡¢¼Â¹Ô»þ¤Ë¤Ï <username>root</username>
+      ¥æ¡¼¥¶¤Î¥Ñ¥¹¥ï¡¼¥É¤òɬÍפȤ·¤Þ¤¹¡£</para>
+
+    <para>°Ê²¼¤ÎÎã¤Ç¤Ï¡¢<command>make install</command>
+      ¤ò¹Ô¤¦¤È¤­¤Ë¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Î¸¢¸Â¤¬É¬ÍפʤΤǡ¢
+      ¤³¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë»þ¤À¤±¥æ¡¼¥¶¤Ï¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ë¤Ê¤ê¤Þ¤¹¡£
+      ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤¿¤é¡¢¥æ¡¼¥¶¤Ï <command>exit</command>
+      ¤ò¼Â¹Ô¤·¤Æ¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤«¤é¥í¥°¥¢¥¦¥È¤·¡¢
+      Ä̾ï¤Î¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Î¸¢¸Â¤ËÌá¤ê¤Þ¤¹¡£</para>
 
-      <indexterm>
-	<primary>¥¢¥«¥¦¥ó¥È</primary>
-	<secondary><username>nobody</username></secondary>
-      </indexterm>
-      <para><username>nobody</username>
-	¥æ¡¼¥¶¤ÏÄ̾ï¤ÎÆø¢¤ò»ý¤¿¤Ê¤¤¥·¥¹¥Æ¥à¥æ¡¼¥¶¤Ç¤¹¡£
-	¤·¤«¤·¡¢<username>nobody</username>
-	¤òÍøÍѤ¹¤ë¥µ¡¼¥Ó¥¹¤¬Áý¤¨¤ì¤ÐÁý¤¨¤ë¤Û¤É¡¢
-	¤½¤ì¤Ë½ê°¤¹¤ë¥Õ¥¡¥¤¥ë¤ä¥×¥í¥»¥¹¤âÁý¤¨¡¢
-	¤½¤ÎÆø¢¤âÂ礭¤¯¤Ê¤ë¤È¤¤¤¦¤³¤È¤ò˺¤ì¤Ê¤¤¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-    </sect2>
-
-    <sect2 id="users-user">
-      <title>¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È</title>
-
-      <indexterm>
-	<primary>¥¢¥«¥¦¥ó¥È</primary>
-	<secondary>user</secondary>
-      </indexterm>
-      <para>¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤Ï¡¢
-	¼ç¤Ë¸½¼Â¤Î¥æ¡¼¥¶¤¬¥·¥¹¥Æ¥à¤Ë¥¢¥¯¥»¥¹¤¹¤ë¼êÃʤȤ·¤ÆÍѤ¤¤é¤ì¤ë¤â¤Î¤Ç¤¹¡£
-	¤³¤Î¥¢¥«¥¦¥ó¥È¤ÏÍøÍѤ¹¤ë¥æ¡¼¥¶¤È¥·¥¹¥Æ¥à´Ä¶­¤òʬΥ¤·¤Þ¤¹¡£
-	¤½¤Î¤¿¤á¡¢¥·¥¹¥Æ¥à¤ä¾¤Î¥æ¡¼¥¶¤Ë´í³²¤ò¤ª¤è¤Ü¤¹´í¸±À­¤ò¤Ê¤¯¤·¡¢¤Þ¤¿¡¢
-	¾¤Ë±Æ¶Á¤òÍ¿¤¨¤ë¤³¤È¤Ê¤¯¥æ¡¼¥¶¼«¿È¤Î´Ä¶­¤ò¥«¥¹¥¿¥Þ¥¤¥º¤¹¤ë¤³¤È¤ò²Äǽ¤Ë¤·¤Æ¤¤¤Þ¤¹¡£</para>
+    <example>
+      <title>¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¸¢¸Â¤Ç¥×¥í¥°¥é¥à¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë</title>
 
-      <para>¥·¥¹¥Æ¥à¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤Ï¡¢
-	¤½¤ì¤¾¤ìÍ£°ì¤Î¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤ò»ý¤Ä¤Ù¤­¤Ç¤¹¡£
-	¤³¤¦¤¹¤ë¤³¤È¤Ç´ÉÍý¼Ô¤Ï郎²¿¤ò¹Ô¤Ê¤Ã¤Æ¤¤¤ë¤«¤¬¤ï¤«¤ê¤Þ¤¹¤·¡¢
-	¾¤Î¿Í¤ÎÀßÄê¤ò²õ¤·¤Æ¤·¤Þ¤Ã¤¿¤ê¡¢
-	¾¿Í¤Î¥á¡¼¥ë¤òÆɤó¤Ç¤·¤Þ¤¦¤è¤¦¤Ê¤³¤È¤òÈò¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+      <screen>&prompt.user; <userinput>configure</userinput>
+&prompt.user; <userinput>make</userinput>
+&prompt.user; <userinput>su -</userinput>
+Password:
+&prompt.root; <userinput>make install</userinput>
+&prompt.root; <userinput>exit</userinput>
+&prompt.user;</screen>
+    </example>
 
-      <para>¤½¤ì¤¾¤ì¤Î¥æ¡¼¥¶¤Ï²÷Ŭ¤Ë¥·¥¹¥Æ¥à¤òÍøÍѤ¹¤ë¤¿¤á¡¢
-	¥·¥§¥ë¡¢¥¨¥Ç¥£¥¿¡¢¥­¡¼ÀßÄê¡¢¸À¸ì¤Ê¤É¡¢
-	³Æ¼«¤Î´Ä¶­¤ò¥»¥Ã¥È¥¢¥Ã¥×¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
-    </sect2>
+     <para>1 ¿Í¤Î´ÉÍý¼Ô¤¬°ìÂæ¤Î¥Þ¥·¥ó¡¢
+       ¤â¤·¤¯¤Ï¾®µ¬ÌϤʥͥåȥ¥¯¤ò´ÉÍý¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢
+       &man.su.1; ¤Î¥Õ¥ì¡¼¥à¥ï¡¼¥¯¤Ï¤¦¤Þ¤¯µ¡Ç½¤¹¤ë¤Ç¤·¤ç¤¦¡£
+       ¤³¤ÎÂå¤ï¤ê¤È¤Ê¤ë¤Î¤Ï¡¢
+       <filename role="package">security/sudo</filename> package ¤Þ¤¿¤Ï port
+       ¤Ç¤¹¡£¤³¤ì¤Ï¥í¥°µ¡Ç½¤ä¡¢
+       ¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Î¸¢¸Â¤Ç¼Â¹Ô¤Ç¤­¤ë¥æ¡¼¥¶¤ä¥³¥Þ¥ó¥É¤òÀßÄê¤Ç¤­¤Þ¤¹¡£</para>
+  </sect2>
   </sect1>
 
   <sect1 id="users-modifying">
-    <title>¥¢¥«¥¦¥ó¥È¾ðÊó¤ÎÊѹ¹</title>
+    <title>¥¢¥«¥¦¥ó¥È¾ðÊó¤Î´ÉÍý</title>
 
     <indexterm>
       <primary>¥¢¥«¥¦¥ó¥È</primary>
@@ -752,14 +760,10 @@ passwd: done</screen>
 	<term><literal>coredumpsize</literal></term>
 
 	<listitem>
-	  <indexterm><primary>coredumpsize</primary></indexterm>
-	  <indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
-	    <secondary>coredumpsize</secondary>
-	  </indexterm>
 	  <para>¥×¥í¥°¥é¥à¤¬À¸À®¤¹¤ë core
-	    ¥Õ¥¡¥¤¥ë¤Î¥µ¥¤¥º¤Ë¤«¤«¤ëÀ©¸Â¤Ï¡¢
+	    ¥Õ¥¡¥¤¥ë¤Î¥µ¥¤¥º<indexterm><primary>coredumpsize</primary></indexterm>¤Ë¤«¤«¤ëÀ©¸Â¤Ï¡¢
 	    <literal>filesize</literal> ¤ä¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿¤Ê¤É¤Î¡¢
-	    ¤Û¤«¤Î¥Ç¥£¥¹¥¯»ÈÍѤ˴ؤ¹¤ëÀ©¸Â¤Ë½¾Â°¤·¤Þ¤¹¡£
+	    ¤Û¤«¤Î¥Ç¥£¥¹¥¯»ÈÍѤ˴ؤ¹¤ëÀ©¸Â<indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary><secondary>coredumpsize</secondary></indexterm>¤Ë½¾Â°¤·¤Þ¤¹¡£
 	    ¤³¤ÎÀ©¸Â¤Ï¡¢¥Ç¥£¥¹¥¯Îΰè¤Î¾ÃÈñ¤òÀ©¸æ¤¹¤ë¤¢¤Þ¤ê¸·¤·¤¯¤Ê¤¤¼êÃʤȤ·¤Æ¤è¤¯»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
 	    ¥æ¡¼¥¶¤Ï core ¥Õ¥¡¥¤¥ë¤ò¼«Ê¬¤ÇÀ¸À®¤¹¤ë¤ï¤±¤Ç¤Ï¤Ê¤¯¡¢
 	    ºï½ü¤·¤Ê¤¤¤³¤È¤â¿¤¤¤Î¤Ç¡¢
@@ -771,12 +775,7 @@ passwd: done</screen>
 	<term><literal>cputime</literal></term>
 
 	<listitem>
-	  <indexterm><primary>cputime</primary></indexterm>
-	  <indexterm>
-	    <primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
-	    <secondary>cputime</secondary>
-	  </indexterm>
-	  <para>¤½¤Î¥æ¡¼¥¶¤Î¥×¥í¥»¥¹¤¬¾ÃÈñ¤Ç¤­¤ë CPU »þ´Ö¤Î¾å¸Â¤Ç¤¹¡£
+	  <para>¤½¤Î¥æ¡¼¥¶¤Î¥×¥í¥»¥¹¤¬¾ÃÈñ¤Ç¤­¤ë CPU »þ´Ö<indexterm><primary>cputime</primary></indexterm><indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary><secondary>cputime</secondary></indexterm> ¤Î¾å¸Â¤Ç¤¹¡£
 	    ¤³¤ì¤òĶ¤¨¤¿¥×¥í¥»¥¹¤Ï¡¢¥«¡¼¥Í¥ë¤Ë¤è¤ê½ªÎ»¤µ¤ì¤Þ¤¹¡£</para>
 
 	  <note>
@@ -792,12 +791,7 @@ passwd: done</screen>
 	<term><literal>filesize</literal></term>
 
 	<listitem>
-	  <indexterm><primary>filesize</primary></indexterm>
-	  <indexterm>
-	    <primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
-	    <secondary>filesize</secondary>
-	  </indexterm>
-	  <para>¥æ¡¼¥¶¤¬½êÍ­¤Ç¤­¤ë¥Õ¥¡¥¤¥ë¤ÎÂ礭¤µ¤Î¾å¸Â¤Ç¤¹¡£<link
+	  <para>¥æ¡¼¥¶¤¬½êÍ­¤Ç¤­¤ë¥Õ¥¡¥¤¥ë¤ÎÂ礭¤µ<indexterm><primary>filesize</primary></indexterm><indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary><secondary>filesize</secondary></indexterm>¤Î¾å¸Â¤Ç¤¹¡£<link
 	    linkend="quotas">¥Ç¥£¥¹¥¯¥¯¥©¡¼¥¿</link> ¤È°ã¤¤¡¢
 	    ¤³¤ÎÀ©¸Â¤Ï¥æ¡¼¥¶¤Î¥Õ¥¡¥¤¥ë¤ò¤¹¤Ù¤Æ¤Þ¤È¤á¤¿½¸¹ç¤Ë¤Ç¤Ï¤Ê¤¯¡¢
 	    ¸Ä¡¹¤Î¥Õ¥¡¥¤¥ë¤Ë¤«¤«¤ê¤Þ¤¹¡£</para>
@@ -808,12 +802,7 @@ passwd: done</screen>
 	<term><literal>maxproc</literal></term>
 
 	<listitem>
-	  <indexterm><primary>maxproc</primary></indexterm>
-	  <indexterm>
-	    <primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
-	    <secondary>maxproc</secondary>
-	  </indexterm>
-	  <para>¥æ¡¼¥¶¤¬¼Â¹Ô¤Ç¤­¤ë¥×¥í¥»¥¹¿ô¤Î¾å¸Â¤Ç¤¹¡£
+	  <para>¥æ¡¼¥¶¤¬¼Â¹Ô¤Ç¤­¤ë¥×¥í¥»¥¹¿ô¤Î¾å¸Â<indexterm><primary>maxproc</primary></indexterm><indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary><secondary>maxproc</secondary></indexterm>¤Ç¤¹¡£
 	    ¥Õ¥©¥¢¥°¥é¥¦¥ó¥É¥×¥í¥»¥¹¤È¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥×¥í¥»¥¹¤ÎξÊý¤ò°·¤¤¤Þ¤¹¡£
 	    ¤³¤Î¾å¸Â¤Ï¡¢&man.sysctl.8; ÊÑ¿ô
 	    <varname>kern.maxproc</varname>
@@ -831,13 +820,8 @@ passwd: done</screen>
 	<term><literal>memorylocked</literal></term>
 
 	<listitem>
-	  <indexterm><primary>memorylocked</primary></indexterm>
-	  <indexterm>
-	    <primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
-	    <secondary>memorylocked</secondary>
-	  </indexterm>
 	  <para>¤³¤ì¤Ï¡¢1 ¤Ä¤Î¥×¥í¥»¥¹¤¬ &man.mlock.2;
-	    ¤Ë¤è¤ê¥á¥¤¥ó¥á¥â¥ê¤Ë¥í¥Ã¥¯¤µ¤ì¤ë¤³¤È¤òÍ×µá¤Ç¤­¤ë¥á¥â¥ê¤ÎºÇÂçÍÆÎ̤Ǥ¹
+	    ¤Ë¤è¤ê¥á¥¤¥ó¥á¥â¥ê¤Ë¥í¥Ã¥¯¤µ¤ì¤ë¤³¤È¤òÍ×µá¤Ç¤­¤ë¥á¥â¥ê<indexterm><primary>memorylocked</primary></indexterm><indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary><secondary>memorylocked</secondary></indexterm>¤ÎºÇÂçÍÆÎ̤Ǥ¹¡£
 	    &man.amd.8; ¤Î¤è¤¦¤Ê¥·¥¹¥Æ¥à¤Ç½ÅÍ×¤Ê¥×¥í¥°¥é¥à¤Ï¡¢
 	    ¥á¥¤¥ó¥á¥â¥ê¤Ø¥í¥Ã¥¯¤·¤Æ¡¢¥·¥¹¥Æ¥à¤¬¥¹¥ï¥Ã¥×¤¹¤ëºÝ¤Ë¡¢
 	    ¥Ç¥£¥¹¥¯¤Î¥¹¥é¥Ã¥·¥ó¥°¤ò°ú¤­µ¯¤³¤µ¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
@@ -848,12 +832,8 @@ passwd: done</screen>
 	<term><literal>memoryuse</literal></term>
 
 	<listitem>
-	  <indexterm><primary>memoryuse</primary></indexterm>
-	  <indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
-	    <secondary>memoryuse</secondary>
-	  </indexterm>
 	  <para>¤³¤ì¤Ï¡¢¤É¤Î»þÅÀ¤«¤òÌä¤ï¤º¡¢
-	    ¤¢¤ë¥×¥í¥»¥¹¤¬¾ÃÈñ¤Ç¤­¤ëºÇÂç¤Î¥á¥â¥êÍÆÎ̤Ǥ¹¡£
+	    ¤¢¤ë¥×¥í¥»¥¹¤¬¾ÃÈñ¤Ç¤­¤ëºÇÂç¤Î¥á¥â¥êÍÆÎÌ<indexterm><primary>memoryuse</primary></indexterm><indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary><secondary>memoryuse</secondary></indexterm>¤Ç¤¹¡£
 	    ¤³¤ì¤Ï¡¢¥á¥¤¥ó¥á¥â¥ê¤È¥¹¥ï¥Ã¥×¤Î»ÈÍÑÎ̤ò¹ç¤ï¤»¤¿¤â¤Î¤Ç¤¹¡£
 	    ¥á¥â¥ê¾ÃÈñ¤òÍÞ¤¨¤ë¤¿¤á¤ÎÊñ³çŪ¤ÊÀ©¸Â¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢
 	    ¼ê»Ï¤á¤Ë¤Ï¤è¤¤¤Ç¤·¤ç¤¦¡£</para>
@@ -864,11 +844,7 @@ passwd: done</screen>
 	<term><literal>openfiles</literal></term>
 
 	<listitem>
-	  <indexterm><primary>openfiles</primary></indexterm>
-	  <indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
-	    <secondary>openfiles</secondary>
-	  </indexterm>
-	  <para>¤³¤ì¤Ï¡¢¤¢¤ë¥×¥í¥»¥¹¤¬³«¤¤¤Æ¤ª¤±¤ëºÇÂç¤Î¥Õ¥¡¥¤¥ë¿ô¤Ç¤¹¡£
+	  <para>¤³¤ì¤Ï¡¢¤¢¤ë¥×¥í¥»¥¹¤¬³«¤¤¤Æ¤ª¤±¤ëºÇÂç¤Î¥Õ¥¡¥¤¥ë¿ô<indexterm><primary>openfiles</primary></indexterm><indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary><secondary>openfiles</secondary></indexterm>¤Ç¤¹¡£
 	    &os; ¤Ç¤Ï¡¢¥Õ¥¡¥¤¥ë¤Ï¤Þ¤¿¡¢¥½¥±¥Ã¥È¤ä
 	    IPC ¥Á¥ã¥ó¥Í¥ë¤òɽ¤ï¤¹¤Î¤Ë¤â»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
 	    ¤Ç¤¹¤«¤é¡¢¤¢¤Þ¤êÄ㤤ÃͤËÀßÄꤷ¤Ê¤¤¤è¤¦Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
@@ -882,12 +858,8 @@ passwd: done</screen>
 	<term><literal>sbsize</literal></term>
 
 	<listitem>
-	  <indexterm><primary>sbsize</primary></indexterm>
-	  <indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
-	    <secondary>sbsize</secondary>
-	  </indexterm>
 	  <para>¤³¤ì¤Ï¡¢¤¢¤ë¥æ¡¼¥¶¤¬¾ÃÈñ¤Ç¤­¤ë¥Í¥Ã¥È¥ï¡¼¥¯¥á¥â¥ê
-	    (¤Ä¤Þ¤ê mbuf) ¤Î¾å¸Â¤ÎÎ̤Ǥ¹¡£¥æ¡¼¥¶¤Ï¡¢
+	    (¤Ä¤Þ¤ê mbuf<indexterm><primary>sbsize</primary></indexterm><indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary><secondary>sbsize</secondary></indexterm>) ¤Î¾å¸Â¤ÎÎ̤Ǥ¹¡£¥æ¡¼¥¶¤Ï¡¢
 	    ¥Í¥Ã¥È¥ï¡¼¥¯ÄÌ¿®¤òÀ©¸Â¤¹¤ë¤Î¤Ë»È¤¨¤Þ¤¹¡£</para>
 	</listitem>
       </varlistentry>
@@ -896,11 +868,8 @@ passwd: done</screen>
 	<term><literal>stacksize</literal></term>
 
 	<listitem>
-	  <indexterm><primary>stacksize</primary></indexterm>
-	  <indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary>
-	    <secondary>stacksize</secondary>
-	  </indexterm>
-	  <para>¤³¤ì¤Ï¡¢¥×¥í¥»¥¹¤Î¥¹¥¿¥Ã¥¯¥µ¥¤¥º¤Î¾å¸Â¤Ç¤¹¡£
+	  
+	  <para>¤³¤ì¤Ï¡¢¥×¥í¥»¥¹¤Î¥¹¥¿¥Ã¥¯¥µ¥¤¥º<indexterm><primary>stacksize</primary></indexterm><indexterm><primary>¥æ¡¼¥¶¤ËÂФ¹¤ëÀ©¸Â</primary><secondary>stacksize</secondary></indexterm>¤Î¾å¸Â¤Ç¤¹¡£
 	    ¤¢¤ë¥×¥í¥°¥é¥à¤¬»ÈÍѤ·¤¦¤ë¥á¥â¥ê¤ÎÎ̤òÀ©¸Â¤¹¤ë¤Ë¤Ï¡¢
 	    ¤³¤ì¤À¤±¤Ç¤Ï½½Ê¬¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
 	    ¤·¤¿¤¬¤Ã¤Æ¡¢Â¾¤ÎÀ©¸Â¤ÈÁȤ߹ç¤ï¤»¤Æ»È¤ï¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
@@ -956,7 +925,7 @@ passwd: done</screen>
   </sect1>
 
   <sect1 id="users-groups">
-    <title>¥°¥ë¡¼¥×</title>
+    <title>¥°¥ë¡¼¥×¤Î´ÉÍý</title>
 
     <indexterm><primary>¥°¥ë¡¼¥×</primary></indexterm>
     <indexterm>

From owner-svn-doc-all@FreeBSD.ORG  Fri Oct 25 20:03:38 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id BEA59FAF;
 Fri, 25 Oct 2013 20:03:38 +0000 (UTC) (envelope-from pgj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A958E2E20;
 Fri, 25 Oct 2013 20:03:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9PK3cHV011786;
 Fri, 25 Oct 2013 20:03:38 GMT (envelope-from pgj@svn.freebsd.org)
Received: (from pgj@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9PK3bxP011780;
 Fri, 25 Oct 2013 20:03:37 GMT (envelope-from pgj@svn.freebsd.org)
Message-Id: <201310252003.r9PK3bxP011780@svn.freebsd.org>
From: Gabor Pali <pgj@FreeBSD.org>
Date: Fri, 25 Oct 2013 20:03:37 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43041 - head/en_US.ISO8859-1/htdocs/news/status
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Oct 2013 20:03:38 -0000

Author: pgj
Date: Fri Oct 25 20:03:37 2013
New Revision: 43041
URL: http://svnweb.freebsd.org/changeset/doc/43041

Log:
  - Add a "how to" page on writing quarterly status reports
  - Adjust the report sample to include the recommendations
  
  Submitted by:	theraven

Added:
  head/en_US.ISO8859-1/htdocs/news/status/howto.xml   (contents, props changed)
Modified:
  head/en_US.ISO8859-1/htdocs/news/status/Makefile
  head/en_US.ISO8859-1/htdocs/news/status/report-sample.xml
  head/en_US.ISO8859-1/htdocs/news/status/status.xml

Modified: head/en_US.ISO8859-1/htdocs/news/status/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/Makefile	Fri Oct 25 09:48:55 2013	(r43040)
+++ head/en_US.ISO8859-1/htdocs/news/status/Makefile	Fri Oct 25 20:03:37 2013	(r43041)
@@ -7,7 +7,7 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	status.xml
+DOCS=	status.xml howto.xml
 
 XMLDOCS=	report-2001-06
 XMLDOCS+=	report-2001-07

Added: head/en_US.ISO8859-1/htdocs/news/status/howto.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/en_US.ISO8859-1/htdocs/news/status/howto.xml	Fri Oct 25 20:03:37 2013	(r43041)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
+"http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [
+<!ENTITY title "How to Write FreeBSD Status Reports">
+]>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>&title;</title>
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
+  </head>
+
+  <body class="navinclude.about">
+
+  <p>&os; status reports are published quarterly and provide the general
+    public with a view of what is going on in the Project, and they are
+    often augmented by special reports from Developer Summits.  As they
+    are one of our most visible forms of communication, they are very
+    important.  This page will provide some advice on writing status
+    report entries from <a href="mailto:theraven@FreeBSD.org">David
+    Chisnall</a>, experienced in technical writing.</p>
+
+  <p><em>Do not worry if you are not a native English speaker.  The team
+    handling status reports, <tt>monthly@FreeBSD.org</tt>, will check
+    your entries for spelling and grammar, and fix it for you.</em></p>
+
+  <h2>Introduce Your Work</h2>
+
+  <p><em>Do not assume that the person reading the report knows about
+    your project.</em></p>
+
+  <p>The status reports have a wide distribution.  They are often one of
+    the top news items on the &os; web site and are one of the first
+    things that people will read if they want to know a bit about what
+    &os; is.  Consider this example:</p>
+
+  <pre>abc(4) support was added, including frobnicator compatibility.</pre>
+
+  <p>Someone reading this, if they are familiar with UNIX man pages,
+    will know that <tt>abc(4)</tt> is some kind of device.  But why should
+    the reader care?  What kind of device is it?  Compare with this
+    version:</p>
+
+  <pre>A new driver, abc(4), was added to the tree, bringing support for
+Yoyodyne's range Frobnicator of network interfaces.</pre>
+
+  <p>Now the reader knows that abc is a network interface driver.  Even
+    if they do not use any Yoyodyne products, you have communicated that
+    &os;'s support for network devices is improving.</p>
+
+  <h2>Show the Importance of Your Work</h2>
+
+  <p><em>Status reports are not just about telling everyone that things
+    were done, they also need to explain why they were done.</em></p>
+
+  <p>Carry on with the previous example.  Why is it interesting that we
+    now support Yoyodyne Frobnicator cards?  Are they widespread?  Are
+    they used in a specific popular device?  Are they used in a
+    particular niche where &os; has (or would like to have) a presence?
+    Are they the fastest network cards on the planet?  Status reports
+    often say things like this:</p>
+
+  <pre>We imported Cyberdyne Systems T800 into the tree.</pre>
+
+  <p>And then they stop.  Maybe the reader is an avid Cyberdyne fan and
+    knows what exciting new features the T800 brings.  This is unlikely.
+    It is far more likely that they have vaguely heard of whatever you
+    have imported (especially into the ports tree: remember that there
+    are 20,000 other things there too...).  List some of the new
+    features, or bug fixes.  Tell them why it is a good thing that we
+    have the new version.</p>
+
+  <h2>Tell Us Something New</h2>
+
+  <p><em>Do not recycle the same status report items.</em></p>
+
+  <p>Bear in mind that status reports are not just reports on the status
+    of the project, they are reports on the change of status of the
+    project.  If there is an ongoing project, spend a couple of
+    sentences introducing it, but then spend the rest of the report
+    talking about the new work.  What progress have been made since the
+    last report?  What is left to do?  When is it likely to be finished
+    (or, if <q>finished</q> does not really apply, when is it likely to
+    be ready for wider use, for testing, for deployment in production,
+    and so on)?</p>
+
+  <h2>Open Items</h2>
+
+  <p><em>If help is needed, make this explicit!</em></p>
+
+  <p>Is there any help needed with something?  Are there tasks other
+    people can do?  There are two ways in which you can use the open
+    items part of the status report: to solicit help, or to give a quick
+    overview of the amount of work left.  If there is already enough
+    people working on the project, or it is in a state where adding more
+    people would not speed it up, then the latter is better.  Give some
+    big work items that are in progress, and maybe indicate who is
+    focussing on each one.</p>
+
+  <p>List tasks, with enough detail that people know if they are likely
+    to be able to do them, and invite people to get in contact.</p>
+
+    <p><a href="status.html">Back to the main page</a></p>
+  </body>
+</html>

Modified: head/en_US.ISO8859-1/htdocs/news/status/report-sample.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/report-sample.xml	Fri Oct 25 09:48:55 2013	(r43040)
+++ head/en_US.ISO8859-1/htdocs/news/status/report-sample.xml	Fri Oct 25 20:03:37 2013	(r43041)
@@ -11,13 +11,20 @@
   <contact>
     <person>
       <name>
+      <!-- For persons -->
 	<given>John</given>
-
 	<common>Smith</common>
       </name>
 
       <email>test@FreeBSD.org</email>
     </person>
+
+    <!-- For teams or groups -->
+    <person>
+      <name>Wunderteam</name>
+
+      <email>team@FreeBSD.org</email>
+    </person>
   </contact>
 
   <!-- Optional section but highly encouraged. -->
@@ -32,20 +39,23 @@
 
   <!-- Required section. -->
   <body>
-    <p>You can start your first paragraph here.  Generally speaking, you
-      will only usually submit one paragraph per status report, as they
-      are intended to be somewhat brief.  If, however, you find it
-      necessary to write one with multiple paragraphs, it's fairly
-      straightforward.</p>
+    <!-- Do not worry if you are not a native English speaker. -->
+    <p>Introduce your work.  Do not assume that the person reading the
+      report knows about your project.</p>
+
+    <p>Show the importance of your work.  Status reports are not just
+      about telling everyone that things were done, they also need to
+      explain why they were done.</p>
 
-    <p>Just start another `p' tag.</p>
+    <p>What has happened since the last report?  Let us know what is new
+      in this area.</p>
   </body>
 
   <!-- Optional section for listing tasks. -->
   <help>
-    <task>Some work you need help with</task>
-    <task>More work</task>
-    <task>Keep these short and to the point</task>
+    <task>If help is needed, make this explicit!</task>
+    <task>List tasks, with enough detail that people know if they are
+      likely to be able to do them, and invite people to get in
+      contact.</task>
   </help>
-
 </project>

Modified: head/en_US.ISO8859-1/htdocs/news/status/status.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/status.xml	Fri Oct 25 09:48:55 2013	(r43040)
+++ head/en_US.ISO8859-1/htdocs/news/status/status.xml	Fri Oct 25 20:03:37 2013	(r43041)
@@ -42,6 +42,9 @@
     If it is a new project, or if a project has not submitted any prior status
     reports, a short description may precede the status information.</p>
 
+  <p>For more exact guidelines on how to write good status reports,
+    please consult <a href="howto.html">our recommendations</a>.</p>
+
   <p>Periodically special status reports are also prepared and
     published.  One of those are the developer summit reports.
     Developer summits are places where developers meet in person to

From owner-svn-doc-all@FreeBSD.ORG  Sat Oct 26 04:46:59 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 5AB2C192;
 Sat, 26 Oct 2013 04:46:59 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 47DB1277F;
 Sat, 26 Oct 2013 04:46:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9Q4kxdZ002008;
 Sat, 26 Oct 2013 04:46:59 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9Q4kxgW002007;
 Sat, 26 Oct 2013 04:46:59 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201310260446.r9Q4kxgW002007@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 26 Oct 2013 04:46:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43042 - head/en_US.ISO8859-1/htdocs/releng
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Oct 2013 04:46:59 -0000

Author: eadler
Date: Sat Oct 26 04:46:58 2013
New Revision: 43042
URL: http://svnweb.freebsd.org/changeset/doc/43042

Log:
  There appears to be no public information about this case.

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

Modified: head/en_US.ISO8859-1/htdocs/releng/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releng/index.xml	Fri Oct 25 20:03:37 2013	(r43041)
+++ head/en_US.ISO8859-1/htdocs/releng/index.xml	Sat Oct 26 04:46:58 2013	(r43042)
@@ -462,8 +462,6 @@
 
   <p>If you are unable to find an FTP mirror that still contains the
     release you are looking for, then you can email CD-ROM vendors to
-    see if they have any old releases available.  In September 2003,
-    we know of a case where FreeBSD 1.1 was used in a court of law to
-    invalidate a bogus software patent.</p>
+    see if they have any old releases available.</p>
   </body>
 </html>

From owner-svn-doc-all@FreeBSD.ORG  Sat Oct 26 18:07:51 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 2C792DF;
 Sat, 26 Oct 2013 18:07:51 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 19BCB2B32;
 Sat, 26 Oct 2013 18:07:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9QI7oYu072953;
 Sat, 26 Oct 2013 18:07:50 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9QI7oav072952;
 Sat, 26 Oct 2013 18:07:50 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201310261807.r9QI7oav072952@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 26 Oct 2013 18:07:50 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43043 - head/en_US.ISO8859-1/htdocs/releases/10.0R
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Oct 2013 18:07:51 -0000

Author: gjb
Date: Sat Oct 26 18:07:50 2013
New Revision: 43043
URL: http://svnweb.freebsd.org/changeset/doc/43043

Log:
  Document the start of the 10.0-BETA2 builds.
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

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

Modified: head/en_US.ISO8859-1/htdocs/releases/10.0R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/10.0R/schedule.xml	Sat Oct 26 04:46:58 2013	(r43042)
+++ head/en_US.ISO8859-1/htdocs/releases/10.0R/schedule.xml	Sat Oct 26 18:07:50 2013	(r43043)
@@ -118,7 +118,7 @@
     <tr>
       <td>BETA2 builds begin</td>
       <td>18&nbsp;October&nbsp;2013</td>
-      <td>-</td>
+      <td>26&nbsp;October&nbsp;2013</td>
       <td>Second beta test snapshot.</td>
     </tr>
 

From owner-svn-doc-all@FreeBSD.ORG  Sat Oct 26 20:21:28 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 8CCF496;
 Sat, 26 Oct 2013 20:21:28 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 790812142;
 Sat, 26 Oct 2013 20:21:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9QKLSRp028293;
 Sat, 26 Oct 2013 20:21:28 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9QKLRAM028289;
 Sat, 26 Oct 2013 20:21:27 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201310262021.r9QKLRAM028289@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Sat, 26 Oct 2013 20:21:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43044 - in head/share: security/advisories
 security/patches/EN-13:04 xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Oct 2013 20:21:28 -0000

Author: delphij
Date: Sat Oct 26 20:21:27 2013
New Revision: 43044
URL: http://svnweb.freebsd.org/changeset/doc/43044

Log:
  Add latest errata notice:
  
  Fix multiple freebsd-update bugs that break upgrading to
  FreeBSD 10.0. [EN-13:04]

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

Added: head/share/security/advisories/FreeBSD-EN-13:04.freebsd-update.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/advisories/FreeBSD-EN-13:04.freebsd-update.asc	Sat Oct 26 20:21:27 2013	(r43044)
@@ -0,0 +1,157 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+=============================================================================
+FreeBSD-EN-13:04.freebsd-update                                 Errata Notice
+                                                          The FreeBSD Project
+
+Topic:          Multiple freebsd-update bugs break upgrading to FreeBSD 10.0
+
+Category:       base
+Module:         freebsd-update
+Announced:      2013-10-24
+Credits:        Colin Percival
+Affects:        All supported FreeBSD releases
+Corrected:      2013-10-26 08:34:35 UTC (stable/10, 10.0-STABLE)
+                2013-10-26 08:34:35 UTC (stable/10, 10.0-BETA1-p1)
+                2013-10-26 19:54:28 UTC (stable/9, 9.2-STABLE)
+                2013-10-26 20:01:00 UTC (releng/9.2, 9.2-RELEASE-p1)
+                2013-10-26 20:01:00 UTC (releng/9.2, 9.2-RC4-p1)
+                2013-10-26 20:01:00 UTC (releng/9.2, 9.2-RC3-p2)
+                2013-10-26 20:01:00 UTC (releng/9.1, 9.1-RELEASE-p8)
+                2013-10-26 19:54:28 UTC (stable/8, 8.4-STABLE)
+                2013-10-26 20:01:00 UTC (releng/8.4, 8.4-RELEASE-p5)
+                2013-10-26 20:01:00 UTC (releng/8.3, 8.3-RELEASE-p12)
+
+For general information regarding FreeBSD Errata Notices and Security
+Advisories, including descriptions of the fields above, security
+branches, and the following sections, please visit
+<URL:http://security.freebsd.org/>.
+
+I.   Background
+
+The freebsd-update(8) utility is used to download and apply binary diffs
+for security and errata patches on systems installed from official FreeBSD
+release CDs and DVDs.  It can also be used to upgrade such systems to new
+FreeBSD releases.
+
+II.  Problem Description
+
+The freebsd-update(8) utility always updates shared libraries first, so
+new or updated libraries will be avaialble when binaries that use them are
+installed or updated.  If shared libraries appear in a directory which
+does not already exist on the target system, freebsd-update(8) will
+attempt to install them before creating the directory.
+
+At the end of the updating process, freebsd-update(8) removes old shared
+libraries which should no longer exist.  An error in filtering the list
+of filesystem objects results in symlinks to shared libraries being
+incorrectly included in the lists of shared libraries.
+
+Additionally, freebsd-update(8) rejects updates which include files with
+the tilde character ('~') in their names.  Such files sometimes occur in
+third-party software and may be included in the src distribution.
+
+III. Impact
+
+It is not possible to use freebsd-update(8) to upgrade an existing
+installation to FreeBSD 10.0-BETA1, because 10.0 introduces two new shared
+library directories, the /usr/lib/libc.so symlink is replaced by a regular
+file, and the source distribution includes a file with a tilde in its name.
+
+It is not possible to use freebsd-update(8) to update 10.0-BETA1, as its
+source distribution includes a file with a tilde in its name.
+
+IV.  Workaround
+
+No workaround is available.
+
+V.   Solution
+
+Perform one of the following:
+
+1) Upgrade your system to a supported FreeBSD stable or release / security
+branch (releng) dated after the correction date.
+
+2) To update your present system via a source code patch:
+
+The following patches have been verified to apply to the applicable
+FreeBSD release branches.
+
+a) Download the relevant patch from the location below, and verify the
+detached PGP signature using your PGP utility.
+
+# fetch http://security.FreeBSD.org/patches/EN-13:04/freebsd-update.patch
+# fetch http://security.FreeBSD.org/patches/EN-13:04/freebsd-update.patch.asc
+# gpg --verify freebsd-update.patch.asc
+
+b) Apply the patch.
+
+# cd /usr/src
+# patch < /path/to/patch
+
+c) Reinstall freebsd-update.
+
+# cd /usr/src/usr.sbin/freebsd-update
+# make install -DWITHOUT_MAN
+
+3) To update your system via a binary patch:
+
+Systems running a RELEASE version of FreeBSD on the i386 or amd64
+platforms can be updated via the freebsd-update(8) utility:
+
+# freebsd-update fetch
+# freebsd-update install
+
+On systems running 10.0-BETA1 (and ONLY systems running 10.0-BETA1), run
+the following command before using freebsd-update in order to fix it
+enough that it can update itself:
+
+# sed -i '' -e 's/%@/%~@/' /usr/sbin/freebsd-update
+
+VI.  Correction details
+
+The following list contains the revision numbers of each file that was
+corrected in FreeBSD.
+
+Branch/path                                                      Revision
+- -------------------------------------------------------------------------
+stable/8/                                                         r257192
+releng/8.3/                                                       r257194
+releng/8.4/                                                       r257194
+stable/9/                                                         r257192
+releng/9.1/                                                       r257194
+releng/9.2/                                                       r257194
+stable/10/                                                        r257153
+- -------------------------------------------------------------------------
+
+To see which files were modified by a particular revision, run the
+following command, replacing NNNNNN with the revision number, on a
+machine with Subversion installed:
+
+# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base
+
+Or visit the following URL, replacing NNNNNN with the revision number:
+
+<URL:http://svnweb.freebsd.org/base?view=revision&revision=NNNNNN>
+
+VII. References
+
+The latest revision of this Errata Notice is available at
+http://security.FreeBSD.org/advisories/FreeBSD-EN-13:04.freebsd-update.asc
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAEBCgAGBQJSbCKSAAoJEO1n7NZdz2rnes0P/ifRGR4Iak0mCzk9oMEzUBGE
+wrjcICt0azsnTHVuRR4ZOzxcRGliY32T36xPvc67nzJYI0KCcnKHurxALg8fmBdM
++OJCkcm8r1jFiaj7i4zxlKFfHtrrFnQe6OP4fVndB8nDjLqWzXcjLjZBZaXPM7Pp
+kWkmyyJN+Hk1ih3lXyPJ9y9YTcvoPmbrIezsHqurBPKPV8dizfp2jR8OmW25koqH
+26Dkt3d2KVXcrPJdTn8LE02as/zSK7s52IMJ0dgPv1/MkxxJBKDddz3x0o1rZUyM
+FdMyISp04zguFg8zZITIuUKDp+N+HrY5cIiBEOHXSWXTM1uXFXrq+P+/kjYxHHZK
+MJG0hi6F5RRooHPHTelZ7kKGVqPMnyT/Wo4bitfHzq5kqa6eys9rbsn5WUQkM7YL
+R4HYE90fwdphIVpEy38/kOAEEjJg/8vwVItS51AqhAtVMCamR65zV2RCNobUDKWJ
+oCjR+OgML5a75VwIhyy/kLaZlPB2nxb8KK3s2iVPDvFj0C368pEkRWz1kLmrc99P
+YkyLAZlEGL3WV6hEh/qlM81fTJHLjahNyQAOZeK8qIORhl8zABAq+Ce7XsWFJI9T
+FGjKvCSjiF3t3G2jRk9pjclXhliJrYJd1Cj9HqtvYdxEN3fEM23pfnsZqR8n0Vlr
+jX7rZ0kgqqZY8/O6AeSH
+=1thb
+-----END PGP SIGNATURE-----

Added: head/share/security/patches/EN-13:04/freebsd-update.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/EN-13:04/freebsd-update.patch	Sat Oct 26 20:21:27 2013	(r43044)
@@ -0,0 +1,78 @@
+Index: usr.sbin/freebsd-update/freebsd-update.sh
+===================================================================
+--- usr.sbin/freebsd-update/freebsd-update.sh
++++ usr.sbin/freebsd-update/freebsd-update.sh
+@@ -1200,7 +1200,7 @@
+ 	# Some aliases to save space later: ${P} is a character which can
+ 	# appear in a path; ${M} is the four numeric metadata fields; and
+ 	# ${H} is a sha256 hash.
+-	P="[-+./:=%@_[[:alnum:]]"
++	P="[-+./:=%@_[~[:alnum:]]"
+ 	M="[0-9]+\|[0-9]+\|[0-9]+\|[0-9]+"
+ 	H="[0-9a-f]{64}"
+ 
+@@ -2814,16 +2814,24 @@
+ 
+ 	# If we haven't already dealt with the world, deal with it.
+ 	if ! [ -f $1/worlddone ]; then
++		# Create any necessary directories first
++		grep -vE '^/boot/' $1/INDEX-NEW |
++		    grep -E '^[^|]+\|d\|' > INDEX-NEW
++		install_from_index INDEX-NEW || return 1
++
+ 		# Install new shared libraries next
+ 		grep -vE '^/boot/' $1/INDEX-NEW |
+-		    grep -E '/lib/.*\.so\.[0-9]+\|' > INDEX-NEW
++		    grep -vE '^[^|]+\|d\|' |
++		    grep -E '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' > INDEX-NEW
+ 		install_from_index INDEX-NEW || return 1
+ 
+ 		# Deal with everything else
+ 		grep -vE '^/boot/' $1/INDEX-OLD |
+-		    grep -vE '/lib/.*\.so\.[0-9]+\|' > INDEX-OLD
++		    grep -vE '^[^|]+\|d\|' |
++		    grep -vE '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' > INDEX-OLD
+ 		grep -vE '^/boot/' $1/INDEX-NEW |
+-		    grep -vE '/lib/.*\.so\.[0-9]+\|' > INDEX-NEW
++		    grep -vE '^[^|]+\|d\|' |
++		    grep -vE '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' > INDEX-NEW
+ 		install_from_index INDEX-NEW || return 1
+ 		install_delete INDEX-OLD INDEX-NEW || return 1
+ 
+@@ -2844,11 +2852,11 @@
+ 
+ 		# Do we need to ask the user to portupgrade now?
+ 		grep -vE '^/boot/' $1/INDEX-NEW |
+-		    grep -E '/lib/.*\.so\.[0-9]+\|' |
++		    grep -E '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' |
+ 		    cut -f 1 -d '|' |
+ 		    sort > newfiles
+ 		if grep -vE '^/boot/' $1/INDEX-OLD |
+-		    grep -E '/lib/.*\.so\.[0-9]+\|' |
++		    grep -E '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' |
+ 		    cut -f 1 -d '|' |
+ 		    sort |
+ 		    join -v 1 - newfiles |
+@@ -2868,11 +2876,20 @@
+ 
+ 	# Remove old shared libraries
+ 	grep -vE '^/boot/' $1/INDEX-NEW |
+-	    grep -E '/lib/.*\.so\.[0-9]+\|' > INDEX-NEW
++	    grep -vE '^[^|]+\|d\|' |
++	    grep -E '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' > INDEX-NEW
+ 	grep -vE '^/boot/' $1/INDEX-OLD |
+-	    grep -E '/lib/.*\.so\.[0-9]+\|' > INDEX-OLD
++	    grep -vE '^[^|]+\|d\|' |
++	    grep -E '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' > INDEX-OLD
+ 	install_delete INDEX-OLD INDEX-NEW || return 1
+ 
++	# Remove old directories
++	grep -vE '^/boot/' $1/INDEX-OLD |
++	    grep -E '^[^|]+\|d\|' > INDEX-OLD
++	grep -vE '^/boot/' $1/INDEX-OLD |
++	    grep -E '^[^|]+\|d\|' > INDEX-OLD
++	install_delete INDEX-OLD INDEX-NEW || return 1
++
+ 	# Remove temporary files
+ 	rm INDEX-OLD INDEX-NEW
+ }

Added: head/share/security/patches/EN-13:04/freebsd-update.patch.asc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/security/patches/EN-13:04/freebsd-update.patch.asc	Sat Oct 26 20:21:27 2013	(r43044)
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJSbCKVAAoJEO1n7NZdz2rnETwQAOMV7xt2OlnEdtppHyG7F5vj
+Kyii95jtZzgdvxh33EpVjqxc/Wo8pLgmciA2tP3K6M9qwbz8B6Hc2HxMyouV1LF2
+WUoJlmZTIZCdXF1RAPndBjvze+15kD7dGPPPfA7pJWN+07p7CZEUTHBoZ94q6u3y
+JlEEAjlXtYvWVJCrd2olIN0xwqNDL1AfywMOBKbfTN+NQiYr4hhPnnA33Fb+gyjK
+JpEZuCJ1p5caQWLRGn7L2Ro+y32MPSujOW8P0It5xTvGNjtSVYU09ZQPKFgdvD0L
+yNSJdSXLKfdpF9fLeUR2Ahwvdnao8BSMfPi2LP3g9sfapw40wP8/s8B7gCXp6wk7
+vl3ZhyqMC53O+kgHxMnbrTB1EK9q6vQ3tEhqUu3caGaCy5zqGxv49WMzNYSYxGcf
+8Kqvmab65YRrB7UY8wo6Sqc3tWqfP4VwWv+eljMeDgvbwcPZ3L7oAMfSZfyPfiYK
+OfR2JNWgutt6rqre5QixN3c+QsIPlpb9UUgOaoS22iveA0h8FmbOeWGyZ7Rwm6Bd
+6VKO+aHiSbumr9/LPVGBxYI63dWkcRj4NZEG/B6eV3wqUJufCEzrRecbJflIEXOJ
+jPg61eMA0ua+y+17D9RVkUqL9rrnhF18YfOh1JAkSzMP2J8NCEtW2ol02QAnlLDc
+Vv5c44zu0PyqRqtvK5sJ
+=QsbS
+-----END PGP SIGNATURE-----

Modified: head/share/xml/notices.xml
==============================================================================
--- head/share/xml/notices.xml	Sat Oct 26 18:07:50 2013	(r43043)
+++ head/share/xml/notices.xml	Sat Oct 26 20:21:27 2013	(r43044)
@@ -8,6 +8,18 @@
     <name>2013</name>
 
     <month>
+      <name>10</name>
+
+      <day>
+	<name>26</name>
+
+	<notice>
+	  <name>FreeBSD-EN-13:04.freebsd-update</name>
+	</notice>
+      </day>
+    </month>
+
+    <month>
       <name>8</name>
 
       <day>

From owner-svn-doc-all@FreeBSD.ORG  Sat Oct 26 20:36:09 2013
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 365BD464;
 Sat, 26 Oct 2013 20:36:09 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 09A312258;
 Sat, 26 Oct 2013 20:36:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9QKa8b6032064;
 Sat, 26 Oct 2013 20:36:08 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9QKa8Y9032063;
 Sat, 26 Oct 2013 20:36:08 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201310262036.r9QKa8Y9032063@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Sat, 26 Oct 2013 20:36:08 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43045 - head/share/security/advisories
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Oct 2013 20:36:09 -0000

Author: delphij
Date: Sat Oct 26 20:36:08 2013
New Revision: 43045
URL: http://svnweb.freebsd.org/changeset/doc/43045

Log:
  Correct a typo.
  
  Submitted by:	Kenta Suzumoto <kentas hush com>

Modified:
  head/share/security/advisories/FreeBSD-EN-13:04.freebsd-update.asc

Modified: head/share/security/advisories/FreeBSD-EN-13:04.freebsd-update.asc
==============================================================================
--- head/share/security/advisories/FreeBSD-EN-13:04.freebsd-update.asc	Sat Oct 26 20:21:27 2013	(r43044)
+++ head/share/security/advisories/FreeBSD-EN-13:04.freebsd-update.asc	Sat Oct 26 20:36:08 2013	(r43045)
@@ -38,7 +38,7 @@ FreeBSD releases.
 II.  Problem Description
 
 The freebsd-update(8) utility always updates shared libraries first, so
-new or updated libraries will be avaialble when binaries that use them are
+new or updated libraries will be available when binaries that use them are
 installed or updated.  If shared libraries appear in a directory which
 does not already exist on the target system, freebsd-update(8) will
 attempt to install them before creating the directory.
@@ -141,17 +141,17 @@ The latest revision of this Errata Notic
 http://security.FreeBSD.org/advisories/FreeBSD-EN-13:04.freebsd-update.asc
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAEBCgAGBQJSbCKSAAoJEO1n7NZdz2rnes0P/ifRGR4Iak0mCzk9oMEzUBGE
-wrjcICt0azsnTHVuRR4ZOzxcRGliY32T36xPvc67nzJYI0KCcnKHurxALg8fmBdM
-+OJCkcm8r1jFiaj7i4zxlKFfHtrrFnQe6OP4fVndB8nDjLqWzXcjLjZBZaXPM7Pp
-kWkmyyJN+Hk1ih3lXyPJ9y9YTcvoPmbrIezsHqurBPKPV8dizfp2jR8OmW25koqH
-26Dkt3d2KVXcrPJdTn8LE02as/zSK7s52IMJ0dgPv1/MkxxJBKDddz3x0o1rZUyM
-FdMyISp04zguFg8zZITIuUKDp+N+HrY5cIiBEOHXSWXTM1uXFXrq+P+/kjYxHHZK
-MJG0hi6F5RRooHPHTelZ7kKGVqPMnyT/Wo4bitfHzq5kqa6eys9rbsn5WUQkM7YL
-R4HYE90fwdphIVpEy38/kOAEEjJg/8vwVItS51AqhAtVMCamR65zV2RCNobUDKWJ
-oCjR+OgML5a75VwIhyy/kLaZlPB2nxb8KK3s2iVPDvFj0C368pEkRWz1kLmrc99P
-YkyLAZlEGL3WV6hEh/qlM81fTJHLjahNyQAOZeK8qIORhl8zABAq+Ce7XsWFJI9T
-FGjKvCSjiF3t3G2jRk9pjclXhliJrYJd1Cj9HqtvYdxEN3fEM23pfnsZqR8n0Vlr
-jX7rZ0kgqqZY8/O6AeSH
-=1thb
+iQIcBAEBCgAGBQJSbCdaAAoJEO1n7NZdz2rnRvAQAOsb3lZIaiLEsQgynVaIgH/I
+ZzvkR1ZwKbfRBzb5QQnQ/3ZHL30m9MCV+Z/dh/g2CKsf5D1K5uAv8a0SIqy0yW8g
+E8Oi4+136VPCTcs5uGC8PuBVEMq87hBhWycKasVL+ukdYA3AHM10JRuVLhV81M87
+Xe/vJqH7qPzvEtNIZdDqvDWhuHhPjlCI6SqMHI5ufxl3M7q+ylNgi5+yTwRbLqtH
+0E109rMlVpnVzRELl28wmgIx9u/lmsa3LHCO6HBRlUjWQlV7CBlRfgGjrlcGhcq+
+wFfmtT1jgbCOtJjakGOzEZhDuD5SlQTbIf4NCMfwgEIZE8PIUkWJcX8dPW4XiIo/
+72IoF8eyvgR8VoGhA+l2gtFwlGWI2AZEpyi0zbk4pZJBmU5O1qVzMLlFRGufD8kx
+1UZDT6yIsdWNCFF/R4YdrgyoySQoUlvpCV38cuKR6asOpyBFY/U9O3Ndu9VlTOBi
+GI2eX1XyFsTAzcp6PuXBIIUFlsRzrHFXxGyagF0NaLIAlB1amwcPHx5yxiRYcquM
+7VFaHUyMqWwRTTq+gtZlPcGI1t16tWmH9O9N+Cip9nUqL37s2Zb0zr+LttnYYod4
+kxMi2jTQLdGkxZvIR+iTGJD3SqKD321n6iWrHuGmyrRKmf3e6P2BTxjerBvI2Jkf
+nPk49938gAirwh9ucDbF
+=VqIo
 -----END PGP SIGNATURE-----